Redirect internally for 2FA management from bank account step by MonilBhavsar · Pull Request #30746 · Expensify/App

MonilBhavsar · 2023-11-02T05:30:49Z

Details

Now that 2FA management inside App, redirect user to 2FA page and then back to bank account step, instead of redirecting to oldDot app

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/278552
PROPOSAL:

Tests

Create and workspace and go to bank accounts and try adding a bank account in VERIFYING state
Have 2FA disabled, so you see a prompt to enable 2FA on Verifying step
Click on the prompt and ensure you're redirected to 2FA codes page
Complete the process till you success page with fireworks
Click on "Got it" and ensure you're redirected back to bank account page but you don't see prompt to enable 2FA

Verify that no errors appear in the JS console

Offline tests

None, as bank account and redirect doesn't work

QA Steps

Create and workspace and go to bank accounts and try adding a bank account in VERIFYING state
Have 2FA disabled, so you see a prompt to enable 2FA on Verifying step
Click on the prompt and ensure you're redirected to 2FA codes page
Complete the process till you success page with fireworks
Click on "Got it" and ensure you're redirected back to bank account page but you don't see prompt to enable 2FA

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2023-11-02.at.2.11.43.PM.mov

Android: mWeb Chrome

Screen.Recording.2023-11-02.at.2.56.59.PM.mov

iOS: Native

Screen.Recording.2023-11-02.at.2.24.40.PM.mov

iOS: mWeb Safari

Screen.Recording.2023-11-02.at.2.36.01.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2023-11-02.at.12.50.01.PM.mov

MacOS: Desktop

Screen.Recording.2023-11-02.at.12.53.26.PM.mov

melvin-bot · 2023-11-02T07:17: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]

MonilBhavsar · 2023-11-06T06:30:54Z

@aimane-chnaif 👋

aimane-chnaif · 2023-11-06T06:34:23Z

Is there a way to go this step without onfido verification?

MonilBhavsar · 2023-11-06T06:45:57Z

I don't think so. You'll need to complete onfido check

aimane-chnaif · 2023-11-10T21:06:15Z

Conflicts. There's function migration refactor of ReimbursementAccountPage merged in main but let's see how it goes, as it caused multiple regressions.

MonilBhavsar · 2023-11-21T09:40:59Z

Conflicts resolved!

MonilBhavsar · 2023-11-24T17:55:59Z

Resolved conflict again!
@aimane-chnaif would be great to get this merged asap considering reunification

aimane-chnaif · 2023-11-24T18:07:16Z

sure, I will review and test during weekend

aimane-chnaif · 2023-11-26T19:02:43Z

This kind of bug is usually reported though it's not normal case so let's fix that:

Refresh on 2fa flow and click back button -> should go back to bank account step

Screen.Recording.2023-11-26.at.8.00.12.PM.mov

aimane-chnaif · 2023-11-26T19:04:49Z

src/pages/ReimbursementAccount/Enable2FAPrompt.js

+    policyID: PropTypes.string.isRequired,
 };
+
 function Enable2FAPrompt(props) {


As we're touching this file, let's destructure props which is new common pattern

MonilBhavsar · 2023-11-27T10:27:58Z

Refresh on 2fa flow and click back button -> should go back to bank account step

Looks like this is navigation bug in general. When we refresh the page, we lose the navigation stack and don't know where to redirect back to

aimane-chnaif · 2023-11-27T10:38:49Z

Refresh on 2fa flow and click back button -> should go back to bank account step

Looks like this is navigation bug in general. When we refresh the page, we lose the navigation stack and don't know where to redirect back to

We get that from backTo param.
Similar issue: #31895 (you can get idea from approved proposal)

Or if you think out of scope, create new GH and handle it separately

MonilBhavsar · 2023-11-27T10:50:18Z

Yes, I think we'll be able to update it. I'll push a fix

MonilBhavsar · 2023-11-27T11:38:06Z

I have pushed a fix. @aimane-chnaif Let me know

aimane-chnaif · 2023-11-27T12:07:50Z

src/libs/actions/TwoFactorAuthActions.ts

+function quitAndNavigateBack(backTo?: string) {
    clearTwoFactorAuthData();
-    Navigation.goBack(ROUTES.SETTINGS_SECURITY);
+    Navigation.goBack(backTo ? backTo : ROUTES.SETTINGS_SECURITY);


To fix TS lint:

Suggested change

Navigation.goBack(backTo ? backTo : ROUTES.SETTINGS_SECURITY);

Navigation.goBack(backTo ? `${backTo}` : ROUTES.SETTINGS_SECURITY);

Isn't using backTo || ROUTES.SETTINGS_SECURITY the right way?

It's against our TS rule.

@blazejkustra what's the best practice for this?

My suggestion would be fine. Otherwise just disable lint for this line

null coalesce won't work in this case. I think it's fair to use || in this case

src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.js

src/pages/settings/Security/TwoFactorAuth/Steps/DisabledStep.js

Co-authored-by: Aimane Chnaif <96077027+aimane-chnaif@users.noreply.github.com>

aimane-chnaif · 2023-11-28T20:16:00Z

TS check still failing

aimane-chnaif · 2023-11-29T06:54:36Z

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(themeColors.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 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-msafari.mov

Android: mWeb Chrome

mchrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

android-msafari.mov

MacOS: Chrome / Safari

web.mov

web2.mov

MacOS: Desktop

desktop.mov

aimane-chnaif

Let's just fix this

aimane-chnaif · 2023-11-29T06:51:26Z

src/libs/actions/TwoFactorAuthActions.ts

 */
 function clearTwoFactorAuthData() {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {recoveryCodes: '', twoFactorAuthSecretKey: '', twoFactorAuthStep: '', codesAreCopied: false});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {recoveryCodes: null, twoFactorAuthSecretKey: null, twoFactorAuthStep: null, codesAreCopied: false});


NAB: what's this change for?

We want to remove these data navigating away from 2FA setup. Setting it as null, removes the onyx data.

melvin-bot · 2023-11-29T08:03:52Z

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

melvin-bot · 2023-11-29T08:03:57Z

🎯 @aimane-chnaif, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #32163.

OSBotify · 2023-11-30T12:15:00Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.5-7 🚀

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

MonilBhavsar added 2 commits November 1, 2023 23:17

Redirect to 2FA page with backTo route

60b155d

Redirect to backTo route

8ee188a

MonilBhavsar self-assigned this Nov 2, 2023

MonilBhavsar added 2 commits November 2, 2023 11:18

Lint fix

2784622

Lint fix and describe props

dc28787

MonilBhavsar marked this pull request as ready for review November 2, 2023 07:17

MonilBhavsar requested a review from a team as a code owner November 2, 2023 07:17

melvin-bot bot removed the request for review from a team November 2, 2023 07:17

melvin-bot bot requested a review from aimane-chnaif November 2, 2023 07:17

Merge branch 'main' into monil-cleanup2FARedirect

b61f097

MonilBhavsar added 2 commits November 21, 2023 15:25

Lint fix

aa24564

Merge branch 'main' into monil-cleanup2FARedirect

8e77bd5

aimane-chnaif reviewed Nov 26, 2023

View reviewed changes

MonilBhavsar added 2 commits November 27, 2023 16:43

Merge branch 'main' into monil-cleanup2FARedirect

1f15e5c

Handle back navigation case

a7fce3b

aimane-chnaif suggested changes Nov 27, 2023

View reviewed changes

Fix function usage

418a672

Co-authored-by: Aimane Chnaif <96077027+aimane-chnaif@users.noreply.github.com>

MonilBhavsar added 2 commits November 27, 2023 21:37

Fix lint

0b7fa44

Merge branch 'main' into monil-cleanup2FARedirect

305f9a1

MonilBhavsar requested a review from aimane-chnaif November 28, 2023 19:10

aimane-chnaif reviewed Nov 29, 2023

View reviewed changes

Fix type check

3c9085a

aimane-chnaif approved these changes Nov 29, 2023

View reviewed changes

melvin-bot bot requested a review from cristipaval November 29, 2023 08:03

melvin-bot bot mentioned this pull request Nov 29, 2023

[Hold of payment 12-6] Payment issue for E/App PR#30746 #32163

Closed

cristipaval approved these changes Nov 29, 2023

View reviewed changes

cristipaval merged commit 8824c8d into main Nov 29, 2023

cristipaval deleted the monil-cleanup2FARedirect branch November 29, 2023 11:27

github-actions bot mentioned this pull request Nov 29, 2023

Deploy Checklist: New Expensify 2023-11-29 #32175

Closed

55 tasks

	Navigation.goBack(backTo ? backTo : ROUTES.SETTINGS_SECURITY);
	Navigation.goBack(backTo ? `${backTo}` : ROUTES.SETTINGS_SECURITY);

Conversation

MonilBhavsar commented Nov 2, 2023 • edited by github-actions bot 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 Nov 2, 2023

Uh oh!

MonilBhavsar commented Nov 6, 2023

Uh oh!

aimane-chnaif commented Nov 6, 2023

Uh oh!

MonilBhavsar commented Nov 6, 2023

Uh oh!

aimane-chnaif commented Nov 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MonilBhavsar commented Nov 21, 2023

Uh oh!

MonilBhavsar commented Nov 24, 2023

Uh oh!

aimane-chnaif commented Nov 24, 2023

Uh oh!

aimane-chnaif commented Nov 26, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar commented Nov 27, 2023

Uh oh!

aimane-chnaif commented Nov 27, 2023

Uh oh!

MonilBhavsar commented Nov 27, 2023

Uh oh!

MonilBhavsar commented Nov 27, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

aimane-chnaif commented Nov 28, 2023

Uh oh!

aimane-chnaif commented Nov 29, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Nov 29, 2023

Uh oh!

melvin-bot bot commented Nov 29, 2023

Uh oh!

OSBotify commented Nov 30, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

MonilBhavsar commented Nov 2, 2023 •

edited by github-actions bot

Loading

aimane-chnaif commented Nov 10, 2023 •

edited

Loading