Allow platinum wallets to transact #29395

coleaeason · 2023-10-11T22:26:54Z

@MariaHCD Please review.

This lets you setup and pay with a Platinum Wallet.

Details

Fixed Issues

Part of https://github.com/Expensify/Expensify/issues/325500
PROPOSAL:

Tests

Use the adhoc build below
Sign in to your employee account
Have someone send you an IOU in USD
You should be able to pay the IOU with your wallet successfully.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test steps

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: mWeb Chrome
- iOS: Native
- iOS: mWeb 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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 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 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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

cloudflare-workers-and-pages · 2023-10-11T22:30:17Z

Deploying with Cloudflare Pages

Latest commit:	`f7f785c`
Status:	✅ Deploy successful!
Preview URL:	https://681211ee.helpdot.pages.dev
Branch Preview URL:	https://cole-platinum-wallets.helpdot.pages.dev

View logs

…llets

OSBotify · 2023-10-11T23:17:47Z

🧪🧪 Use the links below to test this build in android and iOS. Happy testing! 🧪🧪

android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/29395/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/29395/index.html

desktop 💻	web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/29395/NewExpensify.dmg	https://29395.pr-testing.expensify.com

MariaHCD

LGTM, I can work on the reviewer checklist and testing this.

Probably worth mentioning in the QA steps that this should be done internally.

MariaHCD · 2023-10-12T09:51:06Z

src/pages/EnablePayments/ActivateStep.js

@@ -29,18 +30,18 @@ const defaultProps = {
 };

 function ActivateStep(props) {
-    const isGoldWallet = props.userWallet.tierName === CONST.WALLET.TIER_NAME.GOLD;
-    const animation = isGoldWallet ? LottieAnimations.Fireworks : LottieAnimations.ReviewingBankInfo;
+    const isActivedWallet = _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], props.userWallet.tierName);


Suggested change

const isActivedWallet = _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], props.userWallet.tierName);

const isActivatedWallet = _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], props.userWallet.tierName);

MariaHCD · 2023-10-13T13:57:20Z

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 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 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-10-13.at.5.45.39.PM.mov

Screen.Recording.2023-10-13.at.5.47.40.PM.mov

Mobile Web - Chrome

Screen.Recording.2023-10-13.at.6.34.09.PM.mov

Mobile Web - Safari

Screen.Recording.2023-10-13.at.6.08.24.PM.mov

Desktop

Screen.Recording.2023-10-13.at.5.33.41.PM.mov

iOS

Android

Screen.Recording.2023-10-13.at.6.32.26.PM.mov

MariaHCD · 2023-10-13T14:35:05Z

Having issues with the iOS simulator but other platforms look good

…llets

melvin-bot · 2023-10-16T21:51:15Z

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

MonilBhavsar

Looks good! If this is Internal QA, should we add appropriate label

MonilBhavsar · 2023-10-17T05:56:13Z

src/components/KYCWall/BaseKYCWall.js

-            const hasGoldWallet = this.props.userWallet.tierName && this.props.userWallet.tierName === CONST.WALLET.TIER_NAME.GOLD;
-            if (!hasGoldWallet) {
-                Log.info('[KYC Wallet] User does not have gold wallet');
+            const hasActivatedWallet = this.props.userWallet.tierName && _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], this.props.userWallet.tierName);


NAB, we can have a separate method to check if wallet is one of those specific tiers

I had the same thought but I don't believe we have a model (or some sort of lib) class for Wallets?

MariaHCD · 2023-10-17T07:11:43Z

This will need internal QA, only Expensify employees have platinum wallets for now.

OSBotify · 2023-10-17T07:18:37Z

✋ 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-10-17T23:57:42Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 1.3.86-0 🚀

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

OSBotify · 2023-10-18T23:55:12Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.86-5 🚀

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

coleaeason added 2 commits October 10, 2023 11:24

WIP -- allow platinum wallets to transaction

57789df

Add Missing underscore import

1a34570

coleaeason added 2 commits October 11, 2023 15:35

Merge branch 'main' of github.com:Expensify/App into cole_platinum_wa…

4088b8c

…llets

Fix missed rename

1dba748

coleaeason self-assigned this Oct 11, 2023

coleaeason changed the title ~~WIP -- allow platinum wallets to transaction~~ Allow platinum wallets to transact Oct 11, 2023

prettier

e6549d8

coleaeason added the Ready To Build label Oct 11, 2023

coleaeason requested a review from MariaHCD October 12, 2023 01:08

MariaHCD reviewed Oct 12, 2023

View reviewed changes

Rename typoed variable

61417ff

MariaHCD approved these changes Oct 16, 2023

View reviewed changes

Merge branch 'main' of github.com:Expensify/App into cole_platinum_wa…

f7f785c

…llets

coleaeason marked this pull request as ready for review October 16, 2023 21:50

coleaeason requested a review from a team as a code owner October 16, 2023 21:50

melvin-bot bot removed the request for review from a team October 16, 2023 21:51

melvin-bot bot requested a review from MonilBhavsar October 16, 2023 21:51

MonilBhavsar approved these changes Oct 17, 2023

View reviewed changes

MariaHCD added the InternalQA This pull request required internal QA label Oct 17, 2023

MariaHCD merged commit cf16dac into main Oct 17, 2023
16 checks passed

MariaHCD deleted the cole_platinum_wallets branch October 17, 2023 07:11

OSBotify mentioned this pull request Oct 17, 2023

Deploy Checklist: New Expensify 2023-10-17 #29837

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow platinum wallets to transact #29395

Allow platinum wallets to transact #29395

coleaeason commented Oct 11, 2023 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 11, 2023 •

edited

Loading

OSBotify commented Oct 11, 2023

MariaHCD left a comment

MariaHCD Oct 12, 2023

MariaHCD commented Oct 13, 2023 •

edited

Loading

MariaHCD commented Oct 13, 2023

melvin-bot bot commented Oct 16, 2023

MonilBhavsar left a comment

MonilBhavsar Oct 17, 2023

MariaHCD Oct 17, 2023

MariaHCD commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 18, 2023

	const isActivedWallet = _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], props.userWallet.tierName);
	const isActivatedWallet = _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], props.userWallet.tierName);

Allow platinum wallets to transact #29395

Allow platinum wallets to transact #29395

Conversation

coleaeason commented Oct 11, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

cloudflare-workers-and-pages bot commented Oct 11, 2023 • edited Loading

Deploying with Cloudflare Pages

OSBotify commented Oct 11, 2023

MariaHCD left a comment

Choose a reason for hiding this comment

MariaHCD Oct 12, 2023

Choose a reason for hiding this comment

MariaHCD commented Oct 13, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

MariaHCD commented Oct 13, 2023

melvin-bot bot commented Oct 16, 2023

MonilBhavsar left a comment

Choose a reason for hiding this comment

MonilBhavsar Oct 17, 2023

Choose a reason for hiding this comment

MariaHCD Oct 17, 2023

Choose a reason for hiding this comment

MariaHCD commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 17, 2023

OSBotify commented Oct 18, 2023

coleaeason commented Oct 11, 2023 •

edited

Loading

cloudflare-workers-and-pages bot commented Oct 11, 2023 •

edited

Loading

MariaHCD commented Oct 13, 2023 •

edited

Loading