Skip to content

Extract Expensify card lookup into pure function #100945

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

Open
sosek108 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Extract Expensify card lookup into pure function #100945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 2 additions & 19 deletions src/hooks/useGetExpensifyCardFromReportAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import {useCardList, useWorkspaceCardList} from '@components/OnyxListItemProvider';

import {isPolicyAdmin} from '@libs/PolicyUtils';
import {getOriginalMessage, isCardIssuedAction} from '@libs/ReportActionsUtils';
import {getTravelBillingFeedID} from '@libs/TravelBillingUtils';
import {getExpensifyCardFromReportAction} from '@libs/ReportAlternateTextUtils';

import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Card, ReportAction} from '@src/types/onyx';

import usePolicy from './usePolicy';
Expand All @@ -14,21 +10,8 @@ function useGetExpensifyCardFromReportAction({reportAction, policyID}: {reportAc
const allUserCards = useCardList();
const allExpensifyCards = useWorkspaceCardList();
const policy = usePolicy(policyID);
const workspaceAccountID = policy?.policyAccountID ?? CONST.DEFAULT_NUMBER_ID;

const cardIssuedActionOriginalMessage = isCardIssuedAction(reportAction) ? getOriginalMessage(reportAction) : undefined;
const cardID = cardIssuedActionOriginalMessage?.cardID ?? CONST.DEFAULT_NUMBER_ID;
if (!isPolicyAdmin(policy)) {
return allUserCards?.[cardID];
}

// Issued Expensify Cards live on one of two Onyx keys: regular cards on the 2-segment key,
// Travel Billing cards on the `_TRAVEL_US` variant. Check both.
return (
allExpensifyCards?.[`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`]?.[cardID] ??
allExpensifyCards?.[`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${getTravelBillingFeedID(workspaceAccountID)}`]?.[cardID] ??
allUserCards?.[cardID]
);
return getExpensifyCardFromReportAction({reportAction, policy, cardList: allUserCards, workspaceCardList: allExpensifyCards});
}

export default useGetExpensifyCardFromReportAction;
34 changes: 33 additions & 1 deletion src/libs/ReportAlternateTextUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {
Card,
CardList,
PersonalDetails,
PersonalDetailsList,
Policy,
Expand All @@ -18,6 +19,7 @@ import type {
Rule,
Transaction,
VisibleReportActionsDerivedValue,
WorkspaceCardsList,
} from '@src/types/onyx';
import {isEmptyObject} from '@src/types/utils/EmptyObject';

Expand All @@ -36,7 +38,7 @@ import createDynamicRoute from './Navigation/helpers/dynamicRoutesUtils/createDy
import {getIsOffline} from './NetworkState';
import Parser from './Parser';
import {getLoginByAccountID, getPersonalDetailsByID, getPersonalDetailsForAccountIDs, getPersonalDetailsListByIDs, temporaryGetDisplayNameOrDefault} from './PersonalDetailsUtils';
import {getCleanedTagName, hasDynamicExternalWorkflow} from './PolicyUtils';
import {getCleanedTagName, hasDynamicExternalWorkflow, isPolicyAdmin} from './PolicyUtils';
import {
getActionableCard3DSTransactionApprovalMessage,
getActionableCardFraudAlertResolutionMessage,
Expand Down Expand Up @@ -245,6 +247,7 @@ import {getAddExpensifyCardRuleMessage, getRemoveExpensifyCardRuleMessage, getUp
import StringUtils from './StringUtils';
import {getTaskCreatedMessage, getTaskReportActionMessage} from './TaskUtils';
import {getAmount as getTransactionAmount, getCurrency as getTransactionCurrency, getDescription, isScanning} from './TransactionUtils';
import {getTravelBillingFeedID} from './TravelBillingUtils';

let allReports: OnyxCollection<Report>;
// connectWithoutView is justified: this is module-level, non-render preview computation shared by LHN and Search;
Expand Down Expand Up @@ -1603,9 +1606,38 @@ function getReportAlternateText({
return alternateText;
}

function getExpensifyCardFromReportAction({
reportAction,
policy,
cardList,
workspaceCardList,
}: {
reportAction: OnyxEntry<ReportAction>;
policy: OnyxEntry<Policy>;
cardList: OnyxEntry<CardList>;
workspaceCardList: OnyxCollection<WorkspaceCardsList>;
}): Card | undefined {
const workspaceAccountID = policy?.policyAccountID ?? CONST.DEFAULT_NUMBER_ID;

const cardIssuedActionOriginalMessage = isCardIssuedAction(reportAction) ? getOriginalMessage(reportAction) : undefined;
const cardID = cardIssuedActionOriginalMessage?.cardID ?? CONST.DEFAULT_NUMBER_ID;
if (!isPolicyAdmin(policy)) {
return cardList?.[cardID];
}

// Issued Expensify Cards live on one of two Onyx keys: regular cards on the 2-segment key,
// Travel Billing cards on the `_TRAVEL_US` variant. Check both.
return (
workspaceCardList?.[`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`]?.[cardID] ??
workspaceCardList?.[`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${getTravelBillingFeedID(workspaceAccountID)}`]?.[cardID] ??
cardList?.[cardID]
);
}

export {
// eslint-disable-next-line @typescript-eslint/no-deprecated
deprecatedCachedOneTransactionThreadReportIDs,
getExpensifyCardFromReportAction,
getLastActorDisplayName,
getLastActorDisplayNameFromLastVisibleActions,
getLastMessageTextForReport,
Expand Down
Loading