Skip to content

Check cardID exists in cardList #32097

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
luacmartins merged 3 commits into from
Nov 28, 2023
Merged

Check cardID exists in cardList #32097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e348b4a
Check for cardID in cardList
grgia Nov 28, 2023
55a1b87
rename function
grgia Nov 28, 2023
030cfe1
rename function and simplify
grgia Nov 28, 2023
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
10 changes: 9 additions & 1 deletion src/libs/CardUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ function isExpensifyCard(cardID: number) {
return card.bank === CONST.EXPENSIFY_CARD.BANK;
}

/**
* @param cardID
Comment thread
grgia marked this conversation as resolved.
* @returns boolean if the cardID is in the cardList from ONYX. Includes Expensify Cards.
*/
function isCorporateCard(cardID: number) {
Comment thread
MonilBhavsar marked this conversation as resolved.
return !!allCards[cardID];
}

/**
* @param cardID
* @returns string in format %<bank> - <lastFourPAN || Not Activated>%.
Expand Down Expand Up @@ -99,4 +107,4 @@ function findPhysicalCard(cards: Card[]) {
return cards.find((card) => !card.isVirtual);
}

export {isExpensifyCard, getDomainCards, getMonthFromExpirationDateString, getYearFromExpirationDateString, maskCard, getCardDescription, findPhysicalCard};
export {isExpensifyCard, isCorporateCard, getDomainCards, getMonthFromExpirationDateString, getYearFromExpirationDateString, maskCard, getCardDescription, findPhysicalCard};
7 changes: 4 additions & 3 deletions src/libs/TransactionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
import {RecentWaypoint, ReportAction, Transaction} from '@src/types/onyx';
import {Comment, Receipt, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
import {EmptyObject} from '@src/types/utils/EmptyObject';
import {isExpensifyCard} from './CardUtils';
import {isCorporateCard, isExpensifyCard} from './CardUtils';
import DateUtils from './DateUtils';
import * as NumberUtils from './NumberUtils';

Expand Down Expand Up @@ -335,10 +335,11 @@ function isExpensifyCardTransaction(transaction: Transaction): boolean {
}

/**
* Determine whether a transaction is made with a card.
* Determine whether a transaction is made with a card (Expensify or Company Card).
*/
function isCardTransaction(transaction: Transaction): boolean {
return (transaction?.cardID ?? 0) > 0;
const cardID = transaction?.cardID ?? 0;
return isCorporateCard(cardID);
}

/**
Expand Down