From 619397ce5dd5e35e0fcb57c841072993c542957a Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 6 Aug 2024 10:56:24 +0700 Subject: [PATCH 1/4] fix: Empty state categories does not display --- src/pages/workspace/categories/WorkspaceCategoriesPage.tsx | 2 +- .../workspace/reportFields/WorkspaceReportFieldsPage.tsx | 4 +++- src/pages/workspace/tags/WorkspaceTagsPage.tsx | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx index 0c3f23e29c61..4803410fe9cd 100644 --- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx +++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx @@ -332,7 +332,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { danger /> {shouldUseNarrowLayout && {getHeaderButtons()}} - {(!shouldUseNarrowLayout || categoryList.length === 0 || isLoading) && getHeaderText()} + {(!shouldUseNarrowLayout || !hasVisibleCategories || isLoading) && getHeaderText()} {isLoading && ( reportField.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || isOffline); + useFocusEffect(fetchReportFields); useEffect(() => { @@ -269,7 +271,7 @@ function WorkspaceReportFieldsPage({ cancelText={translate('common.cancel')} danger /> - {(!shouldUseNarrowLayout || reportFieldsSections[0].data.length === 0 || isLoading) && getHeaderText()} + {(!isSmallScreenWidth || !hasVisibleReportField || isLoading) && getHeaderText()} {isLoading && ( - {(!shouldUseNarrowLayout || tagList.length === 0 || isLoading) && getHeaderText()} + {(!shouldUseNarrowLayout || !hasVisibleTag || isLoading) && getHeaderText()} {isLoading && ( Date: Tue, 6 Aug 2024 14:40:07 +0700 Subject: [PATCH 2/4] fix ts check --- src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx index 8df4a59131bb..ebfa5cd6f0a8 100644 --- a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx +++ b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx @@ -26,6 +26,7 @@ import useNetwork from '@hooks/useNetwork'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; +import useWindowDimensions from '@hooks/useWindowDimensions'; import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode'; import * as DeviceCapabilities from '@libs/DeviceCapabilities'; import Navigation from '@libs/Navigation/Navigation'; @@ -63,6 +64,7 @@ function WorkspaceReportFieldsPage({ const {environmentURL} = useEnvironment(); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`); const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE); + const {isSmallScreenWidth} = useWindowDimensions(); const filteredPolicyFieldList = useMemo(() => { if (!policy?.fieldList) { return {}; From 0e50d05c71217ef1a1c75a3f964dbe328aad06f7 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 6 Aug 2024 17:25:59 +0700 Subject: [PATCH 3/4] fix: remove useless code --- .../workspace/reportFields/WorkspaceReportFieldsPage.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx index ebfa5cd6f0a8..74167814c466 100644 --- a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx +++ b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx @@ -26,7 +26,6 @@ import useNetwork from '@hooks/useNetwork'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; -import useWindowDimensions from '@hooks/useWindowDimensions'; import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode'; import * as DeviceCapabilities from '@libs/DeviceCapabilities'; import Navigation from '@libs/Navigation/Navigation'; @@ -64,7 +63,6 @@ function WorkspaceReportFieldsPage({ const {environmentURL} = useEnvironment(); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`); const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE); - const {isSmallScreenWidth} = useWindowDimensions(); const filteredPolicyFieldList = useMemo(() => { if (!policy?.fieldList) { return {}; @@ -273,7 +271,7 @@ function WorkspaceReportFieldsPage({ cancelText={translate('common.cancel')} danger /> - {(!isSmallScreenWidth || !hasVisibleReportField || isLoading) && getHeaderText()} + {(shouldUseNarrowLayout || !hasVisibleReportField || isLoading) && getHeaderText()} {isLoading && ( Date: Wed, 7 Aug 2024 20:55:38 +0700 Subject: [PATCH 4/4] fix: duplicate header text --- src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx index e691e1bb5068..92e84355e209 100644 --- a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx +++ b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx @@ -274,7 +274,7 @@ function WorkspaceReportFieldsPage({ cancelText={translate('common.cancel')} danger /> - {(shouldUseNarrowLayout || !hasVisibleReportField || isLoading) && getHeaderText()} + {(!shouldUseNarrowLayout || !hasVisibleReportField || isLoading) && getHeaderText()} {isLoading && (