From 7f81c79abcfa76420b9a6dcc7690c3a1afda5eb7 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Sun, 27 Feb 2022 23:32:41 +0000 Subject: [PATCH 01/11] Add the error messages to CONST --- src/CONST.js | 6 ++++++ src/libs/actions/PaymentMethods.js | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/CONST.js b/src/CONST.js index d169485906e..896d61cddbe 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -431,6 +431,12 @@ const CONST = { UNEXPECTED: 'Unexpected error', MISSING_FIELD: 'Missing required additional details fields', UNABLE_TO_VERIFY: 'Unable to verify identity', + NO_ACCOUNT_TO_LINK: '405 No account to link to wallet', + INVALID_WALLET: '405 Invalid wallet account', + NOT_OWNER_OF_BANK_ACCOUNT: '401 Wallet owner does not own linked bank account', + INVALID_BANK_ACCOUNT: '405 Attempting to link an invalid bank account to a wallet', + NOT_OWNER_OF_FUND: '401 Wallet owner does not own linked fund', + INVALID_FUND: '405 Attempting to link an invalid fund to a wallet', }, STEP: { ONFIDO: 'OnfidoStep', diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index fd9fa25bed3..992cee3162e 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -109,13 +109,16 @@ function setWalletLinkedAccount(password, bankAccountID, fundID) { walletLinkedAccountID: bankAccountID || fundID, walletLinkedAccountType: bankAccountID ? CONST.PAYMENT_METHODS.BANK_ACCOUNT : CONST.PAYMENT_METHODS.DEBIT_CARD, }); Growl.show(Localize.translateLocal('paymentsPage.setDefaultSuccess'), CONST.GROWL.SUCCESS, 5000); - } else { - Growl.show(Localize.translateLocal('paymentsPage.setDefaultFailure'), CONST.GROWL.ERROR, 5000); + return; + } + + if (response.message === CONST.WALLET.ERROR.NO_ACCOUNT_TO_LINK) { + Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000); + return; } + + Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000); }) - .catch(() => { - Growl.show(Localize.translateLocal('paymentsPage.setDefaultFailure'), CONST.GROWL.ERROR, 5000); - }); } /** From 7596e3c2a35d7109d1c2a4689fd1ff3f799d9331 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Sun, 27 Feb 2022 23:44:52 +0000 Subject: [PATCH 02/11] Handle the specific errors in setWalletLinkedAccount action and add english error messages --- src/languages/en.js | 10 +++++++++- src/languages/es.js | 9 +++++++++ src/libs/actions/PaymentMethods.js | 28 +++++++++++++++++++++++----- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 20be3907e42..8df3dded9eb 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -357,7 +357,6 @@ export default { paymentMethodsTitle: 'Payment methods', setDefaultConfirmation: 'Make default payment method', setDefaultSuccess: 'Default payment method set!', - setDefaultFailure: 'Failed to set default payment method.', deleteConfirmation: 'Are you sure that you want to delete this account?', deleteBankAccountSuccess: 'Bank account successfully deleted', deleteDebitCardSuccess: 'Debit Card successfully deleted', @@ -365,6 +364,15 @@ export default { allSet: 'All Set!', transferConfirmText: ({amount}) => `${amount} will hit your account shortly!`, gotIt: 'Got it, Thanks!', + error: { + noAccountToLink: 'Something went wrong. Please, contact Concierge.', + invalidWallet: 'Your Wallet is currently suspended. Reach out to Concierge for help.', + notOwnerOfBankAccount: 'We couldn\'t link this bank account to your Wallet. Please, reach out to Concierge for help.', + invalidBankAccount: 'This bank account is temporarily suspended. Reach out to Concierge for help.', + notOwnerOfFund: 'We couldn\'t link this fund to your Wallet. Reach out to Concierge for help.', + invalidFund: 'This fund is temporarily suspended. Reach out to Concierge for help.', + setDefaultFailure: 'Failed to set default payment method.', + } }, transferAmountPage: { transfer: ({amount}) => `Transfer${amount ? ` ${amount}` : ''}`, diff --git a/src/languages/es.js b/src/languages/es.js index a1d9bc7272f..839f8eb7cf5 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -365,6 +365,15 @@ export default { allSet: 'Todo listo!', transferConfirmText: ({amount}) => `${amount} llegará a tu cuenta en breve!`, gotIt: 'Gracias!', + error: { + noAccountToLink: 'Something went wrong. Please, contact Concierge.', + invalidWallet: 'Your Wallet is currently suspended. Reach out to Concierge for help.', + notOwnerOfBankAccount: 'We couldn\'t link this bank account to your Wallet. Please, reach out to Concierge for help.', + invalidBankAccount: 'This bank account is temporarily suspended. Reach out to Concierge for help.', + notOwnerOfFund: 'We couldn\'t link this fund to your Wallet. Reach out to Concierge for help.', + invalidFund: 'This fund is temporarily suspended. Reach out to Concierge for help.', + setDefaultFailure: 'No se ha podido configurar el método de pago.', + } }, transferAmountPage: { transfer: ({amount}) => `Transferir${amount ? ` ${amount}` : ''}`, diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index 992cee3162e..3b9b7107596 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -112,12 +112,30 @@ function setWalletLinkedAccount(password, bankAccountID, fundID) { return; } - if (response.message === CONST.WALLET.ERROR.NO_ACCOUNT_TO_LINK) { - Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000); - return; + // Make sure to show user more specific errors which will help support identify the problem faster. + switch (response.message) { + case CONST.WALLET.ERROR.NO_ACCOUNT_TO_LINK: + Growl.show(Localize.translateLocal('paymentsPage.error.noAccountToLink'), CONST.GROWL.ERROR, 5000); + return; + case CONST.WALLET.ERROR.INVALID_WALLET: + Growl.show(Localize.translateLocal('paymentsPage.error.invalidWallet'), CONST.GROWL.ERROR, 5000); + return; + case CONST.WALLET.ERROR.NOT_OWNER_OF_BANK_ACCOUNT: + Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfBankAccount'), CONST.GROWL.ERROR, 5000); + return; + case CONST.WALLET.ERROR.INVALID_BANK_ACCOUNT: + Growl.show(Localize.translateLocal('paymentsPage.error.invalidBankAccount'), CONST.GROWL.ERROR, 5000); + return; + case CONST.WALLET.ERROR.NOT_OWNER_OF_FUND: + Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfFund'), CONST.GROWL.ERROR, 5000); + return; + case CONST.WALLET.ERROR.INVALID_FUND: + Growl.show(Localize.translateLocal('paymentsPage.error.invalidFund'), CONST.GROWL.ERROR, 5000); + return; + default: + Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000); + return; } - - Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000); }) } From c1fcfe311625fa13cca749e85b59bd7f85aedda3 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Mon, 28 Feb 2022 00:35:43 +0000 Subject: [PATCH 03/11] Move the error handling to catch --- src/libs/actions/PaymentMethods.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index 3b9b7107596..d77138d01ee 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -111,9 +111,10 @@ function setWalletLinkedAccount(password, bankAccountID, fundID) { Growl.show(Localize.translateLocal('paymentsPage.setDefaultSuccess'), CONST.GROWL.SUCCESS, 5000); return; } - + Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000); + }).catch((error) => { // Make sure to show user more specific errors which will help support identify the problem faster. - switch (response.message) { + switch (error.message) { case CONST.WALLET.ERROR.NO_ACCOUNT_TO_LINK: Growl.show(Localize.translateLocal('paymentsPage.error.noAccountToLink'), CONST.GROWL.ERROR, 5000); return; @@ -134,9 +135,8 @@ function setWalletLinkedAccount(password, bankAccountID, fundID) { return; default: Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000); - return; } - }) + }); } /** From e468cafbdd360bf5c470b2590d2cae1727f5b30e Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Mon, 28 Feb 2022 00:58:24 +0000 Subject: [PATCH 04/11] Remove the translation key from es.js --- src/languages/es.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/languages/es.js b/src/languages/es.js index 839f8eb7cf5..eaaf02b1ed3 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -357,7 +357,6 @@ export default { paymentMethodsTitle: 'Métodos de pago', setDefaultConfirmation: 'Marcar como método de pago predeterminado', setDefaultSuccess: 'Método de pago configurado', - setDefaultFailure: 'No se ha podido configurar el método de pago.', deleteConfirmation: '¿Estás seguro de que quieres eliminar esta cuenta?', deleteBankAccountSuccess: 'Cuenta bancaria eliminada correctamente', deleteDebitCardSuccess: 'Tarjeta de débito eliminada correctamente', From 6fde6549cf3bc5a4f1448510d14d77eedeb66e64 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Mon, 28 Feb 2022 01:04:30 +0000 Subject: [PATCH 05/11] Fix style errors --- src/languages/en.js | 2 +- src/languages/es.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 8df3dded9eb..e258b7fc87e 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -372,7 +372,7 @@ export default { notOwnerOfFund: 'We couldn\'t link this fund to your Wallet. Reach out to Concierge for help.', invalidFund: 'This fund is temporarily suspended. Reach out to Concierge for help.', setDefaultFailure: 'Failed to set default payment method.', - } + }, }, transferAmountPage: { transfer: ({amount}) => `Transfer${amount ? ` ${amount}` : ''}`, diff --git a/src/languages/es.js b/src/languages/es.js index eaaf02b1ed3..4a88e041c1e 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -372,7 +372,7 @@ export default { notOwnerOfFund: 'We couldn\'t link this fund to your Wallet. Reach out to Concierge for help.', invalidFund: 'This fund is temporarily suspended. Reach out to Concierge for help.', setDefaultFailure: 'No se ha podido configurar el método de pago.', - } + }, }, transferAmountPage: { transfer: ({amount}) => `Transferir${amount ? ` ${amount}` : ''}`, From 5bb9ffdb9629b49d66384b51e57e607fd710ea01 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 3 Mar 2022 19:36:58 +0000 Subject: [PATCH 06/11] Update the copies --- src/languages/en.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 945d706dbc4..54aae40973f 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -365,12 +365,12 @@ export default { transferConfirmText: ({amount}) => `${amount} will hit your account shortly!`, gotIt: 'Got it, Thanks!', error: { - noAccountToLink: 'Something went wrong. Please, contact Concierge.', - invalidWallet: 'Your Wallet is currently suspended. Reach out to Concierge for help.', - notOwnerOfBankAccount: 'We couldn\'t link this bank account to your Wallet. Please, reach out to Concierge for help.', - invalidBankAccount: 'This bank account is temporarily suspended. Reach out to Concierge for help.', - notOwnerOfFund: 'We couldn\'t link this fund to your Wallet. Reach out to Concierge for help.', - invalidFund: 'This fund is temporarily suspended. Reach out to Concierge for help.', + noAccountToLink: 'Something went wrong. Please chat with Concierge for further assistance.', + invalidWallet: 'We\'re unable to set this bank account as your default payment method. Please reach out to Concierge for help.', + notOwnerOfBankAccount: 'We\'re unable to set this bank account as your default payment method. Please reach out to Concierge for help.', + invalidBankAccount: 'This bank account is temporarily suspended. Please reach out to Concierge for help.', + notOwnerOfFund: 'We\'re unable to set this card as your default payment method. Please reach out to Concierge for help.', + invalidFund: 'We\'re unable to set this card as your default payment method. Please reach out to Concierge for help.', setDefaultFailure: 'Failed to set default payment method.', }, }, From eb83cb616b8d2fa6f580c3b0785e17ea9e705341 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 3 Mar 2022 19:42:43 +0000 Subject: [PATCH 07/11] Remove the ambiguous error message and use the default one --- src/languages/en.js | 2 +- src/libs/actions/PaymentMethods.js | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 54aae40973f..39f0db49461 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -371,7 +371,7 @@ export default { invalidBankAccount: 'This bank account is temporarily suspended. Please reach out to Concierge for help.', notOwnerOfFund: 'We\'re unable to set this card as your default payment method. Please reach out to Concierge for help.', invalidFund: 'We\'re unable to set this card as your default payment method. Please reach out to Concierge for help.', - setDefaultFailure: 'Failed to set default payment method.', + setDefaultFailure: 'Something went wrong. Please chat with Concierge for further assistance.', }, }, transferAmountPage: { diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index d77138d01ee..8dd6d6b7888 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -115,9 +115,6 @@ function setWalletLinkedAccount(password, bankAccountID, fundID) { }).catch((error) => { // Make sure to show user more specific errors which will help support identify the problem faster. switch (error.message) { - case CONST.WALLET.ERROR.NO_ACCOUNT_TO_LINK: - Growl.show(Localize.translateLocal('paymentsPage.error.noAccountToLink'), CONST.GROWL.ERROR, 5000); - return; case CONST.WALLET.ERROR.INVALID_WALLET: Growl.show(Localize.translateLocal('paymentsPage.error.invalidWallet'), CONST.GROWL.ERROR, 5000); return; From b8a61bcd3d807a822db8897c986e71cbb548aab9 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Tue, 8 Mar 2022 14:26:03 +0000 Subject: [PATCH 08/11] Update the copy again and reduce the number of error messages --- src/languages/en.js | 7 ++----- src/languages/es.js | 9 +++------ src/libs/actions/PaymentMethods.js | 10 +++------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index adbfd4c2e3f..c9e39074792 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -366,12 +366,9 @@ export default { transferConfirmText: ({amount}) => `${amount} will hit your account shortly!`, gotIt: 'Got it, Thanks!', error: { - noAccountToLink: 'Something went wrong. Please chat with Concierge for further assistance.', - invalidWallet: 'We\'re unable to set this bank account as your default payment method. Please reach out to Concierge for help.', - notOwnerOfBankAccount: 'We\'re unable to set this bank account as your default payment method. Please reach out to Concierge for help.', + notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method. Please reach out to Concierge for help.', invalidBankAccount: 'This bank account is temporarily suspended. Please reach out to Concierge for help.', - notOwnerOfFund: 'We\'re unable to set this card as your default payment method. Please reach out to Concierge for help.', - invalidFund: 'We\'re unable to set this card as your default payment method. Please reach out to Concierge for help.', + notOwnerOfFund: 'There was an error setting this card as your default payment method. Please reach out to Concierge for help.', setDefaultFailure: 'Something went wrong. Please chat with Concierge for further assistance.', }, }, diff --git a/src/languages/es.js b/src/languages/es.js index 2df2886916d..2558802ad2e 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -366,12 +366,9 @@ export default { transferConfirmText: ({amount}) => `${amount} llegará a tu cuenta en breve!`, gotIt: 'Gracias!', error: { - noAccountToLink: 'Something went wrong. Please, contact Concierge.', - invalidWallet: 'Your Wallet is currently suspended. Reach out to Concierge for help.', - notOwnerOfBankAccount: 'We couldn\'t link this bank account to your Wallet. Please, reach out to Concierge for help.', - invalidBankAccount: 'This bank account is temporarily suspended. Reach out to Concierge for help.', - notOwnerOfFund: 'We couldn\'t link this fund to your Wallet. Reach out to Concierge for help.', - invalidFund: 'This fund is temporarily suspended. Reach out to Concierge for help.', + notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method. Please reach out to Concierge for help.', + invalidBankAccount: 'This bank account is temporarily suspended. Please reach out to Concierge for help.', + notOwnerOfFund: 'There was an error setting this card as your default payment method. Please reach out to Concierge for help.', setDefaultFailure: 'No se ha podido configurar el método de pago.', }, }, diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index 8dd6d6b7888..ab2ba139d65 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -116,19 +116,15 @@ function setWalletLinkedAccount(password, bankAccountID, fundID) { // Make sure to show user more specific errors which will help support identify the problem faster. switch (error.message) { case CONST.WALLET.ERROR.INVALID_WALLET: - Growl.show(Localize.translateLocal('paymentsPage.error.invalidWallet'), CONST.GROWL.ERROR, 5000); - return; case CONST.WALLET.ERROR.NOT_OWNER_OF_BANK_ACCOUNT: Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfBankAccount'), CONST.GROWL.ERROR, 5000); return; - case CONST.WALLET.ERROR.INVALID_BANK_ACCOUNT: - Growl.show(Localize.translateLocal('paymentsPage.error.invalidBankAccount'), CONST.GROWL.ERROR, 5000); - return; case CONST.WALLET.ERROR.NOT_OWNER_OF_FUND: + case CONST.WALLET.ERROR.INVALID_FUND: Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfFund'), CONST.GROWL.ERROR, 5000); return; - case CONST.WALLET.ERROR.INVALID_FUND: - Growl.show(Localize.translateLocal('paymentsPage.error.invalidFund'), CONST.GROWL.ERROR, 5000); + case CONST.WALLET.ERROR.INVALID_BANK_ACCOUNT: + Growl.show(Localize.translateLocal('paymentsPage.error.invalidBankAccount'), CONST.GROWL.ERROR, 5000); return; default: Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000); From 42c161f868e7cfe5ed84960bf42ac4f91b033542 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Wed, 9 Mar 2022 20:16:44 +0000 Subject: [PATCH 09/11] Add the Spanish translations --- src/languages/en.js | 7 ++++--- src/languages/es.js | 7 ++++--- src/libs/actions/PaymentMethods.js | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index c9e39074792..7fa05a7425c 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -98,6 +98,7 @@ export default { enterManually: 'Enter it manually', message: 'Message ', leaveRoom: 'Leave room', + conciergeHelp: 'Please reach out to Concierge for help.', }, attachmentPicker: { cameraPermissionRequired: 'Camera permission required', @@ -366,9 +367,9 @@ export default { transferConfirmText: ({amount}) => `${amount} will hit your account shortly!`, gotIt: 'Got it, Thanks!', error: { - notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method. Please reach out to Concierge for help.', - invalidBankAccount: 'This bank account is temporarily suspended. Please reach out to Concierge for help.', - notOwnerOfFund: 'There was an error setting this card as your default payment method. Please reach out to Concierge for help.', + notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method.', + invalidBankAccount: 'This bank account is temporarily suspended.', + notOwnerOfFund: 'There was an error setting this card as your default payment method.', setDefaultFailure: 'Something went wrong. Please chat with Concierge for further assistance.', }, }, diff --git a/src/languages/es.js b/src/languages/es.js index 2558802ad2e..5b24c1a0ff4 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -98,6 +98,7 @@ export default { enterManually: 'Ingresar manualmente', message: 'Chatear con ', leaveRoom: 'Salir de la sala de chat', + conciergeHelp: 'Por favor contacta con Concierge para obtener ayuda.', }, attachmentPicker: { cameraPermissionRequired: 'Se necesita permiso para usar la cámara', @@ -366,9 +367,9 @@ export default { transferConfirmText: ({amount}) => `${amount} llegará a tu cuenta en breve!`, gotIt: 'Gracias!', error: { - notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method. Please reach out to Concierge for help.', - invalidBankAccount: 'This bank account is temporarily suspended. Please reach out to Concierge for help.', - notOwnerOfFund: 'There was an error setting this card as your default payment method. Please reach out to Concierge for help.', + notOwnerOfBankAccount: 'Ha ocurrido un error al establecer esta cuenta bancaria como tu método de pago predeterminado.', + invalidBankAccount: 'Esta cuenta bancaria está temporalmente suspendida.', + notOwnerOfFund: 'Ha ocurrido un error al establecer esta tarjeta de crédito como tu método de pago predeterminado.', setDefaultFailure: 'No se ha podido configurar el método de pago.', }, }, diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index ab2ba139d65..d3836e6e26f 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -117,14 +117,14 @@ function setWalletLinkedAccount(password, bankAccountID, fundID) { switch (error.message) { case CONST.WALLET.ERROR.INVALID_WALLET: case CONST.WALLET.ERROR.NOT_OWNER_OF_BANK_ACCOUNT: - Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfBankAccount'), CONST.GROWL.ERROR, 5000); + Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfBankAccount') + " " + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); return; case CONST.WALLET.ERROR.NOT_OWNER_OF_FUND: case CONST.WALLET.ERROR.INVALID_FUND: - Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfFund'), CONST.GROWL.ERROR, 5000); + Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfFund') + " " + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); return; case CONST.WALLET.ERROR.INVALID_BANK_ACCOUNT: - Growl.show(Localize.translateLocal('paymentsPage.error.invalidBankAccount'), CONST.GROWL.ERROR, 5000); + Growl.show(Localize.translateLocal('paymentsPage.error.invalidBankAccount') + " " + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); return; default: Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000); From fe66a081e6f0858297c2cd0e3cbbddeda3bc265e Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Wed, 9 Mar 2022 20:22:13 +0000 Subject: [PATCH 10/11] Fix lint issues --- src/libs/actions/PaymentMethods.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index d3836e6e26f..0293de077f4 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -117,14 +117,14 @@ function setWalletLinkedAccount(password, bankAccountID, fundID) { switch (error.message) { case CONST.WALLET.ERROR.INVALID_WALLET: case CONST.WALLET.ERROR.NOT_OWNER_OF_BANK_ACCOUNT: - Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfBankAccount') + " " + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); + Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfBankAccount') + ' ' + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); return; case CONST.WALLET.ERROR.NOT_OWNER_OF_FUND: case CONST.WALLET.ERROR.INVALID_FUND: - Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfFund') + " " + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); + Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfFund') + ' ' + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); return; case CONST.WALLET.ERROR.INVALID_BANK_ACCOUNT: - Growl.show(Localize.translateLocal('paymentsPage.error.invalidBankAccount') + " " + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); + Growl.show(Localize.translateLocal('paymentsPage.error.invalidBankAccount') + ' ' + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); return; default: Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000); From d1fdfa655714c0d85556c715e53f560d02e2c949 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Wed, 9 Mar 2022 20:56:04 +0000 Subject: [PATCH 11/11] Use String literals --- src/libs/actions/PaymentMethods.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index 0293de077f4..00f2234c829 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -117,14 +117,14 @@ function setWalletLinkedAccount(password, bankAccountID, fundID) { switch (error.message) { case CONST.WALLET.ERROR.INVALID_WALLET: case CONST.WALLET.ERROR.NOT_OWNER_OF_BANK_ACCOUNT: - Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfBankAccount') + ' ' + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); + Growl.show(`${Localize.translateLocal('paymentsPage.error.notOwnerOfBankAccount')} ${Localize.translateLocal('common.conciergeHelp')}`, CONST.GROWL.ERROR, 5000); return; case CONST.WALLET.ERROR.NOT_OWNER_OF_FUND: case CONST.WALLET.ERROR.INVALID_FUND: - Growl.show(Localize.translateLocal('paymentsPage.error.notOwnerOfFund') + ' ' + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); + Growl.show(`${Localize.translateLocal('paymentsPage.error.notOwnerOfFund')} ${Localize.translateLocal('common.conciergeHelp')}`, CONST.GROWL.ERROR, 5000); return; case CONST.WALLET.ERROR.INVALID_BANK_ACCOUNT: - Growl.show(Localize.translateLocal('paymentsPage.error.invalidBankAccount') + ' ' + Localize.translateLocal('common.conciergeHelp'), CONST.GROWL.ERROR, 5000); + Growl.show(`${Localize.translateLocal('paymentsPage.error.invalidBankAccount')} ${Localize.translateLocal('common.conciergeHelp')}`, CONST.GROWL.ERROR, 5000); return; default: Growl.show(Localize.translateLocal('paymentsPage.error.setDefaultFailure'), CONST.GROWL.ERROR, 5000);