Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
db419f4
refactor split phrase hasCurrencyError
PiyushChandra17 Jun 13, 2025
97aa1ac
Merge branch 'main' of https://github.com/Expensify/App into PiyushCh…
PiyushChandra17 Jun 13, 2025
87e815b
Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…
PiyushChandra17 Jun 13, 2025
1816184
added RenderHTML
PiyushChandra17 Jun 14, 2025
7ffe1db
Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…
PiyushChandra17 Jun 14, 2025
ab2f21f
Merge branch 'PiyushChandra17/refactor/splitphrase/hasCurrencyError' …
PiyushChandra17 Jun 14, 2025
1d82d0a
Fix parsing url
PiyushChandra17 Jun 14, 2025
4c5ad03
Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…
PiyushChandra17 Jun 18, 2025
2cf7918
updated translations in all languages
PiyushChandra17 Jun 18, 2025
fb843a5
Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…
PiyushChandra17 Jun 19, 2025
c8d1f6f
added workspaceInitialRoute
PiyushChandra17 Jun 19, 2025
1680f27
updated translations in all languages
PiyushChandra17 Jun 19, 2025
a0f2e8e
Merge branch 'main' into PiyushChandra17/refactor/splitphrase/hasCurr…
PiyushChandra17 Jun 20, 2025
83f2106
added workspaceRoute
PiyushChandra17 Jun 20, 2025
3d98b86
added the check hasUnsupportedCurrency
PiyushChandra17 Jun 20, 2025
ee8dd3f
Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…
PiyushChandra17 Jun 20, 2025
01850ff
hasCurrencyError splitphrase up-to-date
PiyushChandra17 Jun 20, 2025
524589e
Merge branch 'main' into PiyushChandra17/refactor/splitphrase/hasCurr…
PiyushChandra17 Jun 24, 2025
7aafcb5
Merge branch 'main' into PiyushChandra17/refactor/splitphrase/hasCurr…
PiyushChandra17 Jun 25, 2025
67cd724
Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…
PiyushChandra17 Jun 25, 2025
76d2d99
Merge branch 'main' into PiyushChandra17/refactor/splitphrase/hasCurr…
PiyushChandra17 Jun 25, 2025
71599bb
Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…
PiyushChandra17 Jun 26, 2025
ceae223
Fix prettier
PiyushChandra17 Jun 26, 2025
bf36189
removed TextLink
PiyushChandra17 Jun 26, 2025
679c790
remove changes from package-lock.json
PiyushChandra17 Jun 26, 2025
753352b
removed changes from package-lock.json
PiyushChandra17 Jun 26, 2025
e71d793
Merge branch 'Expensify:main' into PiyushChandra17/refactor/splitphra…
PiyushChandra17 Jun 26, 2025
7a3b763
Merge branch 'main' into PiyushChandra17/refactor/splitphrase/hasCurr…
PiyushChandra17 Jul 1, 2025
3da194c
Fix merge conflicts
PiyushChandra17 Jul 1, 2025
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
8 changes: 3 additions & 5 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ import type {
WorkspaceLockedPlanTypeParams,
WorkspaceMemberList,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
WorkspaceRouteParams,
WorkspaceYouMayJoin,
YourPlanPriceParams,
YourPlanPriceValueParams,
Expand Down Expand Up @@ -2625,11 +2626,8 @@ const translations = {
hasPhoneLoginError: ({contactMethodRoute}: ContactMethodParams) =>
`Um ein Bankkonto zu verbinden, bitte <a href="${contactMethodRoute}">Fügen Sie eine E-Mail als Ihren primären Login hinzu</a> und versuchen Sie es erneut. Sie können Ihre Telefonnummer als sekundären Login hinzufügen.`,
hasBeenThrottledError: 'Beim Hinzufügen Ihres Bankkontos ist ein Fehler aufgetreten. Bitte warten Sie ein paar Minuten und versuchen Sie es erneut.',
hasCurrencyError: {
phrase1: 'Ups! Es scheint, dass die Währung Ihres Arbeitsbereichs auf eine andere Währung als USD eingestellt ist. Um fortzufahren, gehen Sie bitte zu',
link: 'Ihre Arbeitsbereichseinstellungen',
phrase2: 'um es auf USD zu setzen und es erneut zu versuchen.',
},
hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) =>
`Ups! Es scheint, dass die Währung Ihres Arbeitsbereichs auf eine andere Währung als USD eingestellt ist. Um fortzufahren, gehen Sie bitte zu <a href="${workspaceRoute}">Ihre Arbeitsbereichseinstellungen</a> um es auf USD zu setzen und es erneut zu versuchen.`,
error: {
youNeedToSelectAnOption: 'Bitte wählen Sie eine Option, um fortzufahren.',
noBankAccountAvailable: 'Entschuldigung, es ist kein Bankkonto verfügbar.',
Expand Down
8 changes: 3 additions & 5 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ import type {
WorkspaceLockedPlanTypeParams,
WorkspaceMemberList,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
WorkspaceRouteParams,
WorkspaceYouMayJoin,
YourPlanPriceParams,
YourPlanPriceValueParams,
Expand Down Expand Up @@ -2621,11 +2622,8 @@ const translations = {
hasPhoneLoginError: ({contactMethodRoute}: ContactMethodParams) =>
`To connect a bank account, please <a href="${contactMethodRoute}">add an email as your primary login</a> and try again. You can add your phone number as a secondary login.`,
hasBeenThrottledError: 'An error occurred while adding your bank account. Please wait a few minutes and try again.',
hasCurrencyError: {
phrase1: 'Oops! It appears that your workspace currency is set to a different currency than USD. To proceed, please go to ',
link: 'your workspace settings',
phrase2: ' to set it to USD and try again.',
},
hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) =>
`Oops! It appears that your workspace currency is set to a different currency than USD. To proceed, please go to <a href="${workspaceRoute}">your workspace settings</a> to set it to USD and try again.`,
error: {
youNeedToSelectAnOption: 'Please select an option to proceed',
noBankAccountAvailable: "Sorry, there's no bank account available",
Expand Down
8 changes: 3 additions & 5 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ import type {
WorkspaceLockedPlanTypeParams,
WorkspaceMemberList,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
WorkspaceRouteParams,
WorkspaceYouMayJoin,
YourPlanPriceParams,
YourPlanPriceValueParams,
Expand Down Expand Up @@ -2609,11 +2610,8 @@ const translations = {
hasPhoneLoginError: ({contactMethodRoute}: ContactMethodParams) =>
`Para añadir una cuenta bancaria verificada, <a href="${contactMethodRoute}">asegúrate de que tu nombre de usuario principal sea un correo electrónico válido</a> y vuelve a intentarlo. Puedes añadir tu número de teléfono como nombre de usuario secundario.`,
hasBeenThrottledError: 'Se ha producido un error al intentar añadir tu cuenta bancaria. Por favor, espera unos minutos e inténtalo de nuevo.',
hasCurrencyError: {
phrase1: '¡Ups! Parece que la moneda de tu espacio de trabajo no está configurada en USD. Para continuar, ve a ',
link: 'la configuración del área de trabajo',
phrase2: ', configúrala en USD e inténtalo nuevamente.',
},
hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) =>
`¡Ups! Parece que la moneda de tu espacio de trabajo no está configurada en USD. Para continuar, ve a <a href="${workspaceRoute}">la configuración del área de trabajo</a>, configúrala en USD e inténtalo nuevamente.`,
error: {
youNeedToSelectAnOption: 'Debes seleccionar una opción para continuar',
noBankAccountAvailable: 'Lo sentimos, no hay ninguna cuenta bancaria disponible',
Expand Down
8 changes: 3 additions & 5 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ import type {
WorkspaceLockedPlanTypeParams,
WorkspaceMemberList,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
WorkspaceRouteParams,
WorkspaceYouMayJoin,
YourPlanPriceParams,
YourPlanPriceValueParams,
Expand Down Expand Up @@ -2625,11 +2626,8 @@ const translations = {
hasPhoneLoginError: ({contactMethodRoute}: ContactMethodParams) =>
`Pour connecter un compte bancaire, veuillez <a href="${contactMethodRoute}">ajoutez un e-mail comme identifiant principal</a> et réessayez. Vous pouvez ajouter votre numéro de téléphone comme connexion secondaire.`,
hasBeenThrottledError: "Une erreur s'est produite lors de l'ajout de votre compte bancaire. Veuillez attendre quelques minutes et réessayer.",
hasCurrencyError: {
phrase1: "Oups ! Il semble que la devise de votre espace de travail soit différente de l'USD. Pour continuer, veuillez aller sur",
link: "vos paramètres d'espace de travail",
phrase2: 'pour le régler sur USD et réessayer.',
},
hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) =>
`Oups ! Il semble que la devise de votre espace de travail soit différente de l'USD. Pour continuer, veuillez aller sur <a href="${workspaceRoute}">vos paramètres d'espace de travail</a> pour le régler sur USD et réessayer.`,
error: {
youNeedToSelectAnOption: 'Veuillez sélectionner une option pour continuer',
noBankAccountAvailable: "Désolé, aucun compte bancaire n'est disponible.",
Expand Down
8 changes: 3 additions & 5 deletions src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ import type {
WorkspaceLockedPlanTypeParams,
WorkspaceMemberList,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
WorkspaceRouteParams,
WorkspaceYouMayJoin,
YourPlanPriceParams,
YourPlanPriceValueParams,
Expand Down Expand Up @@ -2636,11 +2637,8 @@ const translations = {
hasPhoneLoginError: ({contactMethodRoute}: ContactMethodParams) =>
`Per collegare un conto bancario, per favore <a href="${contactMethodRoute}">aggiungi un'email come login principale</a> e riprova. Puoi aggiungere il tuo numero di telefono come login secondario.`,
hasBeenThrottledError: "Si è verificato un errore durante l'aggiunta del tuo conto bancario. Attendi qualche minuto e riprova.",
hasCurrencyError: {
phrase1: 'Ops! Sembra che la valuta del tuo spazio di lavoro sia impostata su una valuta diversa da USD. Per procedere, vai a',
link: 'le impostazioni del tuo spazio di lavoro',
phrase2: 'impostarlo su USD e riprovare.',
},
hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) =>
`Ops! Sembra che la valuta del tuo spazio di lavoro sia impostata su una valuta diversa da USD. Per procedere, vai a <a href="${workspaceRoute}">le impostazioni del tuo spazio di lavoro</a> impostarlo su USD e riprovare.`,
error: {
youNeedToSelectAnOption: "Seleziona un'opzione per procedere",
noBankAccountAvailable: 'Spiacente, non è disponibile alcun conto bancario.',
Expand Down
8 changes: 3 additions & 5 deletions src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ import type {
WorkspaceLockedPlanTypeParams,
WorkspaceMemberList,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
WorkspaceRouteParams,
WorkspaceYouMayJoin,
YourPlanPriceParams,
YourPlanPriceValueParams,
Expand Down Expand Up @@ -2644,11 +2645,8 @@ const translations = {
hasPhoneLoginError: ({contactMethodRoute}: ContactMethodParams) =>
`銀行口座を接続するには、お願いします <a href="${contactMethodRoute}">メールをプライマリーログインとして追加する</a> もう一度試してください。電話番号をセカンダリログインとして追加できます。`,
hasBeenThrottledError: '銀行口座の追加中にエラーが発生しました。数分待ってから再試行してください。',
hasCurrencyError: {
phrase1: 'おっと!ワークスペースの通貨がUSDとは異なる通貨に設定されているようです。続行するには、こちらにアクセスしてください。',
link: 'ワークスペースの設定',
phrase2: 'USDに設定して、もう一度お試しください。',
},
hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) =>
`おっと!ワークスペースの通貨がUSDとは異なる通貨に設定されているようです。続行するには、こちらにアクセスしてください。<a href="${workspaceRoute}">ワークスペースの設定</a> USDに設定して、もう一度お試しください。`,
error: {
youNeedToSelectAnOption: 'オプションを選択してください',
noBankAccountAvailable: '申し訳ありませんが、利用可能な銀行口座がありません。',
Expand Down
8 changes: 3 additions & 5 deletions src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ import type {
WorkspaceLockedPlanTypeParams,
WorkspaceMemberList,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
WorkspaceRouteParams,
WorkspaceYouMayJoin,
YourPlanPriceParams,
YourPlanPriceValueParams,
Expand Down Expand Up @@ -2644,11 +2645,8 @@ const translations = {
hasPhoneLoginError: ({contactMethodRoute}: ContactMethodParams) =>
`Om een bankrekening te koppelen, graag <a href="${contactMethodRoute}">voeg een e-mail toe als je primaire login</a> en probeer het opnieuw. U kunt uw telefoonnummer toevoegen als secundaire login.`,
hasBeenThrottledError: 'Er is een fout opgetreden bij het toevoegen van uw bankrekening. Wacht een paar minuten en probeer het opnieuw.',
hasCurrencyError: {
phrase1: 'Oeps! Het lijkt erop dat de valuta van uw werkruimte is ingesteld op een andere valuta dan USD. Om verder te gaan, ga naar',
link: 'uw werkruimte-instellingen',
phrase2: 'om het in te stellen op USD en het opnieuw te proberen.',
},
hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) =>
`Oeps! Het lijkt erop dat de valuta van uw werkruimte is ingesteld op een andere valuta dan USD. Om verder te gaan, ga naar <a href="${workspaceRoute}">uw werkruimte-instellingen</a> om het in te stellen op USD en het opnieuw te proberen.`,
error: {
youNeedToSelectAnOption: 'Selecteer een optie om verder te gaan.',
noBankAccountAvailable: 'Sorry, er is geen bankrekening beschikbaar',
Expand Down
5 changes: 5 additions & 0 deletions src/languages/params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ type SettleExpensifyCardParams = {
formattedAmount: string;
};

type WorkspaceRouteParams = {
workspaceRoute: string;
};

type RequestAmountParams = {amount: string};

type RequestedAmountMessageParams = {formattedAmount: string; comment?: string};
Expand Down Expand Up @@ -1054,5 +1058,6 @@ export type {
AirlineParams,
RailTicketParams,
TravelTypeParams,
WorkspaceRouteParams,
BusinessTaxIDParams,
};
8 changes: 3 additions & 5 deletions src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ import type {
WorkspaceLockedPlanTypeParams,
WorkspaceMemberList,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
WorkspaceRouteParams,
WorkspaceYouMayJoin,
YourPlanPriceParams,
YourPlanPriceValueParams,
Expand Down Expand Up @@ -2638,11 +2639,8 @@ const translations = {
hasPhoneLoginError: ({contactMethodRoute}: ContactMethodParams) =>
`Aby połączyć konto bankowe, proszę <a href="${contactMethodRoute}">dodaj e-mail jako swoje główne dane logowania</a> i spróbuj ponownie. Możesz dodać swój numer telefonu jako dodatkowy login.`,
hasBeenThrottledError: 'Wystąpił błąd podczas dodawania Twojego konta bankowego. Proszę poczekać kilka minut i spróbować ponownie.',
hasCurrencyError: {
phrase1: 'Ups! Wygląda na to, że waluta Twojego miejsca pracy jest ustawiona na inną niż USD. Aby kontynuować, przejdź do',
link: 'ustawienia Twojego miejsca pracy',
phrase2: 'ustawić na USD i spróbować ponownie.',
},
hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) =>
`Ups! Wygląda na to, że waluta Twojego miejsca pracy jest ustawiona na inną niż USD. Aby kontynuować, przejdź do <a href="${workspaceRoute}">ustawienia Twojego miejsca pracy</a> ustawić na USD i spróbować ponownie.`,
error: {
youNeedToSelectAnOption: 'Proszę wybrać opcję, aby kontynuować',
noBankAccountAvailable: 'Przepraszamy, nie ma dostępnego konta bankowego.',
Expand Down
8 changes: 3 additions & 5 deletions src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ import type {
WorkspaceLockedPlanTypeParams,
WorkspaceMemberList,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
WorkspaceRouteParams,
WorkspaceYouMayJoin,
YourPlanPriceParams,
YourPlanPriceValueParams,
Expand Down Expand Up @@ -2641,11 +2642,8 @@ const translations = {
hasPhoneLoginError: ({contactMethodRoute}: ContactMethodParams) =>
`Para conectar uma conta bancária, por favor <a href="${contactMethodRoute}">adicione um e-mail como seu login principal</a> e tente novamente. Você pode adicionar seu número de telefone como um login secundário.`,
hasBeenThrottledError: 'Ocorreu um erro ao adicionar sua conta bancária. Por favor, aguarde alguns minutos e tente novamente.',
hasCurrencyError: {
phrase1: 'Ops! Parece que a moeda do seu espaço de trabalho está definida para uma moeda diferente de USD. Para continuar, por favor vá para',
link: 'suas configurações de espaço de trabalho',
phrase2: 'para definir para USD e tentar novamente.',
},
hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) =>
`Ops! Parece que a moeda do seu espaço de trabalho está definida para uma moeda diferente de USD. Para continuar, por favor vá para <a href="${workspaceRoute}">suas configurações de espaço de trabalho</a> para definir para USD e tentar novamente.`,
error: {
youNeedToSelectAnOption: 'Por favor, selecione uma opção para continuar',
noBankAccountAvailable: 'Desculpe, não há nenhuma conta bancária disponível.',
Expand Down
8 changes: 3 additions & 5 deletions src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ import type {
WorkspaceLockedPlanTypeParams,
WorkspaceMemberList,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
WorkspaceRouteParams,
WorkspaceYouMayJoin,
YourPlanPriceParams,
YourPlanPriceValueParams,
Expand Down Expand Up @@ -2613,11 +2614,8 @@ const translations = {
hasPhoneLoginError: ({contactMethodRoute}: ContactMethodParams) =>
`要连接银行账户,请 <a href="${contactMethodRoute}">添加一个电子邮件作为您的主要登录方式</a> 并重试。您可以添加电话号码作为辅助登录。`,
hasBeenThrottledError: '添加您的银行账户时发生错误。请稍等几分钟后重试。',
hasCurrencyError: {
phrase1: '哎呀!您的工作区货币似乎设置为不同于 USD 的货币。要继续,请前往',
link: '您的工作区设置',
phrase2: '将其设置为美元,然后重试。',
},
hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) =>
`哎呀!您的工作区货币似乎设置为不同于 USD 的货币。要继续,请前往 <a href="${workspaceRoute}">您的工作区设置</a> 将其设置为美元,然后重试。`,
error: {
youNeedToSelectAnOption: '请选择一个选项继续',
noBankAccountAvailable: '抱歉,没有可用的银行账户。',
Expand Down
20 changes: 6 additions & 14 deletions src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import ReimbursementAccountLoadingIndicator from '@components/ReimbursementAccou
import RenderHTML from '@components/RenderHTML';
import ScreenWrapper from '@components/ScreenWrapper';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useBeforeRemove from '@hooks/useBeforeRemove';
import useEnvironment from '@hooks/useEnvironment';
import useLocalize from '@hooks/useLocalize';
Expand Down Expand Up @@ -87,6 +86,11 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen
// shouldUseNarrowLayout cannot be used here because this page is displayed in a RHP
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
const {isSmallScreenWidth} = useResponsiveLayout();

const workspaceRoute = isSmallScreenWidth
? `${environmentURL}/${ROUTES.WORKSPACE_OVERVIEW.getRoute(policyIDParam, Navigation.getActiveRoute())}`
: `${environmentURL}/${ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute())}`;

const contactMethodRoute = `${environmentURL}/${ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo)}`;

/**
Expand Down Expand Up @@ -397,19 +401,7 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen
} else if (hasUnsupportedCurrency) {
errorText = (
<Text style={styles.flexRow}>
{translate('bankAccount.hasCurrencyError.phrase1')}
<TextLink
style={styles.link}
onPress={() => {
const routeToNavigate = isSmallScreenWidth
? ROUTES.WORKSPACE_OVERVIEW.getRoute(policyIDParam, Navigation.getActiveRoute())
: ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute());
Navigation.goBack(routeToNavigate);
}}
>
{translate('bankAccount.hasCurrencyError.link')}
</TextLink>
{translate('bankAccount.hasCurrencyError.phrase2')}
<RenderHTML html={translate('bankAccount.hasCurrencyError', {workspaceRoute})} />
</Text>
);
}
Expand Down
Loading