[Merge Account] Remove the initial route from state after successful merge #60751

allroundexperts · 2025-04-23T21:54:38Z

Explanation of Change

Remove the initial route from state after successful merge

fixes #59764
fixes #60757

Fixed Issues

$ #59764
$ #60757
PROPOSAL: N/A

Tests

Test 1

Launch Expensify app.
Go to Settings > Security.
Tap Merge account.
Enter email of another account.
Mark "I understand this is not reversible" checkbox.
Click Next.
Enter magic code.
On success page, use device back button.

Verify that you don't end up on the Merge account details page

** Test 2**

Open the app, Go to Account > Security
Click on Merge account
Enter any email that has a valid Expensify account
Mark "I understand this is not reversible" checkbox.
Click Next and Enter the incorrect magic code

Verify that the error message shown reads: "Incorrect or invalid magic code. Please try again or request a new code."

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Same as above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-04-24.at.2.41.54.AM.mov

Android: mWeb Chrome

Screen.Recording.2025-04-24.at.2.36.24.AM.mov

iOS: Native

Screen.Recording.2025-04-24.at.2.48.30.AM.mov

iOS: mWeb Safari

Screen.Recording.2025-04-24.at.2.23.11.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-04-24.at.2.20.42.AM.mov

MacOS: Desktop

N/A

melvin-bot · 2025-04-23T21:54:43Z

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

src/pages/settings/Security/MergeAccounts/MergeResultPage.tsx

parasharrajat · 2025-04-28T21:55:17Z

I will complete the checklist in morning.

parasharrajat · 2025-04-29T16:10:10Z

Also, notice this weird navigation history.

Steps:

Add an email, Go to validate code step.
GO back from browser button.
Change email, go to validate code,
Now press browser back button a few times to notice both flow will be repeated.

29.04.2025_21.39.14_REC.mp4

allroundexperts · 2025-04-29T17:25:13Z

@allroundexperts Testing failed on web on pressing browser back button.

29.04.2025_21.35.06_REC.mp4

@parasharrajat This is to be tested on the success page. On error page, the back button should work as usual.

allroundexperts · 2025-04-29T17:28:40Z

Also, notice this weird navigation history.

Steps:

Add an email, Go to validate code step.

GO back from browser button.

Change email, go to validate code,

Now press browser back button a few times to notice both flow will be repeated.

29.04.2025_21.39.14_REC.mp4

Not sure if this is a bug. It's taking you back to the pages that you visited.

arosiclair · 2025-04-29T19:41:02Z

Also, notice this weird navigation history.
Steps:

Add an email, Go to validate code step.

GO back from browser button.

Change email, go to validate code,

Now press browser back button a few times to notice both flow will be repeated.

29.04.2025_21.39.14_REC.mp4

Not sure if this is a bug. It's taking you back to the pages that you visited.

Definitely looks like a bug. Why are we pushing so many copies of the email page onto the stack? Let's try to fix that so there's only one.

allroundexperts · 2025-04-29T23:32:35Z

Definitely looks like a bug. Why are we pushing so many copies of the email page onto the stack? Let's try to fix that so there's only one.

Done.

parasharrajat · 2025-04-30T08:35:13Z

#60751 (comment)

This does not look solved. I can still see email page history.

parasharrajat · 2025-04-30T08:50:31Z

The page crashed after adding validation code.

30.04.2025_14.19.25_REC.mp4

allroundexperts · 2025-04-30T09:00:13Z

#60751 (comment)

This does not look solved. I can still see email page history.

Screen recording please?

allroundexperts · 2025-04-30T12:41:29Z

Seems to work well for me.

Screen.Recording.2025-04-30.at.5.41.00.PM.mov

allroundexperts · 2025-04-30T12:46:25Z

The page crashed after adding validation code.

30.04.2025_14.19.25_REC.mp4

Not able to reproduce. Are you sure that you're on the latest code?

allroundexperts · 2025-05-02T12:59:07Z

@parasharrajat What's the latest here?

parasharrajat · 2025-05-02T12:59:54Z

I will retest and give you vid in 30 minutes. I was facing issues with iOS builds till yesterday.

allroundexperts · 2025-05-02T13:00:21Z

Please do so. Let's try to finish this today.

parasharrajat · 2025-05-03T20:50:00Z

May be BUG: I noticed this twice on android that the merge accounts button does not react to click on initial click.

Check the previous vid on validate code step. This happened to me twice on both attempts.

Steps:

enter an email.
Add wrong code.
Wait for invalid code error.
Clear error and add correct code.
Try to press merge accounts button

arosiclair · 2025-05-05T13:52:09Z

Can we improve this behavior also where navigating forward, the previous validate code screen is shown?

I think this behavior is fine since nothing is broken after navigating like this.

BUG: Android: Wrong animation for the result page.

Agree this should animate in from the right. Is that something we can fix @allroundexperts?

May be BUG: I noticed this twice on android that the merge accounts button does not react to click on initial click.

Are you also seeing this @allroundexperts?

allroundexperts · 2025-05-06T09:22:02Z

Are you also seeing this @allroundexperts?

Not able to reproduce.

Agree this should animate in from the right. Is that something we can fix @allroundexperts?

Will look into this today.

allroundexperts · 2025-05-07T22:10:22Z

BUG: Android: Wrong animation for the result page.

04.05.2025_02.02.49_REC.mp4

Okay. I managed to check this and it happens because of forceReplace: true flag. We'd need a new feature to accept animation direction when specifying forceReplace. This is being discussed here with the SWM team.

I think this is not a blocker.

arosiclair · 2025-05-08T14:19:00Z

Alright can you conclude your review @parasharrajat?

parasharrajat · 2025-05-08T15:54:04Z

@allroundexperts Looks like this issue is coming with autofocus https://expensify.slack.com/archives/C01GTK53T8Q/p1746616229243239?thread_ts=1745963906.062429&cid=C01GTK53T8Q. Can you please try that change?

So we don't have autofocus here. Hmm, let me mention that on slack.

allroundexperts · 2025-05-08T15:56:27Z

@parasharrajat I have already mentioned that. This is clearly a bug of navigation that SWM should solve. Let's not block this PR because of that.

WojtekBoman · 2025-05-09T08:11:00Z

@allroundexperts This code snippet should solve the animation problem

diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index bd13b29b1dd..f8c0b519c99 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -2,6 +2,7 @@ import type {ParamListBase} from '@react-navigation/routers';
 import React from 'react';
 import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
 import Animations from '@libs/Navigation/PlatformStackNavigation/navigationOptions/animation';
+import type {PlatformStackNavigationOptions} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {
     AddPersonalBankAccountNavigatorParamList,
     AddUnreportedExpensesParamList,
@@ -47,6 +48,12 @@ import useModalStackScreenOptions from './useModalStackScreenOptions';
 
 type Screens = Partial<Record<Screen, () => React.ComponentType>>;
 
+const OPTIONS_PER_SCREEN: Partial<Record<Screen, PlatformStackNavigationOptions>> = {
+    [SCREENS.SETTINGS.MERGE_ACCOUNTS.MERGE_RESULT]: {
+        animationTypeForReplace: 'push',
+    },
+};
+
 /**
  * Create a modal stack navigator with an array of sub-screens.
  *
@@ -66,6 +73,7 @@ function createModalStackNavigator<ParamList extends ParamListBase>(screens: Scr
                         key={name}
                         name={name}
                         getComponent={(screens as Required<Screens>)[name as Screen]}
+                        options={OPTIONS_PER_SCREEN[name as Screen]}
                     />
                 ))}
             </ModalStackNavigator.Navigator>
~
~
~
~
~
~
~
~
~
~

parasharrajat · 2025-05-09T10:44:17Z

@allroundexperts Can you please try that?

allroundexperts · 2025-05-09T20:59:10Z

@parasharrajat I applied the suggestion and it fixed the issue.

Screen.Recording.2025-05-10.at.1.56.13.AM.mov

allroundexperts · 2025-05-11T22:08:40Z

Bump here @parasharrajat

parasharrajat · 2025-05-12T19:04:14Z

Screenshots

🔲 iOS / native

13.05.2025_14.52.35_REC.mp4

🔲 iOS / Safari

04.05.2025_03.34.10_REC.mp4

🔲 MacOS / Desktop

13.05.2025_14.59.38_REC.mp4

🔲 MacOS / Chrome

13.05.2025_14.50.08_REC.mp4

🔲 Android / Chrome

04.05.2025_02.41.00_REC.mp4

🔲 Android / native

13.05.2025_14.46.08_REC.mp4

parasharrajat · 2025-05-12T19:11:13Z

Android: This is related to double click issue. After entering a wrong code, it takes 2 clicks to submit next code. First click on Merge accounts button hide the keyboard.

13.05.2025_00.39.40_REC.mp4

allroundexperts · 2025-05-12T19:21:44Z

Android: This is related to double click issue. After entering a wrong code, it takes 2 clicks to submit next code. First click on Merge accounts button hide the keyboard.

13.05.2025_00.39.40_REC.mp4

This is not related to the bugs we're solving in this PR. Let's not block it because of this.

arosiclair · 2025-05-12T19:30:07Z

Android: This is related to double click issue. After entering a wrong code, it takes 2 clicks to submit next code. First click on Merge accounts button hide the keyboard.

This is not related to the bugs we're solving in this PR. Let's not block it because of this.

Agree with this. Let's see if QA reproduces and fix it in a follow up issue.

parasharrajat

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.
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.

🎀 👀 🎀 C+ reviewed

OSBotify · 2025-05-13T13:20:28Z

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

github-actions · 2025-05-13T18:21:23Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.1.45-0 🚀

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

github-actions · 2025-05-13T19:31:48Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.1.45-0 🚀

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

github-actions · 2025-05-15T19:00:16Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.1.45-21 🚀

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

add remove from state for the initial route

26675cd

allroundexperts requested a review from a team as a code owner April 23, 2025 21:54

melvin-bot bot requested a review from parasharrajat April 23, 2025 21:54

melvin-bot bot removed the request for review from a team April 23, 2025 21:54

This was referenced Apr 23, 2025

[$250] Android - App returns to Merge accounts flow when using back button after merging account #59764

Closed

Add Merge Account to NewExpensify #47073

Open

update copy for incorrect magic code

b0c845c

allroundexperts mentioned this pull request Apr 23, 2025

Settings-Error message mentions two-factor authentication code instead of magic code #60757

Closed

8 tasks

blimpich assigned allroundexperts Apr 23, 2025

arosiclair reviewed Apr 24, 2025

View reviewed changes

src/pages/settings/Security/MergeAccounts/MergeResultPage.tsx Show resolved Hide resolved

add comment explaining the screen removal

0e3a6ca

This comment was marked as outdated.

Sign in to view

allroundexperts added 2 commits April 30, 2025 04:18

Merge branch 'main' into fix-59764

90ef622

fix weird navigation stack

db73e84

Merge branch 'main' into fix-59764

5e69d5b

Merge branch 'main' into fix-59764

99bd8ef

Merge branch 'main' into fix-59764

57cf72e

allroundexperts added 2 commits May 8, 2025 03:17

wrap with interaction manager

45e3b60

Merge branch 'main' into fix-59764

78a7660

allroundexperts added 2 commits May 10, 2025 01:48

Merge branch 'main' into fix-59764

51ced31

apply suggestion

272656d

parasharrajat approved these changes May 13, 2025

View reviewed changes

melvin-bot bot requested a review from arosiclair May 13, 2025 09:32

arosiclair approved these changes May 13, 2025

View reviewed changes

arosiclair merged commit c0c6b7f into Expensify:main May 13, 2025
17 checks passed

github-actions bot mentioned this pull request May 13, 2025

Deploy Checklist: New Expensify 2025-05-13 #61917

Closed

[Merge Account] Remove the initial route from state after successful merge #60751

[Merge Account] Remove the initial route from state after successful merge #60751

Conversation

allroundexperts commented Apr 23, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 23, 2025

parasharrajat commented Apr 28, 2025 • edited Loading

This comment was marked as outdated.

parasharrajat commented Apr 29, 2025 • edited Loading

allroundexperts commented Apr 29, 2025

allroundexperts commented Apr 29, 2025

arosiclair commented Apr 29, 2025

allroundexperts commented Apr 29, 2025

parasharrajat commented Apr 30, 2025

parasharrajat commented Apr 30, 2025

allroundexperts commented Apr 30, 2025

allroundexperts commented Apr 30, 2025

allroundexperts commented Apr 30, 2025

allroundexperts commented May 2, 2025

parasharrajat commented May 2, 2025 • edited Loading

allroundexperts commented May 2, 2025

parasharrajat commented May 3, 2025 • edited Loading

arosiclair commented May 5, 2025

allroundexperts commented May 6, 2025 • edited Loading

allroundexperts commented May 7, 2025

arosiclair commented May 8, 2025

parasharrajat commented May 8, 2025 • edited Loading

allroundexperts commented May 8, 2025

WojtekBoman commented May 9, 2025

parasharrajat commented May 9, 2025

allroundexperts commented May 9, 2025

allroundexperts commented May 11, 2025

parasharrajat commented May 12, 2025 • edited Loading

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

parasharrajat commented May 12, 2025

allroundexperts commented May 12, 2025

arosiclair commented May 12, 2025

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

OSBotify commented May 13, 2025

github-actions bot commented May 13, 2025

github-actions bot commented May 13, 2025

github-actions bot commented May 15, 2025

allroundexperts commented Apr 23, 2025 •

edited

Loading

parasharrajat commented Apr 28, 2025 •

edited

Loading

parasharrajat commented Apr 29, 2025 •

edited

Loading

parasharrajat commented May 2, 2025 •

edited

Loading

parasharrajat commented May 3, 2025 •

edited

Loading

allroundexperts commented May 6, 2025 •

edited

Loading

parasharrajat commented May 8, 2025 •

edited

Loading

parasharrajat commented May 12, 2025 •

edited

Loading