Migrate ACHContractStep.js to function component #20350

multijump · 2023-06-07T11:10:01Z

Details

Fixed Issues

$ #16240
#16240 (comment)

Tests

Click the Profile Avatar on top left
Click on Workspaces in setting in left panel
Choose a Workspace(if you don't have any workspace, create new workspace)
Choose Reimbursement
Click the Connect bank account button
Fill the routing number and account number and then click the Continue button
Fill the company information and then click the Save & continue button
Fill the personal information and then click the Save & continue button
Verify Identity via onfido
Choose the checkboxes and click the Continue button.
You must can do test transaction

Verify that no errors appear in the JS console

Offline tests

Click the Profile Avatar on top left
Click on Workspaces in setting in left panel
Choose a Workspace(if you don't have any workspace, create new workspace)
Choose Reimbursement
You should see the offline notification in Reimburse receipts and hide Connect bank account button
Must be showed loading spinner

QA Steps

Follow the same steps as above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Web.mov

Mobile Web - Chrome

Mobile.Web.-.Chrome.mov

Mobile Web - Safari

Mobile.Web.-.Safari.mov

Desktop

Desktop.mp4

iOS

iOS.mov

Android

Android.mov

melvin-bot · 2023-06-07T11:10:06Z

@grgia @allroundexperts One of you needs to 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]

allroundexperts · 2023-06-08T19:41:06Z

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 / Chrome
- iOS / native
- iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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

Web

Screen.Recording.2023-06-09.at.1.14.45.AM.mov

Mobile Web - Chrome

Screen.Recording.2023-06-09.at.1.23.06.AM.mov

Mobile Web - Safari

Screen.Recording.2023-06-09.at.1.23.53.AM.mov

Desktop

Screen.Recording.2023-06-09.at.1.21.48.AM.mov

iOS

Screen.Recording.2023-06-09.at.1.25.39.AM.mov

Android

Screen.Recording.2023-06-09.at.1.26.30.AM.mov

allroundexperts

Looks good mostly. Minor changes needed.

allroundexperts · 2023-06-08T19:43:44Z

src/pages/ReimbursementAccount/ACHContractStep.js

-            beneficialOwners: lodashGet(this.props.reimbursementAccountDraft, 'beneficialOwners', lodashGet(this.props.reimbursementAccount, 'achData.beneficialOwners', [])),
-        };
-    }
+function ACHContractStep (props) {


We normally use the following arrow function style for defining the functional components.
const FnName = (props) => {

Updated following comment

allroundexperts · 2023-06-08T19:49:19Z

src/pages/ReimbursementAccount/ACHContractStep.js

-            return {beneficialOwners};
-        });
+    const removeBeneficialOwner = (ownerKey) => {
+        const previousBeneficialOwners = _.without(beneficialOwners, ownerKey);


This isn't really a previousBeneficialOwner. I think something like newBeneficialOwners makes more sense here.

Also, I think you should set the state in a callback as it was done previously. State in functional components can be updated using the callback syntax as well. Ref.

Yes, you're right.
I think it is more meaningful and will reduce risk.
Updated following your comment.
Thanks.

allroundexperts · 2023-06-08T19:52:38Z

src/pages/ReimbursementAccount/ACHContractStep.js

+    const addBeneficialOwner = () => {
+        // Each beneficial owner is assigned a unique key that will connect it to an Identity Form.
+        // That way we can dynamically render each Identity Form based on which keys are present in the beneficial owners array.
+        const newBeneficialOwners = [...beneficialOwners, Str.guid()];
+        FormActions.setDraftValues(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {beneficialOwners});
+        setBeneficialOwners(newBeneficialOwners);


Same comments as above.

Updated following your comment.

allroundexperts · 2023-06-08T19:53:58Z

src/pages/ReimbursementAccount/ACHContractStep.js


-        const beneficialOwners = !values.hasOtherBeneficialOwners
+        const updatedBeneficialOwners = !values.hasOtherBeneficialOwners


Why are you renaming this variable?

Because variable name beneficialOwners is the same with state variable name.
So I thought it might to bring some confusion or potential risk in further development.
There was any special purpose or meaning beside above reason.
If you require to change it, I will do.

allroundexperts · 2023-06-08T19:56:40Z

src/pages/ReimbursementAccount/ACHContractStep.js

+                                if (ownsMoreThan25Percent && beneficialOwners.length > 3) {
+                                    // If the user owns more than 25% of the company, then there can only be a maximum of 3 other beneficial owners who owns more than 25%.
+                                    // We have to remove the 4th beneficial owner if the checkbox is checked.
+                                    setBeneficialOwners(beneficialOwners.slice(0, -1));


You need to use the same style of using the previous state in a callback. Check my comment above.

Updated following your comment.

allroundexperts · 2023-06-08T20:35:05Z

@grgia Do you know why the workflows aren't running?

allroundexperts

Looks good. Thanks @multijump!

allroundexperts · 2023-06-08T20:45:12Z

@multijump Since the workflow is not running, can you please make sure to run npm run prettier and npm run test?

multijump · 2023-06-08T20:48:16Z

npm run test

Sorry @allroundexperts , it was my mistake.
Just fixed and pushed.
Thanks

grgia

LGTM, thank you!

allroundexperts · 2023-06-12T14:59:32Z

src/pages/ReimbursementAccount/ACHContractStep.js

-            beneficialOwners: lodashGet(this.props.reimbursementAccountDraft, 'beneficialOwners', lodashGet(this.props.reimbursementAccount, 'achData.beneficialOwners', [])),
-        };
-    }
+const ACHContractStep = (props) => {


Sorry about this, but can you please change this to function ACHContractStep syntax? We've decided to use that on every functional component.

@allroundexperts
Updated per your request.

OSBotify · 2023-06-14T12:30:57Z

✋ 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 · 2023-06-14T21:25:44Z

🚀 Deployed to staging by https://github.com/grgia in version: 1.3.28-0 🚀

platform	result
🤖 android 🤖	failure ❌
🖥 desktop 🖥	failure ❌
🍎 iOS 🍎	failure ❌
🕸 web 🕸	failure ❌

OSBotify · 2023-06-16T18:40:52Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

multijump added 3 commits June 7, 2023 13:21

Migrate ACHContractStep.js to function component

40933a0

reflected updates from remote

0ca81fa

removed unused codes

a694896

multijump requested a review from a team as a code owner June 7, 2023 11:10

melvin-bot bot requested review from allroundexperts and grgia and removed request for a team June 7, 2023 11:10

multijump mentioned this pull request Jun 7, 2023

[HOLD for payment 2023-06-23] [$250] Migrate ACHContractStep.js to function component #16240

Closed

1 task

allroundexperts suggested changes Jun 8, 2023

View reviewed changes

fixed reviewer's comments

1f3de3d

allroundexperts approved these changes Jun 8, 2023

View reviewed changes

fixed lint issues

c63abc5

allroundexperts approved these changes Jun 8, 2023

View reviewed changes

grgia previously approved these changes Jun 12, 2023

View reviewed changes

fixed lint issues

1b3a873

multijump dismissed grgia’s stale review via 1b3a873 June 12, 2023 14:55

allroundexperts reviewed Jun 12, 2023

View reviewed changes

updated per reviewer's request

9a5e951

allroundexperts approved these changes Jun 12, 2023

View reviewed changes

grgia approved these changes Jun 14, 2023

View reviewed changes

grgia merged commit 20f6ae7 into Expensify:main Jun 14, 2023

OSBotify mentioned this pull request Jun 14, 2023

Deploy Checklist: New Expensify 2023-06-14 #20782

Closed

kbecciv mentioned this pull request Jun 16, 2023

Workspace - Loading spinner is missing on Reimbursement page offline #20903

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate ACHContractStep.js to function component #20350

Migrate ACHContractStep.js to function component #20350

multijump commented Jun 7, 2023 •

edited

Loading

melvin-bot bot commented Jun 7, 2023

allroundexperts commented Jun 8, 2023 •

edited

Loading

allroundexperts left a comment

allroundexperts Jun 8, 2023

multijump Jun 8, 2023

allroundexperts Jun 8, 2023

allroundexperts Jun 8, 2023

multijump Jun 8, 2023

allroundexperts Jun 8, 2023

multijump Jun 8, 2023

allroundexperts Jun 8, 2023

multijump Jun 8, 2023

allroundexperts Jun 8, 2023

multijump Jun 8, 2023

allroundexperts commented Jun 8, 2023

allroundexperts left a comment

allroundexperts commented Jun 8, 2023

multijump commented Jun 8, 2023 •

edited

Loading

grgia left a comment

allroundexperts Jun 12, 2023

multijump Jun 12, 2023

OSBotify commented Jun 14, 2023

OSBotify commented Jun 14, 2023

OSBotify commented Jun 16, 2023


		const beneficialOwners = !values.hasOtherBeneficialOwners
		const updatedBeneficialOwners = !values.hasOtherBeneficialOwners

Migrate ACHContractStep.js to function component #20350

Migrate ACHContractStep.js to function component #20350

Conversation

multijump commented Jun 7, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 7, 2023

allroundexperts commented Jun 8, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

allroundexperts left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

allroundexperts commented Jun 8, 2023

allroundexperts left a comment

Choose a reason for hiding this comment

allroundexperts commented Jun 8, 2023

multijump commented Jun 8, 2023 • edited Loading

grgia left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OSBotify commented Jun 14, 2023

OSBotify commented Jun 14, 2023

OSBotify commented Jun 16, 2023

multijump commented Jun 7, 2023 •

edited

Loading

allroundexperts commented Jun 8, 2023 •

edited

Loading

multijump commented Jun 8, 2023 •

edited

Loading