[CP Stag] Fix forced log out in enable wallet flow #52489

arosiclair · 2024-11-13T16:58:44Z

Explanation of Change

Uses ValidateSecondaryLogin to fix issues with the app getting logged out in the enable wallet flow

Fixed Issues

$ #52453

Tests

Enable wallet flow

Log in with the new account
Complete the incorporation process using the option “Get Paid back by my employer”.
Enter a first and last name and click on the Continue button.
Go to Settings > Wallet > Enable wallet
Enter magic code
Verify you're navigated to the Add Bank Account page

Pay someone flow

Log in with a new account
Complete onboarding with the Something else option
Start a chat with an existing user
Start the pay {user} flow
Enter an amount
Select Pay with Expensify
Enter magic code
Verify you're redirected to the confirmation page
Select Pay with Expensify again
Verify you navigate to the add bank account page with Plaid

Offline tests

None

QA Steps

Same as Tests

PR Author Checklist

Screenshots/Videos

Android: Native

screen-20241113-124445.mp4

screen-20241113-124640.mp4

Android: mWeb Chrome

iOS: Native

RPReplay_Final1731519050.MP4

iOS: mWeb Safari

RPReplay_Final1731518166.MP4

MacOS: Chrome / Safari

Screen.Recording.2024-11-13.at.12.03.22.PM.mov

Screen.Recording.2024-11-13.at.12.04.47.PM.mov

MacOS: Desktop

Screen.Recording.2024-11-13.at.12.09.06.PM.mov

melvin-bot · 2024-11-13T17:48:32Z

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

ZhenjaHorbach · 2024-11-13T17:51:43Z

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

2024-11-13.19.48.11.mov

2024-11-13.19.43.25.mov

Android: mWeb Chrome

android-web.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-web-2.mov

ios-web-1.mov

MacOS: Chrome / Safari

web-2.mov

web-1.mov

MacOS: Desktop

desktop-2.mov

desktop-1.mov

ZhenjaHorbach · 2024-11-13T18:08:47Z

src/pages/settings/Wallet/VerifyAccountPage.tsx

@@ -31,9 +30,9 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {

    const handleSubmitForm = useCallback(
        (validateCode: string) => {
-            User.validateLogin(accountID ?? 0, validateCode);


This is a minor comment
But we don't use validateLogin anywhere else
So in theory we could remove validateLogin

But It's not critical
Plus we have this issue
That in the background we navigate to the wallet screen when we press Pay with Expensify and Enter magic code
But I think we can fix all this in a separate PR

But we don't use validateLogin anywhere else
So in theory we could remove validateLogin

I'm planning on reintroducing it later so we can just leave it for now.

That in the background we navigate to the wallet screen when we press Pay with Expensify and Enter magic code
But I think we can fix all this in a separate PR

We'll address that in this issue.

In this case no more questions
Thanks !
I'll finish the review soon

ZhenjaHorbach · 2024-11-13T18:45:27Z

LGTM !

melvin-bot · 2024-11-13T18:45:45Z

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

[CP Stag] Fix forced log out in enable wallet flow (cherry picked from commit 9b86b7d) (CP triggered by francoisl)

OSBotify · 2024-11-13T19:33:03Z

✋ 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-11-13T20:09:51Z

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 9.0.61-1 🚀

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

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

github-actions · 2024-11-14T00:41:07Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.61-3 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	skipped 🚫
🍎🔄 iOS HybridApp 🍎🔄	skipped 🚫

use validateSecondaryLogin to fix log out bug

a91915f

arosiclair self-assigned this Nov 13, 2024

arosiclair marked this pull request as ready for review November 13, 2024 17:48

arosiclair requested a review from a team as a code owner November 13, 2024 17:48

melvin-bot bot requested a review from ZhenjaHorbach November 13, 2024 17:48

melvin-bot bot removed the request for review from a team November 13, 2024 17:48

ZhenjaHorbach reviewed Nov 13, 2024

View reviewed changes

ZhenjaHorbach approved these changes Nov 13, 2024

View reviewed changes

melvin-bot bot requested a review from marcochavezf November 13, 2024 18:45

marcochavezf approved these changes Nov 13, 2024

View reviewed changes

arosiclair changed the title ~~Fix forced log out in enable wallet flow~~ [CP Stag] Fix forced log out in enable wallet flow Nov 13, 2024

arosiclair merged commit 9b86b7d into main Nov 13, 2024
17 of 26 checks passed

arosiclair deleted the arosiclair-fix-wallet-log-out branch November 13, 2024 19:22

OSBotify pushed a commit that referenced this pull request Nov 13, 2024

Merge pull request #52489 from Expensify/arosiclair-fix-wallet-log-out

9083b74

[CP Stag] Fix forced log out in enable wallet flow (cherry picked from commit 9b86b7d) (CP triggered by francoisl)

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

github-actions bot mentioned this pull request Nov 13, 2024

Deploy Checklist: New Expensify 2024-11-13 #52440

Closed

41 tasks

melvin-bot bot mentioned this pull request Nov 14, 2024

[$250] [HOLD for payment 2024-11-22] [HOLD for payment 2024-11-21] Wallet - The page crash when placing the MC to be able to link a wallet #52453

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Stag] Fix forced log out in enable wallet flow #52489

[CP Stag] Fix forced log out in enable wallet flow #52489

arosiclair commented Nov 13, 2024 •

edited

Loading

melvin-bot bot commented Nov 13, 2024

ZhenjaHorbach commented Nov 13, 2024 •

edited

Loading

ZhenjaHorbach Nov 13, 2024

ZhenjaHorbach Nov 13, 2024 •

edited

Loading

arosiclair Nov 13, 2024

ZhenjaHorbach Nov 13, 2024

ZhenjaHorbach commented Nov 13, 2024

melvin-bot bot commented Nov 13, 2024

OSBotify commented Nov 13, 2024

github-actions bot commented Nov 13, 2024

github-actions bot commented Nov 14, 2024

[CP Stag] Fix forced log out in enable wallet flow #52489

[CP Stag] Fix forced log out in enable wallet flow #52489

Conversation

arosiclair commented Nov 13, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 13, 2024

ZhenjaHorbach commented Nov 13, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

ZhenjaHorbach Nov 13, 2024

Choose a reason for hiding this comment

ZhenjaHorbach Nov 13, 2024 • edited Loading

Choose a reason for hiding this comment

arosiclair Nov 13, 2024

Choose a reason for hiding this comment

ZhenjaHorbach Nov 13, 2024

Choose a reason for hiding this comment

ZhenjaHorbach commented Nov 13, 2024

melvin-bot bot commented Nov 13, 2024

OSBotify commented Nov 13, 2024

github-actions bot commented Nov 13, 2024

github-actions bot commented Nov 14, 2024

arosiclair commented Nov 13, 2024 •

edited

Loading

ZhenjaHorbach commented Nov 13, 2024 •

edited

Loading

ZhenjaHorbach Nov 13, 2024 •

edited

Loading