fix: reuse ValidateCodeActionModal in wallet settings page by getusha · Pull Request #51267 · Expensify/App

getusha · 2024-10-22T16:03:20Z

Details

Fixed Issues

$ #51258
$ #51266
$ #51274
$ #51277
$ #51276
PROPOSAL:

Tests

Log in with a new Gmail account.
Complete onboarding.
Go to Account Settings and click on the Wallet section.
Scroll down and click on the "Enable Wallet" option.
Verify that there is a magic code sent to the new email
Enter the magic code
Verify that you're navigated to Add bank account page

Verify that no errors appear in the JS console

Offline tests

N/a

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-10-22.at.7.23.36.in.the.evening.mov

Android: mWeb Chrome

Screen.Recording.2024-10-22.at.7.09.50.in.the.evening.mov

iOS: Native

Screen.Recording.2024-10-22.at.7.28.22.in.the.evening.mov

iOS: mWeb Safari

Screen.Recording.2024-10-22.at.7.11.24.in.the.evening.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-22.at.6.59.56.in.the.evening.mov

MacOS: Desktop

Screen.Recording.2024-10-22.at.7.19.26.in.the.evening.mov

melvin-bot · 2024-10-22T16:31:43Z

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

luacmartins

LGTM and tests well

getusha · 2024-10-22T16:48:56Z

@luacmartins could we hold merging this for a bit? i am thinking of including a fix for #51266 in this PR

luacmartins · 2024-10-22T16:50:11Z

Yea, go for it

getusha · 2024-10-22T17:41:42Z

Managed to fix it

Screen.Recording.2024-10-22.at.8.09.38.in.the.evening.mov

cc @luacmartins @bondydaa

aimane-chnaif · 2024-10-22T18:08:50Z

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 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.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 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.
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: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

aimane-chnaif · 2024-10-22T18:26:47Z

Looks like these are blockers:

[HOLD for payment 2024-11-01] [HOLD for payment 2024-10-30] Account Settings - I don't receive the magic code to verify the account in wallet section #51258
[HOLD for payment 2024-11-01] [HOLD for payment 2024-10-30] Copilot - Nothing happens when clicking on the grayed out user when magic code is incorrect #51266
[HOLD for payment 2024-11-29] [$125] Copilot - Clicking outside magic code RHP does not dismiss the RHP entirely #51272 (demoted)
[HOLD for payment 2024-11-13] [$250] Copilot - Nothing happens when clicking Add copilot after returning from magic code page #51273 (demoted)
[HOLD for payment 2024-11-01] [HOLD for payment 2024-10-30] Profile - "Failed to add this contact method" error appears when correct magic code is entered #51274
[Hold for #50796] [$250] Contact method - User returned to enter new email step after backgrounding app #51275 (demoted)
[HOLD for payment 2024-11-01] Validate - Magic code RHP does not animate correctly from pay someone confirmation page #51276
[HOLD for payment 2024-11-01] [HOLD for payment 2024-10-30] Validate account - Magic code email is received twice when validating from bank account setup #51277
[Awaiting checklist] [$250] Contact method - Keyboard not opened when navigating to enter magic code step #51279 (demoted)

@getusha you're still trying to fix remaining bugs in this PR, right?

getusha · 2024-10-22T18:28:20Z

@aimane-chnaif yes, there could be a couple of unrelated issues i'll keep you updated.

getusha · 2024-10-22T19:32:46Z

Managed to fix #51274 in 5099679

Screen.Recording.2024-10-22.at.10.28.17.at.night.mov

cc @rlinoz

aimane-chnaif · 2024-10-22T19:55:26Z

Reassure Performance Tests / perf-tests (pull_request) Failing after 17m

…ion-modal

aimane-chnaif · 2024-10-22T20:43:35Z

Please let me know when all bugs are fixed and ready for review

getusha · 2024-10-22T20:47:38Z

@aimane-chnaif do you have any idea why a screen reloads after reopening the app from background, doesn't happen on other screens or similar issue you'd remember?

Screen.Recording.2024-10-22.at.11.46.00.at.night.mov

src/pages/settings/Security/AddDelegate/ConfirmDelegatePage.tsx

aimane-chnaif · 2024-10-22T21:53:42Z

Looks like only 1 blocker is remaining - #51276
@getusha you're working on this right now?

getusha · 2024-10-22T22:02:47Z

@aimane-chnaif it should be fixed now

francoisl · 2024-10-22T22:41:54Z

@getusha now, navigating back from the Validate Your Account page in the Pay someone flow doesn't change the route anymore, and renders a blank left-hand panel, can you take a look please?

Screen.Recording.2024-10-22.at.3.39.55.PM.mov

pecanoro · 2024-10-22T23:09:58Z

@aimane-chnaif By reading your comments, are you saying this PR will fix this issue?

francoisl · 2024-10-22T23:18:11Z

Back navigation is working fine now 👍

Screen.Recording.2024-10-22.at.4.10.33.PM.mov

francoisl · 2024-10-22T23:26:04Z

By reading your comments, are you saying this PR will fix this #51272?

@pecanoro I just tested from this branch and no, it doesn't resolve that issue.

melvin-bot · 2024-10-22T23:27:58Z

@francoisl looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

…al-wallet-section fix: reuse ValidateCodeActionModal in wallet settings page (cherry picked from commit c12fe34) (CP triggered by yuwenmemon)

francoisl · 2024-10-22T23:35:22Z

Not an emergency, tests were passing.

OSBotify · 2024-10-22T23:38:13Z

✋ 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 · 2024-10-22T23:59:05Z

🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 9.0.52-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

aimane-chnaif · 2024-10-23T05:04:55Z

@aimane-chnaif By reading your comments, are you saying this PR will fix this issue?

@pecanoro no, I skipped issues which were demoted to NAB and checked off here

github-actions · 2024-10-23T16:27:24Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.52-5 🚀

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

alitoshmatov · 2024-12-10T13:12:30Z

src/components/SettlementButton/index.tsx

        if (iouPaymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY || iouPaymentType === CONST.IOU.PAYMENT_TYPE.VBBA) {
            if (!isUserValidated) {
-                Navigation.navigate(ROUTES.SETTINGS_WALLET_VERIFY_ACCOUNT.getRoute(ROUTES.SETTINGS_ADD_BANK_ACCOUNT));
+                Navigation.navigate(ROUTES.SETTINGS_WALLET_VERIFY_ACCOUNT.route);


This caused an issue where refreshing the page goes to verify page from chat page, more info - #50285

fix: reuse validate-code-action-moda in wallet settings page

412bc42

luacmartins self-requested a review October 22, 2024 16:05

fix: lint

240e285

getusha marked this pull request as ready for review October 22, 2024 16:31

getusha requested a review from a team as a code owner October 22, 2024 16:31

melvin-bot bot requested a review from aimane-chnaif October 22, 2024 16:31

melvin-bot bot removed the request for review from a team October 22, 2024 16:31

luacmartins previously approved these changes Oct 22, 2024

View reviewed changes

luacmartins mentioned this pull request Oct 22, 2024

[HOLD for payment 2024-11-01] [HOLD for payment 2024-10-30] Copilot - Nothing happens when clicking on the grayed out user when magic code is incorrect #51266

Closed

8 tasks

fix: unvalidated copilot not navigating to magic code modal

2ef718a

getusha dismissed luacmartins’s stale review via 2ef718a October 22, 2024 17:17

fix: lint

f226c89

rlinoz mentioned this pull request Oct 22, 2024

[HOLD for payment 2024-11-01] [HOLD for payment 2024-10-30] Profile - "Failed to add this contact method" error appears when correct magic code is entered #51274

Closed

8 tasks

fix: duplicate magic code call

1adf303

fix: duplicate form submission

5099679

getusha added 2 commits October 22, 2024 22:33

fix: lint

4948a3a

fix: lint

719f970

Merge remote-tracking branch 'exfy/main' into reuse-validate-code-act…

2dfad61

…ion-modal

aimane-chnaif reviewed Oct 22, 2024

View reviewed changes

src/pages/settings/Security/AddDelegate/ConfirmDelegatePage.tsx Outdated Show resolved Hide resolved

melvin-bot bot requested a review from francoisl October 22, 2024 21:52

fix: navigation back issues

e02c563

fix: lint

dfc51a3

getusha added 2 commits October 23, 2024 02:06

fix: navigation back issues

ea374a8

fix: lint

9c7c9d9

francoisl mentioned this pull request Oct 22, 2024

[HOLD for payment 2024-11-01] Validate - Magic code RHP does not animate correctly from pay someone confirmation page #51276

Closed

8 tasks

francoisl approved these changes Oct 22, 2024

View reviewed changes

francoisl merged commit c12fe34 into Expensify:main Oct 22, 2024

melvin-bot bot added the Emergency label Oct 22, 2024

luacmartins removed the Emergency label Oct 22, 2024

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Oct 22, 2024

github-actions bot mentioned this pull request Oct 22, 2024

Deploy Checklist: New Expensify 2024-10-22 #51219

Closed

74 tasks

francoisl added the Emergency label Oct 22, 2024

francoisl removed the Emergency label Oct 22, 2024

melvin-bot bot mentioned this pull request Oct 23, 2024

[HOLD for payment 2024-11-01] [HOLD for payment 2024-10-30] Account Settings - I don't receive the magic code to verify the account in wallet section #51258

Closed

8 tasks

alitoshmatov reviewed Dec 10, 2024

View reviewed changes

daledah mentioned this pull request May 6, 2025

workspace-Refreshing airlines page user directed to previous settings page #61202

Closed

8 tasks

Conversation

getusha commented Oct 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Oct 22, 2024

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

getusha commented Oct 22, 2024

Uh oh!

luacmartins commented Oct 22, 2024

Uh oh!

getusha commented Oct 22, 2024

Uh oh!

aimane-chnaif commented Oct 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Oct 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

getusha commented Oct 22, 2024

Uh oh!

getusha commented Oct 22, 2024

Uh oh!

aimane-chnaif commented Oct 22, 2024

Uh oh!

aimane-chnaif commented Oct 22, 2024

Uh oh!

getusha commented Oct 22, 2024

Uh oh!

Uh oh!

aimane-chnaif commented Oct 22, 2024

Uh oh!

getusha commented Oct 22, 2024

Uh oh!

francoisl commented Oct 22, 2024

Uh oh!

pecanoro commented Oct 22, 2024

Uh oh!

francoisl commented Oct 22, 2024

Uh oh!

francoisl commented Oct 22, 2024

Uh oh!

melvin-bot bot commented Oct 22, 2024

Uh oh!

francoisl commented Oct 22, 2024

Uh oh!

OSBotify commented Oct 22, 2024

Uh oh!

github-actions bot commented Oct 22, 2024

Uh oh!

aimane-chnaif commented Oct 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Oct 23, 2024

Uh oh!

alitoshmatov Dec 10, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

getusha commented Oct 22, 2024 •

edited

Loading

aimane-chnaif commented Oct 22, 2024 •

edited

Loading

aimane-chnaif commented Oct 22, 2024 •

edited

Loading

aimane-chnaif commented Oct 23, 2024 •

edited

Loading