From 934f4df5bb9ebfff408ff8f0c123f3f3d5ea0edb Mon Sep 17 00:00:00 2001
From: Brandon Stites <bstites+1@expensify.com>
Date: Tue, 27 Jul 2021 16:24:16 -0600
Subject: [PATCH 1/3] Don't get deleted/unissued cards

---
 src/libs/actions/PaymentMethods.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index f6474b581cd9e..5f995433e4656 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -13,6 +13,8 @@ function getPaymentMethods() {
     return API.Get({
         returnValueList: 'bankAccountList, cardList, userWallet, nameValuePairs',
         name: 'paypalMeAddress',
+        includeDeleted: false,
+        includeNotIssued: false,
     })
         .then((response) => {
             Onyx.multiSet({

From 72da49aed541970be6a7294adc958aecf5f1614d Mon Sep 17 00:00:00 2001
From: Brandon Stites <bstites+1@expensify.com>
Date: Tue, 27 Jul 2021 16:31:05 -0600
Subject: [PATCH 2/3] Add a ternary to ensure that in case of accounts not
 having the numbers, we can still render the item

---
 src/pages/settings/Payments/PaymentMethodList.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index c76ac9024f4e4..25c276d35cd44 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -83,12 +83,15 @@ class PaymentMethodList extends Component {
         _.each(this.props.bankAccountList, (bankAccount) => {
             // Add all bank accounts besides the wallet
             if (bankAccount.type !== CONST.BANK_ACCOUNT_TYPES.WALLET) {
+                const formattedBankAccountNumber = bankAccount.accountNumber
+                    ? `${this.props.translate('paymentMethodList.accountLastFour')} ${bankAccount.accountNumber.slice(-4)}`
+                    : null;
                 combinedPaymentMethods.push({
                     type: MENU_ITEM,
                     title: bankAccount.addressName,
 
                     // eslint-disable-next-line
-                    description: `${this.props.translate('paymentMethodList.accountLastFour')} ${bankAccount.accountNumber.slice(-4)}`,
+                    description: formattedBankAccountNumber,
                     icon: Bank,
                     onPress: e => this.props.onPress(e, bankAccount.bankAccountID),
                     key: `bankAccount-${bankAccount.bankAccountID}`,
@@ -99,12 +102,15 @@ class PaymentMethodList extends Component {
         _.each(this.props.cardList, (card) => {
             // Add all cards besides the "cash" card
             if (card.cardName !== CONST.CARD_TYPES.DEFAULT_CASH) {
+                const formattedCardNumber = card.cardNumber
+                    ? `${this.props.translate('paymentMethodList.cardLastFour')} ${card.cardNumber.slice(-4)}`
+                    : null;
                 combinedPaymentMethods.push({
                     type: MENU_ITEM,
                     title: card.cardName,
 
                     // eslint-disable-next-line
-                    description: `${this.props.translate('paymentMethodList.cardLastFour')} ${card.cardNumber.slice(-4)}`,
+                    description: formattedCardNumber,
                     icon: CreditCard,
                     onPress: e => this.props.onPress(e, card.cardID),
                     key: `card-${card.cardID}`,

From ae9cc84bf12eb3b3f8879a1afa9920e4ade0136e Mon Sep 17 00:00:00 2001
From: Brandon Stites <bstites+1@expensify.com>
Date: Tue, 27 Jul 2021 18:46:07 -0600
Subject: [PATCH 3/3] Style

---
 src/pages/settings/Payments/PaymentMethodList.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index 25c276d35cd44..7e62429e1f38e 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -84,7 +84,9 @@ class PaymentMethodList extends Component {
             // Add all bank accounts besides the wallet
             if (bankAccount.type !== CONST.BANK_ACCOUNT_TYPES.WALLET) {
                 const formattedBankAccountNumber = bankAccount.accountNumber
-                    ? `${this.props.translate('paymentMethodList.accountLastFour')} ${bankAccount.accountNumber.slice(-4)}`
+                    ? `${this.props.translate('paymentMethodList.accountLastFour')} ${
+                        bankAccount.accountNumber.slice(-4)
+                    }`
                     : null;
                 combinedPaymentMethods.push({
                     type: MENU_ITEM,