Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,6 @@ const CONST = {
NO_OPTIMISTIC_TRANSACTION_THREADS: 'noOptimisticTransactionThreads',
UBER_FOR_BUSINESS: 'uberForBusiness',
PAY_INVOICE_VIA_EXPENSIFY: 'payInvoiceViaExpensify',
PERSONAL_CARD_IMPORT: 'personalCardImport',
SUGGESTED_FOLLOWUPS: 'suggestedFollowups',
GUSTO: 'gustoNewDot',
BULK_EDIT: 'bulkEdit',
Expand Down
111 changes: 52 additions & 59 deletions src/pages/settings/Wallet/WalletPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -674,66 +674,59 @@ function WalletPage() {
/>
</Section>

{(hasAssignedCard || isBetaEnabled(CONST.BETAS.PERSONAL_CARD_IMPORT)) && (
<Section
subtitle={translate('walletPage.assignedCardsDescription')}
title={translate('walletPage.assignedCards')}
isCentralPane
subtitleMuted
titleStyles={styles.accountSettingsSectionTitle}
>
<>
<PaymentMethodList
shouldShowAddBankAccount={false}
shouldShowAssignedCards
onPress={assignedCardPressed}
threeDotsMenuItems={cardThreeDotsMenuItems}
style={[styles.mt5, [shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8]]}
listItemStyle={shouldUseNarrowLayout ? styles.ph5 : styles.ph8}
<Section
subtitle={translate('walletPage.assignedCardsDescription')}
title={translate('walletPage.assignedCards')}
isCentralPane
subtitleMuted
titleStyles={styles.accountSettingsSectionTitle}
>
<>
<PaymentMethodList
shouldShowAddBankAccount={false}
shouldShowAssignedCards
onPress={assignedCardPressed}
threeDotsMenuItems={cardThreeDotsMenuItems}
style={[styles.mt5, [shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8]]}
listItemStyle={shouldUseNarrowLayout ? styles.ph5 : styles.ph8}
/>
<View style={shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8}>
<MenuItem
onPress={onAddPersonalCardPress}
title={translate('personalCard.addPersonalCard')}
icon={icons.Plus}
wrapperStyle={[styles.paymentMethod, shouldUseNarrowLayout ? styles.ph5 : styles.ph8]}
sentryLabel={CONST.SENTRY_LABEL.SETTINGS_WALLET.ADD_PERSONAL_CARD}
/>
{isBetaEnabled(CONST.BETAS.PERSONAL_CARD_IMPORT) && (
<View style={shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8}>
<MenuItem
onPress={onAddPersonalCardPress}
title={translate('personalCard.addPersonalCard')}
icon={icons.Plus}
wrapperStyle={[styles.paymentMethod, shouldUseNarrowLayout ? styles.ph5 : styles.ph8]}
sentryLabel={CONST.SENTRY_LABEL.SETTINGS_WALLET.ADD_PERSONAL_CARD}
/>
</View>
)}
</>
{isBetaEnabled(CONST.BETAS.PERSONAL_CARD_IMPORT) && (
<View style={[shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8]}>
<MenuItem
title={translate('workspace.companyCards.importTransactions.importButton')}
icon={icons.Table}
shouldShowRightIcon
onPress={() => Navigation.navigate(ROUTES.SETTINGS_WALLET_IMPORT_TRANSACTIONS)}
wrapperStyle={[styles.paymentMethod, shouldUseNarrowLayout ? styles.ph5 : styles.ph8]}
sentryLabel={CONST.SENTRY_LABEL.SETTINGS_WALLET.IMPORT_TRANSACTIONS}
/>
</View>
)}
{!hasAssignedCard && (
<View style={[shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8]}>
<MenuItem
iconHeight={40}
iconWidth={40}
shouldShowRightIcon
icon={illustrations.VerticalCreditCards}
displayInDefaultIconColor
wrapperStyle={[styles.paymentMethod, shouldUseNarrowLayout ? styles.ph5 : styles.ph8]}
title={translate('personalCard.lookingForCompanyCards')}
description={translate('personalCard.lookingForCompanyCardsDescription')}
titleStyle={styles.textStrong}
onPress={openCompanyCardFlow}
/>
</View>
)}
</Section>
)}

</View>
</>
<View style={[shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8]}>
<MenuItem
title={translate('workspace.companyCards.importTransactions.importButton')}
icon={icons.Table}
shouldShowRightIcon
onPress={() => Navigation.navigate(ROUTES.SETTINGS_WALLET_IMPORT_TRANSACTIONS)}
wrapperStyle={[styles.paymentMethod, shouldUseNarrowLayout ? styles.ph5 : styles.ph8]}
sentryLabel={CONST.SENTRY_LABEL.SETTINGS_WALLET.IMPORT_TRANSACTIONS}
/>
</View>
{!hasAssignedCard && (
<View style={[shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8]}>
<MenuItem
iconHeight={40}
iconWidth={40}
shouldShowRightIcon
icon={illustrations.VerticalCreditCards}
displayInDefaultIconColor
wrapperStyle={[styles.paymentMethod, shouldUseNarrowLayout ? styles.ph5 : styles.ph8]}
title={translate('personalCard.lookingForCompanyCards')}
description={translate('personalCard.lookingForCompanyCardsDescription')}
titleStyle={styles.textStrong}
onPress={openCompanyCardFlow}
/>
</View>
)}
</Section>
{hasWallet && (
<Section
subtitle={translate(`walletPage.sendAndReceiveMoney`)}
Expand Down
Loading