From 167f5ef264f3ae73ef9d5bc801791fb4980b3e75 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Fri, 25 Aug 2023 15:05:03 +0100 Subject: [PATCH 1/6] replace corporateCardList with cardList --- src/ONYXKEYS.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index d4d2ab1f90a65..b5bd6daf1d45d 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -139,11 +139,11 @@ const ONYXKEYS = { /** The user's bank accounts */ BANK_ACCOUNT_LIST: 'bankAccountList', - /** The user's credit cards (renamed from cardList) */ + /** The user's credit / P2P cards */ FUND_LIST: 'fundList', // The user's Expensify cards - CORPORATE_CARD_LIST: 'corporateCardList', + CARD_LIST: 'cardList', /** Stores information about the user's saved statements */ WALLET_STATEMENT: 'walletStatement', @@ -327,6 +327,7 @@ type OnyxValues = { [ONYXKEYS.WALLET_TERMS]: OnyxTypes.WalletTerms; [ONYXKEYS.BANK_ACCOUNT_LIST]: Record; [ONYXKEYS.FUND_LIST]: Record; + [ONYXKEYS.CARD_LIST]: Record; [ONYXKEYS.WALLET_STATEMENT]: OnyxTypes.WalletStatement; [ONYXKEYS.PERSONAL_BANK_ACCOUNT]: OnyxTypes.PersonalBankAccount; [ONYXKEYS.REIMBURSEMENT_ACCOUNT]: OnyxTypes.ReimbursementAccount; From 6874abaa5868d662f1f3dc62f7feab3a4e8baf72 Mon Sep 17 00:00:00 2001 From: Georgia Monahan <38015950+grgia@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:41:23 +0100 Subject: [PATCH 2/6] Update src/ONYXKEYS.ts Co-authored-by: Florent De'Neve --- src/ONYXKEYS.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index b5bd6daf1d45d..c7d3bd8870617 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -139,7 +139,7 @@ const ONYXKEYS = { /** The user's bank accounts */ BANK_ACCOUNT_LIST: 'bankAccountList', - /** The user's credit / P2P cards */ + /** The user's cash card and imported cards */ FUND_LIST: 'fundList', // The user's Expensify cards From 9f3d5912bd7b552cebb79530ef4522a644a7ac4e Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Wed, 30 Aug 2023 11:14:09 +0100 Subject: [PATCH 3/6] Add Fund TS type --- src/CONST.js | 7 +++++++ src/ONYXKEYS.ts | 2 +- src/types/onyx/Fund.ts | 17 +++++++++++++++++ src/types/onyx/index.ts | 2 ++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/types/onyx/Fund.ts diff --git a/src/CONST.js b/src/CONST.js index e86a9c4660dae..488764da94da4 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -1132,6 +1132,13 @@ const CONST = { MENTION_ICON: 'mention-icon', SMALL_NORMAL: 'small-normal', }, + EXPENSIFY_CARD: { + FRAUD_TYPES: { + DOMAIN: 'domain', + INDIVIDUAL: 'individal', + NONE: 'none', + }, + }, AVATAR_ROW_SIZE: { DEFAULT: 4, LARGE_SCREEN: 8, diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index b5bd6daf1d45d..169afadc47d4d 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -326,7 +326,7 @@ type OnyxValues = { [ONYXKEYS.WALLET_ADDITIONAL_DETAILS]: OnyxTypes.WalletAdditionalDetails; [ONYXKEYS.WALLET_TERMS]: OnyxTypes.WalletTerms; [ONYXKEYS.BANK_ACCOUNT_LIST]: Record; - [ONYXKEYS.FUND_LIST]: Record; + [ONYXKEYS.FUND_LIST]: Record; [ONYXKEYS.CARD_LIST]: Record; [ONYXKEYS.WALLET_STATEMENT]: OnyxTypes.WalletStatement; [ONYXKEYS.PERSONAL_BANK_ACCOUNT]: OnyxTypes.PersonalBankAccount; diff --git a/src/types/onyx/Fund.ts b/src/types/onyx/Fund.ts new file mode 100644 index 0000000000000..7da35df5b8c73 --- /dev/null +++ b/src/types/onyx/Fund.ts @@ -0,0 +1,17 @@ +import {ValueOf} from 'type-fest'; +import CONST from '../../CONST'; + +type Fund = { + cardID?: number; + state?: number; + bank?: string; + availableSpend?: number; + domainName?: string; + maskedPan?: string; + isVirtual?: boolean; + fraud?: ValueOf; + cardholderFirstName?: string, + cardholderLastName?: string, +}; + +export default Fund; \ No newline at end of file diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts index e7ab360551c57..cb82e5521b95b 100644 --- a/src/types/onyx/index.ts +++ b/src/types/onyx/index.ts @@ -24,6 +24,7 @@ import WalletAdditionalDetails from './WalletAdditionalDetails'; import WalletTerms from './WalletTerms'; import BankAccount from './BankAccount'; import Card from './Card'; +import Fund from './Fund'; import WalletStatement from './WalletStatement'; import PersonalBankAccount from './PersonalBankAccount'; import FrequentlyUsedEmoji from './FrequentlyUsedEmoji'; @@ -71,6 +72,7 @@ export type { WalletTerms, BankAccount, Card, + Fund, WalletStatement, PersonalBankAccount, ReimbursementAccount, From 667f6d3449d41c48e7259b0f535ac16db258195c Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Wed, 30 Aug 2023 11:16:04 +0100 Subject: [PATCH 4/6] prettier --- src/types/onyx/Fund.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/types/onyx/Fund.ts b/src/types/onyx/Fund.ts index 7da35df5b8c73..4c4ab5f8e8929 100644 --- a/src/types/onyx/Fund.ts +++ b/src/types/onyx/Fund.ts @@ -10,8 +10,8 @@ type Fund = { maskedPan?: string; isVirtual?: boolean; fraud?: ValueOf; - cardholderFirstName?: string, - cardholderLastName?: string, + cardholderFirstName?: string; + cardholderLastName?: string; }; -export default Fund; \ No newline at end of file +export default Fund; From a290a6f8ffb974944eefdb3260b84d2720c75202 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Wed, 30 Aug 2023 11:56:55 +0100 Subject: [PATCH 5/6] use Fund for fundList, Card for cardList --- src/types/onyx/Card.ts | 39 ++++++++++++--------------------------- src/types/onyx/Fund.ts | 39 +++++++++++++++++++++++++++------------ 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts index 71ef3d4d98e75..1fe800f7fd2f9 100644 --- a/src/types/onyx/Card.ts +++ b/src/types/onyx/Card.ts @@ -1,32 +1,17 @@ -type AdditionalData = { - isBillingCard?: boolean; - isP2PDebitCard?: boolean; -}; - -type AccountData = { - additionalData?: AdditionalData; - addressName?: string; - addressState?: string; - addressStreet?: string; - addressZip?: number; - cardMonth?: number; - - /** The masked credit card number */ - cardNumber?: string; - - cardYear?: number; - created?: string; - currency?: string; - fundID?: number; -}; +import {ValueOf} from 'type-fest'; +import CONST from '../../CONST'; type Card = { - accountData?: AccountData; - accountType?: string; - description?: string; - key?: string; - methodID?: number; - title?: string; + cardID?: number; + state?: number; + bank?: string; + availableSpend?: number; + domainName?: string; + maskedPan?: string; + isVirtual?: boolean; + fraud?: ValueOf; + cardholderFirstName?: string; + cardholderLastName?: string; }; export default Card; diff --git a/src/types/onyx/Fund.ts b/src/types/onyx/Fund.ts index 4c4ab5f8e8929..7c7c0445081aa 100644 --- a/src/types/onyx/Fund.ts +++ b/src/types/onyx/Fund.ts @@ -1,17 +1,32 @@ -import {ValueOf} from 'type-fest'; -import CONST from '../../CONST'; +type AdditionalData = { + isBillingCard?: boolean; + isP2PDebitCard?: boolean; +}; + +type AccountData = { + additionalData?: AdditionalData; + addressName?: string; + addressState?: string; + addressStreet?: string; + addressZip?: number; + cardMonth?: number; + + /** The masked credit card number */ + cardNumber?: string; + + cardYear?: number; + created?: string; + currency?: string; + fundID?: number; +}; type Fund = { - cardID?: number; - state?: number; - bank?: string; - availableSpend?: number; - domainName?: string; - maskedPan?: string; - isVirtual?: boolean; - fraud?: ValueOf; - cardholderFirstName?: string; - cardholderLastName?: string; + accountData?: AccountData; + accountType?: string; + description?: string; + key?: string; + methodID?: number; + title?: string; }; export default Fund; From a8011b711d8330a5cd38ea2addfc2c313ddd66d3 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Wed, 30 Aug 2023 14:48:07 +0100 Subject: [PATCH 6/6] fix key comments, remove optional --- src/ONYXKEYS.ts | 4 ++-- src/types/onyx/Card.ts | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 14ae0f5b4db6b..b3ef88cc0094d 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -142,10 +142,10 @@ const ONYXKEYS = { /** The user's bank accounts */ BANK_ACCOUNT_LIST: 'bankAccountList', - /** The user's cash card and imported cards */ + /** The user's payment and P2P cards */ FUND_LIST: 'fundList', - // The user's Expensify cards + /** The user's cash card and imported cards (including the Expensify Card) */ CARD_LIST: 'cardList', /** Stores information about the user's saved statements */ diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts index 1fe800f7fd2f9..deaf32cabd1f5 100644 --- a/src/types/onyx/Card.ts +++ b/src/types/onyx/Card.ts @@ -2,16 +2,16 @@ import {ValueOf} from 'type-fest'; import CONST from '../../CONST'; type Card = { - cardID?: number; - state?: number; - bank?: string; - availableSpend?: number; - domainName?: string; - maskedPan?: string; - isVirtual?: boolean; - fraud?: ValueOf; - cardholderFirstName?: string; - cardholderLastName?: string; + cardID: number; + state: number; + bank: string; + availableSpend: number; + domainName: string; + maskedPan: string; + isVirtual: boolean; + fraud: ValueOf; + cardholderFirstName: string; + cardholderLastName: string; }; export default Card;