From fe4f627d5b2d68f740e264beab5f4b9751e97664 Mon Sep 17 00:00:00 2001 From: Samran Ahmed Date: Fri, 14 Nov 2025 00:11:33 +0500 Subject: [PATCH 1/5] fix: Not Found Page briefly seen after deleting workspace from Overview --- src/pages/workspace/WorkspacePageWithSections.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspacePageWithSections.tsx b/src/pages/workspace/WorkspacePageWithSections.tsx index 940915787dbc..eab71239adad 100644 --- a/src/pages/workspace/WorkspacePageWithSections.tsx +++ b/src/pages/workspace/WorkspacePageWithSections.tsx @@ -167,7 +167,7 @@ function WorkspacePageWithSections({ } // We check isPendingDelete and prevIsPendingDelete to prevent the NotFound view from showing right after we delete the workspace - return (!isEmptyObject(policy) && !isPolicyAdmin(policy) && !shouldShowNonAdmin) || (!shouldShowPolicy && (!isPendingDelete || prevIsPendingDelete)); + return (!isEmptyObject(policy) && !isPolicyAdmin(policy) && !shouldShowNonAdmin) || (!shouldShowPolicy && !isPendingDelete && !prevIsPendingDelete); // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps }, [policy, shouldShowNonAdmin, shouldShowPolicy]); From bc4554a4c4afa1c883b303514a5ee740208805b0 Mon Sep 17 00:00:00 2001 From: Samran Ahmed Date: Mon, 17 Nov 2025 20:03:05 +0500 Subject: [PATCH 2/5] fix: broken UI on android when admin delete workspace --- src/pages/workspace/WorkspaceOverviewPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx index 55fc36fa9e36..97e30afbc11b 100644 --- a/src/pages/workspace/WorkspaceOverviewPage.tsx +++ b/src/pages/workspace/WorkspaceOverviewPage.tsx @@ -559,7 +559,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa numberOfLinesTitle={0} /> - {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly) && ( + {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly || prevIsPendingDelete) && ( Date: Mon, 17 Nov 2025 21:15:38 +0500 Subject: [PATCH 3/5] fix: hide description item on pending delete --- src/pages/workspace/WorkspaceOverviewPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx index 97e30afbc11b..14e0ad3968a3 100644 --- a/src/pages/workspace/WorkspaceOverviewPage.tsx +++ b/src/pages/workspace/WorkspaceOverviewPage.tsx @@ -559,7 +559,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa numberOfLinesTitle={0} /> - {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly || prevIsPendingDelete) && ( + {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly) && !isPendingDelete && ( Date: Mon, 17 Nov 2025 22:55:12 +0500 Subject: [PATCH 4/5] fix: keep description field visible on Pending Delete for admins --- src/pages/workspace/WorkspaceOverviewPage.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx index 14e0ad3968a3..1300b29c4ef5 100644 --- a/src/pages/workspace/WorkspaceOverviewPage.tsx +++ b/src/pages/workspace/WorkspaceOverviewPage.tsx @@ -9,7 +9,6 @@ import AvatarWithImagePicker from '@components/AvatarWithImagePicker'; import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu'; import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types'; import ConfirmModal from '@components/ConfirmModal'; -import * as Expensicons from '@components/Icon/Expensicons'; import {LockedAccountContext} from '@components/LockedAccountModalProvider'; import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; @@ -74,7 +73,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa const currentUserPersonalDetails = useCurrentUserPersonalDetails(); const illustrations = useThemeIllustrations(); const illustrationIcons = useMemoizedLazyIllustrations(['Building'] as const); - const expensifyIcons = useMemoizedLazyExpensifyIcons(['FallbackWorkspaceAvatar', 'ImageCropSquareMask', 'QrCode', 'Transfer', 'Trashcan', 'UserPlus'] as const); + const expensifyIcons = useMemoizedLazyExpensifyIcons(['FallbackWorkspaceAvatar', 'ImageCropSquareMask', 'QrCode', 'Transfer', 'Trashcan', 'UserPlus', 'Exit'] as const); const backTo = route.params.backTo; const [currencyList = getEmptyObject()] = useOnyx(ONYXKEYS.CURRENCY_LIST, {canBeMissing: true}); @@ -404,7 +403,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa secondaryActions.push({ value: 'leave', text: translate('common.leave'), - icon: Expensicons.Exit, + icon: expensifyIcons.Exit, onSelected: () => close(handleLeave), }); return renderDropdownMenu(secondaryActions); @@ -458,7 +457,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa secondaryActions.push({ value: 'leave', text: translate('common.leave'), - icon: Expensicons.Exit, + icon: expensifyIcons.Exit, onSelected: () => close(handleLeave), }); } @@ -559,7 +558,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa numberOfLinesTitle={0} /> - {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly) && !isPendingDelete && ( + {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly || prevIsPendingDelete) && ( Date: Sat, 22 Nov 2025 23:03:35 +0500 Subject: [PATCH 5/5] Update src/pages/workspace/WorkspaceOverviewPage.tsx Co-authored-by: Situ Chandra Shil <108292595+situchan@users.noreply.github.com> --- src/pages/workspace/WorkspaceOverviewPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx index 1300b29c4ef5..3b2f3e116bd0 100644 --- a/src/pages/workspace/WorkspaceOverviewPage.tsx +++ b/src/pages/workspace/WorkspaceOverviewPage.tsx @@ -558,7 +558,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa numberOfLinesTitle={0} /> - {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly || prevIsPendingDelete) && ( + {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly || (prevIsPendingDelete && !isPendingDelete)) && (