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
6 changes: 3 additions & 3 deletions src/ROUTES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2248,10 +2248,10 @@ const ROUTES = {
`workspaces/${policyID}/company-cards/${encodeURIComponent(feed)}/${encodeURIComponent(cardID)}/edit/name` as const,
},
WORKSPACE_COMPANY_CARD_EXPORT: {
route: 'workspaces/:policyID/company-cards/:bank/:cardID/edit/export',
getRoute: (policyID: string, cardID: string, bank: string, backTo?: string) =>
route: 'workspaces/:policyID/company-cards/:feed/:cardID/edit/export',
getRoute: (policyID: string, cardID: string, feed: CompanyCardFeedWithDomainID, backTo?: string) =>
// eslint-disable-next-line no-restricted-syntax -- Legacy route generation
getUrlWithBackToParam(`workspaces/${policyID}/company-cards/${bank}/${cardID}/edit/export`, backTo, false),
getUrlWithBackToParam(`workspaces/${policyID}/company-cards/${feed}/${cardID}/edit/export`, backTo, false),
},
WORKSPACE_EXPENSIFY_CARD: {
route: 'workspaces/:policyID/expensify-card',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function WorkspaceCompanyCardsTable({policy, onAssignCard, isAssigningCardDisabl
const isLoadingPage = !isOffline && (isLoadingFeed || isLoadingOnyxValue(personalDetailsMetadata));

const showCards = !isInitiallyLoadingFeeds && !isFeedPending && !isNoFeed && !isLoadingFeed;
const showTableControls = showCards && !!selectedFeed && !isFeedPending;
const showTableControls = showCards && !!selectedFeed && !isLoadingCards;

const isGB = countryByIp === CONST.COUNTRY.GB;
const shouldShowGBDisclaimer = isGB && isBetaEnabled(CONST.BETAS.PLAID_COMPANY_CARDS) && (isNoFeed || hasNoAssignedCard);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function AssigneeStep({route}: AssigneeStepProps) {
const memberName = personalDetail?.firstName ? personalDetail.firstName : Str.removeSMSDomain(personalDetail?.login ?? '');
const cardToAssign: Partial<AssignCardData> = {
email: assignee?.login ?? '',
cardName: getDefaultCardName(memberName),
...(!assignCard?.cardToAssign?.cardName ? {cardName: getDefaultCardName(memberName)} : {}),
};

Keyboard.dismiss();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ function ConfirmationStep({route}: ConfirmationStepProps) {

const cardholder = getPersonalDetailByEmail(cardToAssign?.email ?? '');
const cardholderName = Str.removeSMSDomain(cardholder?.displayName ?? '');
const cardholderEmail = cardToAssign?.email ?? '';

const cardholderEmail = Str.removeSMSDomain(cardToAssign?.email ?? '');
const cardholderAccountID = cardholder?.accountID;

useEffect(() => {
Expand Down
Loading