fix: restart the flow for another policy by koko57 · Pull Request #49687 · Expensify/App

koko57 · 2024-09-25T06:47:23Z

Details

Fixed Issues

$ #49447
PROPOSAL:

Tests

Create several workspaces (if you don't have any).
Go to one of your workspaces (from now on called Workspace A)
Enable Expensify Card or Workflows for Workspace A
Click Issue New Card / Connect Bank Account
Go through the flow and leave on any step i.e. Personal Info.
Go to another workspace (Workspace B)
Repeat steps 3. - 5. for this workspace, verify that when entering the VBBA flow you see the buttons to choose the setup type - not "Continue" or "Start over"
Go back to Workspace A, repeat step 3
Verify that you see the "Continue" and "Start over" buttons.
Repeat steps 3-4 several times - for the workspaces you left the flow at the very beginning you should see the starting page with setup types, for the workspaces you left off at some point in the flow (after adding bank account) you should see the "continue" modal

Verify that no errors appear in the JS console

Offline tests

QA Steps

Create several workspaces (if you don't have any).
Go to one of your workspaces (from now on called Workspace A)
Enable Expensify Card or Workflows for Workspace A
Click Issue New Card / Connect Bank Account
Go through the flow and leave on any step i.e. Personal Info.
Go to another workspace (Workspace B)
Repeat steps 3. - 5. for this workspace, verify that when entering the VBBA flow you see the buttons to choose the setup type - not "Continue" or "Start over"
Go back to Workspace A, repeat step 3
Verify that you see the "Continue" and "Start over" buttons.
Repeat steps 3-4 several times - for the workspaces you left the flow at the very beginning you should see the starting page with setup types, for the workspaces you left off at some point in the flow (after adding bank account) you should see the "continue" modal

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-09-26.at.19.18.23.mp4

MacOS: Desktop

melvin-bot · 2024-09-26T12:38:40Z

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

mountiny

@DylanDylann what is your ETA for testing on this pr?

src/pages/ReimbursementAccount/BankInfo/substeps/Manual.tsx

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

DylanDylann · 2024-09-26T14:39:07Z

If we rush, I can start now

mountiny · 2024-09-26T15:17:00Z

We do not rush specifically, just asking 😂

DylanDylann · 2024-09-26T15:05:54Z

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

+
+function ReimbursementAccountPage({route, policy}: ReimbursementAccountPageProps) {
+    const session = useSession();
+    const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);


Should we add a fallback value as before?

Same to plaidLinkToken, onfidoToken, plaidCurrentEvent

I don't think we need it

@koko57 Why don't you think we need it? Let's see the our previous implementation

@DylanDylann I don't see anywhere in the app we're using fallback values for the values from useOnyx. And here if we get undefined or null to won't break anything, the conditions will work the same and the TS is not complaining. So I don't see the reason to add these fallbacks.

but ok, I see that it was implemented in the conflicting file

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com> Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

koko57 · 2024-09-27T08:27:17Z

@mountiny @DylanDylann comments addressed. @DylanDylann I had to reverse your suggestion with parentheses, because prettier was failing. It works as it's supposed

koko57 · 2024-09-27T08:45:08Z

@DylanDylann could you please test other ways that we can get to VBBA that you may know?

mountiny · 2024-09-27T09:11:32Z

@DylanDylann could you please test other ways that we can get to VBBA that you may know?

That would be namely:

Workspace > Workflows > Payments > Add bank account
Bottom up flow - change vpn to USA, request 1:1 between two users as P2P and then as the user to pay, you can choose pay with business bank account

koko57 · 2024-09-27T09:18:31Z

@mountiny yes, thanks! the first one I also tested myself - it's in the video, but I haven't tested the bottom-up flow

…space

DylanDylann · 2024-10-01T06:51:59Z

@koko57 Also please resolve conflict

koko57 · 2024-10-01T07:16:34Z

@DylanDylann conflicts resolved, could you please retest it?

DylanDylann · 2024-10-01T07:26:36Z

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

     */
    function hasInProgressVBBA(): boolean {
-        return !!achData?.bankAccountID && achData?.state !== BankAccount.STATE.OPEN && achData?.state !== BankAccount.STATE.LOCKED;
+        return !!achData?.state && achData?.state !== BankAccount.STATE.OPEN && achData?.state !== BankAccount.STATE.LOCKED;


Why do you remove bankAccountID check here? We need to check bankAccountID condition before display continue setup button (in getShouldShowContinueSetupButtonInitialValue function)

Screen.Recording.2024-10-01.at.14.25.21.mov

@DylanDylann I don't remember, but ok reverting it.

DylanDylann · 2024-10-01T15:28:27Z

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

    }

    useEffect(() => {
-        if (!isReimbursementAccountLoading) {


@koko57 Why do you remove this check?

we no longer use isReimbursementAccountLoading here. I removed the local state we're just taking the info about the loading from Onyx. We don't need it locally

Night owl 😄

@koko57 I mean should we replace with reimbursementAccount?.isLoading

temporarily different timezone 😃

@koko57 Bump on this

but here I'm changing the logic a bit. This runs only when component mounts. As we no longer set the state like this:

const [isReimbursementAccountLoading, setIsReimbursementAccountLoading] = useState(() => { // By default return true (loading), if there are already loaded data we can skip the loading state if (hasACHDataBeenLoaded && typeof reimbursementAccount?.isLoading === 'boolean' && !reimbursementAccount?.isLoading) { return false; } return true; });

we don't need to check if it's true or false and skip the content of the hook. We also don't need to check for reimbursementAccount?.isLoading, we set it true later and we actually want the whole hook to run on mount. We only don't want to fetch the data if it's the same policy as we already have the data.

DylanDylann · 2024-10-01T15:30:11Z

@mountiny The change seems more complicated than I thought. I need more time to complete the checklist. (maybe done in tomorrow)

mountiny · 2024-10-01T19:22:28Z

Thanks!

DylanDylann · 2024-10-02T09:50:48Z

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

        BankAccounts.setBankAccountSubStep(CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL).then(() => {
            setShouldShowContinueSetupButton(false);
        });
-        fetchData(true);


@koko57 same here, Why do you remove this line?

we don't need to fetch the data here. Besides, when I was working on that that call to API seemed not to be sent

@koko57 To safe, If we remove this, I think we need to understand why we added it before

This flow is quite complicated. So we should be careful about this change to avoid regression. Thanks

@DylanDylann as we fetchData when the component mounts we don't need to fetch it once again when we choose manual flow. And as I said - when working on it I've never saw this request being sent (not sure why).

@DylanDylann yeah it's complicates 😅 I've tried to simplify it as much as possible.

DylanDylann · 2024-10-02T09:52:01Z

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

        },
        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-        [isOffline, reimbursementAccount, route, hasACHDataBeenLoaded, shouldShowContinueSetupButton],
+        [isOffline, reimbursementAccount, route, hasACHDataBeenLoaded, shouldShowContinueSetupButton, policyIDParam],


I think this is unnecessary. When policyIDParam change this component will be rendered for sure (because policyIDParam change means that the route change). Please correct me if I am wrong

yep and we no longer use it here - removed!

DylanDylann · 2024-10-03T10:21:40Z

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

            return;
        }
-        setIsReimbursementAccountLoading(reimbursementAccount.isLoading);
+        setHasACHDataBeenLoaded(true);


@koko57 In case of isLoading is updated from false to true, It will be incorrect. Wdyt If we remove this useEffect? As I understand, this useEffect is to update the deprecated state that no longer use

@DylanDylann yep, I think that makes sense. Although I must have had some idea why I changed this, but I don't remember now 😅
I will check and remove this useEffect or refactor it

Thanks for pointing this out!

DylanDylann · 2024-10-03T11:04:57Z

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

Screen.Recording.2024-10-03.at.22.58.57.mov

Android: mWeb Chrome

Screen.Recording.2024-10-03.at.22.57.25.mov

iOS: Native

Screen.Recording.2024-10-03.at.22.55.46.mov

iOS: mWeb Safari

Screen.Recording.2024-10-03.at.22.55.12.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-03.at.22.52.42.mov

MacOS: Desktop

Screen.Recording.2024-10-03.at.22.54.17.mov

…space

koko57 · 2024-10-03T11:48:45Z

@DylanDylann seems like removing this useEffect doesn't break anything, could you please retest it?

mountiny

Thanks! all yours @grgia

grgia

Code LGTM, NAB comments

src/pages/ReimbursementAccount/BankInfo/substeps/Manual.tsx

grgia · 2024-10-04T15:50:15Z

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

+function getFieldsForStep(step: TBankAccountStep): InputID[] {
+    switch (step) {
+        case CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT:
+            return ['routingNumber', 'accountNumber', 'bankName', 'plaidAccountID', 'plaidAccessToken', 'isSavings'];


Is there a reason these aren't also CONST?

not sure, it was implemented like that before, I've just taken this function out of the component

I think this is not a blocker for now, we can add consts in future PRs if we think it would be cleaner

grgia

LGTM

DylanDylann · 2024-10-07T09:43:12Z

@grgia Is there any blocker here?

mountiny · 2024-10-07T11:27:27Z

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

+function getFieldsForStep(step: TBankAccountStep): InputID[] {
+    switch (step) {
+        case CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT:
+            return ['routingNumber', 'accountNumber', 'bankName', 'plaidAccountID', 'plaidAccessToken', 'isSavings'];


I think this is not a blocker for now, we can add consts in future PRs if we think it would be cleaner

OSBotify · 2024-10-07T11:39:35Z

✋ 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-07T22:28:51Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.46-0 🚀

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

github-actions · 2024-10-09T20:28:40Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.46-5 🚀

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

fix: restast the flow for another policy

ae7a704

koko57 changed the title ~~fix: restast the flow for another policy~~ fix: restart the flow for another policy Sep 25, 2024

koko57 added 4 commits September 25, 2024 20:12

fix: replace withOnyx for useOnyx

d7d0411

fix: last changes and cleanup

e88d940

fix: cleanup

98b1256

fix: final fixes

90b1454

koko57 marked this pull request as ready for review September 26, 2024 12:38

koko57 requested a review from a team as a code owner September 26, 2024 12:38

melvin-bot bot requested review from DylanDylann and removed request for a team September 26, 2024 12:38

koko57 mentioned this pull request Sep 26, 2024

[PAID] [$250] [Workspace Feeds] App crashes after creating new WS and selecting start over #49447

Closed

6 tasks

mountiny assigned koko57 Sep 26, 2024

mountiny reviewed Sep 26, 2024

View reviewed changes

DylanDylann reviewed Sep 26, 2024

View reviewed changes

koko57 and others added 3 commits September 27, 2024 14:40

fix: apply suggestions from code review

e1524d7

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com> Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

fix: add policyIDParam to the dependency array

29623ee

fix: prettier

67d7d99

Merge branch 'main' into fix/49447-restart-vbba-flow-for-another-work…

626cea8

…space

fix: resolve conflicts

7956396

DylanDylann reviewed Oct 1, 2024

View reviewed changes

fix: revert removing check

d4ca888

DylanDylann reviewed Oct 1, 2024

View reviewed changes

DylanDylann reviewed Oct 2, 2024

View reviewed changes

fix: remove unnecessary dep

e461db1

koko57 mentioned this pull request Oct 2, 2024

[HOLD for payment 2024-11-01] [$250] Bank account - User is able to edit account number but the change does not take affect #49786

Closed

6 tasks

DylanDylann reviewed Oct 3, 2024

View reviewed changes

koko57 added 2 commits October 3, 2024 18:20

Merge branch 'main' into fix/49447-restart-vbba-flow-for-another-work…

20165ec

…space

fix: remove unnecessary useEffect

e56d462

DylanDylann approved these changes Oct 3, 2024

View reviewed changes

melvin-bot bot requested a review from grgia October 3, 2024 16:00

mountiny previously approved these changes Oct 3, 2024

View reviewed changes

grgia previously approved these changes Oct 4, 2024

View reviewed changes

fix: apply suggestion

dfd1ab5

koko57 dismissed stale reviews from grgia and mountiny via dfd1ab5 October 7, 2024 03:07

koko57 requested a review from grgia October 7, 2024 08:28

grgia approved these changes Oct 7, 2024

View reviewed changes

mountiny approved these changes Oct 7, 2024

View reviewed changes

mountiny merged commit 0989dda into Expensify:main Oct 7, 2024

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

Investigate workflow job failing on main: e2ePerformanceTests / Build apk from delta ref / Build Android app #50330

Closed

koko57 mentioned this pull request Oct 7, 2024

Bank Account - Plaid bank connection reverts to manual method after navigating back #50009

Closed

6 tasks

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

Deploy Checklist: New Expensify 2024-10-07 #50366

Closed

50 tasks

lanitochka17 mentioned this pull request Oct 8, 2024

[$250] VBA - Continue modal is not shown after several attempts #50422

Closed

6 tasks

Conversation

koko57 commented Sep 25, 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 Sep 26, 2024

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DylanDylann commented Sep 26, 2024

Uh oh!

mountiny commented Sep 26, 2024

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!

koko57 commented Sep 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

koko57 commented Sep 27, 2024

Uh oh!

mountiny commented Sep 27, 2024

Uh oh!

koko57 commented Sep 27, 2024

Uh oh!

DylanDylann commented Oct 1, 2024

Uh oh!

koko57 commented Oct 1, 2024

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

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!

DylanDylann commented Oct 1, 2024

Uh oh!

mountiny commented Oct 1, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

koko57 commented Sep 25, 2024 •

edited

Loading

koko57 commented Sep 27, 2024 •

edited

Loading

koko57 Oct 2, 2024 •

edited

Loading

koko57 Oct 3, 2024 •

edited

Loading

DylanDylann commented Oct 3, 2024 •

edited

Loading