From 1b328bbacfad5a3ef022c28a9bd6e406270207c7 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Tue, 26 Aug 2025 16:08:04 -0700 Subject: [PATCH] Revert "Merge workspace.accounting.enableContinuousReconciliation translation" --- src/languages/de.ts | 4 +- src/languages/en.ts | 4 +- src/languages/es.ts | 4 +- src/languages/fr.ts | 4 +- src/languages/it.ts | 4 +- src/languages/ja.ts | 4 +- src/languages/nl.ts | 4 +- src/languages/params.ts | 6 --- src/languages/pl.ts | 4 +- src/languages/pt-BR.ts | 4 +- src/languages/zh-hans.ts | 4 +- .../reconciliation/CardReconciliationPage.tsx | 46 ++++++++++--------- 12 files changed, 35 insertions(+), 57 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index 7f3b7e620e3c..6ef123233763 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -103,7 +103,6 @@ import type { EmployeeInviteMessageParams, EmptyCategoriesSubtitleWithAccountingParams, EmptyTagsSubtitleWithAccountingParams, - EnableContinuousReconciliationParams, EnterMagicCodeParams, ExportAgainModalDescriptionParams, ExportedToIntegrationParams, @@ -5222,8 +5221,7 @@ const translations = { continuousReconciliation: 'Kontinuierliche Abstimmung', saveHoursOnReconciliation: 'Sparen Sie Stunden bei der Abstimmung in jedem Buchhaltungszeitraum, indem Expensify kontinuierlich Expensify Card-Abrechnungen und -Abwicklungen in Ihrem Namen abstimmt.', - enableContinuousReconciliation: ({accountingAdvancedSettingsLink, connectionName}: EnableContinuousReconciliationParams) => - `Um den kontinuierlichen Abgleich zu aktivieren, aktivieren Sie bitte die automatische Synchronisierung für ${connectionName}.`, + enableContinuousReconciliation: 'Um die kontinuierliche Abstimmung zu aktivieren, bitte aktivieren Sie', chooseReconciliationAccount: { chooseBankAccount: 'Wählen Sie das Bankkonto, gegen das Ihre Expensify Card-Zahlungen abgeglichen werden sollen.', accountMatches: 'Stellen Sie sicher, dass dieses Konto mit Ihrem übereinstimmt', diff --git a/src/languages/en.ts b/src/languages/en.ts index e4afa3e5e801..ab411324f449 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -92,7 +92,6 @@ import type { EmployeeInviteMessageParams, EmptyCategoriesSubtitleWithAccountingParams, EmptyTagsSubtitleWithAccountingParams, - EnableContinuousReconciliationParams, EnterMagicCodeParams, ExportAgainModalDescriptionParams, ExportedToIntegrationParams, @@ -5205,8 +5204,7 @@ const translations = { continuousReconciliation: 'Continuous Reconciliation', saveHoursOnReconciliation: 'Save hours on reconciliation each accounting period by having Expensify continuously reconcile Expensify Card statements and settlements on your behalf.', - enableContinuousReconciliation: ({accountingAdvancedSettingsLink, connectionName}: EnableContinuousReconciliationParams) => - `In order to enable Continuous Reconciliation, please enable auto-sync for ${connectionName}.`, + enableContinuousReconciliation: 'In order to enable Continuous Reconciliation, please enable ', chooseReconciliationAccount: { chooseBankAccount: 'Choose the bank account that your Expensify Card payments will be reconciled against.', accountMatches: 'Make sure this account matches your ', diff --git a/src/languages/es.ts b/src/languages/es.ts index 699deab322b5..db103304f680 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -90,7 +90,6 @@ import type { EmployeeInviteMessageParams, EmptyCategoriesSubtitleWithAccountingParams, EmptyTagsSubtitleWithAccountingParams, - EnableContinuousReconciliationParams, EnterMagicCodeParams, ExportAgainModalDescriptionParams, ExportedToIntegrationParams, @@ -5176,8 +5175,7 @@ const translations = { continuousReconciliation: 'Conciliación continua', saveHoursOnReconciliation: 'Ahorra horas de conciliación en cada período contable haciendo que Expensify concilie continuamente los extractos y liquidaciones de la Tarjeta Expensify en tu nombre.', - enableContinuousReconciliation: ({accountingAdvancedSettingsLink, connectionName}: EnableContinuousReconciliationParams) => - `Para activar la Conciliación Continua, activa la auto-sync para ${connectionName}.`, + enableContinuousReconciliation: 'Para activar la Conciliación Continua, activa la ', chooseReconciliationAccount: { chooseBankAccount: 'Elige la cuenta bancaria con la que se conciliarán los pagos de tu Tarjeta Expensify.', accountMatches: 'Asegúrate de que esta cuenta coincide con ', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index d323b0d3b9a8..c6a00dc16566 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -103,7 +103,6 @@ import type { EmployeeInviteMessageParams, EmptyCategoriesSubtitleWithAccountingParams, EmptyTagsSubtitleWithAccountingParams, - EnableContinuousReconciliationParams, EnterMagicCodeParams, ExportAgainModalDescriptionParams, ExportedToIntegrationParams, @@ -5237,8 +5236,7 @@ const translations = { continuousReconciliation: 'Réconciliation Continue', saveHoursOnReconciliation: 'Gagnez des heures sur la réconciliation à chaque période comptable en laissant Expensify réconcilier en continu les relevés et les règlements de la carte Expensify pour vous.', - enableContinuousReconciliation: ({accountingAdvancedSettingsLink, connectionName}: EnableContinuousReconciliationParams) => - `Pour activer la réconciliation continue, veuillez activer la synchronisation automatique pour ${connectionName}.`, + enableContinuousReconciliation: 'Pour activer la Réconciliation Continue, veuillez activer', chooseReconciliationAccount: { chooseBankAccount: 'Choisissez le compte bancaire sur lequel les paiements de votre carte Expensify seront rapprochés.', accountMatches: 'Assurez-vous que ce compte correspond à votre', diff --git a/src/languages/it.ts b/src/languages/it.ts index eb53db7576b3..c3baecc995bb 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -103,7 +103,6 @@ import type { EmployeeInviteMessageParams, EmptyCategoriesSubtitleWithAccountingParams, EmptyTagsSubtitleWithAccountingParams, - EnableContinuousReconciliationParams, EnterMagicCodeParams, ExportAgainModalDescriptionParams, ExportedToIntegrationParams, @@ -5235,8 +5234,7 @@ const translations = { continuousReconciliation: 'Riconciliazione Continua', saveHoursOnReconciliation: 'Risparmia ore di riconciliazione ogni periodo contabile facendo riconciliare continuamente a Expensify gli estratti conto e i regolamenti della Expensify Card per tuo conto.', - enableContinuousReconciliation: ({accountingAdvancedSettingsLink, connectionName}: EnableContinuousReconciliationParams) => - `Per abilitare la riconciliazione continua, abilita la sincronizzazione automatica per ${connectionName}.`, + enableContinuousReconciliation: 'Per abilitare la Riconciliazione Continua, si prega di abilitare', chooseReconciliationAccount: { chooseBankAccount: 'Scegli il conto bancario su cui verranno riconciliati i pagamenti della tua carta Expensify.', accountMatches: 'Assicurati che questo account corrisponda al tuo', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 01a13c3cbe35..cce8f97e11f2 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -103,7 +103,6 @@ import type { EmployeeInviteMessageParams, EmptyCategoriesSubtitleWithAccountingParams, EmptyTagsSubtitleWithAccountingParams, - EnableContinuousReconciliationParams, EnterMagicCodeParams, ExportAgainModalDescriptionParams, ExportedToIntegrationParams, @@ -5211,8 +5210,7 @@ const translations = { reconciliationAccount: '調整口座', continuousReconciliation: '継続的な照合', saveHoursOnReconciliation: '各会計期間の調整にかかる時間を節約するために、ExpensifyがExpensify Cardの明細書と決済を継続的に調整します。', - enableContinuousReconciliation: ({accountingAdvancedSettingsLink, connectionName}: EnableContinuousReconciliationParams) => - `継続的な照合を有効にするため、${connectionName}の自動同期を有効にしてください。`, + enableContinuousReconciliation: '継続的な調整を有効にするには、有効にしてください', chooseReconciliationAccount: { chooseBankAccount: 'Expensifyカードの支払いを照合する銀行口座を選択してください。', accountMatches: 'このアカウントがあなたのものと一致していることを確認してください', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 3cf7ae80cbd9..3701b0b3ecc2 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -103,7 +103,6 @@ import type { EmployeeInviteMessageParams, EmptyCategoriesSubtitleWithAccountingParams, EmptyTagsSubtitleWithAccountingParams, - EnableContinuousReconciliationParams, EnterMagicCodeParams, ExportAgainModalDescriptionParams, ExportedToIntegrationParams, @@ -5236,8 +5235,7 @@ const translations = { continuousReconciliation: 'Continue Reconciliatie', saveHoursOnReconciliation: 'Bespaar uren op reconciliatie elke boekhoudperiode door Expensify continu Expensify Card-afschriften en afrekeningen namens u te laten reconciliëren.', - enableContinuousReconciliation: ({accountingAdvancedSettingsLink, connectionName}: EnableContinuousReconciliationParams) => - `Om continue afstemming mogelijk te maken, moet u automatische synchronisatie voor ${connectionName} inschakelen.`, + enableContinuousReconciliation: 'Om Continue Reconciliation in te schakelen, schakel alstublieft in', chooseReconciliationAccount: { chooseBankAccount: 'Kies de bankrekening waarmee uw Expensify Card-betalingen worden verrekend.', accountMatches: 'Zorg ervoor dat dit account overeenkomt met uw', diff --git a/src/languages/params.ts b/src/languages/params.ts index ac7bd34c18c6..b81f87971e9b 100644 --- a/src/languages/params.ts +++ b/src/languages/params.ts @@ -859,11 +859,6 @@ type MergeFailureDescriptionGenericParams = { email: string; }; -type EnableContinuousReconciliationParams = { - connectionName: string; - accountingAdvancedSettingsLink: string; -}; - type WorkspaceUpgradeNoteParams = { subscriptionLink: string; }; @@ -1192,7 +1187,6 @@ export type { MergeSuccessDescriptionParams, MergeFailureUncreatedAccountDescriptionParams, MergeFailureDescriptionGenericParams, - EnableContinuousReconciliationParams, WorkspaceUpgradeNoteParams, ChangedApproverMessageParams, WorkflowSettingsParam, diff --git a/src/languages/pl.ts b/src/languages/pl.ts index cc07a6be4cff..2f6b3bf9aa96 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -103,7 +103,6 @@ import type { EmployeeInviteMessageParams, EmptyCategoriesSubtitleWithAccountingParams, EmptyTagsSubtitleWithAccountingParams, - EnableContinuousReconciliationParams, EnterMagicCodeParams, ExportAgainModalDescriptionParams, ExportedToIntegrationParams, @@ -5225,8 +5224,7 @@ const translations = { continuousReconciliation: 'Ciągła rekonsyliacja', saveHoursOnReconciliation: 'Zaoszczędź godziny na uzgadnianiu w każdym okresie rozliczeniowym, pozwalając Expensify na ciągłe uzgadnianie wyciągów i rozliczeń z karty Expensify w Twoim imieniu.', - enableContinuousReconciliation: ({accountingAdvancedSettingsLink, connectionName}: EnableContinuousReconciliationParams) => - `Aby włączyć funkcję ciągłego uzgadniania, włącz automatyczną synchronizację dla ${connectionName}.`, + enableContinuousReconciliation: 'Aby włączyć Ciągłą Rekoncyliację, proszę włączyć', chooseReconciliationAccount: { chooseBankAccount: 'Wybierz konto bankowe, z którym będą uzgadniane płatności kartą Expensify.', accountMatches: 'Upewnij się, że to konto pasuje do Twojego', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 5f4a11a2d70e..f25a0eb08e3d 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -103,7 +103,6 @@ import type { EmployeeInviteMessageParams, EmptyCategoriesSubtitleWithAccountingParams, EmptyTagsSubtitleWithAccountingParams, - EnableContinuousReconciliationParams, EnterMagicCodeParams, ExportAgainModalDescriptionParams, ExportedToIntegrationParams, @@ -5233,8 +5232,7 @@ const translations = { continuousReconciliation: 'Reconciliação Contínua', saveHoursOnReconciliation: 'Economize horas na reconciliação de cada período contábil ao permitir que a Expensify reconcilie continuamente os extratos e liquidações do Cartão Expensify em seu nome.', - enableContinuousReconciliation: ({accountingAdvancedSettingsLink, connectionName}: EnableContinuousReconciliationParams) => - `Para ativar a reconciliação contínua, habilite a sincronização automática para o ${connectionName}.`, + enableContinuousReconciliation: 'Para ativar a Reconciliação Contínua, por favor, ative', chooseReconciliationAccount: { chooseBankAccount: 'Escolha a conta bancária na qual os pagamentos do seu Expensify Card serão reconciliados.', accountMatches: 'Certifique-se de que esta conta corresponde à sua', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 0dbc3216223d..4eb2a173c7f6 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -103,7 +103,6 @@ import type { EmployeeInviteMessageParams, EmptyCategoriesSubtitleWithAccountingParams, EmptyTagsSubtitleWithAccountingParams, - EnableContinuousReconciliationParams, EnterMagicCodeParams, ExportAgainModalDescriptionParams, ExportedToIntegrationParams, @@ -5144,8 +5143,7 @@ const translations = { reconciliationAccount: '对账账户', continuousReconciliation: '持续对账', saveHoursOnReconciliation: '通过让Expensify持续为您对账Expensify卡的对账单和结算，您可以在每个会计期间节省数小时的对账时间。', - enableContinuousReconciliation: ({accountingAdvancedSettingsLink, connectionName}: EnableContinuousReconciliationParams) => - `要启用持续对账，请启用 ${connectionName} 的自动同步功能。`, + enableContinuousReconciliation: '为了启用持续对账，请启用', chooseReconciliationAccount: { chooseBankAccount: '选择用于对账您的 Expensify Card 支付的银行账户。', accountMatches: '确保此账户与您的账户匹配', diff --git a/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx b/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx index a36a849b9c79..611a8f1db2ff 100644 --- a/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx +++ b/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx @@ -1,11 +1,10 @@ import React, {useCallback, useEffect, useMemo} from 'react'; -import {View} from 'react-native'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; -import RenderHTML from '@components/RenderHTML'; import ScreenWrapper from '@components/ScreenWrapper'; import ScrollView from '@components/ScrollView'; -import useEnvironment from '@hooks/useEnvironment'; +import Text from '@components/Text'; +import TextLink from '@components/TextLink'; import useExpensifyCardFeeds from '@hooks/useExpensifyCardFeeds'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; @@ -42,7 +41,6 @@ function CardReconciliationPage({policy, route}: CardReconciliationPageProps) { const workspaceAccountID = policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID; const policyID = policy?.id; const allCardSettings = useExpensifyCardFeeds(policyID); - const {environmentURL} = useEnvironment(); const fullySetUpCardSetting = useMemo(() => { const entries = Object.entries(allCardSettings ?? {}); @@ -88,23 +86,27 @@ function CardReconciliationPage({policy, route}: CardReconciliationPageProps) { } }; - const accountingAdvancedSettingsLink = useMemo(() => { - const backTo = Navigation.getActiveRoute(); + const navigateToAdvancedSettings = useCallback(() => { switch (connection) { case CONST.POLICY.CONNECTIONS.ROUTE.QBO: - return `${environmentURL}/${ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_AUTO_SYNC.getRoute(policyID, backTo)}`; + Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_AUTO_SYNC.getRoute(policyID, Navigation.getActiveRoute())); + break; case CONST.POLICY.CONNECTIONS.ROUTE.XERO: - return `${environmentURL}/${ROUTES.POLICY_ACCOUNTING_XERO_AUTO_SYNC.getRoute(policyID, backTo)}`; + Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_AUTO_SYNC.getRoute(policyID, Navigation.getActiveRoute())); + break; case CONST.POLICY.CONNECTIONS.ROUTE.NETSUITE: - return `${environmentURL}/${ROUTES.POLICY_ACCOUNTING_NETSUITE_AUTO_SYNC.getRoute(policyID, backTo)}`; + Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_AUTO_SYNC.getRoute(policyID, Navigation.getActiveRoute())); + break; case CONST.POLICY.CONNECTIONS.ROUTE.SAGE_INTACCT: - return `${environmentURL}/${ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED.getRoute(policyID)}`; + Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED.getRoute(policyID)); + break; case CONST.POLICY.CONNECTIONS.ROUTE.QBD: - return `${environmentURL}/${ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_DESKTOP_ADVANCED.getRoute(policyID, backTo)}`; + Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_DESKTOP_ADVANCED.getRoute(policyID, Navigation.getActiveRoute())); + break; default: - return ''; + break; } - }, [connection, policyID, environmentURL]); + }, [connection, policyID]); const fetchPolicyAccountingData = useCallback(() => { if (!policyID) { @@ -148,14 +150,16 @@ function CardReconciliationPage({policy, route}: CardReconciliationPageProps) { wrapperStyle={styles.ph5} /> {!autoSync && ( - - - + + {translate('workspace.accounting.enableContinuousReconciliation')} + + {translate('workspace.accounting.autoSync').toLowerCase()} + {' '} + {translate('common.conjunctionFor')} {CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]} + )} {!!paymentBankAccountID && !!isContinuousReconciliationOn && (