Use policy achAccount instead of reimbursementAccount in WorkspaceWorkflow #38395

nkuoch · 2024-03-15T13:20:13Z

HOLD on https://github.com/Expensify/Auth/pull/10222

Details

Fixed Issues

$ #38200

Tests

From oldDot:

From a paid Plan workspace, add an OPEN verified bank account with the test credentials

From newDot, you should see it in your workspace workflows settings:

Toggle off "Make or Track Payments".
Settings should stick

Toggle it on again and click on Connect

Try to readd the same bank account. You shouldn't have to redo all steps, as the bank account was still attached to your personal bank account, so we automatically retreived all the info.

Click on Disconnect. Workflow should show back "Connect Bank Account"

Offline tests

N/A

QA Steps

Same as Tests

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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed 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.js 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.
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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…kflow

melvin-bot · 2024-03-26T10:54:35Z

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

nkuoch · 2024-03-26T10:58:00Z

Main is currently broken, so I tested this with this fix.

luacmartins

Looking good and tests well. Just one small comment

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx

luacmartins · 2024-03-26T16:50:04Z

We also got conflicts now.

nkuoch · 2024-03-26T18:11:20Z

updated

getusha · 2024-03-26T19:27:51Z

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-03-27.at.2.33.51.in.the.afternoon.mov

Android: mWeb Chrome

Screen.Recording.2024-03-27.at.1.16.16.in.the.afternoon.mov

iOS: Native

Screen.Recording.2024-03-27.at.1.57.54.in.the.afternoon.mov

iOS: mWeb Safari

Screen.Recording.2024-03-27.at.1.39.22.in.the.afternoon.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-27.at.1.07.42.in.the.afternoon.mov

MacOS: Desktop

Screen.Recording.2024-03-27.at.3.01.54.in.the.afternoon.mov

getusha · 2024-03-27T12:11:25Z

This is the offline behavior; is there there is anything we can do? @luacmartins @nkuoch

Press on the Bank account
Enable offline mode
Disconnect the BA

Screen.Recording.2024-03-27.at.3.05.49.in.the.afternoon.mov

Screen.Recording.2024-03-27.at.3.09.33.in.the.afternoon.mov

After returning online after disabling it offline

Screen.Recording.2024-03-27.at.3.12.38.in.the.afternoon.mov

nkuoch · 2024-03-27T15:46:03Z

Will be fixed with https://github.com/Expensify/Auth/pull/10349 and https://github.com/Expensify/Web-Expensify/pull/41462

luacmartins · 2024-03-27T16:23:03Z

@nkuoch lint is failing

getusha

LGTM & tests well. just one minor comment.

getusha · 2024-03-27T16:28:30Z

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx

                            onPress={() => {
+                                if (isOffline || !isPolicyAdmin) {
+                                    return;
+                                }


Suggested change

onPress={() => {

if (isOffline || !isPolicyAdmin) {

return;

}

disabled={isOffline || !isPolicyAdmin}

onPress={() => {

melvin-bot · 2024-03-27T16:29:25Z

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

nkuoch · 2024-03-28T08:54:17Z

updated

OSBotify · 2024-03-28T13:13:15Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2024-03-29T02:27:05Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.58-0 🚀

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

OSBotify · 2024-04-02T11:03:21Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.58-8 🚀

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

rayane-djouah · 2024-05-03T16:20:25Z

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx

-        const hasVBA = state === BankAccount.STATE.OPEN;
-        const bankDisplayName = bankName ? `${bankName} ${accountNumber ? `${accountNumber.slice(-5)}` : ''}` : '';
+        const {accountNumber, addressName, bankName} = policy?.achAccount ?? {};
+        const hasVBA = !!policy?.achAccount;


Hey, this PR caused a bug: Disconnected bank account is still displayed on bank account preview on Workflows page.
It has been handled but just FYI,
Whether the bank name shows up in the bank account preview on the workspace workflows page depends on the policy's achAccount. But when we disconnect the bank account, we forget to set achAccount to null in optimistic data. So, even after disconnecting, the bank account preview still appears until we get response from backend.
More details here - #39439 (comment)

ikevin127 · 2024-05-30T21:48:09Z

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx

-        const hasVBA = state === BankAccount.STATE.OPEN;
-        const bankDisplayName = bankName ? `${bankName} ${accountNumber ? `${accountNumber.slice(-5)}` : ''}` : '';
+        const {accountNumber, addressName, bankName} = policy?.achAccount ?? {};
+        const hasVBA = !!policy?.achAccount;


This change also caused issue #39947 where we don't yet have a bank account added and because the achAccount: {reimburser: reimburserEmail} is set everytime we toggle "Make or track payments", the UI ends up looking like we have a bank account added because of this check, when we don't actually have a bank account added yet.

nkuoch self-assigned this Mar 15, 2024

nkuoch changed the title ~~Use policy achAccount instead of reimbursementAccount in WorkspaceWor…~~ Use policy achAccount instead of reimbursementAccount in WorkspaceWorkflow Mar 15, 2024

nkuoch force-pushed the nat-workflow branch 2 times, most recently from af00aed to 65fe96b Compare March 15, 2024 14:38

nkuoch force-pushed the nat-workflow branch from 65fe96b to 64b36c7 Compare March 22, 2024 17:31

Use policy achAccount instead of reimbursementAccount in WorkspaceWor…

9af39f6

…kflow

nkuoch force-pushed the nat-workflow branch from 64b36c7 to 9af39f6 Compare March 26, 2024 10:16

nkuoch marked this pull request as ready for review March 26, 2024 10:54

nkuoch requested a review from a team as a code owner March 26, 2024 10:54

melvin-bot bot requested review from getusha and removed request for a team March 26, 2024 10:54

luacmartins self-requested a review March 26, 2024 15:26

luacmartins reviewed Mar 26, 2024

View reviewed changes

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx Outdated Show resolved Hide resolved

nkuoch added 3 commits March 26, 2024 18:11

Fix displayName

bb7f77c

Merge branch 'main' into nat-workflow

8dc35ac

Add back OnyxData, but with Policy loading key

354a2f6

nkuoch force-pushed the nat-workflow branch from 36b392d to 354a2f6 Compare March 26, 2024 17:47

luacmartins previously approved these changes Mar 26, 2024

View reviewed changes

rlinoz mentioned this pull request Mar 26, 2024

Replaces usage of reimburserEmail with achAccount.reimburser #39017

Merged

50 tasks

Prevent opening vbba modal if offline

f597bea

nkuoch dismissed luacmartins’s stale review via f597bea March 27, 2024 15:50

luacmartins previously approved these changes Mar 27, 2024

View reviewed changes

getusha approved these changes Mar 27, 2024

View reviewed changes

melvin-bot bot requested a review from cead22 March 27, 2024 16:29

Fix lint and use disabled

25bb7e5

nkuoch dismissed luacmartins’s stale review via 25bb7e5 March 28, 2024 08:41

luacmartins approved these changes Mar 28, 2024

View reviewed changes

luacmartins merged commit 4fbd218 into main Mar 28, 2024
16 checks passed

luacmartins deleted the nat-workflow branch March 28, 2024 13:06

github-actions bot mentioned this pull request Mar 29, 2024

Deploy Checklist: New Expensify 2024-03-29 #39222

Closed

trjExpensify mentioned this pull request Apr 2, 2024

[HOLD for payment 2024-04-09] [Simplified Collect][Workflows] Bank account info still displayed in Make or track payments after disconnecting #38200

Closed

6 tasks

rayane-djouah reviewed May 3, 2024

View reviewed changes

rayane-djouah mentioned this pull request May 3, 2024

[HOLD for Payment 2024-04-30] [$500] BA - Disconnected bank account is still displayed on bank account preview on Workflows page #39439

Closed

6 tasks

ikevin127 reviewed May 30, 2024

View reviewed changes

ikevin127 mentioned this pull request May 30, 2024

[HOLD for payment 2024-06-06] [$500] [Workflows] Bank account and Authorized payer buttons displayed instead of Connect bank account #39947

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use policy achAccount instead of reimbursementAccount in WorkspaceWorkflow #38395

Use policy achAccount instead of reimbursementAccount in WorkspaceWorkflow #38395

nkuoch commented Mar 15, 2024 •

edited

Loading

melvin-bot bot commented Mar 26, 2024

nkuoch commented Mar 26, 2024

luacmartins left a comment

luacmartins commented Mar 26, 2024

nkuoch commented Mar 26, 2024

getusha commented Mar 26, 2024 •

edited

Loading

getusha commented Mar 27, 2024 •

edited

Loading

nkuoch commented Mar 27, 2024

luacmartins commented Mar 27, 2024

getusha left a comment

getusha Mar 27, 2024

melvin-bot bot commented Mar 27, 2024

nkuoch commented Mar 28, 2024

OSBotify commented Mar 28, 2024

OSBotify commented Mar 29, 2024

OSBotify commented Apr 2, 2024

rayane-djouah May 3, 2024

ikevin127 May 30, 2024

Use policy achAccount instead of reimbursementAccount in WorkspaceWorkflow #38395

Use policy achAccount instead of reimbursementAccount in WorkspaceWorkflow #38395

Conversation

nkuoch commented Mar 15, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 26, 2024

nkuoch commented Mar 26, 2024

luacmartins left a comment

Choose a reason for hiding this comment

luacmartins commented Mar 26, 2024

nkuoch commented Mar 26, 2024

getusha commented Mar 26, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

getusha commented Mar 27, 2024 • edited Loading

nkuoch commented Mar 27, 2024

luacmartins commented Mar 27, 2024

getusha left a comment

Choose a reason for hiding this comment

getusha Mar 27, 2024

Choose a reason for hiding this comment

melvin-bot bot commented Mar 27, 2024

nkuoch commented Mar 28, 2024

OSBotify commented Mar 28, 2024

OSBotify commented Mar 29, 2024

OSBotify commented Apr 2, 2024

rayane-djouah May 3, 2024

Choose a reason for hiding this comment

ikevin127 May 30, 2024

Choose a reason for hiding this comment

nkuoch commented Mar 15, 2024 •

edited

Loading

getusha commented Mar 26, 2024 •

edited

Loading

getusha commented Mar 27, 2024 •

edited

Loading