Skip to content

Commit

Permalink
Always use CardUtils.getCustomOrFormattedFeedName
Browse files Browse the repository at this point in the history
  • Loading branch information
grgia committed Nov 14, 2024
1 parent 8a3a00c commit 1c68c99
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function WorkspaceCompanyCardFeedSelectorPage({route}: WorkspaceCompanyCardFeedS

const feeds: CardFeedListItem[] = (Object.keys(availableCards) as CompanyCardFeed[]).map((feed) => ({
value: feed,
text: cardFeeds?.settings?.companyCardNicknames?.[feed] ?? CardUtils.getCardFeedName(feed),
text: cardFeeds?.settings?.companyCardNicknames?.[feed] ?? CardUtils.getCustomOrFormattedFeedName(feed),
keyForList: feed,
isSelected: feed === selectedFeed,
brickRoadIndicator: companyFeeds[feed]?.errors ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function CardInstructionsStep({policyID}: CardInstructionsStepProps) {
contentContainerStyle={styles.flexGrow1}
>
<Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>
{translate('workspace.companyCards.addNewCard.enableFeed.title', {provider: CardUtils.getCardFeedName(feedProvider)})}
{translate('workspace.companyCards.addNewCard.enableFeed.title', {provider: CardUtils.getCustomOrFormattedFeedName(feedProvider)})}

Check failure on line 87 in src/pages/workspace/companyCards/addNew/CardInstructionsStep.tsx

View workflow job for this annotation

GitHub Actions / typecheck

Type 'string | undefined' is not assignable to type 'string'.
</Text>
<Text style={[styles.ph5, styles.mb3]}>{translate('workspace.companyCards.addNewCard.enableFeed.heading')}</Text>
<View style={[styles.ph5]}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ function CardSelectionStep({feed, policyID}: CardSelectionStepProps) {
<Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>
{translate('workspace.companyCards.chooseCardFor', {
assignee: assigneeDisplayName,
feed: CardUtils.getCardFeedName(feed),
feed: CardUtils.getCustomOrFormattedFeedName(feed),

Check failure on line 175 in src/pages/workspace/companyCards/assignCard/CardSelectionStep.tsx

View workflow job for this annotation

GitHub Actions / typecheck

Type 'string | undefined' is not assignable to type 'string'.
})}
</Text>
</View>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function WorkspaceMemberNewCardPage({route, personalDetails}: WorkspaceMemberNew

const companyCardFeeds: CardFeedListItem[] = (Object.keys(availableCompanyCards) as CompanyCardFeed[]).map((key) => ({
value: key,
text: cardFeeds?.settings?.companyCardNicknames?.[key] ?? CardUtils.getCardFeedName(key),
text: cardFeeds?.settings?.companyCardNicknames?.[key] ?? CardUtils.getCustomOrFormattedFeedName(key),
keyForList: key,
isSelected: selectedFeed === key,
leftElement: (
Expand Down

0 comments on commit 1c68c99

Please sign in to comment.