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
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ function WorkspaceCompanyCardsTableHeaderButtons({policyID, feedName, isLoadingF
}

Navigation.setNavigationActionToMicrotaskQueue(() => {
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_BROKEN_CARD_FEED_CONNECTION.getRoute(policyID ?? '', feedName));
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_BROKEN_CARD_FEED_CONNECTION.getRoute(policyID ?? String(CONST.DEFAULT_NUMBER_ID), feedName));
});
};

const secondaryActions = [
{
icon: icons.Gear,
text: translate('common.settings'),
onSelected: () => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SETTINGS.getRoute(policyID ?? '')),
onSelected: () => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SETTINGS.getRoute(policyID ?? String(CONST.DEFAULT_NUMBER_ID))),
value: CONST.POLICY.SECONDARY_ACTIONS.SETTINGS,
},
];
Expand Down Expand Up @@ -126,7 +126,7 @@ function WorkspaceCompanyCardsTableHeaderButtons({policyID, feedName, isLoadingF
/>
) : (
<FeedSelector
onFeedSelect={() => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SELECT_FEED.getRoute(policyID ?? ''))}
onFeedSelect={() => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SELECT_FEED.getRoute(policyID ?? String(CONST.DEFAULT_NUMBER_ID)))}
CardFeedIcon={CardFeedIcon}
feedName={formattedFeedName}
supportingText={supportingText}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Navigation from '@libs/Navigation/Navigation';
import {getDefaultAvatarURL} from '@libs/UserAvatarUtils';
import CONST from '@src/CONST';
import ROUTES from '@src/ROUTES';
import type {Card, FailedCompanyCardAssignment, PersonalDetails} from '@src/types/onyx';
import type {Card, CompanyCardFeed, FailedCompanyCardAssignment, PersonalDetails} from '@src/types/onyx';

type WorkspaceCompanyCardTableItemData = {
/** Card number */
Expand Down Expand Up @@ -140,7 +140,7 @@ function WorkspaceCompanyCardTableItem({
return;
}

const feedName = getCompanyCardFeedWithDomainID(assignedCard?.bank, assignedCard.fundID);
const feedName = getCompanyCardFeedWithDomainID(assignedCard?.bank as CompanyCardFeed, assignedCard.fundID);

return Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARD_DETAILS.getRoute(policyID, assignedCard.cardID.toString(), feedName));
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function WorkspaceCompanyCardsTable({policy, onAssignCard, isAssigningCardDisabl
<WorkspaceCompanyCardTableItem
key={`${item.cardName}_${index}`}
item={item}
policyID={policy?.id ?? ''}
policyID={policy?.id ?? String(CONST.DEFAULT_NUMBER_ID)}
domainOrWorkspaceAccountID={domainOrWorkspaceAccountID}
CardFeedIcon={cardFeedIcon}
isPlaidCardFeed={isDirectCardFeed}
Expand Down
Loading