From 657c8c062e7ab6c1aee54d995fbbb1dca36fc5e8 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 18 Apr 2024 14:25:09 +0800 Subject: [PATCH] pop the current screen before navigating back to member details page --- src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx | 1 + src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx | 1 + src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx | 1 + src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx | 1 + 4 files changed, 4 insertions(+) diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx index 83bc3a1d1b4d..1ec928158a59 100644 --- a/src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx +++ b/src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx @@ -64,6 +64,7 @@ function WorkspaceOwnerChangeCheck({personalDetails, policy, accountID, error}: if (error === CONST.POLICY.OWNERSHIP_ERRORS.HAS_FAILED_SETTLEMENTS || error === CONST.POLICY.OWNERSHIP_ERRORS.FAILED_TO_CLEAR_BALANCE) { // cannot transfer ownership if there are failed settlements, or we cannot clear the balance PolicyActions.clearWorkspaceOwnerChangeFlow(policyID); + Navigation.goBack(); Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID)); return; } diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx index 81c43f6ab818..8604ba23fc92 100644 --- a/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx +++ b/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx @@ -31,6 +31,7 @@ function WorkspaceOwnerChangeErrorPage({route}: WorkspaceOwnerChangeSuccessPageP const closePage = useCallback(() => { PolicyActions.clearWorkspaceOwnerChangeFlow(policyID); + Navigation.goBack(); Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID)); }, [accountID, policyID]); diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx index 856a852037b4..c4968128df06 100644 --- a/src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx +++ b/src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx @@ -25,6 +25,7 @@ function WorkspaceOwnerChangeSuccessPage({route}: WorkspaceOwnerChangeSuccessPag const closePage = useCallback(() => { PolicyActions.clearWorkspaceOwnerChangeFlow(policyID); + Navigation.goBack(); Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID)); }, [accountID, policyID]); diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx index 9f9540327c53..6eda891a8fc9 100644 --- a/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx +++ b/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx @@ -62,6 +62,7 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr title={translate('workspace.changeOwner.changeOwnerPageTitle')} onBackButtonPress={() => { PolicyActions.clearWorkspaceOwnerChangeFlow(policyID); + Navigation.goBack(); Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID)); }} />