Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: Migrate BankAccountManualStep.js to function component #22245

Merged
merged 11 commits into from
Jul 10, 2023
Merged

Refactor: Migrate BankAccountManualStep.js to function component #22245

merged 11 commits into from
Jul 10, 2023

Conversation

Vishrut19
Copy link
Contributor

@Vishrut19 Vishrut19 commented Jul 5, 2023

Details

Fixed Issues

$ #16241
PROPOSAL: 16241(COMMENT)

Tests

  1. Go to settings.
  2. Click the workspaces
  3. Create a workspace or click the already created workspace
  4. Click the Reimbursements
  5. Click the Connect Bank Account
  6. Click the Connect Manually
    Please make sure you must set the currency as USD in workspace settings.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Go to settings.
  2. Click the workspaces
  3. Create a workspace or click the already created workspace
  4. Click the Reimbursements
  5. Click the Connect Bank Account
  6. Click the Connect Manually
    Please make sure you must set the currency as USD in workspace settings.
  • 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 / Chrome
    • iOS / native
    • iOS / 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 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
Screen.Recording.2023-07-05.at.12.22.47.PM.mov
Mobile Web - Chrome Screenshot 2023-07-05 at 11 28 45 PM
Mobile Web - Safari Screenshot 2023-07-05 at 5 21 28 PM
Desktop Screenshot 2023-07-05 at 6 43 08 PM
iOS Screenshot 2023-07-05 at 9 05 14 PM
Android Screenshot 2023-07-05 at 11 21 24 PM

@github-actions
Copy link
Contributor

github-actions bot commented Jul 5, 2023

CLA Assistant Lite bot:
Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.


I have read the CLA Document and I hereby sign the CLA


Vishrut Agarwalla seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You can retrigger this bot by commenting recheck in this Pull Request

@Vishrut19
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@Vishrut19 Vishrut19 marked this pull request as ready for review July 5, 2023 07:53
@Vishrut19 Vishrut19 requested a review from a team as a code owner July 5, 2023 07:53
@melvin-bot melvin-bot bot requested review from parasharrajat and removed request for a team July 5, 2023 07:53
@melvin-bot
Copy link

melvin-bot bot commented Jul 5, 2023

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

@parasharrajat
Copy link
Member

Missing details.

image

@Vishrut19
Copy link
Contributor Author

Missing details.

image

Done

@parasharrajat
Copy link
Member

Please fix it
image

@parasharrajat
Copy link
Member

Fix merge conflicts.

@Vishrut19
Copy link
Contributor Author

Fix merge conflicts.

Created a seperate PR for that other issue which already resolves the merge conflict

@parasharrajat
Copy link
Member

It was fine to keep it here if you already added the code. Instead of removing it, I asked to add that issue to the template as well. But it's OK where we have landed. Please fix the conflicts here.

@parasharrajat
Copy link
Member

parasharrajat commented Jul 6, 2023

You can do the following.

  1. There are many extra commits here.

image

  1. So remove all the commits that are done today.
3. Then check the commits 
git reset --hard edea17abf52fb6cba234fa7e0d8c1529d62bab15 #commit number to reset the head to
  1. Then force push.
git push -f

@Vishrut19
Copy link
Contributor Author

You can do the following.

  1. There are many extra commits here.

image

  1. So remove all the commits that are done today.
3. Then check the commits 
git reset --hard edea17abf52fb6cba234fa7e0d8c1529d62bab15 #commit number to reset the head to
  1. Then force push.
git push -f

Thanks a lot for helping! I was a bit confused

@Vishrut19
Copy link
Contributor Author

@parasharrajat please review it and merge if everything is good

@Vishrut19
Copy link
Contributor Author

Did you test the page after refactoring? I can't type anything in the fields.

image

Yes, it was working perfectly fine. Maybe this is happening because of some other component

@parasharrajat
Copy link
Member

Please use proper commit messages. We should be serious about these. They are info that we look back on in the future.
image

@Vishrut19
Copy link
Contributor Author

Please use proper commit messages. We should be serious about these. They are info that we look back on in the future.

image

Oh okay sorry. Do you want me to change it ? And also sorry since it is my first contribution to Expensify so that's why. For future I will keep it in mind

@parasharrajat
Copy link
Member

I think yes we should because it is possible. Let's just change the last commit.

git commit --amend -m "Use defaultValue for textInputs in the Form"

@parasharrajat
Copy link
Member

parasharrajat commented Jul 8, 2023

Screenshots

🔲 iOS / native

Screen.Recording.2023-07-08.at.6.19.49.PM.mov

🔲 iOS / Safari

Screen.Recording.2023-07-08.at.6.11.41.PM.mov

🔲 MacOS / Desktop

Screen.Recording.2023-07-08.at.6.05.23.PM.mov

🔲 MacOS / Chrome

Screenshot 2023-07-08 at 6 05 10 PM

🔲 Android / Chrome

Screen.Recording.2023-07-08.at.6.13.08.PM.mov

🔲 Android / native

Screen.Recording.2023-07-08.at.6.06.15.PM.mov

@parasharrajat
Copy link
Member

parasharrajat commented Jul 8, 2023

Now there are extra commits. You had to force push after running the above command. Now run the following commands one by one.

git reset --hard HEAD^2
git commit --amend -m "Use defaultValue for textInputs in the Form"
git push -f

Please practice git basics.

@Vishrut19
Copy link
Contributor Author

Now there are extra commits. You had to force push after running the above command. Now run the following commands one by one.

git reset --hard HEAD^2
git commit --amend -m "Use defaultValue for textInputs in the Form"
git push -f

Please practice git basics.

Done and thanks

@Vishrut19
Copy link
Contributor Author

I think yes we should because it is possible. Let's just change the last commit.

git commit --amend -m "Use defaultValue for textInputs in the Form"

done

@parasharrajat
Copy link
Member

Did you find it?

Copy link
Member

@parasharrajat parasharrajat left a comment

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 / 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.

🎀 👀 🎀 C+ reviewed

@melvin-bot melvin-bot bot requested a review from thienlnam July 9, 2023 07:56
@Vishrut19
Copy link
Contributor Author

Did you find it?

what? the value things? Yes I found it and I changed it to defaultValue from value

@@ -19,115 +21,116 @@ import ScreenWrapper from '../../components/ScreenWrapper';
import StepPropTypes from './StepPropTypes';

const propTypes = {
...StepPropTypes,
..._.omit(StepPropTypes, _.keys(withLocalizePropTypes)),
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are we removing the withLocalizePropTypes in prop types?

Copy link
Member

Choose a reason for hiding this comment

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

We moved to useLocalize from HOC so no such props will be passed.

Copy link
Contributor

Choose a reason for hiding this comment

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

Then could we not include it in StepPropTypes? Or is that too big of a refactor

Copy link
Member

@parasharrajat parasharrajat Jul 10, 2023

Choose a reason for hiding this comment

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

We can't remove it yet from StepPropTyped as that is still used in many other components so when last of that component is refactored to function, we can safely refactor all.

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool cool, thanks for the context

@thienlnam
Copy link
Contributor

Waiting for workflows before merging

@Vishrut19
Copy link
Contributor Author

Waiting for workflows before merging

so when will it get merged?

@thienlnam thienlnam merged commit 3f76eaa into Expensify:main Jul 10, 2023
17 checks passed
@OSBotify
Copy link
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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/thienlnam in version: 1.3.39-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.39-11 🚀

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

const submit = useCallback(
(values) => {
BankAccounts.connectBankAccountManually(
lodashGet(reimbursementAccount, ['achData.bankAccountID']) || 0,
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like this line caused this regression. Why did you convert lodashGet to an array path? Regardless, this should be lodashGet(reimbursementAccount, ['achData', 'bankAccountID'])

Copy link
Member

@parasharrajat parasharrajat Jul 26, 2023

Choose a reason for hiding this comment

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

Oops, I completely missed this during refactor. There is one more.

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.

5 participants