diff --git a/packages/client/src/pages/Confirm/sub-components/tfaActivation.js b/packages/client/src/pages/Confirm/sub-components/tfaActivation.js
index d65ed9289f..6dfff336f0 100644
--- a/packages/client/src/pages/Confirm/sub-components/tfaActivation.js
+++ b/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
-
+
Android
and{" "}
-
+
iOS
{" "}
or Authenticator for{" "}
-
+
Windows Phone
{" "}
.
@@ -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))
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/History/index.js b/packages/client/src/pages/Home/InfoPanel/Body/views/History/index.js
index bb67f14c9f..c97faa4d40 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/History/index.js
+++ b/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 ;
- if (!history || history?.feeds.length === 0) return ;
+ if (!history) return <>>;
+ if (history?.feeds?.length === 0) return ;
return (
<>
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js
index 3b4eff5d21..3ff27ec117 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledSsoPageContainer.js
+++ b/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;
}