Skip to content

Commit 7585b7f

Browse files
authored
Merge pull request Expensify#71333 from nkdengineer/fix/70732
fix: Downgrade workspace RHP appears briefly
2 parents 266ee6b + d0ddf52 commit 7585b7f

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

src/pages/workspace/downgrade/WorkspaceDowngradePage.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, {useMemo, useState} from 'react';
2+
import {InteractionManager} from 'react-native';
23
import ConfirmModal from '@components/ConfirmModal';
34
import HeaderWithBackButton from '@components/HeaderWithBackButton';
45
import ScreenWrapper from '@components/ScreenWrapper';
@@ -54,13 +55,23 @@ function WorkspaceDowngradePage({route}: WorkspaceDowngradePageProps) {
5455
Navigation.dismissModal();
5556
};
5657

58+
const dismissModalAndNavigate = (targetPolicyID: string) => {
59+
Navigation.dismissModal();
60+
Navigation.isNavigationReady().then(() => {
61+
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(targetPolicyID));
62+
InteractionManager.runAfterInteractions(() => {
63+
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SELECT_FEED.getRoute(targetPolicyID));
64+
});
65+
});
66+
};
67+
5768
const onMoveToCompanyCardFeeds = () => {
5869
if (!policyID) {
5970
return;
6071
}
72+
6173
setIsDowngradeWarningModalOpen(false);
62-
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
63-
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SELECT_FEED.getRoute(policyID));
74+
InteractionManager.runAfterInteractions(() => dismissModalAndNavigate(policyID));
6475
};
6576

6677
if (!canPerformDowngrade) {

0 commit comments

Comments
 (0)