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

Allow platinum wallets to transact #29395

Merged
merged 7 commits into from
Oct 17, 2023
Merged

Allow platinum wallets to transact #29395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
57789df
WIP -- allow platinum wallets to transaction
coleaeason Oct 10, 2023
1a34570
Add Missing underscore import
coleaeason Oct 11, 2023
4088b8c
Merge branch 'main' of github.com:Expensify/App into cole_platinum_wa…
coleaeason Oct 11, 2023
1dba748
Fix missed rename
coleaeason Oct 11, 2023
e6549d8
prettier
coleaeason Oct 11, 2023
61417ff
Rename typoed variable
coleaeason Oct 13, 2023
f7f785c
Merge branch 'main' of github.com:Expensify/App into cole_platinum_wa…
coleaeason Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/CONST.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,8 +1017,10 @@ const CONST = {
ACTIVATE: 'ActivateStep',
},
TIER_NAME: {
PLATINUM: 'PLATINUM',
GOLD: 'GOLD',
SILVER: 'SILVER',
BRONZE: 'BRONZE',
},
WEB_MESSAGE_TYPE: {
STATEMENT: 'STATEMENT_NAVIGATE',
Expand Down
7 changes: 4 additions & 3 deletions src/components/KYCWall/BaseKYCWall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import _ from 'underscore';
import React from 'react';
import {withOnyx} from 'react-native-onyx';
import {Dimensions} from 'react-native';
Expand Down Expand Up @@ -123,9 +124,9 @@ class KYCWall extends React.Component {
}
if (!isExpenseReport) {
// Ask the user to upgrade to a gold wallet as this means they have not yet gone through our Know Your Customer (KYC) checks
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);
Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

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

if (!hasActivatedWallet) {
Log.info('[KYC Wallet] User does not have active wallet');
Navigation.navigate(this.props.enablePaymentsRoute);
return;
}
Expand Down
11 changes: 6 additions & 5 deletions src/pages/EnablePayments/ActivateStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import _ from 'underscore';
import React from 'react';
import {withOnyx} from 'react-native-onyx';
import * as LottieAnimations from '../../components/LottieAnimations';
Expand Down Expand Up @@ -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 isActivatedWallet = _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], props.userWallet.tierName);
const animation = isActivatedWallet ? LottieAnimations.Fireworks : LottieAnimations.ReviewingBankInfo;
const continueButtonText = props.walletTerms.chatReportID ? props.translate('activateStep.continueToPayment') : props.translate('activateStep.continueToTransfer');

return (
<>
<HeaderWithBackButton title={props.translate('activateStep.headerTitle')} />
<ConfirmationPage
animation={animation}
heading={props.translate(`activateStep.${isGoldWallet ? 'activated' : 'checkBackLater'}Title`)}
description={props.translate(`activateStep.${isGoldWallet ? 'activated' : 'checkBackLater'}Message`)}
shouldShowButton={isGoldWallet}
heading={props.translate(`activateStep.${isActivatedWallet ? 'activated' : 'checkBackLater'}Title`)}
description={props.translate(`activateStep.${isActivatedWallet ? 'activated' : 'checkBackLater'}Message`)}
shouldShowButton={isActivatedWallet}
buttonText={continueButtonText}
onButtonPress={PaymentMethods.continueSetup}
/>
Expand Down
4 changes: 3 additions & 1 deletion src/pages/settings/Wallet/TransferBalancePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ function TransferBalancePage(props) {
const isButtonDisabled = !isTransferable || !selectedAccount;
const errorMessage = !_.isEmpty(props.walletTransfer.errors) ? _.chain(props.walletTransfer.errors).values().first().value() : '';

const shouldShowTransferView = PaymentUtils.hasExpensifyPaymentMethod(paymentCardList, props.bankAccountList) && props.userWallet.tierName === CONST.WALLET.TIER_NAME.GOLD;
const shouldShowTransferView =
PaymentUtils.hasExpensifyPaymentMethod(paymentCardList, props.bankAccountList) &&
_.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], props.userWallet.tierName);

return (
<ScreenWrapper testID={TransferBalancePage.displayName}>
Expand Down
Loading