Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3798,10 +3798,11 @@ const CONST = {
STRIPE: 'Stripe',
WELLS_FARGO: 'Wells Fargo',
MOCK_BANK: 'Mock Bank',
PEX: 'PEX',
EXPENSIFY: 'Expensify',
OTHER: 'Other',
},
NON_CONNECTABLE_BANKS: {
PEX: 'PEX',
},
BANK_CONNECTIONS: {
WELLS_FARGO: 'wellsfargo',
BANK_OF_AMERICA: 'bankofamerica',
Expand Down
2 changes: 1 addition & 1 deletion src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ const translations: TranslationDeepObject<typeof en> = {
auf dem er ursprünglich angefordert wurde
`),
doNotShare: dedent(`
Gib deinen Code an niemanden weiter.
Gib deinen Code an niemanden weiter.
Expensify wird niemals danach fragen!
`),
or: 'oder',
Expand Down
14 changes: 6 additions & 8 deletions src/libs/CardUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import type {
CompanyCardFeedWithDomainID,
CompanyCardFeedWithNumber,
CompanyFeeds,
NonConnectableBankName,
} from '@src/types/onyx/CardFeeds';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import type IconAsset from '@src/types/utils/IconAsset';
Expand Down Expand Up @@ -574,10 +575,9 @@ function getBankName(feedType: CardFeedWithNumber | CardFeedWithDomainID): strin
[CONST.COMPANY_CARD.FEED_BANK_NAME.BREX]: CONST.COMPANY_CARDS.BANKS.BREX,
[CONST.COMPANY_CARD.FEED_BANK_NAME.AMEX_1205]: CONST.COMPANY_CARDS.BANKS.AMEX,
[CONST.COMPANY_CARD.FEED_BANK_NAME.AMEX_FILE_DOWNLOAD]: CONST.COMPANY_CARDS.BANKS.AMEX,
[CONST.COMPANY_CARD.FEED_BANK_NAME.PEX]: CONST.COMPANY_CARDS.BANKS.PEX,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The last commit looks like a bit of an overcorrection:

Image

We still need PEX in the getBankName mapping, otherwise users with an existing PEX feed will not get a proper display name

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this locally btw to validate, this is what it looks like without PEX in the list:

local-pex

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you're right, we still need PEX in getBankName.

[CONST.EXPENSIFY_CARD.BANK]: CONST.COMPANY_CARDS.BANKS.AMEX,
[CONST.COMPANY_CARD.FEED_BANK_NAME.MOCK_BANK]: CONST.COMPANY_CARDS.BANKS.MOCK_BANK,
} satisfies Partial<Record<CardFeed, BankName | CardTypeName>>;
[CONST.COMPANY_CARD.FEED_BANK_NAME.PEX]: CONST.COMPANY_CARDS.NON_CONNECTABLE_BANKS.PEX,
} satisfies Partial<Record<CardFeed, BankName | NonConnectableBankName | CardTypeName>>;

// In existing OldDot setups other variations of feeds could exist, ex: vcf2, vcf3, oauth.americanexpressfdx.com 2003
const feedKey = (Object.keys(feedNamesMapping) as Array<keyof typeof feedNamesMapping>).find((feed) => feedType?.startsWith(feed));
Expand All @@ -593,8 +593,8 @@ function getBankName(feedType: CardFeedWithNumber | CardFeedWithDomainID): strin
return feedNamesMapping[feedKey];
}

const getBankCardDetailsImage = (bank: ValueOf<typeof CONST.COMPANY_CARDS.BANKS>, illustrations: IllustrationsType, companyCardIllustrations: CompanyCardBankIcons): IconAsset => {
const iconMap: Record<ValueOf<typeof CONST.COMPANY_CARDS.BANKS>, IconAsset> = {
const getBankCardDetailsImage = (bank: BankName, illustrations: IllustrationsType, companyCardIllustrations: CompanyCardBankIcons): IconAsset => {
const iconMap: Record<BankName, IconAsset> = {
[CONST.COMPANY_CARDS.BANKS.AMEX]: companyCardIllustrations.AmexCardCompanyCardDetail,
[CONST.COMPANY_CARDS.BANKS.BANK_OF_AMERICA]: companyCardIllustrations.BankOfAmericaCompanyCardDetail,
[CONST.COMPANY_CARDS.BANKS.CAPITAL_ONE]: companyCardIllustrations.CapitalOneCompanyCardDetail,
Expand All @@ -604,8 +604,6 @@ const getBankCardDetailsImage = (bank: ValueOf<typeof CONST.COMPANY_CARDS.BANKS>
[CONST.COMPANY_CARDS.BANKS.BREX]: companyCardIllustrations.BrexCompanyCardDetail,
[CONST.COMPANY_CARDS.BANKS.STRIPE]: companyCardIllustrations.StripeCompanyCardDetail,
[CONST.COMPANY_CARDS.BANKS.MOCK_BANK]: illustrations.GenericCompanyCard,
[CONST.COMPANY_CARDS.BANKS.PEX]: illustrations.GenericCompanyCard,
[CONST.COMPANY_CARDS.BANKS.EXPENSIFY]: Illustrations.ExpensifyCardImage,
[CONST.COMPANY_CARDS.BANKS.OTHER]: illustrations.GenericCompanyCard,
};
return iconMap[bank];
Expand Down Expand Up @@ -740,7 +738,7 @@ function getPlaidCountry(outputCurrency?: string, currencyList?: CurrencyList, c
return country ?? '';
}

function getCorrectStepForPlaidSelectedBank(selectedBank: ValueOf<typeof CONST.COMPANY_CARDS.BANKS>) {
function getCorrectStepForPlaidSelectedBank(selectedBank: BankName) {
if (selectedBank === CONST.COMPANY_CARDS.BANKS.STRIPE) {
return CONST.COMPANY_CARDS.STEP.CARD_INSTRUCTIONS;
}
Expand Down
7 changes: 7 additions & 0 deletions src/types/onyx/CardFeeds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ type CardFeedWithDomainID = `${CardFeedWithNumber}${typeof CONST.COMPANY_CARD.FE
*/
type BankName = ValueOf<typeof CONST.COMPANY_CARDS.BANKS>;

/**
* Bank name for card feeds that can be displayed in NewDot but cannot be added
* as a new connection (e.g. banks without an OAuth or Plaid integration).
*/
type NonConnectableBankName = ValueOf<typeof CONST.COMPANY_CARDS.NON_CONNECTABLE_BANKS>;

/**
*
*/
Expand Down Expand Up @@ -321,6 +327,7 @@ export type {
CardFeedWithNumber,
CardFeedWithDomainID,
BankName,
NonConnectableBankName,
CardType,
CardTypeName,
CompanyCardFeed,
Expand Down
Loading