Skip to content

fix: show not found page on change owner page for invalid account#68935

Merged
srikarparsi merged 17 commits into
Expensify:mainfrom
daledah:fix/68574
Dec 17, 2025
Merged

fix: show not found page on change owner page for invalid account#68935
srikarparsi merged 17 commits into
Expensify:mainfrom
daledah:fix/68574

Conversation

@daledah

@daledah daledah commented Aug 21, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #68574
PROPOSAL: #68574 (comment)

Tests

  1. Deeplink into workspaces/:workspaceID/change-owner/12345/failure
  2. Verify that: Not found page is shown
  3. Press back button
  4. Verify that: User is navigated back previous page
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Deeplink into workspaces/:workspaceID/change-owner/12345/failure
  2. Verify that: Not found page is shown
  3. Press back button
  4. Verify that: User is navigated back to previous page
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Screen.Recording.2025-08-22.at.00.20.56.mov
Android: mWeb Chrome
Screen.Recording.2025-08-22.at.00.30.19.mov
iOS: Native
Screen_Recording_2025-12-15_at_13.27.15.mov
iOS: mWeb Safari
Screen.Recording.2025-08-22.at.00.30.59.mov
MacOS: Chrome / Safari
Screen.Recording.2025-08-22.at.00.31.39.mov
MacOS: Desktop
Screen.Recording.2025-08-22.at.00.33.04.mov

@daledah daledah marked this pull request as ready for review August 21, 2025 17:36
@daledah daledah requested a review from a team as a code owner August 21, 2025 17:36
@melvin-bot melvin-bot Bot requested review from s77rt and removed request for a team August 21, 2025 17:36
@melvin-bot

melvin-bot Bot commented Aug 21, 2025

Copy link
Copy Markdown

@s77rt Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Comment thread src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx Outdated
Comment thread src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx Outdated
Comment thread src/pages/workspace/members/useShouldShowChangeOwnerPage.ts Outdated
@s77rt

s77rt commented Aug 30, 2025

Copy link
Copy Markdown
Member

@hoangzinh Can you please continue review this PR

@hoangzinh

Copy link
Copy Markdown
Contributor

sure @s77rt. I will start to review it today

@hoangzinh

Copy link
Copy Markdown
Contributor

@daledah just in case you missed my comment here

@daledah

daledah commented Sep 9, 2025

Copy link
Copy Markdown
Contributor Author

@hoangzinh Sorry for delays, I'll update soon!

@daledah

daledah commented Sep 11, 2025

Copy link
Copy Markdown
Contributor Author

@hoangzinh I updated. Additional changes is to fix some bugs.

Comment thread src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx Outdated
Comment thread src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx Outdated
@hoangzinh

Copy link
Copy Markdown
Contributor

@hoangzinh

Copy link
Copy Markdown
Contributor

friendly bump @daledah

@daledah

daledah commented Sep 30, 2025

Copy link
Copy Markdown
Contributor Author

@codecov

codecov Bot commented Sep 30, 2025

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
...s/workspace/members/WorkspaceMemberDetailsPage.tsx 0.00% <ø> (ø)
...orkspace/members/WorkspaceOwnerChangeErrorPage.tsx 0.00% <0.00%> (ø)
...kspace/members/WorkspaceOwnerChangeSuccessPage.tsx 0.00% <0.00%> (ø)
...kspace/members/WorkspaceOwnerChangeWrapperPage.tsx 0.00% <0.00%> (ø)
... and 10 files with indirect coverage changes

@hoangzinh

Copy link
Copy Markdown
Contributor

@daledah I got it. However, what I would like to confirm is:

  • What is the issue with the current approach?
  • And with the new approach, I found an issue here

@daledah

daledah commented Oct 20, 2025

Copy link
Copy Markdown
Contributor Author

@hoangzinh Sorry for the delay.

The bug I mentioned here still exists so I keep current change here with some updates to prevent duplicated API calls.

There's one issue I've discovered with current implementation: When we deeplink using a nonexistent account, the flow works well, but after going back we get not found page:

Screen.Recording.2025-10-20.at.10.23.18.mov

To fix this we should reapply this commit. What do you think?

@melvin-bot melvin-bot Bot requested review from trjExpensify and removed request for a team November 26, 2025 07:45
@daledah

daledah commented Nov 26, 2025

Copy link
Copy Markdown
Contributor Author

@hoangzinh sorry for the delay, here's the deeplink behaviour in prod:

Screen.Recording.2025-11-26.at.14.52.22.mov

trjExpensify
trjExpensify previously approved these changes Nov 26, 2025

@trjExpensify trjExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So niche for someone to do this 😅

Navigation.goBack();
Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
}
InteractionManager.runAfterInteractions(() => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have ESLint failure here. We just marked using InteractionManager as deprecated for new RN version ref unless it's need to fix a critical bug.

Can we simply solve original issue and don't worry too much other edge cases until it's a real issue for customers? As long as it doesn't break the happy case then it LGTM.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

da.mov

If don't use it, the page will be not found when closing RHP.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we move clearWorkspaceOwnerChangeFlow on page unmount to fix this issue? Or can we use a boolean state to fix this issue? We should avoid using InteractionManager

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hoangzinh i updated

Comment thread src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx
@hoangzinh

hoangzinh commented Dec 13, 2025

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Screen.Recording.2025-12-13.at.21.15.05.android.mov
Android: mWeb Chrome
Screen.Recording.2025-12-13.at.20.53.27.android.c.mov
iOS: HybridApp
Screen.Recording.2025-12-13.at.21.15.47.ios.mov
iOS: mWeb Safari
Screen.Recording.2025-12-13.at.21.17.13.mov
MacOS: Chrome / Safari
Screen.Recording.2025-12-13.at.20.49.54.web.mov

@hoangzinh

Copy link
Copy Markdown
Contributor

@daledah can you resolve conflicts and add recording for IOS?

@daledah

daledah commented Dec 15, 2025

Copy link
Copy Markdown
Contributor Author

@hoangzinh i resolved and added the ios record

@hoangzinh hoangzinh left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@melvin-bot melvin-bot Bot requested a review from srikarparsi December 15, 2025 09:17
@srikarparsi

Copy link
Copy Markdown
Contributor

Looks like some checks are failing @daledah

@daledah

daledah commented Dec 17, 2025

Copy link
Copy Markdown
Contributor Author

@srikarparsi all looks good now

@srikarparsi srikarparsi merged commit d25d90d into Expensify:main Dec 17, 2025
30 checks passed
@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.2.82-0 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 failure ❌
🍎 iOS 🍎 success ✅

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.2.82-0 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 cancelled 🔪
🍎 iOS 🍎 success ✅

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.2.82-0 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.2.84-0 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.84-8 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

return;
}
requestWorkspaceOwnerChange(policyID, currentUserPersonalDetails.accountID, currentUserPersonalDetails.login ?? '');
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daledah Can you please give a reason why we use only policyID as dependency here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This effect is meant to call ⁨requestWorkspaceOwnerChange⁩ once on page mount, so I only use ⁨policyID⁩ as a dependency.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants