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
4 changes: 1 addition & 3 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4808,9 +4808,7 @@ ${amount} für ${merchant} - ${date}`,
noAccountsFound: 'Keine Konten gefunden',
defaultCard: 'Standardkarte',
downgradeTitle: `Arbeitsbereich kann nicht herabgestuft werden`,
downgradeSubTitleFirstPart: `Dieser Arbeitsbereich kann nicht herabgestuft werden, da mehrere Karten-Feeds verbunden sind (außer Expensify-Karten). Bitte`,
downgradeSubTitleMiddlePart: `nur einen Karten-Feed behalten`,
downgradeSubTitleLastPart: 'fortzufahren.',
downgradeSubTitle: `Dieser Arbeitsbereich kann nicht herabgestuft werden, da mehrere Karten-Feeds verbunden sind (außer Expensify-Karten). Bitte <a href="#">nur einen Karten-Feed behalten</a> fortzufahren.`,
noAccountsFoundDescription: ({connection}: ConnectionParams) => `Bitte fügen Sie das Konto in ${connection} hinzu und synchronisieren Sie die Verbindung erneut.`,
expensifyCardBannerTitle: 'Erhalte die Expensify-Karte',
expensifyCardBannerSubtitle:
Expand Down
4 changes: 1 addition & 3 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4777,9 +4777,7 @@ const translations = {
noAccountsFound: 'No accounts found',
defaultCard: 'Default card',
downgradeTitle: `Can't downgrade workspace`,
downgradeSubTitleFirstPart: `This workspace can't be downgraded because multiple card feeds are connected (excluding Expensify Cards). Please`,
downgradeSubTitleMiddlePart: `keep only one card feed`,
downgradeSubTitleLastPart: 'to proceed.',
downgradeSubTitle: `This workspace can't be downgraded because multiple card feeds are connected (excluding Expensify Cards). Please <a href="#">keep only one card feed</a> to proceed.`,
noAccountsFoundDescription: ({connection}: ConnectionParams) => `Please add the account in ${connection} and sync the connection again`,
expensifyCardBannerTitle: 'Get the Expensify Card',
expensifyCardBannerSubtitle: 'Enjoy cash back on every US purchase, up to 50% off your Expensify bill, unlimited virtual cards, and so much more.',
Expand Down
4 changes: 1 addition & 3 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4792,9 +4792,7 @@ ${amount} para ${merchant} - ${date}`,
noAccountsFound: 'No se han encontrado cuentas',
defaultCard: 'Tarjeta predeterminada',
downgradeTitle: 'No se puede degradar el espacio de trabajo',
downgradeSubTitleFirstPart: `No es posible cambiar a una versión inferior de este espacio de trabajo porque hay varias fuentes de tarjetas conectadas (excluidas las tarjetas Expensify). Por favor`,
downgradeSubTitleMiddlePart: 'mantenga solo una tarjeta',
downgradeSubTitleLastPart: 'para continuar.',
downgradeSubTitle: `No es posible cambiar a una versión inferior de este espacio de trabajo porque hay varias fuentes de tarjetas conectadas (excluidas las tarjetas Expensify). Por favor <a href="#">mantenga solo una tarjeta</a> para continuar.`,
noAccountsFoundDescription: ({connection}: ConnectionParams) => `Añade la cuenta en ${connection} y sincroniza la conexión de nuevo`,
expensifyCardBannerTitle: 'Obtén la Tarjeta Expensify',
expensifyCardBannerSubtitle:
Expand Down
4 changes: 1 addition & 3 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4815,9 +4815,7 @@ ${amount} pour ${merchant} - ${date}`,
noAccountsFound: 'Aucun compte trouvé',
defaultCard: 'Carte par défaut',
downgradeTitle: `Impossible de rétrograder l'espace de travail`,
downgradeSubTitleFirstPart: `Cet espace de travail ne peut pas être rétrogradé car plusieurs flux de cartes sont connectés (à l'exclusion des cartes Expensify). Veuillez`,
downgradeSubTitleMiddlePart: `garder uniquement un flux de cartes`,
downgradeSubTitleLastPart: 'pour continuer.',
downgradeSubTitle: `Cet espace de travail ne peut pas être rétrogradé car plusieurs flux de cartes sont connectés (à l'exclusion des cartes Expensify). Veuillez <a href="#">garder uniquement un flux de cartes</a> pour continuer.`,
noAccountsFoundDescription: ({connection}: ConnectionParams) => `Veuillez ajouter le compte dans ${connection} et synchroniser à nouveau la connexion.`,
expensifyCardBannerTitle: 'Obtenez la carte Expensify',
expensifyCardBannerSubtitle:
Expand Down
5 changes: 2 additions & 3 deletions src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4819,9 +4819,8 @@ ${amount} per ${merchant} - ${date}`,
noAccountsFound: 'Nessun account trovato',
defaultCard: 'Carta predefinita',
downgradeTitle: `Impossibile effettuare il downgrade dello spazio di lavoro`,
downgradeSubTitleFirstPart: `Questo workspace non può essere declassato perché sono collegati più flussi di carte (escludendo le carte Expensify). Per favore`,
downgradeSubTitleMiddlePart: `mantieni solo un feed di carte`,
downgradeSubTitleLastPart: 'per procedere.',
downgradeSubTitle: `Questo workspace non può essere declassato perché sono collegati più flussi di carte (escludendo le carte Expensify). Per favore <a href="#">mantieni solo un feed di carte</a> per procedere.`,

noAccountsFoundDescription: ({connection}: ConnectionParams) => `Per favore, aggiungi l'account in ${connection} e sincronizza nuovamente la connessione.`,
expensifyCardBannerTitle: 'Ottieni la Expensify Card',
expensifyCardBannerSubtitle:
Expand Down
5 changes: 2 additions & 3 deletions src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4777,9 +4777,8 @@ ${date} - ${merchant}に${amount}`,
noAccountsFound: 'アカウントが見つかりません',
defaultCard: 'デフォルトカード',
downgradeTitle: `ワークスペースをダウングレードできません`,
downgradeSubTitleFirstPart: `このワークスペースは、複数のカードフィードが接続されているため(Expensifyカードを除く)、ダウングレードできません。どうぞ`,
downgradeSubTitleMiddlePart: `カードフィードを1つだけ保持`,
downgradeSubTitleLastPart: '続行する。',
downgradeSubTitle: `このワークスペースは、複数のカードフィードが接続されているため(Expensifyカードを除く)、ダウングレードできません。どうぞ <a href="#">カードフィードを1つだけ保持</a> 続行する。`,

noAccountsFoundDescription: ({connection}: ConnectionParams) => `${connection}にアカウントを追加し、再度接続を同期してください。`,
expensifyCardBannerTitle: 'Expensifyカードを取得する',
expensifyCardBannerSubtitle: 'すべての米国での購入でキャッシュバックを楽しみ、Expensifyの請求書が最大50%オフ、無制限のバーチャルカードなど、さらに多くの特典があります。',
Expand Down
5 changes: 2 additions & 3 deletions src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4814,9 +4814,8 @@ ${amount} voor ${merchant} - ${date}`,
noAccountsFound: 'Geen accounts gevonden',
defaultCard: 'Standaardkaart',
downgradeTitle: `Kan werkruimte niet downgraden`,
downgradeSubTitleFirstPart: `Deze werkruimte kan niet worden gedowngraded omdat er meerdere kaartfeeds zijn verbonden (met uitzondering van Expensify Cards). Alstublieft`,
downgradeSubTitleMiddlePart: `houd slechts één kaartfeed`,
downgradeSubTitleLastPart: 'om door te gaan.',
downgradeSubTitle: `Deze werkruimte kan niet worden gedowngraded omdat er meerdere kaartfeeds zijn verbonden (met uitzondering van Expensify Cards). Alstublieft <a href="#">houd slechts één kaartfeed</a> om door te gaan.`,

noAccountsFoundDescription: ({connection}: ConnectionParams) => `Voeg het account toe in ${connection} en synchroniseer de verbinding opnieuw.`,
expensifyCardBannerTitle: 'Verkrijg de Expensify Card',
expensifyCardBannerSubtitle: 'Geniet van cashback op elke aankoop in de VS, tot 50% korting op je Expensify-rekening, onbeperkte virtuele kaarten en nog veel meer.',
Expand Down
5 changes: 2 additions & 3 deletions src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4803,9 +4803,8 @@ ${amount} dla ${merchant} - ${date}`,
noAccountsFound: 'Nie znaleziono kont',
defaultCard: 'Domyślna karta',
downgradeTitle: `Nie można obniżyć poziomu workspace.`,
downgradeSubTitleFirstPart: `Tego miejsca pracy nie można obniżyć, ponieważ jest połączonych wiele kanałów kart (z wyłączeniem kart Expensify). Proszę`,
downgradeSubTitleMiddlePart: `zachowaj tylko jeden kanał kart`,
downgradeSubTitleLastPart: 'aby kontynuować.',
downgradeSubTitle: `Tego miejsca pracy nie można obniżyć, ponieważ jest połączonych wiele kanałów kart (z wyłączeniem kart Expensify). Proszę <a href="#">zachowaj tylko jeden kanał kart</a> aby kontynuować.`,

noAccountsFoundDescription: ({connection}: ConnectionParams) => `Proszę dodać konto w ${connection} i ponownie zsynchronizować połączenie.`,
expensifyCardBannerTitle: 'Zdobądź kartę Expensify',
expensifyCardBannerSubtitle:
Expand Down
5 changes: 2 additions & 3 deletions src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4804,9 +4804,8 @@ ${amount} para ${merchant} - ${date}`,
noAccountsFound: 'Nenhuma conta encontrada',
defaultCard: 'Cartão padrão',
downgradeTitle: `Não é possível rebaixar o espaço de trabalho`,
downgradeSubTitleFirstPart: `Este espaço de trabalho não pode ser rebaixado porque vários feeds de cartão estão conectados (excluindo os Cartões Expensify). Por favor,`,
downgradeSubTitleMiddlePart: `manter apenas um feed de cartão`,
downgradeSubTitleLastPart: 'para prosseguir.',
downgradeSubTitle: `Este espaço de trabalho não pode ser rebaixado porque vários feeds de cartão estão conectados (excluindo os Cartões Expensify). Por favor, <a href="#">manter apenas um feed de cartão</a> para prosseguir.`,

noAccountsFoundDescription: ({connection}: ConnectionParams) => `Por favor, adicione a conta em ${connection} e sincronize a conexão novamente.`,
expensifyCardBannerTitle: 'Obtenha o Cartão Expensify',
expensifyCardBannerSubtitle: 'Aproveite o cashback em todas as compras nos EUA, até 50% de desconto na sua fatura do Expensify, cartões virtuais ilimitados e muito mais.',
Expand Down
5 changes: 2 additions & 3 deletions src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4714,9 +4714,8 @@ ${merchant}的${amount} - ${date}`,
noAccountsFound: '未找到账户',
defaultCard: '默认卡片',
downgradeTitle: `无法降级工作区`,
downgradeSubTitleFirstPart: `由于连接了多个卡片馈送(不包括Expensify卡),此工作区无法降级。请`,
downgradeSubTitleMiddlePart: `仅保留一个卡片信息流`,
downgradeSubTitleLastPart: '继续。',
downgradeSubTitle: `由于连接了多个卡片馈送(不包括Expensify卡),此工作区无法降级。请 <a href="#">仅保留一个卡片信息流</a> 继续。`,

noAccountsFoundDescription: ({connection}: ConnectionParams) => `请在${connection}中添加账户并再次同步连接。`,
expensifyCardBannerTitle: '获取Expensify卡',
expensifyCardBannerSubtitle: '享受每笔美国消费的现金返还,Expensify账单最高可享50%折扣,无限虚拟卡等更多优惠。',
Expand Down
25 changes: 12 additions & 13 deletions src/pages/workspace/downgrade/WorkspaceDowngradePage.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React, {useMemo, useState} from 'react';
import {InteractionManager} from 'react-native';
import {InteractionManager, View} from 'react-native';
import ConfirmModal from '@components/ConfirmModal';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import RenderHTML from '@components/RenderHTML';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useCardFeeds from '@hooks/useCardFeeds';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
Expand Down Expand Up @@ -59,6 +58,8 @@ function WorkspaceDowngradePage({route}: WorkspaceDowngradePageProps) {
Navigation.dismissModal();
Navigation.isNavigationReady().then(() => {
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(targetPolicyID));

// eslint-disable-next-line @typescript-eslint/no-deprecated
InteractionManager.runAfterInteractions(() => {
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_SELECT_FEED.getRoute(targetPolicyID));
});
Expand All @@ -71,6 +72,8 @@ function WorkspaceDowngradePage({route}: WorkspaceDowngradePageProps) {
}

setIsDowngradeWarningModalOpen(false);

// eslint-disable-next-line @typescript-eslint/no-deprecated
InteractionManager.runAfterInteractions(() => dismissModalAndNavigate(policyID));
};

Expand Down Expand Up @@ -121,16 +124,12 @@ function WorkspaceDowngradePage({route}: WorkspaceDowngradePageProps) {
shouldShowCancelButton={false}
onCancel={onClose}
prompt={
<Text>
{translate('workspace.moreFeatures.companyCards.downgradeSubTitleFirstPart')}{' '}
<TextLink
style={styles.link}
onPress={onMoveToCompanyCardFeeds}
>
{translate('workspace.moreFeatures.companyCards.downgradeSubTitleMiddlePart')}
</TextLink>{' '}
{translate('workspace.moreFeatures.companyCards.downgradeSubTitleLastPart')}
</Text>
<View style={styles.flexRow}>

@situchan situchan Oct 26, 2025 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed styles.renderHTML was added to View wrapper of RenderHTML in all other translation migrations.
Do you know exactly what it is for? What issue without that style?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the stylesheet is defined as:

        renderHTML: {
            maxWidth: '100%',
            ...whiteSpace.preWrap,
            ...wordBreak.breakWord,
        },

So i think the idea here was to never overflow the text out of screen, but i think this won't happen here since we already wrap it inside a view, wdyt?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tested latest changes on all platforms? I don't see you updated video recordings

<RenderHTML
html={translate('workspace.moreFeatures.companyCards.downgradeSubTitle')}
onLinkPress={onMoveToCompanyCardFeeds}
/>
</View>
}
confirmText={translate('common.buttonConfirm')}
/>
Expand Down