Add merge account feature to ND #56911

allroundexperts · 2025-02-16T16:28:59Z

Explanation of Change

Implements merge account feature for NewDot

Fixed Issues

$ #54443
PROPOSAL: N/A

Tests

Open Account Settings -> Security -> Merge accounts.
Verify that various cases highlighted here work.

Successful Account Merge
Action To Take: Log into the test account and navigate to Security in the left-hand menu.
Verify: The Security page displays options:

Two-factor authentication
Merge accounts
Close account

Action To Take: Click on Merge accounts.
Verify:

A screen appears showing the target account email (e.g. [email protected]).
The input field for “Email or phone” is visible.
The checkbox "I understand this is not reversible" is present.

Action To Take: Enter a valid email into the input field.
Verify: No error message.

Action To Take: Check the "I understand this is not reversible" checkbox.
Action To Take: Click on the Next button.
Verify: The screen transitions to the Magic Code Input step.

Action To Take: Enter the magic code sent to [email protected].
Verify:

A message displays confirming that a magic code was sent to the correct email address.
The input field for the magic code is visible.

Action To Take: Input the correct 6-digit magic code.
Verify: The “Merge accounts” button can be tapped.

Action To Take: Click the Merge accounts button.
Verify: The screen transitions to the Accounts Merged Confirmation page.

Action To Take: Review the confirmation message.
Verify:

The message confirms: “You've successfully merged all data from [email protected] into [email protected].”
The Got it button is displayed.

Action To Take: Click the Got it button.
Verify: User is redirected back to the Security page.

Account merge blocked due to trying to merge an account with SAML into a personal account
Prerequisite: Set up a new private domain with domain control and require SAML. Create a new domain member email to use for this test.

Action To Take: Sign into New Expensify with a public domain account.
Action To Take: Attempt to merge the SAML domain member account into the public domain account.
Action To Take: Check the “I understand this is not reversible” checkbox.
Action To Take: Tap the “Next” button
Verify: The “Can’t merge accounts” screen appears and explains why the action cannot be taken i.e. “because your domain admin has set it as your primary login”.

Account merge for users on domain with SAML enabled and required
Prerequisite: Set up a new private domain with domain control and require SAML. Create two new domain member emails to use for this test.

Action To Take: Sign into New Expensify with a SAML required domain controlled email account.
Action To Take: Attempt to merge a domain email account on that same domain into the SAML required account.
Action To Take: Check the “I understand this is not reversible” checkbox.
Action To Take: Tap the “Next” button
Verify: The “We’re working on it” screen appears and explains why the action cannot be taken.

Action To Take: Tap “Go to Expensify Classic”
Verify: We are brought to Expensify Classic and land in the “Settings > Account details” section.

Action To Take: Tap the “Got it” button in New Expensify
Verify: We are brought back to the “Security” screen.

Merge Failure: 2FA is enabled on the oldAccount
Prerequisite: Create two accounts. One with 2FA enabled and one without.

Action To Take: Sign into the account which does not have 2FA enabled.
Action To Take: Attempt to merge the account which does have 2FA enabled into the account that does not have 2FA enabled.
Verify: The screen to enter the magic code appears and a magic code is sent.

Action To Take: Enter the 6-digit magic code.
Verify: “Can’t merge accounts” screen appears. With a message to “disable 2FA for [email] and try again”.

Merge Failure: User is trying to merge an uncreated account
Prerequisite: Create one account with no domain control or 2FA.

Action To Take: Sign into the created validated account in NewDot.
Action To Take: Attempt to merge an account that does not yet exist into an account that does exist.
Verify: “Can’t merge accounts” screen appears. With a message: “[email] doesn’t have an Expensify account”.

Merge Failure: SmartScanner account
Prerequisite: Create one account with no domain control or 2FA.

Action To Take: Sign into the created validated account in NewDot.
Action To Take: Attempt to merge an account that is one of our SmartScan vendor domains.
Verify: “Can’t merge accounts” screen appears. With a message: “You can’t merge [email] into other accounts”.

Merge Failure: Invoiced Billing account
Prerequisite: Create one account with no domain control or 2FA. Create another account with a policy set up for invoiced billing.

Action To Take: Sign into the created validated account in NewDot.
Action To Take: Attempt to merge an account that has invoiced billing.
Verify: “Can’t merge accounts” screen appears. With a message: “You can’t merge [email] into other accounts because it’s the billing owner of an invoiced account”.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Open Account Settings -> Security -> Merge accounts.
Verify that various cases highlighted here work.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2025-03-07.at.10.35.26.PM.mov

iOS: Native

Screen.Recording.2025-03-07.at.10.25.59.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-03-07.at.9.42.39.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-02-24.at.1.08.56.PM.mov

Screen.Recording.2025-03-07.at.9.13.47.PM.mov

MacOS: Desktop

Screen.Recording.2025-02-24.at.12.49.16.PM.mov

melvin-bot · 2025-02-23T18:04:49Z

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

shawnborton · 2025-02-24T14:20:56Z

Let us know when there are screenshots to review!

parasharrajat · 2025-02-24T16:35:55Z

Under review.

allroundexperts · 2025-02-26T15:22:37Z

Let us know when there are screenshots to review!

@shawnborton Added recordings for web and desktop. I'm having trouble building on native devices, but these should help you get started.

shawnborton · 2025-02-26T17:54:02Z

Looking good so far. Do you have an example of a successful account merge so we can see that flow?

Q for the @Expensify/design team - do we want to use our textSupporting color for the text below the heading here? I think we do?

parasharrajat · 2025-04-03T16:57:59Z

@zanyrenney Probably today. I will run it through final test round in sometime.

parasharrajat · 2025-04-04T16:51:49Z

@allroundexperts Design of 2FA page is as follows. Can you please fix it?

Current	Expected

parasharrajat · 2025-04-04T17:16:46Z

BUG: Web: Android: Hardware back button and header back button does not lead to same page.

On Error result page, press the hardware back button. It leads to validate code page.
On the Error result page, press Header back button, it takes to enter email page.

04.04.2025_22.42.23_REC.mp4

parasharrajat · 2025-04-04T17:17:04Z

I believe these are the only errors left here.

parasharrajat · 2025-04-04T17:25:09Z

Screenshots

🔲 iOS / native

02.04.2025_17.12.59_REC.mp4

🔲 iOS / Safari

04.04.2025_22.38.17_REC.mp4

🔲 MacOS / Desktop

02.04.2025_17.03.13_REC.mp4

02.04.2025_17.06.33_REC.mp4

🔲 MacOS / Chrome

02.04.2025_01.55.51_REC.mp4

02.04.2025_02.15.27_REC.mp4

🔲 Android / Chrome

04.04.2025_22.53.26_REC.mp4

🔲 Android / native

02.04.2025_02.18.39_REC.mp4

02.04.2025_02.27.28_REC.mp4

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

arosiclair

Overall this looks pretty good just a few suggestions and questions

src/components/ValidateCodeActionForm/index.tsx

src/components/ValidateCodeActionForm/type.ts

src/libs/actions/MergeAccounts.ts

src/pages/EnablePayments/ActivateStep.tsx

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

src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx

src/types/onyx/Account.ts

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

arosiclair

Thank you for the hard work @allroundexperts @parasharrajat 👍

OSBotify · 2025-04-07T14:33:21Z

✋ 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-04-07T23:07:40Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.1.24-2 🚀

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

izarutskaya · 2025-04-08T12:03:20Z

@allroundexperts QA found issue #59761

github-actions · 2025-04-09T02:12:56Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.24-10 🚀

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

github-actions · 2025-04-09T04:31:17Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.24-10 🚀

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

allroundexperts added 17 commits December 16, 2024 21:00

draft version of merge account

cda8dad

account details page draft

e4bdee3

add translations and forms

16d5fdc

more files

ec445e1

Merge branch 'main' into feat-47073

06c15e5

WIP: ad6007b onboarding flow without errors

717bc14

more finetunings

217ceb4

fix a bunch of lint errors

353a410

working version

e79174a

remove delegate access wrappers

89ecf4e

merge with main

61ff190

add confirmation screen

478de42

fix spanish translations

20f900e

merge with main

3281bc5

handle lint issues

c2eeb1e

more lint errors

305253c

lint fix

78a5563

allroundexperts changed the title ~~Feat 47073~~ Add merge account feature to ND Feb 23, 2025

allroundexperts marked this pull request as ready for review February 23, 2025 18:04

allroundexperts requested review from a team as code owners February 23, 2025 18:04

melvin-bot bot requested review from parasharrajat and removed request for a team February 23, 2025 18:04

fix: footer styles

6501b6d

merge with main

a4800c2

allroundexperts requested a review from parasharrajat April 3, 2025 11:09

parasharrajat approved these changes Apr 4, 2025

View reviewed changes

arosiclair requested changes Apr 4, 2025

View reviewed changes

allroundexperts added 3 commits April 5, 2025 22:16

Merge branch 'main' into feat-47073

cb653ec

minor fixes

3ceb6d6

change variable names

ddce6cf

allroundexperts requested a review from arosiclair April 5, 2025 17:51

parasharrajat reviewed Apr 6, 2025

View reviewed changes

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

arosiclair approved these changes Apr 7, 2025

View reviewed changes

arosiclair merged commit 53786aa into Expensify:main Apr 7, 2025
21 checks passed

github-actions bot mentioned this pull request Apr 7, 2025

Deploy Checklist: New Expensify 2025-04-07 #59756

Closed

This was referenced Apr 8, 2025

[$250] Merge account - Long email is cut off on magic code page #59757

Closed

[$250] Merge Account - Background changes to inbox when reloading on merge page #59759

Closed

This was referenced Apr 8, 2025

[$250] LHN - When merging accounts, more chats appear after killing the app and relaunching. #59779

Open

Merge Accounts - Keyboard does not open automatically on Magic Code page. #59783

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add merge account feature to ND #56911

Add merge account feature to ND #56911

allroundexperts commented Feb 16, 2025 •

edited

Loading

melvin-bot bot commented Feb 23, 2025

shawnborton commented Feb 24, 2025

parasharrajat commented Feb 24, 2025

allroundexperts commented Feb 26, 2025

shawnborton commented Feb 26, 2025

parasharrajat commented Apr 3, 2025

parasharrajat commented Apr 4, 2025

parasharrajat commented Apr 4, 2025

parasharrajat commented Apr 4, 2025 •

edited

Loading

parasharrajat commented Apr 4, 2025

parasharrajat left a comment

arosiclair left a comment

arosiclair left a comment

OSBotify commented Apr 7, 2025

github-actions bot commented Apr 7, 2025

izarutskaya commented Apr 8, 2025

github-actions bot commented Apr 9, 2025

github-actions bot commented Apr 9, 2025

Add merge account feature to ND #56911

Add merge account feature to ND #56911

Conversation

allroundexperts commented Feb 16, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 23, 2025

shawnborton commented Feb 24, 2025

parasharrajat commented Feb 24, 2025

allroundexperts commented Feb 26, 2025

shawnborton commented Feb 26, 2025

parasharrajat commented Apr 3, 2025

parasharrajat commented Apr 4, 2025

parasharrajat commented Apr 4, 2025

parasharrajat commented Apr 4, 2025 • edited Loading

parasharrajat commented Apr 4, 2025

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

arosiclair left a comment

Choose a reason for hiding this comment

arosiclair left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 7, 2025

github-actions bot commented Apr 7, 2025

izarutskaya commented Apr 8, 2025

github-actions bot commented Apr 9, 2025

github-actions bot commented Apr 9, 2025

allroundexperts commented Feb 16, 2025 •

edited

Loading

parasharrajat commented Apr 4, 2025 •

edited

Loading