Skip to content

Commit 2b603e4

Browse files
authored
Merge pull request #40395 from bernhardoj/fix/39503-transfer-owner-page-infinite-back-loop
Fix back navigation loop after refreshing page on transfer owner success
2 parents e662e00 + 657c8c0 commit 2b603e4

File tree

4 files changed

+4
-0
lines changed

4 files changed

+4
-0
lines changed

src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ function WorkspaceOwnerChangeCheck({personalDetails, policy, accountID, error}:
6464
if (error === CONST.POLICY.OWNERSHIP_ERRORS.HAS_FAILED_SETTLEMENTS || error === CONST.POLICY.OWNERSHIP_ERRORS.FAILED_TO_CLEAR_BALANCE) {
6565
// cannot transfer ownership if there are failed settlements, or we cannot clear the balance
6666
PolicyActions.clearWorkspaceOwnerChangeFlow(policyID);
67+
Navigation.goBack();
6768
Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
6869
return;
6970
}

src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ function WorkspaceOwnerChangeErrorPage({route}: WorkspaceOwnerChangeSuccessPageP
3131

3232
const closePage = useCallback(() => {
3333
PolicyActions.clearWorkspaceOwnerChangeFlow(policyID);
34+
Navigation.goBack();
3435
Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
3536
}, [accountID, policyID]);
3637

src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function WorkspaceOwnerChangeSuccessPage({route}: WorkspaceOwnerChangeSuccessPag
2525

2626
const closePage = useCallback(() => {
2727
PolicyActions.clearWorkspaceOwnerChangeFlow(policyID);
28+
Navigation.goBack();
2829
Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
2930
}, [accountID, policyID]);
3031

src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr
6262
title={translate('workspace.changeOwner.changeOwnerPageTitle')}
6363
onBackButtonPress={() => {
6464
PolicyActions.clearWorkspaceOwnerChangeFlow(policyID);
65+
Navigation.goBack();
6566
Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
6667
}}
6768
/>

0 commit comments

Comments
 (0)