Merge account feature fixes - Part 1 #59911

allroundexperts · 2025-04-09T12:23:20Z

Explanation of Change

Fixes the following issues:
fixes #59767
fixes #59757
fixes #59759
fixes #59760
fixes #59761
fixes #59772
fixes #59784
fixes #59824

Fixed Issues

$ #47073
PROPOSAL: N/A

Tests

Test 1

Go to Settings > Security.
Tap Merge account.
Enter email of another account.
Mark "I understand this is not reversible" checkbox.
Click Next.
Wait 30 seconds.
Tap "Didn't receive a magic code?".
Tap app back button.

Verify that the app will return to the previous page, which is merge account email page.

Test 2

Go to Settings > Security
Tap Merge account
Enter long email
Mark "I understand this is not reversible" checkbox
Click Next

Verify that the long email will be wrapped into two lines and does not overflow

Test 3

Go to Settings > Security
Click on Merge account
Refresh the page

Verify that the background stays in settings

Test 4

Go to Settings > Security.
Tap Merge account.
Enter email of another account that has enabled 2FA.
Mark "I understand this is not reversible" checkbox.
Click Next.
Enter magic code.
Click "Learn more about merging accounts" link.

Verify that the "Learn more about merging accounts" link will open a valid help site.

Test 5

Go to Settings > Security.
Tap Merge account.
Enter the same email as your current account.

Verify that you're shown an error and blocked from proceeding.

Test 6

Go to Settings > Security.
Tap Merge account.
Enter any email that has a valid Expensify account.
Enter incorrect OTP.

Verify that you're shown an invalid code error and it does not show the error 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

Android.mov

Android: mWeb Chrome

Screen.Recording.2025-04-09.at.10.08.38.PM.mov

iOS: Native

iOS.Native.mov

iOS: mWeb Safari

iOS.Safari.mov

MacOS: Chrome / Safari

Screen.Recording.2025-04-09.at.9.50.50.PM.mov

Screen.Recording.2025-04-09.at.9.51.14.PM.mov

Screen.Recording.2025-04-09.at.9.51.57.PM.mov

MacOS: Desktop

Desktop.mov

melvin-bot · 2025-04-09T21:30:27Z

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

parasharrajat · 2025-04-10T07:19:40Z

@allroundexperts Can you please use link this PR to the main issue as well via our template?

This way

lakchote · 2025-04-10T08:04:43Z

@parasharrajat could you please review it? Based on this comment from @allroundexperts.

src/components/ConfirmationPage.tsx

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

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

parasharrajat · 2025-04-10T08:43:12Z

Test List.

Merge account-Magic code page reopens when returning to previous page after requesting code #59767
[$250] Merge account - Long email is cut off on magic code page #59757
[$250] Merge Account - Background changes to inbox when reloading on merge page #59759
Merge account - "Learn more about merging accounts" link opens not here page #59760
Merge account - Error message contains 404 when merging with the same account #59761
Merge account - Error message contains 401 when entering incorrect magic code #59772
Merge account - Error messages in code section are not translated to Spanish #59784
Merge account - Error message for non-existing account contains 404 #59824

parasharrajat · 2025-04-10T08:46:07Z

Please add fixes before each issue in the list so that they get auto-closed afterwards, making it easy for all.

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

parasharrajat · 2025-04-17T16:56:04Z

I couldn't get access to the internet last 2 days. I will test this asap.

arosiclair

Code LGTM. Waiting on your review @parasharrajat

parasharrajat · 2025-04-18T14:12:18Z

Testing...

allroundexperts · 2025-04-20T21:54:22Z

WEB: #59757

@parasharrajat Fixed.

parasharrajat · 2025-04-21T02:47:36Z

BUG: The Result page has the wrong animation, It should be right to left.

21.04.2025_08.14.18_REC.mp4

allroundexperts · 2025-04-21T10:25:19Z

BUG: The Result page has the wrong animation, It should be right to left.

21.04.2025_08.14.18_REC.mp4

Let's solve this in a follow up as its not related to the fixes in this PR.

arosiclair

Looks good, but there are conflicts @allroundexperts

parasharrajat · 2025-04-21T14:24:07Z

Please resolve conflicts and I noticing that I am not seeing the private domain flow now. It takes to be purpose screen. Is something wrong from backend?

allroundexperts · 2025-04-21T17:07:21Z

Please resolve conflicts

Done.

I noticing that I am not seeing the private domain flow now. It takes to be purpose screen. Is something wrong from backend?

The private domain flow is disabled until #54912 is merged.

arosiclair · 2025-04-21T17:46:27Z

@parasharrajat you still need to fill out the checklist

parasharrajat · 2025-04-21T17:53:39Z

Lol, my bad. I confused this PR for a wrong issue. Completing the final checks.

parasharrajat · 2025-04-21T18:02:02Z

Screenshots

🔲 iOS / native

21.04.2025_23.44.52_REC.mp4

🔲 iOS / Safari

21.04.2025_23.47.16_REC.mp4

🔲 MacOS / Desktop

21.04.2025_23.35.03_REC.mp4

🔲 MacOS / Chrome

21.04.2025_08.10.02_REC.mp4

🔲 Android / Chrome

21.04.2025_23.29.24_REC.mp4

🔲 Android / native

21.04.2025_23.27.56_REC.mp4

Mobile-Expensify

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

parasharrajat · 2025-04-21T18:22:37Z

Please check this comment before merging #59911 (comment).

allroundexperts · 2025-04-21T18:42:00Z

Please check this comment before merging #59911 (comment).

Done @parasharrajat

allroundexperts · 2025-04-21T20:34:40Z

Waiting on you @arosiclair 😄

OSBotify · 2025-04-22T12:22: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-23T18:44:24Z

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

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

github-actions · 2025-04-28T19:51:16Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.1.32-8 🚀

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

first phase of fixes

c55c163

allroundexperts mentioned this pull request Apr 9, 2025

Add Merge Account to NewExpensify #47073

Open

19 tasks

allroundexperts added 3 commits April 9, 2025 17:42

fix type errors

be860ff

auth error

7517dd8

change error message

c5bdc95

allroundexperts marked this pull request as ready for review April 9, 2025 21:29

allroundexperts requested a review from a team as a code owner April 9, 2025 21:29

melvin-bot bot requested a review from lakchote April 9, 2025 21:30

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

lakchote requested a review from parasharrajat April 10, 2025 08:03

parasharrajat suggested changes Apr 10, 2025

View reviewed changes

refactor key names

793f855

arosiclair requested review from arosiclair and removed request for lakchote April 15, 2025 16:18

arosiclair requested changes Apr 15, 2025

View reviewed changes

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

allroundexperts added 4 commits April 18, 2025 01:46

Merge branch 'main' into feat-47073-1

c378cc1

handle comment

9d5dbe2

fix lint errors

624a213

remove the un-used usememo

0a182b7

allroundexperts requested review from arosiclair and parasharrajat April 17, 2025 20:57

arosiclair reviewed Apr 18, 2025

View reviewed changes

Merge branch 'main' into feat-47073-1

80a0efd

add w-100 to validate page description

7b2e73d

arosiclair previously approved these changes Apr 21, 2025

View reviewed changes

Merge branch 'main' into feat-47073-1

37264ec

allroundexperts dismissed arosiclair’s stale review via 37264ec April 21, 2025 17:06

arosiclair previously approved these changes Apr 21, 2025

View reviewed changes

parasharrajat reviewed Apr 21, 2025

View reviewed changes

Mobile-Expensify Outdated Show resolved Hide resolved

parasharrajat approved these changes Apr 21, 2025

View reviewed changes

melvin-bot bot requested a review from arosiclair April 21, 2025 18:19

remove mobile exfy changes

33caa59

allroundexperts dismissed arosiclair’s stale review via 33caa59 April 21, 2025 18:41

arosiclair approved these changes Apr 22, 2025

View reviewed changes

arosiclair merged commit 32c95be into Expensify:main Apr 22, 2025
17 checks passed

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

Deploy Checklist: New Expensify 2025-04-23 #60729

Closed

91 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge account feature fixes - Part 1 #59911

Merge account feature fixes - Part 1 #59911

allroundexperts commented Apr 9, 2025 •

edited

Loading

melvin-bot bot commented Apr 9, 2025

parasharrajat commented Apr 10, 2025

lakchote commented Apr 10, 2025

parasharrajat commented Apr 10, 2025 •

edited

Loading

parasharrajat commented Apr 10, 2025

parasharrajat commented Apr 17, 2025 •

edited

Loading

arosiclair left a comment

parasharrajat commented Apr 18, 2025

allroundexperts commented Apr 20, 2025

parasharrajat commented Apr 21, 2025

allroundexperts commented Apr 21, 2025

arosiclair left a comment •

edited

Loading

parasharrajat commented Apr 21, 2025

allroundexperts commented Apr 21, 2025 •

edited

Loading

arosiclair commented Apr 21, 2025

parasharrajat commented Apr 21, 2025

parasharrajat commented Apr 21, 2025 •

edited

Loading

parasharrajat left a comment

parasharrajat commented Apr 21, 2025

allroundexperts commented Apr 21, 2025

allroundexperts commented Apr 21, 2025

OSBotify commented Apr 22, 2025

github-actions bot commented Apr 23, 2025

github-actions bot commented Apr 28, 2025

Merge account feature fixes - Part 1 #59911

Merge account feature fixes - Part 1 #59911

Conversation

allroundexperts commented Apr 9, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 9, 2025

parasharrajat commented Apr 10, 2025

lakchote commented Apr 10, 2025

parasharrajat commented Apr 10, 2025 • edited Loading

parasharrajat commented Apr 10, 2025

parasharrajat commented Apr 17, 2025 • edited Loading

arosiclair left a comment

Choose a reason for hiding this comment

parasharrajat commented Apr 18, 2025

allroundexperts commented Apr 20, 2025

parasharrajat commented Apr 21, 2025

allroundexperts commented Apr 21, 2025

arosiclair left a comment • edited Loading

Choose a reason for hiding this comment

parasharrajat commented Apr 21, 2025

allroundexperts commented Apr 21, 2025 • edited Loading

arosiclair commented Apr 21, 2025

parasharrajat commented Apr 21, 2025

parasharrajat commented Apr 21, 2025 • edited Loading

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

parasharrajat commented Apr 21, 2025

allroundexperts commented Apr 21, 2025

allroundexperts commented Apr 21, 2025

OSBotify commented Apr 22, 2025

github-actions bot commented Apr 23, 2025

github-actions bot commented Apr 28, 2025

allroundexperts commented Apr 9, 2025 •

edited

Loading

parasharrajat commented Apr 10, 2025 •

edited

Loading

parasharrajat commented Apr 17, 2025 •

edited

Loading

arosiclair left a comment •

edited

Loading

allroundexperts commented Apr 21, 2025 •

edited

Loading

parasharrajat commented Apr 21, 2025 •

edited

Loading