Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0

packages/client/src/pages/Confirm/sub-components/tfaActivation.js

@@ -96,6 +96,7 @@ const TfaActivationForm = withLoader((props) => {
     loginWithCodeAndCookie,
     history,
     location,
+    currentColorScheme,
   } = props;
 
   const [code, setCode] = useState("");
@@ -153,15 +154,27 @@ const TfaActivationForm = withLoader((props) => {
               portal security. Configure your authenticator application to
               continue work on the portal. For example you could use Google
               Authenticator for
-              <Link isHovered href={props.tfaAndroidAppUrl} target="_blank">
+              <Link
+                color={currentColorScheme?.main?.accent}
+                href={props.tfaAndroidAppUrl}
+                target="_blank"
+              >
                 Android
               </Link>
               and{" "}
-              <Link isHovered href={props.tfaIosAppUrl} target="_blank">
+              <Link
+                color={currentColorScheme?.main?.accent}
+                href={props.tfaIosAppUrl}
+                target="_blank"
+              >
                 iOS
               </Link>{" "}
               or Authenticator for{" "}
-              <Link isHovered href={props.tfaWinAppUrl} target="_blank">
+              <Link
+                color={currentColorScheme?.main?.accent}
+                href={props.tfaWinAppUrl}
+                target="_blank"
+              >
                 Windows Phone
               </Link>{" "}
               .
@@ -286,6 +299,7 @@ export default inject(({ auth, confirm }) => ({
   tfaAndroidAppUrl: auth.tfaStore.tfaAndroidAppUrl,
   tfaIosAppUrl: auth.tfaStore.tfaIosAppUrl,
   tfaWinAppUrl: auth.tfaStore.tfaWinAppUrl,
+  currentColorScheme: auth.settingsStore.currentColorScheme,
 }))(
   withRouter(
     withTranslation(["Confirm", "Common"])(observer(TfaActivationWrapper))

packages/client/src/pages/Home/InfoPanel/Body/views/History/index.js

@@ -89,7 +89,7 @@ const History = ({
     return { ...fetchedHistory, feedsByDays: parsedFeeds };
   };
 
-  useEffect(async () => {
+  useEffect(() => {
     if (!isMount.current) return;
 
     if (selection.history) {
@@ -101,7 +101,8 @@ const History = ({
   }, [selection]);
 
   if (showLoader) return <Loaders.InfoPanelViewLoader view="history" />;
-  if (!history || history?.feeds.length === 0) return <NoHistory t={t} />;
+  if (!history) return <></>;
+  if (history?.feeds?.length === 0) return <NoHistory t={t} />;
 
   return (
     <>

packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js

@@ -142,7 +142,7 @@ const StyledSsoPage = styled.div`
       width: 350px;
     }
 
-    p > div {
+    .label > div {
       display: inline-flex;
       margin-left: 4px;
     }