Merge pull request #43651 from bernhardoj/fix/43143-empty-screen-tran…

…sfer-owner Fix empty screen when transferring ownership of the workplace
Expensify · Jun 14, 2024 · 43cd0f7 · 43cd0f7
2 parents 2144fc6 + 7ad6165
commit 43cd0f7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts
@@ -181,7 +181,10 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
  const targetFocusedRoute = findFocusedRoute(stateFromPath);
 
  // If the current focused route is the same as the target focused route, we don't want to navigate.
- if (currentFocusedRoute?.name === targetFocusedRoute?.name) {
+ if (
+ currentFocusedRoute?.name === targetFocusedRoute?.name &&
+ shallowCompare(currentFocusedRoute?.params as Record<string, string | undefined>, targetFocusedRoute?.params as Record<string, string | undefined>)
+ ) {
  return;
  }
 

diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -84,18 +84,6 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
  [member?.role, translate],
  );
 
- useEffect(() => {
- if (!policy?.errorFields?.changeOwner && policy?.isChangeOwnerSuccessful) {
- return;
- }
-
- const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
-
- if (changeOwnerErrors && changeOwnerErrors.length > 0) {
- Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.getRoute(policyID, accountID, changeOwnerErrors[0] as ValueOf<typeof CONST.POLICY.OWNERSHIP_ERRORS>));
- }
- }, [accountID, policy?.errorFields?.changeOwner, policy?.isChangeOwnerSuccessful, policyID]);
-
  useEffect(() => {
  if (!prevMember || prevMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || member?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
  return;

diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx
@@ -48,7 +48,7 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr
 
  const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
 
- if (changeOwnerErrors && changeOwnerErrors.length > 0 && changeOwnerErrors[0] !== CONST.POLICY.OWNERSHIP_ERRORS.NO_BILLING_CARD) {
+ if (changeOwnerErrors && changeOwnerErrors.length > 0) {
  Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.getRoute(policyID, accountID, changeOwnerErrors[0] as ValueOf<typeof CONST.POLICY.OWNERSHIP_ERRORS>));
  }
  }, [accountID, policy, policy?.errorFields?.changeOwner, policyID]);