Merge pull request #9609 from Expensify/jack-refactorDeleteDebitCard

Refactor DeleteFund
Expensify · Aug 11, 2022 · 37eacaf · 37eacaf
2 parents 72dcbe4 + 0cede96
commit 37eacaf
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 38 deletions.
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -393,7 +393,6 @@ export default {
         deleteAccount: 'Delete Account',
         deleteConfirmation: 'Are you sure that you want to delete this account?',
         deleteBankAccountSuccess: 'Bank account successfully deleted',
-        deleteDebitCardSuccess: 'Debit Card successfully deleted',
         deletePayPalSuccess: 'PayPal.me successfully deleted',
         error: {
             notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method.',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -393,7 +393,6 @@ export default {
         deleteAccount: 'Eliminar cuenta',
         deleteConfirmation: '¿Estás seguro de que quieres eliminar esta cuenta?',
         deleteBankAccountSuccess: 'Cuenta bancaria eliminada correctamente',
-        deleteDebitCardSuccess: 'Tarjeta de débito eliminada correctamente',
         deletePayPalSuccess: 'PayPal.me eliminada correctamente',
         error: {
             notOwnerOfBankAccount: 'Ha ocurrido un error al establecer esta cuenta bancaria como tu método de pago predeterminado.',

diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
@@ -14,28 +14,6 @@ import * as User from './User';
 import * as store from './ReimbursementAccount/store';
 import ROUTES from '../../ROUTES';
 
-/**
- * Deletes a debit card
- *
- * @param {Number} fundID
- *
- * @returns {Promise}
- */
-function deleteDebitCard(fundID) {
-    return DeprecatedAPI.DeleteFund({fundID})
-        .then((response) => {
-            if (response.jsonCode === 200) {
-                Growl.show(Localize.translateLocal('paymentsPage.deleteDebitCardSuccess'), CONST.GROWL.SUCCESS, 3000);
-                Onyx.merge(ONYXKEYS.CARD_LIST, {[fundID]: null});
-            } else {
-                Growl.show(Localize.translateLocal('common.genericErrorMessage'), CONST.GROWL.ERROR, 3000);
-            }
-        })
-        .catch(() => {
-            Growl.show(Localize.translateLocal('common.genericErrorMessage'), CONST.GROWL.ERROR, 3000);
-        });
-}
-
 function deletePayPalMe() {
     User.deletePaypalMeAddress();
     Growl.show(Localize.translateLocal('paymentsPage.deletePayPalSuccess'), CONST.GROWL.SUCCESS, 3000);
@@ -311,9 +289,23 @@ function dismissSuccessfulTransferBalancePage() {
     Navigation.navigate(ROUTES.SETTINGS_PAYMENTS);
 }
 
+function deletePaymentCard(fundID) {
+    API.write('DeletePaymentCard', {
+        fundID,
+    }, {
+        optimisticData: [
+            {
+                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                key: `${ONYXKEYS.CARD_LIST}`,
+                value: {[fundID]: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}},
+            },
+        ],
+    });
+}
+
 export {
-    deleteDebitCard,
     deletePayPalMe,
+    deletePaymentCard,
     getPaymentMethods,
     openPaymentsPage,
     makeDefaultPaymentMethod,

diff --git a/src/libs/deprecatedAPI.js b/src/libs/deprecatedAPI.js
@@ -94,17 +94,6 @@ function CreateLogin(parameters) {
     return Network.post(commandName, parameters);
 }
 
-/**
- * @param {Object} parameters
- * @param {Number} parameters.fundID
- * @returns {Promise}
- */
-function DeleteFund(parameters) {
-    const commandName = 'DeleteFund';
-    requireParameters(['fundID'], parameters, commandName);
-    return Network.post(commandName, parameters);
-}
-
 /**
  * @param {Object} parameters
  * @param {String} parameters.partnerUserID
@@ -690,7 +679,6 @@ export {
     CreateLogin,
     CreatePolicyRoom,
     RenameReport,
-    DeleteFund,
     DeleteLogin,
     DeleteBankAccount,
     Get,

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -248,7 +248,7 @@ class BasePaymentsPage extends React.Component {
         } else if (this.state.selectedPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
             BankAccounts.deleteBankAccount(this.state.selectedPaymentMethod.bankAccountID);
         } else if (this.state.selectedPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
-            PaymentMethods.deleteDebitCard(this.state.selectedPaymentMethod.fundID);
+            PaymentMethods.deletePaymentCard(this.state.selectedPaymentMethod.fundID);
         }
     }