Skip to content

Commit 758691e

Browse files
authored
Merge pull request Expensify#59791 from daledah/fix/57775
fix: Not found page when deleting workspace
2 parents 94a6034 + a11523f commit 758691e

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

src/pages/workspace/WorkspaceOverviewPage.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import resetPolicyIDInNavigationState from '@libs/Navigation/helpers/resetPolicy
3939
import Navigation from '@libs/Navigation/Navigation';
4040
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
4141
import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
42-
import {getUserFriendlyWorkspaceType, isPolicyAdmin as isPolicyAdminPolicyUtils, isPolicyOwner} from '@libs/PolicyUtils';
42+
import {getUserFriendlyWorkspaceType, goBackFromInvalidPolicy, isPolicyAdmin as isPolicyAdminPolicyUtils, isPolicyOwner} from '@libs/PolicyUtils';
4343
import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
4444
import StringUtils from '@libs/StringUtils';
4545
import {shouldCalculateBillNewDot} from '@libs/SubscriptionUtils';
@@ -190,7 +190,10 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
190190
resetPolicyIDInNavigationState();
191191
updateLastAccessedWorkspaceSwitcher(undefined);
192192
}
193-
}, [policy?.id, policyName, activeWorkspaceID, setActiveWorkspaceID]);
193+
if (!shouldUseNarrowLayout) {
194+
goBackFromInvalidPolicy();
195+
}
196+
}, [policy?.id, policyName, activeWorkspaceID, setActiveWorkspaceID, shouldUseNarrowLayout]);
194197

195198
const onDeleteWorkspace = useCallback(() => {
196199
if (shouldCalculateBillNewDot()) {

0 commit comments

Comments
 (0)