Skip to content

Reapply feat: Connect USD and nonUSD VBA flows#57460

Merged
madmax330 merged 4 commits into
Expensify:mainfrom
callstack-internal:feat/50911-reimbursement-account-page-refactor
Mar 3, 2025
Merged

Reapply feat: Connect USD and nonUSD VBA flows#57460
madmax330 merged 4 commits into
Expensify:mainfrom
callstack-internal:feat/50911-reimbursement-account-page-refactor

Conversation

@MrMuzyk

@MrMuzyk MrMuzyk commented Feb 26, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

Reapplies changes reverted by - #57422

Original PR (#55949) caused 5 deploy blockers so it was reverted.

This PR includes fixes for all the blocker issues below that were reported while this was on staging:
#57408
#57409
#57410
#57413
#57415

None of these issues are reproducible anymore.

Changes this PR re-introduces

  • refactor of ReimbursementAccountPage
  • moved certain methods to utils
  • files division that represents better existence of two flows - USD/non USD
  • moved connect/continue/start over/disconnect screens. They're now common for USD/non USD flows
  • default values should now be displayed correctly for Steps 1-3 in non USD flow
  • connect/continue screens work for non USD flow
  • default steps and sub steps are being correctly displayed for non USD flow - they reflect user progress in the flow
  • fixed imports in multiple files
  • got rid of deprecated HOCs like with-onyx in multiple files
  • typo's fixes

Fixed Issues

$ #50911

PROPOSAL:
n/a

Tests

For USD workspace:

  • Connect Plaid account
  • Connect Manually account
  • Connect Plaid account on unverified account (no confirmed email)
  • Connect Manually account on unverified account (no confirmed email)
  • Check if exiting and coming back to flow displays correct buttons and they work correctly (continue/start over/disconnect)

For non USD workspace:

  • Connect Manually account (at the moment working up to step 4 included)
  • Connect Manually account (at the moment working up to step 4 included) on unverified account (no confirmed email)
  • Continue/Exit for each step
  • Back button for each step
  • Default values for each step (up to step 4 included) are displayed properly
  • User returns to correct step and sub step upon pressing continue
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

For USD workspace:

  • Connect Plaid account
  • Connect Manual account
  • Connect plaid account on unverified account (no confirmed email)
  • Connect manual account on unverified account (no confirmed email)
  • Check if exiting and coming back to flow displays correct buttons and they work correctly (continue/start over/disconnect)

For non USD workspace:

  • Behaviour shouldn't change at all. It should work the same way as it does on production at the moment

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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.

Screenshots/Videos

Recording showcasing fixes for previously reported blockers
https://github.com/user-attachments/assets/766cffd7-fc83-42c9-8180-eb83649dcedb

Android: Native
android.mp4
Android: mWeb Chrome
android.web.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
ios.web.mp4
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mp4

@melvin-bot

melvin-bot Bot commented Feb 26, 2025

Copy link
Copy Markdown

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

@MrMuzyk MrMuzyk changed the title Reapply feat: Connect USD and nonUSD VBA flows with Reapply feat: Connect USD and nonUSD VBA flows Feb 26, 2025
@MrMuzyk MrMuzyk marked this pull request as ready for review February 27, 2025 10:01
@MrMuzyk MrMuzyk requested a review from a team as a code owner February 27, 2025 10:01
@melvin-bot melvin-bot Bot requested review from paultsimura and removed request for a team February 27, 2025 10:01
@melvin-bot

melvin-bot Bot commented Feb 27, 2025

Copy link
Copy Markdown

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

@MrMuzyk

MrMuzyk commented Feb 27, 2025

Copy link
Copy Markdown
Contributor Author

Hey @hungvu193! So as you probably know this PR got reverted because of the deploy blockers it caused. I wasn't able to fix them at that time as it was already late evening for me after whole day of work so decision was made to revert the PR.

I've linked all the blockers it caused and added 2 new commits with fixes and 1 rebase - these are the only new things in this PR.

@hungvu193

Copy link
Copy Markdown
Contributor

Thanks @MrMuzyk, I'll verify these bugs and let you know

@hungvu193

Copy link
Copy Markdown
Contributor

@MrMuzyk To confirm, since we moved non-usd flow into separated flow, we also removed the ContinueBankAccountSetup steps from non-usd flow right?

@MrMuzyk

MrMuzyk commented Feb 28, 2025

Copy link
Copy Markdown
Contributor Author

non USD flow was built separately but it needs to have the same options and looks as USD flow in it's entry point, thus the refactor. I've extracted that Start, Continue etc. options from USD flow and created VerifiedBankAccountFlowEntryPoint.tsx component that is used as an entry point for both flows

@hungvu193

Copy link
Copy Markdown
Contributor

Status of the linked issues:

#57408.

Test
57408.mov

#57409

Test
57409.mov

#57410

Test
57410.mov
✅ https://github.com//issues/57413
Test
57413.mov
✅ https://github.com//issues/57415
Test
57415.mov

@hungvu193 hungvu193 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.ts 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • 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
Screen.Recording.2025-02-21.at.17.01.37.mov
Android: mWeb Chrome
Screen.Recording.2025-02-21.at.16.17.14.mov
iOS: Native
IOS.mov
ios1.mov
iOS: mWeb Safari
Screen.Recording.2025-02-21.at.16.05.22.mov
MacOS: Chrome / Safari
Chrome.mov
MacOS: Desktop
Desktop.mov

@hungvu193

Copy link
Copy Markdown
Contributor

All yours @madmax330

@madmax330 madmax330 merged commit d1ffdad into Expensify:main Mar 3, 2025
@OSBotify

OSBotify commented Mar 3, 2025

Copy link
Copy Markdown
Contributor

✋ 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

github-actions Bot commented Mar 3, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/madmax330 in version: 9.1.8-0 🚀

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

@izarutskaya

Copy link
Copy Markdown

Hi @MrMuzyk For USD workspace working well. Check please video

bandicam.2025-03-04.18-07-02-790.mp4

For non USD workspace we see pop up that we need change the currency to USD.
This is the same as in Production.

image

Is it pass?

@MrMuzyk

MrMuzyk commented Mar 4, 2025

Copy link
Copy Markdown
Contributor Author

Hi @izarutskaya. If USD flow is working well then it's a pass. Non USD flow is not enabled yet so it can't be tested.

@izarutskaya

Copy link
Copy Markdown

@MrMuzyk One more thing, we can not actually add a manual bank account because of the amount verification, so we can only test until that step. In the other hand, we can not add a bank account to an unverified email

@MrMuzyk

MrMuzyk commented Mar 4, 2025

Copy link
Copy Markdown
Contributor Author

I think the beginning of the process was the most fragile part - it had the most changes - so if it's all working there then it's ok. Steps 2-5 are identical regardless of the picked option (plaid/manual).

@github-actions

github-actions Bot commented Mar 4, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.8-1 🚀

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

setBankAccountSubStep(CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL);
setUSDBankAccountStep(CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT);
} else if (optionPressed.current === CONST.BANK_ACCOUNT.SUBSTEP.PLAID) {
setUSDBankAccountStep(CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We also should set BankAccountSubStep to Plaid to avoid showing the manual step briefly. ref issue

setUSDBankAccountStep(null);
} else {
Navigation.goBack();
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You incorrectly handled the success page back button, which caused #63123

if (!account?.validated) {
return;
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to hide the modal here to avoid issue #73690

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants