Fix wallet blank screen when tapping back after enabling wallet by MelvinBot · Pull Request #90139 · Expensify/App

MelvinBot · 2026-05-11T03:36:19Z

Explanation of Change

After completing the wallet activation flow (Fees & Terms), FeesAndTerms.submit() called Navigation.navigate(ROUTES.SETTINGS_WALLET) which pushed a new Wallet screen onto the stack while leaving the EnablePayments screen behind it. When the user tapped the back button, they landed on EnablePayments with currentStep = ACTIVATE, which was unhandled in the switch statement, causing the component to return null — a blank screen.

This PR changes Navigation.navigate to Navigation.goBack in the FeesAndTerms submit handler so the EnablePayments screen is properly removed from the navigation stack.

Fixed Issues

$ #86633
PROPOSAL: #86633 (comment)

Tests

Go to Settings > Wallet
Tap Enable Wallet (or the equivalent CTA to start the wallet activation flow)
Complete all steps in the Enable Payments flow (personal details, identity verification, etc.)
On the Fees & Terms step, accept the terms and tap Continue / Submit
Verify you are navigated back to the Wallet page (not pushed to a new Wallet screen)
Tap the back button from the Wallet page
Verify you do NOT see a blank screen — you should go to the previous Settings page as expected

Verify that no errors appear in the JS console

Offline tests

N/A — navigation-only change, no network dependency.

QA Steps

Go to Settings > Wallet
Start the wallet activation flow and complete all steps through Fees & Terms
Accept the terms and submit
Verify you return to the Wallet page without a blank screen flash
Tap back from the Wallet page
Verify no blank screen appears — you navigate to the expected previous screen

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Use Navigation.goBack instead of Navigation.navigate in FeesAndTerms submit handler so the EnablePayments screen is removed from the navigation stack. Also add a safety net in EnablePayments to redirect to the Wallet page if the ACTIVATE step is reached. Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

codecov · 2026-05-11T03:45:38Z

Codecov Report

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

Files with missing lines	Coverage Δ
...pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx	`0.00% <ø> (ø)`
... and 10 files with indirect coverage changes

nyomanjyotisa · 2026-05-11T06:28:45Z

+    useEffect(() => {
+        if (userWallet?.currentStep !== CONST.WALLET.STEP.ACTIVATE) {
+            return;
+        }
+
+        Navigation.goBack(ROUTES.SETTINGS_WALLET);
+    }, [userWallet?.currentStep]);
+


@MelvinBot I don't think we need this useEffect. Please remove this

Removed the useEffect in b07916e.

Remove the useEffect that redirected to the Wallet page when currentStep was ACTIVATE, as it is unnecessary. Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

MelvinBot · 2026-05-11T06:30:30Z

All code checks are passing (ESLint, Prettier, typecheck, all 8 test jobs, React Compiler Compliance, Storybook, perf-tests, builds, spellcheck, etc.).

The only failing check is checklist (PR Author Checklist), which flags unchecked template boxes — not a code issue. This is expected for a draft PR and needs to be completed manually before marking the PR as ready for review.

nyomanjyotisa · 2026-05-13T05:56:16Z

@MelvinBot please merge main

…eenGoBack Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

MelvinBot · 2026-05-13T06:02:44Z

Main has been merged into this PR branch. ✅

MelvinBot · 2026-05-13T06:18:02Z

All CI checks have now completed. The only failing check is PR Author Checklist, which requires manual action (checking off items in the PR description) — it's not a code issue and cannot be auto-fixed.

Every other check passed: Jest tests (all 8 jobs), TypeScript, ESLint, Prettier, React Compiler Compliance, Storybook, perf-tests, builds, and spellcheck.

nyomanjyotisa · 2026-05-13T06:52:41Z

@MelvinBot Please add tests in the PR description that verify the implemented fix and complete all checkboxes in the PR Author Checklist

MelvinBot · 2026-05-13T06:55:13Z

Updated the PR description with test steps, QA steps, and completed the PR Author Checklist. Please add screenshots/videos for each platform before marking as ready for review.

nyomanjyotisa · 2026-05-13T06:57:33Z

@MelvinBot Please mark the PR as ready for review.

MelvinBot · 2026-05-13T06:59:54Z

PR has been marked as ready for review. ✅

melvin-bot · 2026-05-13T06:59:56Z

@nyomanjyotisa 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]

nyomanjyotisa · 2026-05-13T16:37:52Z

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 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

Android-Native.mp4

Android: mWeb Chrome

Android-mWeb.Chrome.mp4

iOS: HybridApp

iOS-Native.mp4

iOS: mWeb Safari

iOS-mWeb.Safari.mp4

MacOS: Chrome / Safari

MacOS-Chrome.mp4

nyomanjyotisa · 2026-05-25T08:18:01Z

@MelvinBot please merge main

…eenGoBack Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

MelvinBot · 2026-05-25T08:23:55Z

Merged main into this PR branch. ✅

melvin-bot · 2026-05-25T08:23:58Z

@nyomanjyotisa 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]

MelvinBot assigned nyomanjyotisa May 11, 2026

MelvinBot requested a review from a team May 11, 2026 03:36

MelvinBot mentioned this pull request May 11, 2026

[$250] Wallet - Blank screen displayed after user enable Wallet & tap app back button #86633

Open

7 tasks

nyomanjyotisa reviewed May 11, 2026

View reviewed changes

Remove safety-net useEffect for ACTIVATE step

b07916e

Remove the useEffect that redirected to the Wallet page when currentStep was ACTIVATE, as it is unnecessary. Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

Merge remote-tracking branch 'origin/main' into claude-walletBlankScr…

38b894e

…eenGoBack Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

MelvinBot marked this pull request as ready for review May 13, 2026 06:59

MelvinBot requested a review from a team as a code owner May 13, 2026 06:59

melvin-bot Bot requested review from JmillsExpensify and nyomanjyotisa and removed request for a team May 13, 2026 06:59

melvin-bot Bot removed the request for review from a team May 13, 2026 06:59

nyomanjyotisa approved these changes May 13, 2026

View reviewed changes

melvin-bot Bot requested a review from marcochavezf May 13, 2026 16:48

Merge remote-tracking branch 'origin/main' into claude-walletBlankScr…

8603466

…eenGoBack Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

MelvinBot requested a review from a team as a code owner May 25, 2026 08:23

melvin-bot Bot requested review from nyomanjyotisa and removed request for a team May 25, 2026 08:23

nyomanjyotisa approved these changes May 25, 2026

View reviewed changes

Conversation

MelvinBot commented May 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented May 11, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

nyomanjyotisa May 11, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot May 11, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

nyomanjyotisa commented May 13, 2026

Uh oh!

MelvinBot commented May 13, 2026

Uh oh!

MelvinBot commented May 13, 2026

Uh oh!

nyomanjyotisa commented May 13, 2026

Uh oh!

MelvinBot commented May 13, 2026

Uh oh!

nyomanjyotisa commented May 13, 2026

Uh oh!

MelvinBot commented May 13, 2026

Uh oh!

melvin-bot Bot commented May 13, 2026

Uh oh!

nyomanjyotisa commented May 13, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

nyomanjyotisa commented May 25, 2026

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

melvin-bot Bot commented May 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MelvinBot commented May 11, 2026 •

edited

Loading

codecov Bot commented May 11, 2026 •

edited by github-actions Bot

Loading