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.

Sign up for GitHub

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

Jump to bottom

Refactor TransferWalletBalance #9589

Merged
merged 54 commits into from
Jul 22, 2022
Merged

Refactor TransferWalletBalance #9589

merged 54 commits into from
Jul 22, 2022

Conversation

MariaHCD
Copy link
Contributor

@MariaHCD MariaHCD commented Jun 28, 2022 •
edited
Loading

Related Web PR: https://github.com/Expensify/Web-Expensify/pull/34127

Details

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/216150

Tests

Pre-requisite accounts (via clitools.sh generator:account and validator:wallet)

  1. Account A set up with a gold wallet and a validated bank account
  2. Account B set up with a gold wallet and a validated bank account

Tests:

  1. As Account A send money to Account B
  2. As Account B, navigate to Settings > Payments > Transfer Balance

Screen Shot 2022-07-08 at 9 37 51 PM

Screen Shot 2022-07-08 at 9 37 57 PM

  1. Click on Transfer Balance and then the Transfer $<amount> button

Screen Shot 2022-07-08 at 9 38 53 PM

  1. Verify the transfer completes successfully and you see the success page

Screen Shot 2022-07-11 at 1 28 08 PM

  1. Verify clicking Done or the close button directs you back to the Settings > Payments page

Screen Shot 2022-07-08 at 10 11 44 PM

  1. Verify the Transfer Balance button on the Payments page is disabled when offline

Screen Shot 2022-07-21 at 12 14 19 PM

  1. Verify that the button on the Transfer Balance page is disabled when offline

Screen Shot 2022-07-21 at 12 14 41 PM

PR Review Checklist

Contributor (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 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 included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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
  • 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 */
    • Any functional components have the displayName property
    • 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
  • 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 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.

PR Reviewer Checklist
  • 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 verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 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 */
    • Any functional components have the displayName property
    • 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 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 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.

QA Steps

Pre-requisite accounts:

  1. Account A on the wallet beta, set up with a gold wallet and a validated bank account
  2. Account B on the wallet beta, set up with a gold wallet and a validated bank account

Tests:

  1. As Account A send money to Account B
  2. As Account B, navigate to Settings > Payments > Transfer Balance
  3. Click on Transfer Balance and then the Transfer $<amount> button
  4. Verify the transfer completes successfully and you see the success page
  5. Verify clicking Done or the close button directs you back to the Settings > Payments page
  6. Verify the Transfer Balance button on the Payments page is disabled when offline

Screen Shot 2022-07-21 at 12 14 19 PM

  1. Verify that the button on the Transfer Balance page is disabled when offline

Screen Shot 2022-07-21 at 12 14 41 PM

  • Verify that no errors appear in the JS console

Screenshots

Web

1.New.Expensify.mp4

Desktop

Untitled_.Jul.12.2022.3_28.PM.mp4

@MariaHCD MariaHCD self-assigned this Jun 28, 2022
MariaHCD added 24 commits June 30, 2022 10:49
@MariaHCD
Add successful balance transfer page
6f4c9bb
@MariaHCD
Fixes for successful transfer balance page
3e5fee2
@MariaHCD
Show transfer success page
60eed1c
@MariaHCD
Add showShouldTransferSuccess Onyx prop
ae22a8b
@MariaHCD
Import routes
eaed050
@MariaHCD
Add close button
8ede4a9
@MariaHCD
Allow success and failure data to be set for refactored commands
93fe910
@MariaHCD
Style fixes
bd830bd
@MariaHCD
Rename api command
fea3749
@MariaHCD
Update success transfer message
79e80d9
@MariaHCD
Update success message
de4847c
@MariaHCD
Remove unused confirm modal
217c071
@MariaHCD
Delete successful transfer balance page
c70a5ea
@MariaHCD
Style fixes
a3aa6b1
@MariaHCD
Merge remote-tracking branch 'origin/main' into maria-refactor-transf…
7419781 
…er-wallet-balance
@MariaHCD
Merge remote-tracking branch 'origin/main' into maria-refactor-transf…
ac8f06d 
…er-wallet-balance
@MariaHCD
Rename method
725900b
@MariaHCD
Specify that we want the API to return onyxData
93bbb80
@MariaHCD
Merge remote-tracking branch 'origin/main' into maria-refactor-transf…
96ed727 
…er-wallet-balance

# Conflicts:
#	src/libs/Middleware/SaveResponseInOnyx.js
@MariaHCD
Update transfer balance success screen
114f2d5
@MariaHCD
Update success text
81ec21e
@MariaHCD
Remove unused text and translations
247b557
@MariaHCD
Fix capitalization
bc8ad80
@MariaHCD
Add Spanish translations
173255a
@MariaHCD MariaHCD changed the title Refactor TransferWalletBalance [Hold Web-E #34127] Refactor TransferWalletBalance Jul 8, 2022
@MariaHCD
Copy link
Contributor Author

Fixed merge conflicts and tweaked the styles for the OfflineIndicator

shawnborton
shawnborton previously approved these changes Jul 21, 2022
View reviewed changes
thienlnam
thienlnam previously approved these changes Jul 21, 2022
View reviewed changes
Copy link
Contributor

@thienlnam thienlnam left a comment

Choose a reason for hiding this comment

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

Approved but pending another merge conflic

ctkochan22
ctkochan22 previously approved these changes Jul 21, 2022
View reviewed changes
Copy link
Contributor

@ctkochan22 ctkochan22 left a comment

Choose a reason for hiding this comment

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

Looks good. Just conflicts

@ctkochan22 ctkochan22 dismissed stale reviews from thienlnam, shawnborton, and themself via e4550d6 July 21, 2022 22:16
@ctkochan22
Copy link
Contributor

@MariaHCD I hope its okay, I feel like we have all the approves, but cause of the timezone, we are getting approvals after changes that causes conflicts. I just went in and fixed the conflicts

@ctkochan22
Copy link
Contributor

@stitesExpensify @shawnborton @thienlnam Can we get a quick re-reveiw, I just took care of the small merge conflict

@thienlnam
Copy link
Contributor

Just going to merge this before we get any more conflicts - all previous reviewers have approved pending conflicts

@thienlnam thienlnam merged commit 8bbc2ec into main Jul 22, 2022
@thienlnam thienlnam deleted the maria-refactor-transfer-wallet-balance branch July 22, 2022 00:49
@melvin-bot melvin-bot bot added the Emergency label Jul 22, 2022
@melvin-bot
Copy link

melvin-bot bot commented Jul 22, 2022

@thienlnam looks like this was merged without passing tests. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

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

@MariaHCD
Copy link
Contributor Author

Thanks for moving this forward!

@MariaHCD MariaHCD mentioned this pull request Jul 25, 2022
Merged
91 tasks
@OSBotify OSBotify mentioned this pull request Jul 25, 2022
Closed
92 tasks
@mvtglobally
Copy link

@MariaHCD @JmillsExpensify @thienlnam Can you QA this internally? We are not able to test wallet due to PROD KYC wall

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by @thienlnam in version: 1.1.86-0 🚀

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

@MariaHCD
Copy link
Contributor Author

@MariaHCD @JmillsExpensify @thienlnam Can you QA this internally? We are not able to test wallet due to PROD KYC wall

Asked here! https://expensify.slack.com/archives/C02HWMSMZEC/p1658825528148109?thread_ts=1657045889.543309&cid=C02HWMSMZEC

@NikkiWines NikkiWines mentioned this pull request Jul 26, 2022
Closed
@luacmartins
Copy link
Contributor

@MariaHCD did we manage to test this on staging?

@yuwenmemon
Copy link
Contributor

Tested on staging! It's a pass 🎉

@OSBotify
Copy link
Contributor

OSBotify commented Aug 1, 2022

🚀 Deployed to production by @yuwenmemon in version: 1.1.86-5 🚀

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

@MariaHCD MariaHCD mentioned this pull request Aug 3, 2022
Merged
91 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thienlnam thienlnam thienlnam approved these changes

@stitesExpensify stitesExpensify stitesExpensify left review comments

@ctkochan22 ctkochan22 ctkochan22 left review comments

@shawnborton shawnborton shawnborton left review comments

@marcochavezf marcochavezf Awaiting requested review from marcochavezf

Assignees

@MariaHCD MariaHCD

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@MariaHCD @JmillsExpensify @stitesExpensify @ctkochan22 @shawnborton @thienlnam @OSBotify @mvtglobally @luacmartins @yuwenmemon