From db419f4549d396bb648bc1a0b56d16201a126ff5 Mon Sep 17 00:00:00 2001 From: Piyush Date: Fri, 13 Jun 2025 11:09:56 +0530 Subject: [PATCH 01/13] refactor split phrase hasCurrencyError --- src/languages/en.ts | 7 +-- src/languages/es.ts | 7 +-- .../ReimbursementAccountPage.tsx | 46 +++++++++++++------ 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 05f99434cfae..37ffd5e65a5e 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -2380,11 +2380,8 @@ const translations = { phrase2: ' 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: + 'Oops! It appears that your workspace currency is set to a different currency than USD. To proceed, please go to your workspace settings to set it to USD and try again.', error: { youNeedToSelectAnOption: 'Please select an option to proceed', noBankAccountAvailable: "Sorry, there's no bank account available", diff --git a/src/languages/es.ts b/src/languages/es.ts index 27e5f0874eed..1214bcd13c10 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -2400,11 +2400,8 @@ const translations = { phrase2: ' 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: + '¡Ups! Parece que la moneda de tu espacio de trabajo no está configurada en USD. Para continuar, ve a la configuración del área de trabajo, 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', diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index f0d59e110851..7319dc9e508d 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -3,6 +3,8 @@ import lodashPick from 'lodash/pick'; import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {View} from 'react-native'; import {useOnyx} from 'react-native-onyx'; +import RenderHtml, {defaultSystemFonts} from 'react-native-render-html'; +import type {CustomBlockRenderer} from 'react-native-render-html'; import type {TupleToUnion} from 'type-fest'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; @@ -19,6 +21,7 @@ import usePermissions from '@hooks/usePermissions'; import usePrevious from '@hooks/usePrevious'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; +import useWindowDimensions from '@hooks/useWindowDimensions'; import BankAccount from '@libs/models/BankAccount'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; @@ -73,6 +76,8 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen const backTo = route.params.backTo; const styles = useThemeStyles(); const {translate} = useLocalize(); + const {windowWidth} = useWindowDimensions(); + const systemFonts = [...defaultSystemFonts, 'CustomFontName']; const {isOffline} = useNetwork(); const requestorStepRef = useRef(null); const prevReimbursementAccount = usePrevious(reimbursementAccount); @@ -399,21 +404,32 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen errorText = translate('bankAccount.hasBeenThrottledError'); } else if (hasUnsupportedCurrency) { errorText = ( - - {translate('bankAccount.hasCurrencyError.phrase1')} - { - const routeToNavigate = isSmallScreenWidth - ? ROUTES.WORKSPACE_OVERVIEW.getRoute(policyIDParam, Navigation.getActiveRoute()) - : ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute()); - Navigation.goBack(routeToNavigate); - }} - > - {translate('bankAccount.hasCurrencyError.link')} - - {translate('bankAccount.hasCurrencyError.phrase2')} - + ( + { + const routeToNavigate = isSmallScreenWidth + ? ROUTES.WORKSPACE_OVERVIEW.getRoute(policyIDParam, Navigation.getActiveRoute()) + : ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute()); + Navigation.goBack(routeToNavigate); + }} + > + {/* eslint-disable-next-line react/jsx-props-no-spreading */} + + + )) as CustomBlockRenderer, + }} + /> ); } From 18161844dfa142b3f246d69446008324f1c1463b Mon Sep 17 00:00:00 2001 From: Piyush Date: Sat, 14 Jun 2025 16:03:12 +0530 Subject: [PATCH 02/13] added RenderHTML --- .../ReimbursementAccountPage.tsx | 45 ++++++------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index 7319dc9e508d..59492c4398bd 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -3,14 +3,13 @@ import lodashPick from 'lodash/pick'; import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {View} from 'react-native'; import {useOnyx} from 'react-native-onyx'; -import RenderHtml, {defaultSystemFonts} from 'react-native-render-html'; -import type {CustomBlockRenderer} from 'react-native-render-html'; import type {TupleToUnion} from 'type-fest'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import {useSession} from '@components/OnyxProvider'; import ReimbursementAccountLoadingIndicator from '@components/ReimbursementAccountLoadingIndicator'; +import RenderHTML from '@components/RenderHTML'; import ScreenWrapper from '@components/ScreenWrapper'; import Text from '@components/Text'; import TextLink from '@components/TextLink'; @@ -21,7 +20,6 @@ import usePermissions from '@hooks/usePermissions'; import usePrevious from '@hooks/usePrevious'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; -import useWindowDimensions from '@hooks/useWindowDimensions'; import BankAccount from '@libs/models/BankAccount'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; @@ -76,8 +74,6 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen const backTo = route.params.backTo; const styles = useThemeStyles(); const {translate} = useLocalize(); - const {windowWidth} = useWindowDimensions(); - const systemFonts = [...defaultSystemFonts, 'CustomFontName']; const {isOffline} = useNetwork(); const requestorStepRef = useRef(null); const prevReimbursementAccount = usePrevious(reimbursementAccount); @@ -404,32 +400,19 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen errorText = translate('bankAccount.hasBeenThrottledError'); } else if (hasUnsupportedCurrency) { errorText = ( - ( - { - const routeToNavigate = isSmallScreenWidth - ? ROUTES.WORKSPACE_OVERVIEW.getRoute(policyIDParam, Navigation.getActiveRoute()) - : ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute()); - Navigation.goBack(routeToNavigate); - }} - > - {/* eslint-disable-next-line react/jsx-props-no-spreading */} - - - )) as CustomBlockRenderer, - }} - /> + + { + const routeToNavigate = isSmallScreenWidth + ? ROUTES.WORKSPACE_OVERVIEW.getRoute(policyIDParam, Navigation.getActiveRoute()) + : ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute()); + Navigation.goBack(routeToNavigate); + }} + > + + + ); } From 1d82d0a4a45fdc5b3465015d5055b4e6238ba92a Mon Sep 17 00:00:00 2001 From: Piyush Date: Sat, 14 Jun 2025 16:58:35 +0530 Subject: [PATCH 03/13] Fix parsing url --- .../ReimbursementAccountPage.tsx | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index 6ba619cd0cd9..367f575a1555 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -14,12 +14,14 @@ 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'; import useNetwork from '@hooks/useNetwork'; import usePermissions from '@hooks/usePermissions'; import usePrevious from '@hooks/usePrevious'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; +import getPlatform from '@libs/getPlatform'; import BankAccount from '@libs/models/BankAccount'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; @@ -59,6 +61,7 @@ type ReimbursementAccountPageProps = WithPolicyOnyxProps & PlatformStackScreenPr type CurrencyType = TupleToUnion; function ReimbursementAccountPage({route, policy, isLoadingPolicy}: ReimbursementAccountPageProps) { + const {environmentURL} = useEnvironment(); const session = useSession(); const [reimbursementAccount] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {canBeMissing: true}); const [reimbursementAccountDraft] = useOnyx(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM_DRAFT, {canBeMissing: true}); @@ -401,17 +404,26 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen } else if (hasUnsupportedCurrency) { errorText = ( - { - const routeToNavigate = isSmallScreenWidth - ? ROUTES.WORKSPACE_OVERVIEW.getRoute(policyIDParam, Navigation.getActiveRoute()) - : ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute()); - Navigation.goBack(routeToNavigate); - }} - > - - + {getPlatform() === CONST.PLATFORM.IOS || getPlatform() === CONST.PLATFORM.ANDROID || getPlatform() === CONST.PLATFORM.DESKTOP ? ( + { + const routeToNavigate = isSmallScreenWidth + ? ROUTES.WORKSPACE_OVERVIEW.getRoute(policyIDParam, Navigation.getActiveRoute()) + : ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute()); + Navigation.goBack(routeToNavigate); + }} + > + + + ) : ( + + + + )} ); } From 2cf79181ff2073d8eccb52471101621321c2ff1e Mon Sep 17 00:00:00 2001 From: Piyush Date: Wed, 18 Jun 2025 14:12:35 +0530 Subject: [PATCH 04/13] updated translations in all languages --- src/languages/de.ts | 7 ++----- src/languages/fr.ts | 7 ++----- src/languages/it.ts | 7 ++----- src/languages/ja.ts | 7 ++----- src/languages/nl.ts | 7 ++----- src/languages/pl.ts | 7 ++----- src/languages/pt-BR.ts | 7 ++----- src/languages/zh-hans.ts | 6 +----- 8 files changed, 15 insertions(+), 40 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index 653bac3d4718..364ed1dc8141 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -2414,11 +2414,8 @@ const translations = { phrase2: '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: + 'Ups! Es scheint, dass die Währung Ihres Arbeitsbereichs auf eine andere Währung als USD eingestellt ist. Um fortzufahren, gehen Sie bitte zu Ihre Arbeitsbereichseinstellungen 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.', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 0cefe1d7f5a9..2a67ef4ba7a4 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -2412,11 +2412,8 @@ const translations = { phrase2: '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: + "Oups ! Il semble que la devise de votre espace de travail soit différente de l'USD. Pour continuer, veuillez aller sur vos paramètres d'espace de travail 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.", diff --git a/src/languages/it.ts b/src/languages/it.ts index e18ee160cc5d..9bc6c4799d95 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -2398,11 +2398,8 @@ const translations = { phrase2: '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: + 'Ops! Sembra che la valuta del tuo spazio di lavoro sia impostata su una valuta diversa da USD. Per procedere, vai a le impostazioni del tuo spazio di lavoro impostarlo su USD e riprovare.', error: { youNeedToSelectAnOption: "Seleziona un'opzione per procedere", noBankAccountAvailable: 'Spiacente, non è disponibile alcun conto bancario.', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 12f47873f705..8723fbcf970b 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -2390,11 +2390,8 @@ const translations = { phrase2: 'もう一度試してください。電話番号をセカンダリログインとして追加できます。', }, hasBeenThrottledError: '銀行口座の追加中にエラーが発生しました。数分待ってから再試行してください。', - hasCurrencyError: { - phrase1: 'おっと！ワークスペースの通貨がUSDとは異なる通貨に設定されているようです。続行するには、こちらにアクセスしてください。', - link: 'ワークスペースの設定', - phrase2: 'USDに設定して、もう一度お試しください。', - }, + hasCurrencyError: + 'おっと！ワークスペースの通貨がUSDとは異なる通貨に設定されているようです。続行するには、こちらにアクセスしてください。ワークスペースの設定 USDに設定して、もう一度お試しください。', error: { youNeedToSelectAnOption: 'オプションを選択してください', noBankAccountAvailable: '申し訳ありませんが、利用可能な銀行口座がありません。', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 9c366528acd5..75a81d77e71c 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -2400,11 +2400,8 @@ const translations = { phrase2: '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: + 'Oeps! Het lijkt erop dat de valuta van uw werkruimte is ingesteld op een andere valuta dan USD. Om verder te gaan, ga naar uw werkruimte-instellingen 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', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 03d16997b7c5..c9571268c8f8 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -2394,11 +2394,8 @@ const translations = { phrase2: '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: + 'Ups! Wygląda na to, że waluta Twojego miejsca pracy jest ustawiona na inną niż USD. Aby kontynuować, przejdź do ustawienia Twojego miejsca pracy ustawić na USD i spróbować ponownie.', error: { youNeedToSelectAnOption: 'Proszę wybrać opcję, aby kontynuować', noBankAccountAvailable: 'Przepraszamy, nie ma dostępnego konta bankowego.', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 07508ead53b6..3cabcf5f0c06 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -2396,11 +2396,8 @@ const translations = { phrase2: '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: + '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 suas configurações de espaço de trabalho 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.', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index a86c38877629..66a10048a699 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -2369,11 +2369,7 @@ const translations = { phrase2: '并重试。您可以添加电话号码作为辅助登录。', }, hasBeenThrottledError: '添加您的银行账户时发生错误。请稍等几分钟后重试。', - hasCurrencyError: { - phrase1: '哎呀！您的工作区货币似乎设置为不同于 USD 的货币。要继续，请前往', - link: '您的工作区设置', - phrase2: '将其设置为美元，然后重试。', - }, + hasCurrencyError: '哎呀！您的工作区货币似乎设置为不同于 USD 的货币。要继续，请前往 您的工作区设置 将其设置为美元，然后重试。', error: { youNeedToSelectAnOption: '请选择一个选项继续', noBankAccountAvailable: '抱歉，没有可用的银行账户。', From c8d1f6fe81ccaa943a40f08b617bd3c22641adbf Mon Sep 17 00:00:00 2001 From: Piyush Date: Thu, 19 Jun 2025 11:40:02 +0530 Subject: [PATCH 05/13] added workspaceInitialRoute --- src/languages/en.ts | 5 ++-- src/languages/es.ts | 5 ++-- src/languages/params.ts | 5 ++++ .../ReimbursementAccountPage.tsx | 23 ++----------------- 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index c15b9feac2be..d719c04da807 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -255,6 +255,7 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, + WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, @@ -2375,8 +2376,8 @@ const translations = { phrase2: ' 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: - 'Oops! It appears that your workspace currency is set to a different currency than USD. To proceed, please go to your workspace settings to set it to USD and try again.', + hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => + `Oops! It appears that your workspace currency is set to a different currency than USD. To proceed, please go to your workspace settings to set it to USD and try again.`, error: { youNeedToSelectAnOption: 'Please select an option to proceed', noBankAccountAvailable: "Sorry, there's no bank account available", diff --git a/src/languages/es.ts b/src/languages/es.ts index e91734a3af41..c193c8fa5a96 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -255,6 +255,7 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, + WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, @@ -2395,8 +2396,8 @@ const translations = { phrase2: ' 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: - '¡Ups! Parece que la moneda de tu espacio de trabajo no está configurada en USD. Para continuar, ve a la configuración del área de trabajo, configúrala en USD e inténtalo nuevamente.', + hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => + `¡Ups! Parece que la moneda de tu espacio de trabajo no está configurada en USD. Para continuar, ve a la configuración del área de trabajo, 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', diff --git a/src/languages/params.ts b/src/languages/params.ts index bebce040ab00..a2c0e8881179 100644 --- a/src/languages/params.ts +++ b/src/languages/params.ts @@ -5,6 +5,10 @@ import type {DelegateRole} from '@src/types/onyx/Account'; import type {AllConnectionName, ConnectionName, PolicyConnectionSyncStage, SageIntacctMappingName} from '@src/types/onyx/Policy'; import type {ViolationDataType} from '@src/types/onyx/TransactionViolation'; +type WorkspaceInitialRouteParams = { + workspaceInitialRoute: string; +}; + type AddressLineParams = { lineNumber: number; }; @@ -768,6 +772,7 @@ type TravelTypeParams = { }; export type { + WorkspaceInitialRouteParams, SplitExpenseEditTitleParams, SplitExpenseSubtitleParams, TotalAmountGreaterOrLessThanOriginalParams, diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index 367f575a1555..862cf137b5bb 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -21,7 +21,6 @@ import usePermissions from '@hooks/usePermissions'; import usePrevious from '@hooks/usePrevious'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; -import getPlatform from '@libs/getPlatform'; import BankAccount from '@libs/models/BankAccount'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; @@ -88,6 +87,7 @@ 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 workspaceInitialRoute = `${environmentURL}/${ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute())}`; /** The SetupWithdrawalAccount flow allows us to continue the flow from various points depending on where the @@ -404,26 +404,7 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen } else if (hasUnsupportedCurrency) { errorText = ( - {getPlatform() === CONST.PLATFORM.IOS || getPlatform() === CONST.PLATFORM.ANDROID || getPlatform() === CONST.PLATFORM.DESKTOP ? ( - { - const routeToNavigate = isSmallScreenWidth - ? ROUTES.WORKSPACE_OVERVIEW.getRoute(policyIDParam, Navigation.getActiveRoute()) - : ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute()); - Navigation.goBack(routeToNavigate); - }} - > - - - ) : ( - - - - )} + ); } From 1680f271e7ce65e41d9233f278bc847b7a68394d Mon Sep 17 00:00:00 2001 From: Piyush Date: Thu, 19 Jun 2025 16:29:10 +0530 Subject: [PATCH 06/13] updated translations in all languages --- src/languages/de.ts | 5 +++-- src/languages/fr.ts | 5 +++-- src/languages/it.ts | 5 +++-- src/languages/ja.ts | 5 +++-- src/languages/nl.ts | 5 +++-- src/languages/pl.ts | 5 +++-- src/languages/pt-BR.ts | 5 +++-- src/languages/zh-hans.ts | 4 +++- 8 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index 2a33656670ed..c5158e29b7d9 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -267,6 +267,7 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, + WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, @@ -2414,8 +2415,8 @@ const translations = { phrase2: '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: - 'Ups! Es scheint, dass die Währung Ihres Arbeitsbereichs auf eine andere Währung als USD eingestellt ist. Um fortzufahren, gehen Sie bitte zu Ihre Arbeitsbereichseinstellungen um es auf USD zu setzen und es erneut zu versuchen.', + hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => + `Ups! Es scheint, dass die Währung Ihres Arbeitsbereichs auf eine andere Währung als USD eingestellt ist. Um fortzufahren, gehen Sie bitte zu Ihre Arbeitsbereichseinstellungen 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.', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index d88dc524c989..71b5a4c64286 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -267,6 +267,7 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, + WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, @@ -2412,8 +2413,8 @@ const translations = { phrase2: '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: - "Oups ! Il semble que la devise de votre espace de travail soit différente de l'USD. Pour continuer, veuillez aller sur vos paramètres d'espace de travail pour le régler sur USD et réessayer.", + hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => + `Oups ! Il semble que la devise de votre espace de travail soit différente de l'USD. Pour continuer, veuillez aller sur vos paramètres d'espace de travail 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.", diff --git a/src/languages/it.ts b/src/languages/it.ts index ef24819d7855..3e64b8b77ef2 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -267,6 +267,7 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, + WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, @@ -2398,8 +2399,8 @@ const translations = { phrase2: '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: - 'Ops! Sembra che la valuta del tuo spazio di lavoro sia impostata su una valuta diversa da USD. Per procedere, vai a le impostazioni del tuo spazio di lavoro impostarlo su USD e riprovare.', + hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => + `Ops! Sembra che la valuta del tuo spazio di lavoro sia impostata su una valuta diversa da USD. Per procedere, vai a le impostazioni del tuo spazio di lavoro impostarlo su USD e riprovare.`, error: { youNeedToSelectAnOption: "Seleziona un'opzione per procedere", noBankAccountAvailable: 'Spiacente, non è disponibile alcun conto bancario.', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 928ced04d15b..8fb13e02cafd 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -267,6 +267,7 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, + WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, @@ -2390,8 +2391,8 @@ const translations = { phrase2: 'もう一度試してください。電話番号をセカンダリログインとして追加できます。', }, hasBeenThrottledError: '銀行口座の追加中にエラーが発生しました。数分待ってから再試行してください。', - hasCurrencyError: - 'おっと！ワークスペースの通貨がUSDとは異なる通貨に設定されているようです。続行するには、こちらにアクセスしてください。ワークスペースの設定 USDに設定して、もう一度お試しください。', + hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => + `おっと！ワークスペースの通貨がUSDとは異なる通貨に設定されているようです。続行するには、こちらにアクセスしてください。ワークスペースの設定 USDに設定して、もう一度お試しください。`, error: { youNeedToSelectAnOption: 'オプションを選択してください', noBankAccountAvailable: '申し訳ありませんが、利用可能な銀行口座がありません。', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 5cc871faf386..971541d29ed9 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -267,6 +267,7 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, + WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, @@ -2400,8 +2401,8 @@ const translations = { phrase2: '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: - 'Oeps! Het lijkt erop dat de valuta van uw werkruimte is ingesteld op een andere valuta dan USD. Om verder te gaan, ga naar uw werkruimte-instellingen om het in te stellen op USD en het opnieuw te proberen.', + hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => + `Oeps! Het lijkt erop dat de valuta van uw werkruimte is ingesteld op een andere valuta dan USD. Om verder te gaan, ga naar uw werkruimte-instellingen 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', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 0e655c7e688b..7b7605be53a2 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -267,6 +267,7 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, + WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, @@ -2394,8 +2395,8 @@ const translations = { phrase2: '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: - 'Ups! Wygląda na to, że waluta Twojego miejsca pracy jest ustawiona na inną niż USD. Aby kontynuować, przejdź do ustawienia Twojego miejsca pracy ustawić na USD i spróbować ponownie.', + hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => + `Ups! Wygląda na to, że waluta Twojego miejsca pracy jest ustawiona na inną niż USD. Aby kontynuować, przejdź do ustawienia Twojego miejsca pracy ustawić na USD i spróbować ponownie.`, error: { youNeedToSelectAnOption: 'Proszę wybrać opcję, aby kontynuować', noBankAccountAvailable: 'Przepraszamy, nie ma dostępnego konta bankowego.', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index fd78f35f0d12..2e9b3755e910 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -267,6 +267,7 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, + WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, @@ -2396,8 +2397,8 @@ const translations = { phrase2: '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: - '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 suas configurações de espaço de trabalho para definir para USD e tentar novamente.', + hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => + `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 suas configurações de espaço de trabalho 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.', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 9331fb23690b..e12f2e617f72 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -267,6 +267,7 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, + WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, @@ -2369,7 +2370,8 @@ const translations = { phrase2: '并重试。您可以添加电话号码作为辅助登录。', }, hasBeenThrottledError: '添加您的银行账户时发生错误。请稍等几分钟后重试。', - hasCurrencyError: '哎呀！您的工作区货币似乎设置为不同于 USD 的货币。要继续，请前往 您的工作区设置 将其设置为美元，然后重试。', + hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => + `哎呀！您的工作区货币似乎设置为不同于 USD 的货币。要继续，请前往 您的工作区设置 将其设置为美元，然后重试。`, error: { youNeedToSelectAnOption: '请选择一个选项继续', noBankAccountAvailable: '抱歉，没有可用的银行账户。', From 83f21067c7edebedee3f0f77125f14d8cc3db378 Mon Sep 17 00:00:00 2001 From: Piyush Date: Fri, 20 Jun 2025 23:31:26 +0530 Subject: [PATCH 07/13] added workspaceRoute --- src/languages/de.ts | 6 +++--- src/languages/en.ts | 6 +++--- src/languages/es.ts | 6 +++--- src/languages/fr.ts | 6 +++--- src/languages/it.ts | 6 +++--- src/languages/ja.ts | 6 +++--- src/languages/nl.ts | 6 +++--- src/languages/params.ts | 10 +++++----- src/languages/pl.ts | 6 +++--- src/languages/pt-BR.ts | 6 +++--- src/languages/zh-hans.ts | 6 +++--- .../ReimbursementAccount/ReimbursementAccountPage.tsx | 8 +++++--- 12 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index c5158e29b7d9..4072eba611c9 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -267,10 +267,10 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, - WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, + WorkspaceRouteParams, WorkspaceYouMayJoin, YourPlanPriceParams, YourPlanPriceValueParams, @@ -2415,8 +2415,8 @@ const translations = { phrase2: '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: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => - `Ups! Es scheint, dass die Währung Ihres Arbeitsbereichs auf eine andere Währung als USD eingestellt ist. Um fortzufahren, gehen Sie bitte zu Ihre Arbeitsbereichseinstellungen 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 Ihre Arbeitsbereichseinstellungen 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.', diff --git a/src/languages/en.ts b/src/languages/en.ts index d719c04da807..abe7645b130f 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -255,10 +255,10 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, - WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, + WorkspaceRouteParams, WorkspaceYouMayJoin, YourPlanPriceParams, YourPlanPriceValueParams, @@ -2376,8 +2376,8 @@ const translations = { phrase2: ' 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: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => - `Oops! It appears that your workspace currency is set to a different currency than USD. To proceed, please go to your workspace settings 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 your workspace settings to set it to USD and try again.`, error: { youNeedToSelectAnOption: 'Please select an option to proceed', noBankAccountAvailable: "Sorry, there's no bank account available", diff --git a/src/languages/es.ts b/src/languages/es.ts index c193c8fa5a96..2540cb81cf07 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -255,10 +255,10 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, - WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, + WorkspaceRouteParams, WorkspaceYouMayJoin, YourPlanPriceParams, YourPlanPriceValueParams, @@ -2396,8 +2396,8 @@ const translations = { phrase2: ' 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: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => - `¡Ups! Parece que la moneda de tu espacio de trabajo no está configurada en USD. Para continuar, ve a la configuración del área de trabajo, 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 la configuración del área de trabajo, 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', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 71b5a4c64286..64dbf6c1da3d 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -267,10 +267,10 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, - WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, + WorkspaceRouteParams, WorkspaceYouMayJoin, YourPlanPriceParams, YourPlanPriceValueParams, @@ -2413,8 +2413,8 @@ const translations = { phrase2: '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: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => - `Oups ! Il semble que la devise de votre espace de travail soit différente de l'USD. Pour continuer, veuillez aller sur vos paramètres d'espace de travail 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 vos paramètres d'espace de travail 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.", diff --git a/src/languages/it.ts b/src/languages/it.ts index 3e64b8b77ef2..78cc6101b206 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -267,10 +267,10 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, - WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, + WorkspaceRouteParams, WorkspaceYouMayJoin, YourPlanPriceParams, YourPlanPriceValueParams, @@ -2399,8 +2399,8 @@ const translations = { phrase2: '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: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => - `Ops! Sembra che la valuta del tuo spazio di lavoro sia impostata su una valuta diversa da USD. Per procedere, vai a le impostazioni del tuo spazio di lavoro 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 le impostazioni del tuo spazio di lavoro impostarlo su USD e riprovare.`, error: { youNeedToSelectAnOption: "Seleziona un'opzione per procedere", noBankAccountAvailable: 'Spiacente, non è disponibile alcun conto bancario.', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 8fb13e02cafd..34a7cb0d5b01 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -267,10 +267,10 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, - WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, + WorkspaceRouteParams, WorkspaceYouMayJoin, YourPlanPriceParams, YourPlanPriceValueParams, @@ -2391,8 +2391,8 @@ const translations = { phrase2: 'もう一度試してください。電話番号をセカンダリログインとして追加できます。', }, hasBeenThrottledError: '銀行口座の追加中にエラーが発生しました。数分待ってから再試行してください。', - hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => - `おっと！ワークスペースの通貨がUSDとは異なる通貨に設定されているようです。続行するには、こちらにアクセスしてください。ワークスペースの設定 USDに設定して、もう一度お試しください。`, + hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) => + `おっと！ワークスペースの通貨がUSDとは異なる通貨に設定されているようです。続行するには、こちらにアクセスしてください。ワークスペースの設定 USDに設定して、もう一度お試しください。`, error: { youNeedToSelectAnOption: 'オプションを選択してください', noBankAccountAvailable: '申し訳ありませんが、利用可能な銀行口座がありません。', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 971541d29ed9..01a2ad3e2673 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -267,10 +267,10 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, - WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, + WorkspaceRouteParams, WorkspaceYouMayJoin, YourPlanPriceParams, YourPlanPriceValueParams, @@ -2401,8 +2401,8 @@ const translations = { phrase2: '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: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => - `Oeps! Het lijkt erop dat de valuta van uw werkruimte is ingesteld op een andere valuta dan USD. Om verder te gaan, ga naar uw werkruimte-instellingen 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 uw werkruimte-instellingen 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', diff --git a/src/languages/params.ts b/src/languages/params.ts index a2c0e8881179..85b5e09b66fe 100644 --- a/src/languages/params.ts +++ b/src/languages/params.ts @@ -5,10 +5,6 @@ import type {DelegateRole} from '@src/types/onyx/Account'; import type {AllConnectionName, ConnectionName, PolicyConnectionSyncStage, SageIntacctMappingName} from '@src/types/onyx/Policy'; import type {ViolationDataType} from '@src/types/onyx/TransactionViolation'; -type WorkspaceInitialRouteParams = { - workspaceInitialRoute: string; -}; - type AddressLineParams = { lineNumber: number; }; @@ -141,6 +137,10 @@ type SettleExpensifyCardParams = { formattedAmount: string; }; +type WorkspaceRouteParams = { + workspaceRoute: string; +}; + type RequestAmountParams = {amount: string}; type RequestedAmountMessageParams = {formattedAmount: string; comment?: string}; @@ -772,7 +772,6 @@ type TravelTypeParams = { }; export type { - WorkspaceInitialRouteParams, SplitExpenseEditTitleParams, SplitExpenseSubtitleParams, TotalAmountGreaterOrLessThanOriginalParams, @@ -1042,4 +1041,5 @@ export type { AirlineParams, RailTicketParams, TravelTypeParams, + WorkspaceRouteParams, }; diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 7b7605be53a2..d635c0402e8e 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -267,10 +267,10 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, - WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, + WorkspaceRouteParams, WorkspaceYouMayJoin, YourPlanPriceParams, YourPlanPriceValueParams, @@ -2395,8 +2395,8 @@ const translations = { phrase2: '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: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => - `Ups! Wygląda na to, że waluta Twojego miejsca pracy jest ustawiona na inną niż USD. Aby kontynuować, przejdź do ustawienia Twojego miejsca pracy 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 ustawienia Twojego miejsca pracy ustawić na USD i spróbować ponownie.`, error: { youNeedToSelectAnOption: 'Proszę wybrać opcję, aby kontynuować', noBankAccountAvailable: 'Przepraszamy, nie ma dostępnego konta bankowego.', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 2e9b3755e910..84b8a2baf0dd 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -267,10 +267,10 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, - WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, + WorkspaceRouteParams, WorkspaceYouMayJoin, YourPlanPriceParams, YourPlanPriceValueParams, @@ -2397,8 +2397,8 @@ const translations = { phrase2: '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: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => - `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 suas configurações de espaço de trabalho 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 suas configurações de espaço de trabalho 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.', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index e12f2e617f72..401b3beeaea9 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -267,10 +267,10 @@ import type { WeSentYouMagicSignInLinkParams, WorkEmailMergingBlockedParams, WorkEmailResendCodeParams, - WorkspaceInitialRouteParams, WorkspaceLockedPlanTypeParams, WorkspaceMemberList, WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams, + WorkspaceRouteParams, WorkspaceYouMayJoin, YourPlanPriceParams, YourPlanPriceValueParams, @@ -2370,8 +2370,8 @@ const translations = { phrase2: '并重试。您可以添加电话号码作为辅助登录。', }, hasBeenThrottledError: '添加您的银行账户时发生错误。请稍等几分钟后重试。', - hasCurrencyError: ({workspaceInitialRoute}: WorkspaceInitialRouteParams) => - `哎呀！您的工作区货币似乎设置为不同于 USD 的货币。要继续，请前往 您的工作区设置 将其设置为美元，然后重试。`, + hasCurrencyError: ({workspaceRoute}: WorkspaceRouteParams) => + `哎呀！您的工作区货币似乎设置为不同于 USD 的货币。要继续，请前往 您的工作区设置 将其设置为美元，然后重试。`, error: { youNeedToSelectAnOption: '请选择一个选项继续', noBankAccountAvailable: '抱歉，没有可用的银行账户。', diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index 862cf137b5bb..1aa2bfb26878 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -87,7 +87,9 @@ 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 workspaceInitialRoute = `${environmentURL}/${ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute())}`; + const workspaceRoute = isSmallScreenWidth + ? `${environmentURL}/${ROUTES.WORKSPACE_OVERVIEW.getRoute(policyIDParam, Navigation.getActiveRoute())}` + : `${environmentURL}/${ROUTES.WORKSPACE_INITIAL.getRoute(policyIDParam, Navigation.getActiveRoute())}`; /** The SetupWithdrawalAccount flow allows us to continue the flow from various points depending on where the @@ -401,10 +403,10 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen ); } else if (throttledDate) { errorText = translate('bankAccount.hasBeenThrottledError'); - } else if (hasUnsupportedCurrency) { + } else { errorText = ( - + ); } From 3d98b8611edc708eed758bffc3f2407608ca1b8d Mon Sep 17 00:00:00 2001 From: Piyush Date: Fri, 20 Jun 2025 23:37:46 +0530 Subject: [PATCH 08/13] added the check hasUnsupportedCurrency --- src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index 1aa2bfb26878..7e558eee6898 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -403,7 +403,7 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen ); } else if (throttledDate) { errorText = translate('bankAccount.hasBeenThrottledError'); - } else { + } else if (hasUnsupportedCurrency) { errorText = ( From ceae22302a43c40d18c1f77e4ccad244855f4ab9 Mon Sep 17 00:00:00 2001 From: Piyush Date: Thu, 26 Jun 2025 10:49:00 +0530 Subject: [PATCH 09/13] Fix prettier --- package-lock.json | 6 ------ src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx | 1 - 2 files changed, 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index d8c9469c8ad1..c0810f0d83da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18447,7 +18447,6 @@ }, "node_modules/core-util-is": { "version": "1.0.2", - "dev": true, "license": "MIT" }, "node_modules/corser": { @@ -31367,7 +31366,6 @@ }, "node_modules/process-nextick-args": { "version": "2.0.1", - "dev": true, "license": "MIT" }, "node_modules/progress": { @@ -33292,7 +33290,6 @@ }, "node_modules/readable-stream": { "version": "2.3.8", - "dev": true, "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", @@ -33306,7 +33303,6 @@ }, "node_modules/readable-stream/node_modules/isarray": { "version": "1.0.0", - "dev": true, "license": "MIT" }, "node_modules/readdir-glob": { @@ -34938,7 +34934,6 @@ }, "node_modules/string_decoder": { "version": "1.1.1", - "devOptional": true, "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" @@ -36650,7 +36645,6 @@ }, "node_modules/util-deprecate": { "version": "1.0.2", - "devOptional": true, "license": "MIT" }, "node_modules/utila": { diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index 38ecf99d5925..e19e44e41a4e 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -94,7 +94,6 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen const contactMethodRoute = `${environmentURL}/${ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo)}`; - /** The SetupWithdrawalAccount flow allows us to continue the flow from various points depending on where the user left off. This view will refer to the achData as the single source of truth to determine which route to From bf3618924d9171c80aa8f55c07bb1ff5ca1c0f9b Mon Sep 17 00:00:00 2001 From: Piyush Date: Thu, 26 Jun 2025 10:53:51 +0530 Subject: [PATCH 10/13] removed TextLink --- src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx index e19e44e41a4e..ecc548a9ef07 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx @@ -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'; From 679c7908776f655bcc6cc5f3452984cc1607213d Mon Sep 17 00:00:00 2001 From: Piyush Date: Fri, 27 Jun 2025 01:06:45 +0530 Subject: [PATCH 11/13] remove changes from package-lock.json --- package-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package-lock.json b/package-lock.json index c0810f0d83da..3686602d8aed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18447,6 +18447,7 @@ }, "node_modules/core-util-is": { "version": "1.0.2", + "dev": true, "license": "MIT" }, "node_modules/corser": { From 753352b1afbbdca34c7319dc2331ce3ed78c15c9 Mon Sep 17 00:00:00 2001 From: Piyush Date: Fri, 27 Jun 2025 01:18:34 +0530 Subject: [PATCH 12/13] removed changes from package-lock.json --- package-lock.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 3686602d8aed..d8c9469c8ad1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18447,7 +18447,7 @@ }, "node_modules/core-util-is": { "version": "1.0.2", - "dev": true, + "dev": true, "license": "MIT" }, "node_modules/corser": { @@ -31367,6 +31367,7 @@ }, "node_modules/process-nextick-args": { "version": "2.0.1", + "dev": true, "license": "MIT" }, "node_modules/progress": { @@ -33291,6 +33292,7 @@ }, "node_modules/readable-stream": { "version": "2.3.8", + "dev": true, "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", @@ -33304,6 +33306,7 @@ }, "node_modules/readable-stream/node_modules/isarray": { "version": "1.0.0", + "dev": true, "license": "MIT" }, "node_modules/readdir-glob": { @@ -34935,6 +34938,7 @@ }, "node_modules/string_decoder": { "version": "1.1.1", + "devOptional": true, "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" @@ -36646,6 +36650,7 @@ }, "node_modules/util-deprecate": { "version": "1.0.2", + "devOptional": true, "license": "MIT" }, "node_modules/utila": { From 3da194cdecf547dbb20e995bde74778977d8f15c Mon Sep 17 00:00:00 2001 From: Piyush Date: Tue, 1 Jul 2025 10:33:54 +0530 Subject: [PATCH 13/13] Fix merge conflicts --- src/languages/params.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/languages/params.ts b/src/languages/params.ts index 8c5dd9a0f56b..037ad2b71eab 100644 --- a/src/languages/params.ts +++ b/src/languages/params.ts @@ -141,11 +141,6 @@ type WorkspaceRouteParams = { workspaceRoute: string; }; -type BusinessBankAccountParams = { - amount: string; - last4Digits: string; -}; - type RequestAmountParams = {amount: string}; type RequestedAmountMessageParams = {formattedAmount: string; comment?: string};