[NoQA] Feat/44313 edit settlement settings be integration #47309

koko57 · 2024-08-13T11:22:15Z

Details

Fixed Issues

$ #44313
PROPOSAL:

Tests

PREREQUISITES: WorkspaceFeed/ all betas enabled, Expensify Card enabled, at least two bank accounts added, Expensify Card issued

Go to Workspaces -> [workspace] -> Expensify Card
Go to Settings (on the Expensify Card page)
Go to Settlement Account -> try to change the account
Verify that the request is sent and you get the proper response
Go back, verify that the last 4 digits in the bank account number change to the new bank account's last 4
Go to Settlement Frequency (if you don't have it locked on Daily - DISCLAIMER: when locked to daily you will see Learn more link - it doesn't link to any page yet)
If you can change the frequency, change it
Verify that the request is sent and you get the proper response

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to Workspaces -> [workspace] -> Expensify Card
Go to Settings (on the Expensify Card page)
Go to Settlement Account -> try to change the account
Verify that the request is sent and you get the proper response
Go back, verify that the last 4 digits in the bank account number change to the new bank account's last 4
Go to Settlement Frequency (if you don't have it locked on Daily - DISCLAIMER: when locked to daily you will see Learn more link - it doesn't link to any page yet)
If you can change the frequency, change it
Verify that the request is sent and you get the proper response

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

MacOS: Desktop

…ration

src/CONST.ts

src/libs/actions/Card.ts

koko57 · 2024-08-13T14:26:45Z

@mountiny strangely for UpdateCardSettlementAccount I get 200, for UpdateCardSettlementFrequency - 400 (both screenshots in the checklist). For the second outcome I am not surprised though, bc I got an empty array for createExpensifyCard

koko57 · 2024-08-13T14:39:22Z

@mountiny should it be No QA?

melvin-bot · 2024-08-13T14:45:45Z

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

koko57 · 2024-08-13T14:45:53Z

ok opening it 😅

allgandalf

Looks good to test but i will wait for the comments to get addressed first

src/CONST.ts

allgandalf · 2024-08-14T04:26:50Z

src/libs/PolicyUtils.ts

@@ -969,6 +969,14 @@ function getWorkspaceAccountID(policyID: string) {
    return policy.workspaceAccountID ?? 0;
 }

+function getDomainNameForPolicy(policyID?: string): string {


Suggested change

function getDomainNameForPolicy(policyID?: string): string {

function getDomainNameForPolicy(policyID: string): string {

Any reason for keeping this optional ?

eslint complaining

src/libs/actions/Card.ts

allgandalf · 2024-08-14T04:31:53Z

src/libs/actions/Card.ts

+    if (!settlementBankAccountID) {
+        return;
+    }


Do we throw an error on the FE if this fails? I guess we just :do-nothing: if we return from here

If it's better to send some invalid value - like -1 and get the error from the BE, I'm ok with that I can change it. But in my other PRs I was requested not to do so, so I also applied it here. But since we don't have this kind of error handling anywhere through the app I think we should rely on the BE errors.
cc @mountiny wdyt?

Yeah I think its more common to do something and show error but I guess the problem with these is that its theoretical problem only, right? Like it should not happen that the bankAccountID is missing when we get this far?

Happy to change this to call with invalid value or the least we should do is to add some log

koko57 · 2024-08-14T09:35:48Z

@allgandalf responded to your comments

allgandalf · 2024-08-14T10:01:26Z

at least two bank accounts added

How do you add a second account to workspace?

I tried having 2 bank accounts under wallets:

But when i go into workspace card settings i only see one:

koko57 · 2024-08-14T10:19:19Z

@allgandalf not sure, maybe try savings account from different bank (like Regions or Wells Fargo)

koko57 · 2024-08-14T10:21:51Z

@allgandalf or just try with the one account - just click on the currently selected account - the request should be sent properly and you should get a proper response (for me it worked)

allgandalf · 2024-08-14T10:36:58Z

Dou you have any idea about the following error?

Screen.Recording.2024-08-14.at.4.05.47.PM.mov

allgandalf · 2024-08-14T10:42:35Z

Also, this has conflicts @koko57

allgandalf · 2024-08-16T05:18:49Z

@DylanDylann would be working on this PR, We switched each others PR's

DylanDylann · 2024-08-16T05:28:32Z

@allgandalf Ok, nvm 😅

allgandalf · 2024-08-16T05:30:23Z

wait aren't we, sorry i didn't understand your message here, did you mean the PR which was going to be raised today, if that's the case i can take this issue back no worries 😅

DylanDylann · 2024-08-16T05:33:59Z

Yepp 😄 If you get any problem about connecting bank account, please raise it on Slack. Maybe I can help you

allgandalf · 2024-08-16T05:35:38Z

Thanks, taking this issue again :))

allgandalf · 2024-08-17T04:03:55Z

@koko57 please resolve the conflicts once you get back, thanks :)

koko57 · 2024-08-20T09:42:02Z

@allgandalf conflicts resolved

allgandalf · 2024-08-21T11:28:28Z

I tried with fresh account and the post request is successful:

But i get 666 error from the BE, but still the API does get called successfully, should i tick the checklist @mountiny ?

mountiny · 2024-08-21T20:21:46Z

@allgandalf is the error still that the account is used somewhere else?

allgandalf · 2024-08-22T09:43:45Z

@allgandalf is the error still that the account is used somewhere else?

The error says that verfied bank account cant be used as settlement account on multiple domains, you can see the complete error in this video, I tried with a new account same error

…ration

DylanDylann · 2024-08-26T15:40:11Z

@allgandalf I will review this tomorrow

DylanDylann · 2024-08-27T07:05:39Z

@allgandalf I get the same problem

Screen.Recording.2024-08-27.at.14.04.53.mov

mountiny · 2024-08-27T09:18:40Z

src/CONST.ts

@@ -633,6 +633,10 @@ const CONST = {
        INBOX: 'inbox',
    },

+    // TODO: change to expensify-policy once the new domain is available
+    EXPENSIFY_POLICY_DOMAIN: 'expensify_policy',


Can you please change this to the dash format?

Suggested change

EXPENSIFY_POLICY_DOMAIN: 'expensify_policy',

EXPENSIFY_POLICY_DOMAIN: 'expensify-policy',

@mountiny done!

allgandalf · 2024-08-27T09:49:18Z

This also has conflicts @koko57

koko57 · 2024-08-27T10:58:37Z

@allgandalf conflicts resolved!

allgandalf · 2024-08-27T11:32:16Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

allgandalf

Cannot test this in Dev, still approving the PR, based on the conversation on slack

mountiny

We are working on adding another option for the VBBA testing account so we can test flows like this in staging, but we do not have to hold on that I think, this is not a new logic but rather reusing what we have in Olddot

OSBotify · 2024-08-27T12:39:23Z

✋ 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-08-28T21:44:09Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.26-1 🚀

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

OSBotify · 2024-08-30T18:32:37Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.26-6 🚀

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

koko57 added 5 commits August 9, 2024 19:15

feat: [WIP] updateSettlementFrequency and updateSettlementAccount

beb2a92

Merge branch 'main' into feat/44313-edit-settlement-settings-be-integ…

df3797c

…ration

fix: resolve conflicts

a40d4bc

feat: create getDomainNameForPolicy util

9c26711

fix: minor fix

8a405f0

mountiny self-requested a review August 13, 2024 12:51

mountiny assigned koko57 Aug 13, 2024

mountiny reviewed Aug 13, 2024

View reviewed changes

src/CONST.ts Outdated Show resolved Hide resolved

src/libs/actions/Card.ts Outdated Show resolved Hide resolved

src/libs/actions/Card.ts Outdated Show resolved Hide resolved

fix: typecheck

cacd33e

koko57 added 2 commits August 13, 2024 16:28

fix: resolve conflicts

aec2763

fix: minor fix

1005b60

fix: apply requested changes

acc9224

koko57 marked this pull request as ready for review August 13, 2024 14:45

koko57 requested a review from a team as a code owner August 13, 2024 14:45

melvin-bot bot requested review from allgandalf and removed request for a team August 13, 2024 14:45

koko57 requested a review from mountiny August 13, 2024 14:46

mountiny changed the title ~~Feat/44313 edit settlement settings be integration~~ [NoQA] Feat/44313 edit settlement settings be integration Aug 13, 2024

allgandalf reviewed Aug 14, 2024

View reviewed changes

fix: add a comment

4cd7ab1

fix: resolve conflicts

18668cc

Merge branch 'main' into feat/44313-edit-settlement-settings-be-integ…

168c554

…ration

mountiny requested changes Aug 27, 2024

View reviewed changes

fix: resolve conflicts, apply requested changes

385ab1b

koko57 requested review from allgandalf and mountiny August 27, 2024 10:58

mountiny approved these changes Aug 27, 2024

View reviewed changes

allgandalf approved these changes Aug 27, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny August 27, 2024 11:33

mountiny approved these changes Aug 27, 2024

View reviewed changes

mountiny merged commit 7eb8c33 into Expensify:main Aug 27, 2024
16 of 18 checks passed

github-actions bot mentioned this pull request Aug 28, 2024

Deploy Checklist: New Expensify 2024-08-28 #48221

Closed

93 tasks

	function getDomainNameForPolicy(policyID?: string): string {
	function getDomainNameForPolicy(policyID: string): string {

	EXPENSIFY_POLICY_DOMAIN: 'expensify_policy',
	EXPENSIFY_POLICY_DOMAIN: 'expensify-policy',

[NoQA] Feat/44313 edit settlement settings be integration #47309

[NoQA] Feat/44313 edit settlement settings be integration #47309

Conversation

koko57 commented Aug 13, 2024 • edited by github-actions bot Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

koko57 commented Aug 13, 2024

koko57 commented Aug 13, 2024

melvin-bot bot commented Aug 13, 2024

koko57 commented Aug 13, 2024

allgandalf left a comment

Choose a reason for hiding this comment

allgandalf Aug 14, 2024

Choose a reason for hiding this comment

koko57 Aug 14, 2024

Choose a reason for hiding this comment

allgandalf Aug 14, 2024

Choose a reason for hiding this comment

koko57 Aug 14, 2024

Choose a reason for hiding this comment

mountiny Aug 14, 2024

Choose a reason for hiding this comment

koko57 commented Aug 14, 2024

allgandalf commented Aug 14, 2024

koko57 commented Aug 14, 2024

koko57 commented Aug 14, 2024

allgandalf commented Aug 14, 2024

allgandalf commented Aug 14, 2024

allgandalf commented Aug 16, 2024

DylanDylann commented Aug 16, 2024

allgandalf commented Aug 16, 2024

DylanDylann commented Aug 16, 2024

allgandalf commented Aug 16, 2024

allgandalf commented Aug 17, 2024

koko57 commented Aug 20, 2024

allgandalf commented Aug 21, 2024

mountiny commented Aug 21, 2024

allgandalf commented Aug 22, 2024

DylanDylann commented Aug 26, 2024

DylanDylann commented Aug 27, 2024

mountiny Aug 27, 2024

Choose a reason for hiding this comment

koko57 Aug 27, 2024

Choose a reason for hiding this comment

allgandalf commented Aug 27, 2024

koko57 commented Aug 27, 2024

allgandalf commented Aug 27, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

allgandalf left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 27, 2024

OSBotify commented Aug 28, 2024

OSBotify commented Aug 30, 2024

koko57 commented Aug 13, 2024 •

edited by github-actions bot

Loading

allgandalf commented Aug 27, 2024 •

edited

Loading