From b014e376606a1d9988560d0472d445a1d62a3b00 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Tue, 2 Apr 2024 18:44:35 +0800 Subject: [PATCH 1/4] use the correct key --- src/ONYXKEYS.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index c134d2a65db28..623e2a8cfd5ed 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -430,8 +430,8 @@ const ONYXKEYS = { REPORT_FIELD_EDIT_FORM_DRAFT: 'reportFieldEditFormDraft', REIMBURSEMENT_ACCOUNT_FORM: 'reimbursementAccount', REIMBURSEMENT_ACCOUNT_FORM_DRAFT: 'reimbursementAccountDraft', - PERSONAL_BANK_ACCOUNT: 'personalBankAccountForm', - PERSONAL_BANK_ACCOUNT_DRAFT: 'personalBankAccountFormDraft', + PERSONAL_BANK_ACCOUNT: 'personalBankAccount', + PERSONAL_BANK_ACCOUNT_DRAFT: 'personalBankAccountDraft', EXIT_SURVEY_REASON_FORM: 'exitSurveyReasonForm', EXIT_SURVEY_REASON_FORM_DRAFT: 'exitSurveyReasonFormDraft', EXIT_SURVEY_RESPONSE_FORM: 'exitSurveyResponseForm', From fb723f7c17a03a9ca48c58138fc5a67114d7276d Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Tue, 2 Apr 2024 19:35:29 +0800 Subject: [PATCH 2/4] suppress typecheck --- src/libs/actions/BankAccounts.ts | 1 + src/pages/AddPersonalBankAccountPage.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts index bb20b2b686abe..cbc116d3d325e 100644 --- a/src/libs/actions/BankAccounts.ts +++ b/src/libs/actions/BankAccounts.ts @@ -208,6 +208,7 @@ function addPersonalBankAccount(account: PlaidBankAccount) { }, ], failureData: [ + // @ts-expect-error: ONYXKEYS.PERSONAL_BANK_ACCOUNT is conflicting with ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT { onyxMethod: Onyx.METHOD.MERGE, key: ONYXKEYS.PERSONAL_BANK_ACCOUNT, diff --git a/src/pages/AddPersonalBankAccountPage.tsx b/src/pages/AddPersonalBankAccountPage.tsx index e2d832f672b24..864b5fd845eab 100644 --- a/src/pages/AddPersonalBankAccountPage.tsx +++ b/src/pages/AddPersonalBankAccountPage.tsx @@ -103,6 +103,7 @@ function AddPersonalBankAccountPage({personalBankAccount, plaidData}: AddPersona AddPersonalBankAccountPage.displayName = 'AddPersonalBankAccountPage'; export default withOnyx({ + // @ts-expect-error: ONYXKEYS.PERSONAL_BANK_ACCOUNT is conflicting with ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT personalBankAccount: { key: ONYXKEYS.PERSONAL_BANK_ACCOUNT, }, From 3e5629bcee567269cd5aade88e8034bcce82ba55 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Wed, 10 Apr 2024 23:39:18 +0800 Subject: [PATCH 3/4] fix typing after conflict --- src/libs/actions/BankAccounts.ts | 1 - src/pages/AddPersonalBankAccountPage.tsx | 2 +- src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts index 0e7a93a2e1535..234868f8322c9 100644 --- a/src/libs/actions/BankAccounts.ts +++ b/src/libs/actions/BankAccounts.ts @@ -236,7 +236,6 @@ function addPersonalBankAccount(account: PlaidBankAccount) { }, ], failureData: [ - // @ts-expect-error: ONYXKEYS.PERSONAL_BANK_ACCOUNT is conflicting with ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT { onyxMethod: Onyx.METHOD.MERGE, key: ONYXKEYS.PERSONAL_BANK_ACCOUNT, diff --git a/src/pages/AddPersonalBankAccountPage.tsx b/src/pages/AddPersonalBankAccountPage.tsx index e3f6d70e0af77..5cd0f3ef80269 100644 --- a/src/pages/AddPersonalBankAccountPage.tsx +++ b/src/pages/AddPersonalBankAccountPage.tsx @@ -102,7 +102,7 @@ function AddPersonalBankAccountPage({personalBankAccount, plaidData}: AddPersona AddPersonalBankAccountPage.displayName = 'AddPersonalBankAccountPage'; export default withOnyx({ - // @ts-expect-error: ONYXKEYS.PERSONAL_BANK_ACCOUNT is conflicting with ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT + // @ts-expect-error: ONYXKEYS.PERSONAL_BANK_ACCOUNT is conflicting with ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM personalBankAccount: { key: ONYXKEYS.PERSONAL_BANK_ACCOUNT, }, diff --git a/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx b/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx index c07ad9aba5878..314f5da988fd7 100644 --- a/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx +++ b/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx @@ -119,6 +119,7 @@ export default withOnyx Date: Thu, 11 Apr 2024 14:22:18 +0800 Subject: [PATCH 4/4] set to null --- src/libs/actions/BankAccounts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts index 234868f8322c9..85896d50e0951 100644 --- a/src/libs/actions/BankAccounts.ts +++ b/src/libs/actions/BankAccounts.ts @@ -113,7 +113,7 @@ function setPersonalBankAccountContinueKYCOnSuccess(onSuccessFallbackRoute: Rout function clearPersonalBankAccount() { clearPlaid(); - Onyx.set(ONYXKEYS.PERSONAL_BANK_ACCOUNT, {}); + Onyx.set(ONYXKEYS.PERSONAL_BANK_ACCOUNT, null); Onyx.set(ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM_DRAFT, null); clearPersonalBankAccountSetupType(); }