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 TransferBalancePage into a functional component #20194

Merged
merged 6 commits into from
Jun 27, 2023

Conversation

francoisl
Copy link
Contributor

@francoisl francoisl commented Jun 5, 2023

Details

This refactors TransferBalancePage into a functional component.

Fixed Issues

$ #16288

Tests

Prerequisites: have two accounts set up with bank accounts for money transfers.

  1. From account A, send money to account B
  2. Sign in to account B, and go to Settings > Payment > Transfer Balance
  3. Below "Which account?", click on the selected account
  4. In the view to select an account, make sure the default account is pre-selected
  5. Select any other account
  6. Make sure you are redirected back to the Transfer Balance page, and the account you just chose is selected
  • Verify that no errors appear in the JS console

Offline tests

N/A, being online is required to navigate to the Transfer Balance page

QA Steps

Prerequisites: have two accounts set up with bank accounts for money transfers.

  1. From account A, send money to account B
  2. Sign in to account B, and go to Settings > Payment > Transfer Balance
  3. Below "Which account?", click on the selected account
  4. In the view to select an account, make sure the default account is pre-selected
  5. Select any other account
  6. Make sure you are redirected back to the Transfer Balance page, and the account you just chose is selected
  • 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
chrome2.mov
Mobile Web - Chrome
mchrome2.mov
Mobile Web - Safari
msafari2.mov
Desktop
desktop2.mov
iOS
ios2.mov
Android
android2.mov

@francoisl francoisl self-assigned this Jun 5, 2023
@francoisl francoisl marked this pull request as ready for review June 5, 2023 19:38
@francoisl francoisl requested a review from a team as a code owner June 5, 2023 19:38
@melvin-bot melvin-bot bot requested review from 0xmiros and marcaaron and removed request for a team June 5, 2023 19:39
@melvin-bot
Copy link

melvin-bot bot commented Jun 5, 2023

@0xmiroslav @marcaaron 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]


/**
* Get the selected/default payment method account for wallet transfer
* @returns {Object|undefined}
*/
getSelectedPaymentMethodAccount() {
const paymentMethods = PaymentUtils.formatPaymentMethods(this.props.bankAccountList, this.props.cardList);
const getSelectedPaymentMethodAccount = useCallback(() => {
Copy link
Contributor

Choose a reason for hiding this comment

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

According to our standard, we avoid const () => pattern. Instead use function()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍 ah yeah, thanks for the reminder. To clarify though, you meant this for the whole component and not just this useCallback, correct?

Copy link
Contributor

Choose a reason for hiding this comment

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

This is just example. Whole component, except component declaration.
I see lots of components are already refactored with const pattern, against our rule 😞

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe this comment is in the wrong spot? You certainly can declare a function like this if you are calling a function that returns a function.

Copy link
Contributor

Choose a reason for hiding this comment

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

yes sorry wrong spot. const can be still used in those functions like useCallback

@francoisl francoisl requested a review from 0xmiros June 5, 2023 20:07

/**
* Get the selected/default payment method account for wallet transfer
* @returns {Object|undefined}
*/
getSelectedPaymentMethodAccount() {
const paymentMethods = PaymentUtils.formatPaymentMethods(this.props.bankAccountList, this.props.cardList);
const getSelectedPaymentMethodAccount = useCallback(() => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe this comment is in the wrong spot? You certainly can declare a function like this if you are calling a function that returns a function.


/**
* Get the selected/default payment method account for wallet transfer
* @returns {Object|undefined}
*/
getSelectedPaymentMethodAccount() {
const paymentMethods = PaymentUtils.formatPaymentMethods(this.props.bankAccountList, this.props.cardList);
const getSelectedPaymentMethodAccount = useCallback(() => {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can probably skip useCallback() here according to the latest debate on it 😄

Just inline the function and we will only worry about the optimizations if there's a good reason for it. Or if there's some good reason for it we should explain in a comment what it is. If there is, it wasn't obvious to me.

}

PaymentMethods.saveWalletTransferAccountTypeAndID(selectedAccount.accountType, selectedAccount.methodID);
}, [getSelectedPaymentMethodAccount]);
Copy link
Contributor

Choose a reason for hiding this comment

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

This is... interesting... I am sort of wondering why we are running that logic in the constructor before. Because it would only ever run once for the life of the instantiated component and now it will run again whenever the reference changes (which would happen if any props change) 🤔

Not sure how to advise as I'm not sure why we used the constructor in the first place. But my first instinct would be to move this into a useEffect() with an empty array as a dependency since that is the closest thing to running logic in the constructor (but isn't exactly the same).

I haven't run into this much. It seems uncommon to run logic in the constructor unless you are initializing state.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah so for context, at first I was trying to use [] for the dependencies here to only run the effect once, but I would get the exhaustive-deps ESLint warning. Same thing if I didn't useCallback() for getSelectedPaymentMethodAccount.

I'll go ahead and try your suggestion though, thanks.


/**
* @param {String} filterPaymentMethodType
*/
navigateToChooseTransferAccount(filterPaymentMethodType) {
const navigateToChooseTransferAccount = (filterPaymentMethodType) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
const navigateToChooseTransferAccount = (filterPaymentMethodType) => {
function navigateToChooseTransferAccount (filterPaymentMethodType) {

francoisl added 2 commits June 7, 2023 13:36
- Consolidate into a single `useEffect` with empty array dependency, to only run once on initial render
- Change `useCallback` function into a regular function
@francoisl francoisl force-pushed the francois-transferBalanceFunctionalComponent branch from a3efadd to 657ec67 Compare June 7, 2023 18:44
@francoisl francoisl requested a review from marcaaron June 7, 2023 18:53
@francoisl
Copy link
Contributor Author

Updated and retested!

@marcaaron
Copy link
Contributor

@0xmiroslav can you check this one out and give me a shout when it looks ready? 🙇

@francoisl
Copy link
Contributor Author

@0xmiroslav did you get a chance to review the PR again?

@francoisl
Copy link
Contributor Author

@0xmiroslav bump please

@0xmiros
Copy link
Contributor

0xmiros commented Jun 16, 2023

Sorry reviewing now

Comment on lines +127 to +130
const selectedAccount = getSelectedPaymentMethodAccount();
if (!selectedAccount) {
return;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

        // Select the default payment account when page is opened,
        // so that user can see that preselected on choose transfer account page
        if (!selectedAccount || !selectedAccount.isDefault) {
            return;
        }

This was original code.
Any concerns in keeping original comment and also adding || !selectedAccount.isDefault condition?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I think this was a bug, if we return early here and you have a non-default account selected, then we can't properly pre-select the account in the ChooseTransferAccountPage.

Here's what it looks like if we add the || !selectedAccount.isDefault (also happening on main):

Screen.Recording.2023-06-16.at.2.22.21.PM.mov

@0xmiros
Copy link
Contributor

0xmiros commented Jun 16, 2023

ok, code looks good. But I have trouble in testing this page as I have no balance. Is there any for me to test?

Screen.Recording.2023-06-16.at.11.33.54.PM.mov

@francoisl
Copy link
Contributor Author

Good question. Looking at previous PRs that modified this component, they were mostly tested internally. I asked in Slack here for now.

@francoisl
Copy link
Contributor Author

@0xmiroslav were you able to test this PR?

@marcaaron
Copy link
Contributor

@francoisl I'm gonna jump in and take over the review on this one as @0xmiroslav may not be able to test.

I think to get to that page you basically would need to have:

  • gold wallet
  • paid via Expensify for an IOU
  • bank account to transfer to
  • etc

So, it seems quite hard for a C+ to test actually. I am guessing that's the explanation for the delay here.

@marcaaron
Copy link
Contributor

marcaaron commented Jun 27, 2023

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

2023-06-27_09-10-51

Mobile Web - Chrome

2023-06-27_10-44-52

Mobile Web - Safari

2023-06-27_10-03-18

Desktop

Full disclosure - ran into issues testing on Desktop and could not find time to sort them out locally.

iOS

2023-06-27_10-02-18

Android

2023-06-27_10-41-53

@0xmiros
Copy link
Contributor

0xmiros commented Jun 27, 2023

Thanks @marcaaron

@marcaaron
Copy link
Contributor

This PR was a bit broken for me in the current state - but was fixed after merging in main. After sending money the app was crashing. I think it's unrelated to these changes though.

One thing I have noticed (also unrelated) - the button here does not go anywhere... though this feature is still behind a beta IIRC so we are good. Will continue testing on all the platforms now!

2023-06-27_09-10-51

@marcaaron marcaaron merged commit 41eb9ba into main Jun 27, 2023
@marcaaron marcaaron deleted the francois-transferBalanceFunctionalComponent branch June 27, 2023 20:06
@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.

@marcaaron
Copy link
Contributor

Whoops was I not supposed to merge this? I heard something about a "merge freeze" - hopefully it is OK.

@francoisl
Copy link
Contributor Author

Haha I forgot about that too. I think it's ok that we merged though.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/marcaaron in version: 1.3.34-0 🚀

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

@kbecciv
Copy link

kbecciv commented Jun 28, 2023

Hello @francoisl @marcaaron QA team have trouble to see the Transfer balance option under Payment. Can you please help us? Is this internal testing?
Applause accounts only have Silver wallet
image

@francoisl
Copy link
Contributor Author

@kbecciv Oh I thought you guys had Gold wallets already, my bad. I can take care of QAing this internally!

@francoisl
Copy link
Contributor Author

Internal QA done 👍
I only have one Gold wallet and deposit account as well so couldn't test the page to switch deposit accounts :/

Chrome image
Desktop image
Android
Android web
iOS (via Browserstack) image
iOS Safari (via Browserstack) image

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.34-1 🚀

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

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