Skip to content

Commit 43cd0f7

Browse files
authored
Merge pull request #43651 from bernhardoj/fix/43143-empty-screen-transfer-owner
Fix empty screen when transferring ownership of the workplace
2 parents 2144fc6 + 7ad6165 commit 43cd0f7

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

src/libs/Navigation/linkTo/index.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,10 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
181181
const targetFocusedRoute = findFocusedRoute(stateFromPath);
182182

183183
// If the current focused route is the same as the target focused route, we don't want to navigate.
184-
if (currentFocusedRoute?.name === targetFocusedRoute?.name) {
184+
if (
185+
currentFocusedRoute?.name === targetFocusedRoute?.name &&
186+
shallowCompare(currentFocusedRoute?.params as Record<string, string | undefined>, targetFocusedRoute?.params as Record<string, string | undefined>)
187+
) {
185188
return;
186189
}
187190

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

-12
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,6 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
8484
[member?.role, translate],
8585
);
8686

87-
useEffect(() => {
88-
if (!policy?.errorFields?.changeOwner && policy?.isChangeOwnerSuccessful) {
89-
return;
90-
}
91-
92-
const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
93-
94-
if (changeOwnerErrors && changeOwnerErrors.length > 0) {
95-
Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.getRoute(policyID, accountID, changeOwnerErrors[0] as ValueOf<typeof CONST.POLICY.OWNERSHIP_ERRORS>));
96-
}
97-
}, [accountID, policy?.errorFields?.changeOwner, policy?.isChangeOwnerSuccessful, policyID]);
98-
9987
useEffect(() => {
10088
if (!prevMember || prevMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || member?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
10189
return;

src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr
4848

4949
const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
5050

51-
if (changeOwnerErrors && changeOwnerErrors.length > 0 && changeOwnerErrors[0] !== CONST.POLICY.OWNERSHIP_ERRORS.NO_BILLING_CARD) {
51+
if (changeOwnerErrors && changeOwnerErrors.length > 0) {
5252
Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.getRoute(policyID, accountID, changeOwnerErrors[0] as ValueOf<typeof CONST.POLICY.OWNERSHIP_ERRORS>));
5353
}
5454
}, [accountID, policy, policy?.errorFields?.changeOwner, policyID]);

0 commit comments

Comments
 (0)