From 14d743181e0ad4d7433e5f384eaf1906508aa4fe Mon Sep 17 00:00:00 2001
From: gazizova-vlada <vlada.gazizova@onlyoffice.com>
Date: Wed, 17 Aug 2022 12:20:52 +0300
Subject: [PATCH] Web:Common:Fix InfoPanelToggle, LinkForgotPassword,
 LoadingButton.

---
 .../ColorTheme/styled/infoPanelToggle.js      | 18 +++++++------
 .../ColorTheme/styled/linkForgotPassword.js   | 12 +++++----
 .../ColorTheme/styled/loadingButton.js        | 26 ++++++++++---------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/packages/common/components/ColorTheme/styled/infoPanelToggle.js b/packages/common/components/ColorTheme/styled/infoPanelToggle.js
index 19e5e28e00..7a511e9408 100644
--- a/packages/common/components/ColorTheme/styled/infoPanelToggle.js
+++ b/packages/common/components/ColorTheme/styled/infoPanelToggle.js
@@ -2,15 +2,17 @@ import styled, { css } from "styled-components";
 import { StyledInfoPanelToggleWrapper } from "@docspace/client/src/pages/Home/InfoPanel/Header/styles/styles";
 import Base from "@docspace/components/themes/base";
 
-const getDefaultStyles = ({ currentColorScheme, theme }) => css`
-  .info-panel-toggle-bg {
-    path {
-      fill: ${theme.isBase
-        ? currentColorScheme.accentColor
-        : theme.infoPanel.sectionHeaderToggleIconActive};
+const getDefaultStyles = ({ currentColorScheme, theme }) =>
+  currentColorScheme &&
+  css`
+    .info-panel-toggle-bg {
+      path {
+        fill: ${theme.isBase
+          ? currentColorScheme.accentColor
+          : theme.infoPanel.sectionHeaderToggleIconActive};
+      }
     }
-  }
-`;
+  `;
 
 StyledInfoPanelToggleWrapper.defaultProps = { theme: Base };
 
diff --git a/packages/common/components/ColorTheme/styled/linkForgotPassword.js b/packages/common/components/ColorTheme/styled/linkForgotPassword.js
index d3c91605d8..9b981e3cb6 100644
--- a/packages/common/components/ColorTheme/styled/linkForgotPassword.js
+++ b/packages/common/components/ColorTheme/styled/linkForgotPassword.js
@@ -1,10 +1,12 @@
 import styled, { css } from "styled-components";
 import { LoginContainer } from "@docspace/login/src/StyledLogin";
 
-const getDefaultStyles = ({ currentColorScheme }) => css`
-  .login-link {
-    color: ${currentColorScheme.accentColor};
-  }
-`;
+const getDefaultStyles = ({ currentColorScheme }) =>
+  currentColorScheme &&
+  css`
+    .login-link {
+      color: ${currentColorScheme.accentColor};
+    }
+  `;
 
 export default styled(LoginContainer)(getDefaultStyles);
diff --git a/packages/common/components/ColorTheme/styled/loadingButton.js b/packages/common/components/ColorTheme/styled/loadingButton.js
index cbb3e5be51..36f3aeda9e 100644
--- a/packages/common/components/ColorTheme/styled/loadingButton.js
+++ b/packages/common/components/ColorTheme/styled/loadingButton.js
@@ -6,21 +6,23 @@ import {
 } from "@docspace/client/src/components/panels/UploadPanel/SubComponents/StyledLoadingButton";
 import { Base } from "@docspace/components/themes";
 
-const getDefaultStyles = ({ currentColorScheme, theme }) => css`
-  ${StyledCircle} {
-    .circle__mask .circle__fill {
-      background-color: ${theme.isBase === true
+const getDefaultStyles = ({ currentColorScheme, theme }) =>
+  currentColorScheme &&
+  css`
+    ${StyledCircle} {
+      .circle__mask .circle__fill {
+        background-color: ${theme.isBase
+          ? currentColorScheme.accentColor
+          : theme.filesPanels.upload.loadingButton.color};
+      }
+    }
+
+    ${StyledLoadingButton} {
+      color: ${theme.isBase
         ? currentColorScheme.accentColor
         : theme.filesPanels.upload.loadingButton.color};
     }
-  }
-
-  ${StyledLoadingButton} {
-    color: ${theme.isBase === true
-      ? currentColorScheme.accentColor
-      : theme.filesPanels.upload.loadingButton.color};
-  }
-`;
+  `;
 
 StyledCircleWrap.defaultProps = {
   theme: Base,