Skip to content

Refactor Delete Bank Account #10341

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

Merged
srikarparsi merged 4 commits into from
Aug 12, 2022
Merged

Refactor Delete Bank Account #10341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8458e09
remove old bank account API
thienlnam Aug 10, 2022
c991298
add new functionality for deleting payment bank account
thienlnam Aug 10, 2022
d9aa36f
Merge branch 'main' into jack-deleteBankAccountRefactor
thienlnam Aug 11, 2022
1f40a55
remove bad merge
thienlnam Aug 11, 2022
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/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,6 @@ export default {
setDefaultSuccess: 'Default payment method set!',
deleteAccount: 'Delete Account',
deleteConfirmation: 'Are you sure that you want to delete this account?',
deleteBankAccountSuccess: 'Bank account successfully deleted',
deletePayPalSuccess: 'PayPal.me successfully deleted',
error: {
notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method.',
Expand Down
1 change: 0 additions & 1 deletion src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,6 @@ export default {
setDefaultSuccess: 'Método de pago configurado',
deleteAccount: 'Eliminar cuenta',
deleteConfirmation: '¿Estás seguro de que quieres eliminar esta cuenta?',
deleteBankAccountSuccess: 'Cuenta bancaria 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.',
Expand Down
40 changes: 11 additions & 29 deletions src/libs/actions/BankAccounts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import lodashGet from 'lodash/get';
import Onyx from 'react-native-onyx';
import CONST from '../../CONST';
import * as DeprecatedAPI from '../deprecatedAPI';
import * as API from '../API';
import * as ReimbursementAccount from './ReimbursementAccount';
import ONYXKEYS from '../../ONYXKEYS';
import Growl from '../Growl';
import * as Localize from '../Localize';
import * as store from './ReimbursementAccount/store';

export {
setupWithdrawalAccount,
Expand Down Expand Up @@ -104,36 +99,23 @@ function addPersonalBankAccount(account, password) {
API.write(commandName, parameters, onyxData);
}

/**
* Deletes a bank account
*
* @param {Number} bankAccountID
*/
function deleteBankAccount(bankAccountID) {
const reimbursementBankAccountId = lodashGet(store.getReimbursementAccountInSetup(), 'bankAccountID');

// Early return as DeleteBankAccount API is called inside `resetFreePlanBankAccount`
if (reimbursementBankAccountId === bankAccountID) {
ReimbursementAccount.resetFreePlanBankAccount();
return;
}
DeprecatedAPI.DeleteBankAccount({
function deletePaymentBankAccount(bankAccountID) {
API.write('DeletePaymentBankAccount', {
bankAccountID,
}).then((response) => {
if (response.jsonCode === 200) {
ReimbursementAccount.deleteFromBankAccountList(bankAccountID);
Growl.show(Localize.translateLocal('paymentsPage.deleteBankAccountSuccess'), CONST.GROWL.SUCCESS, 3000);
} else {
Growl.show(Localize.translateLocal('common.genericErrorMessage'), CONST.GROWL.ERROR, 3000);
}
}).catch(() => {
Growl.show(Localize.translateLocal('common.genericErrorMessage'), CONST.GROWL.ERROR, 3000);
}, {
optimisticData: [
{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: `${ONYXKEYS.BANK_ACCOUNT_LIST}`,
value: {[bankAccountID]: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}},
},
],
});
}

export {
addPersonalBankAccount,
deleteBankAccount,
deletePaymentBankAccount,
clearPersonalBankAccount,
clearPlaid,
};
13 changes: 0 additions & 13 deletions src/libs/deprecatedAPI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,18 +483,6 @@ function BankAccount_SetupWithdrawal(parameters) {
);
}

/**
* @param {Object} parameters
* @param {Number} parameters.bankAccountID
* @param {String} parameters.ownerEmail
* @returns {Promise}
*/
function DeleteBankAccount(parameters) {
const commandName = 'DeleteBankAccount';
requireParameters(['bankAccountID'], parameters, commandName);
return Network.post(commandName, parameters);
}

/**
* @param {Object} parameters
* @param {Number} [parameters.latitude]
Expand Down Expand Up @@ -670,7 +658,6 @@ export {
CreatePolicyRoom,
RenameReport,
DeleteLogin,
DeleteBankAccount,
Get,
GetStatementPDF,
GetIOUReport,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ class BasePaymentsPage extends React.Component {
if (this.state.selectedPaymentMethodType === CONST.PAYMENT_METHODS.PAYPAL) {
PaymentMethods.deletePayPalMe();
} else if (this.state.selectedPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
BankAccounts.deleteBankAccount(this.state.selectedPaymentMethod.bankAccountID);
BankAccounts.deletePaymentBankAccount(this.state.selectedPaymentMethod.bankAccountID);
} else if (this.state.selectedPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
PaymentMethods.deletePaymentCard(this.state.selectedPaymentMethod.fundID);
}
Expand Down