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
1 change: 0 additions & 1 deletion src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5384,7 +5384,6 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
monthly: 'Monatlich',
},
cardDetails: 'Kartendaten',
cardPending: ({name}: {name: string}) => `Die Karte ist derzeit ausstehend und wird ausgestellt, sobald das Konto von ${name} verifiziert wurde.`,
virtual: 'Virtuell',
physical: 'Physisch',
deactivate: 'Karte deaktivieren',
Expand Down
1 change: 0 additions & 1 deletion src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5392,7 +5392,6 @@ const translations = {
monthly: 'Monthly',
},
cardDetails: 'Card details',
cardPending: ({name}: {name: string}) => `Card is currently pending and will be issued once ${name}'s account is validated.`,
virtual: 'Virtual',
physical: 'Physical',
deactivate: 'Deactivate card',
Expand Down
1 change: 0 additions & 1 deletion src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5250,7 +5250,6 @@ ${amount} para ${merchant} - ${date}`,
monthly: 'Mensual',
},
cardDetails: 'Datos de la tarjeta',
cardPending: ({name}: {name: string}) => `La tarjeta está pendiente y se emitirá una vez que la cuenta de ${name} haya sido validada.`,
virtual: 'Virtual',
physical: 'Física',
deactivate: 'Desactivar tarjeta',
Expand Down
1 change: 0 additions & 1 deletion src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5393,7 +5393,6 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
monthly: 'Mensuel',
},
cardDetails: 'Détails de la carte',
cardPending: ({name}: {name: string}) => `La carte est actuellement en attente et sera émise une fois le compte de ${name} validé.`,
virtual: 'Virtuelle',
physical: 'Physique',
deactivate: 'Désactiver la carte',
Expand Down
1 change: 0 additions & 1 deletion src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5364,7 +5364,6 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
monthly: 'Mensile',
},
cardDetails: 'Dettagli carta',
cardPending: ({name}: {name: string}) => `La carta è al momento in sospeso e verrà emessa non appena l'account di ${name} sarà convalidato.`,
virtual: 'Virtuale',
physical: 'Fisico',
deactivate: 'Disattiva carta',
Expand Down
1 change: 0 additions & 1 deletion src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5314,7 +5314,6 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
monthly: '毎月',
},
cardDetails: 'カード情報',
cardPending: ({name}: {name: string}) => `カードは現在保留中で、${name} さんのアカウントが認証され次第、発行されます。`,
virtual: 'バーチャル',
physical: '物理',
deactivate: 'カードを無効化',
Expand Down
1 change: 0 additions & 1 deletion src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5356,7 +5356,6 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
monthly: 'Maandelijks',
},
cardDetails: 'Kaartgegevens',
cardPending: ({name}: {name: string}) => `De kaart is momenteel in behandeling en wordt uitgegeven zodra het account van ${name} is gevalideerd.`,
virtual: 'Virtueel',
physical: 'Fysiek',
deactivate: 'Kaart deactiveren',
Expand Down
1 change: 0 additions & 1 deletion src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5344,7 +5344,6 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
monthly: 'Miesięcznie',
},
cardDetails: 'Dane karty',
cardPending: ({name}: {name: string}) => `Karta jest obecnie w oczekiwaniu i zostanie wydana po zweryfikowaniu konta ${name}.`,
virtual: 'Wirtualna',
physical: 'Fizyczny',
deactivate: 'Dezaktywuj kartę',
Expand Down
1 change: 0 additions & 1 deletion src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5347,7 +5347,6 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
monthly: 'Mensal',
},
cardDetails: 'Detalhes do cartão',
cardPending: ({name}: {name: string}) => `O cartão está atualmente pendente e será emitido quando a conta de ${name} for validada.`,
virtual: 'Virtual',
physical: 'Físico',
deactivate: 'Desativar cartão',
Expand Down
1 change: 0 additions & 1 deletion src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5229,7 +5229,6 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM
monthly: '每月',
},
cardDetails: '卡片详情',
cardPending: ({name}: {name: string}) => `卡片目前处于待处理状态,将在验证完 ${name} 的账户后发行。`,
virtual: '虚拟',
physical: '实体',
deactivate: '停用卡片',
Expand Down
14 changes: 1 addition & 13 deletions src/pages/settings/Wallet/PersonalCardDetailsHeaderMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ type PersonalCardDetailsHeaderMenuProps = {
card: Card;
cardID: string;
cardholder: PersonalDetails | null | undefined;
displayName: string;
customCardNames: Record<string, string> | undefined;
expensifyIcons: Record<string, IconAsset>;
isCSVImportedPersonalCard: boolean;
Expand All @@ -40,7 +39,6 @@ function PersonalCardDetailsHeaderMenu({
card,
cardID,
cardholder,
displayName,
customCardNames,
expensifyIcons,
isCSVImportedPersonalCard,
Expand All @@ -54,21 +52,11 @@ function PersonalCardDetailsHeaderMenu({
}: PersonalCardDetailsHeaderMenuProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
const icons = useMemoizedLazyExpensifyIcons(['Hourglass', 'Trashcan']);
const icons = useMemoizedLazyExpensifyIcons(['Trashcan']);
const isLoadingLastUpdatedReasonAttributes: SkeletonSpanReasonAttributes = {context: 'PersonalCardDetailsHeaderMenu', isLoadingLastUpdated: !!card?.isLoadingLastUpdated};

return (
<>
{!cardholder?.validated && (
<MenuItem
icon={icons.Hourglass}
iconStyles={styles.mln2}
description={translate('workspace.expensifyCard.cardPending', {name: displayName})}
numberOfLinesDescription={0}
interactive={false}
/>
)}

<OfflineWithFeedback
pendingAction={card?.nameValuePairs?.pendingFields?.cardTitle}
errorRowStyles={[styles.ph5, styles.mb3]}
Expand Down
3 changes: 0 additions & 3 deletions src/pages/settings/Wallet/PersonalCardDetailsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {getCardFeedIcon, isCardConnectionBroken, isPersonalCard} from '@libs/Car
import {getLatestErrorField} from '@libs/ErrorUtils';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
import {getDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
import Navigation from '@navigation/Navigation';
import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
import variables from '@styles/variables';
Expand Down Expand Up @@ -58,7 +57,6 @@ function PersonalCardDetailsPage({route}: PersonalCardDetailsPageProps) {
const cardBank = card?.bank ?? '';
const isCardBroken = card ? isCardConnectionBroken(card) : false;
const cardholder = personalDetails?.[card?.accountID ?? CONST.DEFAULT_NUMBER_ID];
const displayName = getDisplayNameOrDefault(cardholder);
const isUserPersonalCard = !!(card && isPersonalCard(card));
const reimbursableSetting = card?.reimbursable ?? true;
const isCSVImportedPersonalCard = !!(isUserPersonalCard && card && (card.bank === CONST.COMPANY_CARD.FEED_BANK_NAME.UPLOAD || card.bank.includes(CONST.COMPANY_CARD.FEED_BANK_NAME.CSV)));
Expand Down Expand Up @@ -162,7 +160,6 @@ function PersonalCardDetailsPage({route}: PersonalCardDetailsPageProps) {
card={card}
cardID={cardID}
cardholder={cardholder}
displayName={displayName}
customCardNames={customCardNames}
expensifyIcons={expensifyIcons}
isCSVImportedPersonalCard={isCSVImportedPersonalCard}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
import usePolicy from '@hooks/usePolicy';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeIllustrations from '@hooks/useThemeIllustrations';
import useThemeStyles from '@hooks/useThemeStyles';
import {isUsingStagingApi} from '@libs/ApiUtils';
Expand Down Expand Up @@ -55,10 +54,9 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag

const {translate, getLocalDateFromDatetime} = useLocalize();
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
const illustrations = useThemeIllustrations();
const companyCardFeedIcons = useCompanyCardFeedIcons();
const expensifyIcons = useMemoizedLazyExpensifyIcons(['FallbackAvatar', 'Hourglass', 'MoneySearch', 'RemoveMembers', 'Sync', 'Trashcan']);
const expensifyIcons = useMemoizedLazyExpensifyIcons(['FallbackAvatar', 'MoneySearch', 'RemoveMembers', 'Sync', 'Trashcan']);
const {isOffline} = useNetwork();
const {showConfirmModal} = useConfirmModal();

Expand Down Expand Up @@ -156,17 +154,6 @@ function WorkspaceCompanyCardDetailsPage({route}: WorkspaceCompanyCardDetailsPag
/>
)}
</View>
{!cardholder?.validated && (
<MenuItem
icon={expensifyIcons.Hourglass}
iconStyles={styles.mln2}
descriptionTextStyle={StyleUtils.combineStyles([styles.textLabelSupporting, styles.ml0, StyleUtils.getLineHeightStyle(variables.fontSizeNormal)])}
description={translate('workspace.expensifyCard.cardPending', {name: displayName})}
numberOfLinesDescription={0}
interactive={false}
/>
)}

<MenuItem
label={translate('workspace.moreFeatures.companyCards.cardholder')}
title={displayName}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
const [isFreezeModalVisible, setIsFreezeModalVisible] = useState(false);
const [isUnfreezeModalVisible, setIsUnfreezeModalVisible] = useState(false);
const {translate} = useLocalize();
const expensifyIcons = useMemoizedLazyExpensifyIcons(['FallbackAvatar', 'FreezeCard', 'Hourglass', 'MoneySearch', 'Trashcan', 'CreditCardLock']);
const expensifyIcons = useMemoizedLazyExpensifyIcons(['FallbackAvatar', 'FreezeCard', 'MoneySearch', 'Trashcan', 'CreditCardLock']);
const illustrations = useMemoizedLazyIllustrations(['ExpensifyCardImage']);
// We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to use the correct modal type for the decision modal
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
Expand Down Expand Up @@ -259,17 +259,6 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
<View style={[styles.walletCard, styles.mb3]}>{workspaceCardImage}</View>
)}

{!cardholder?.validated && (
<MenuItem
icon={expensifyIcons.Hourglass}
iconStyles={styles.mln2}
descriptionTextStyle={StyleUtils.combineStyles([styles.textLabelSupporting, styles.ml0, StyleUtils.getLineHeightStyle(variables.fontSizeNormal)])}
description={translate('workspace.expensifyCard.cardPending', {name: displayName})}
numberOfLinesDescription={0}
interactive={false}
/>
)}

<MenuItem
label={translate('workspace.card.issueNewCard.cardholder')}
title={displayName}
Expand Down
Loading