From 276c89dc3d6823e0fee42adc86c080c17eee7eb5 Mon Sep 17 00:00:00 2001 From: Timofey Boyko <55255132+TimofeyBoyko@users.noreply.github.com> Date: Mon, 5 Jun 2023 18:06:07 +0300 Subject: [PATCH] Web:Client:Home: fix empty screen for accounts and click at accounts article item --- packages/client/src/components/Article/Body/index.js | 5 ++++- .../src/pages/Home/Section/AccountsBody/EmptyScreen.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/Article/Body/index.js b/packages/client/src/components/Article/Body/index.js index 560134c18d..568029f032 100644 --- a/packages/client/src/components/Article/Body/index.js +++ b/packages/client/src/components/Article/Body/index.js @@ -64,6 +64,8 @@ const ArticleBodyContent = (props) => { .split(",") .filter((campaign) => campaign.length > 0); + const isAccounts = location.pathname.includes("accounts/filter"); + const onClick = React.useCallback( (folderId, title, rootFolderType) => { const { toggleArticleOpen } = props; @@ -116,7 +118,7 @@ const ArticleBodyContent = (props) => { params = accountsFilter.toUrlParams(); path = getCategoryUrl(CategoryType.Accounts); - withTimer = false; + if (activeItem === "accounts" && isAccounts) return; break; case "settings": @@ -156,6 +158,7 @@ const ArticleBodyContent = (props) => { recycleBinFolderId, activeItem, selectedFolderId, + isAccounts, ] ); diff --git a/packages/client/src/pages/Home/Section/AccountsBody/EmptyScreen.js b/packages/client/src/pages/Home/Section/AccountsBody/EmptyScreen.js index e484bc3331..fbef2f2ef5 100644 --- a/packages/client/src/pages/Home/Section/AccountsBody/EmptyScreen.js +++ b/packages/client/src/pages/Home/Section/AccountsBody/EmptyScreen.js @@ -78,7 +78,7 @@ export default inject(({ auth, peopleStore, clientLoadingStore }) => { }; return { resetFilter, - isEmptyGroup, + setIsLoading, theme: auth.settingsStore.theme, };