Stephanieelliott patch 18 1#73163
Merged
stephanieelliott merged 18 commits intostephanieelliott-patch-18from Oct 22, 2025
Merged
Stephanieelliott patch 18 1#73163stephanieelliott merged 18 commits intostephanieelliott-patch-18from
stephanieelliott merged 18 commits intostephanieelliott-patch-18from
Conversation
[No QA] Update redirects.csv
…-native-web [No QA] Chore: Bump `react-native-web` to 0.21.2
…FocusMode fix: translation migration for focus mode notification
stephanieelliott
merged commit 1e5b93b
into
stephanieelliott-patch-18
21 of 23 checks passed
|
@rlinoz Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] NOTE: It looks like |
Contributor
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 1196fa98..854862f7 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -5394,7 +5394,6 @@ ${amount} pour ${merchant} - ${date}`,
`<muted-text-label>Pour activer la réconciliation continue, veuillez activer la <a href="${accountingAdvancedSettingsLink}">synchronisation automatique</a> pour ${connectionName}.</muted-text-label>`,
chooseReconciliationAccount: {
chooseBankAccount: 'Choisissez le compte bancaire sur lequel les paiements de votre carte Expensify seront rapprochés.',
-
settlementAccountReconciliation: ({settlementAccountUrl, lastFourPAN}: SettlementAccountReconciliationParams) =>
`Assurez-vous que ce compte correspond à votre <a href="${settlementAccountUrl}">Compte de règlement de la carte Expensify</a> (terminant par ${lastFourPAN}) afin que la Réconciliation Continue fonctionne correctement.`,
},
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 7eb2884e..4ba97d35 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -5396,7 +5396,6 @@ ${amount} per ${merchant} - ${date}`,
`<muted-text-label>Per abilitare la riconciliazione continua, abilita la <a href="${accountingAdvancedSettingsLink}">sincronizzazione automatica</a> per ${connectionName}.</muted-text-label>`,
chooseReconciliationAccount: {
chooseBankAccount: 'Scegli il conto bancario su cui verranno riconciliati i pagamenti della tua carta Expensify.',
-
settlementAccountReconciliation: ({settlementAccountUrl, lastFourPAN}: SettlementAccountReconciliationParams) =>
`Assicurati che questo account corrisponda al tuo <a href="${settlementAccountUrl}">Conto di regolamento della carta Expensify</a> (terminante con ${lastFourPAN}) affinché la Riconciliazione Continua funzioni correttamente.`,
},
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 6f21acbf..56b4ced3 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -5350,7 +5350,6 @@ ${date} - ${merchant}に${amount}`,
`<muted-text-label>継続的な照合を有効にするため、${connectionName}の<a href="${accountingAdvancedSettingsLink}">自動同期</a>を有効にしてください。</muted-text-label>`,
chooseReconciliationAccount: {
chooseBankAccount: 'Expensifyカードの支払いを照合する銀行口座を選択してください。',
-
settlementAccountReconciliation: ({settlementAccountUrl, lastFourPAN}: SettlementAccountReconciliationParams) =>
`このアカウントがあなたの<a href="${settlementAccountUrl}">Expensifyカード決済口座</a>（${lastFourPAN}で終わる）と一致していることを確認してください。`,
},
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 24b72e78..2419ffe4 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -5389,7 +5389,6 @@ ${amount} voor ${merchant} - ${date}`,
`<muted-text-label>Om continue afstemming mogelijk te maken, moet u <a href="${accountingAdvancedSettingsLink}">automatische synchronisatie</a> voor ${connectionName} inschakelen.</muted-text-label>`,
chooseReconciliationAccount: {
chooseBankAccount: 'Kies de bankrekening waarmee uw Expensify Card-betalingen worden verrekend.',
-
settlementAccountReconciliation: ({settlementAccountUrl, lastFourPAN}: SettlementAccountReconciliationParams) =>
`Zorg ervoor dat dit account overeenkomt met uw <a href="${settlementAccountUrl}">Expensify Card afwikkelingsrekening</a> (eindigend op ${lastFourPAN}) zodat Continue Reconciliation goed werkt.`,
},
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index b648dc70..5b670ae1 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -5378,7 +5378,6 @@ ${amount} dla ${merchant} - ${date}`,
`<muted-text-label>Aby włączyć funkcję ciągłego uzgadniania, włącz <a href="${accountingAdvancedSettingsLink}">automatyczną synchronizację</a> dla ${connectionName}.</muted-text-label>`,
chooseReconciliationAccount: {
chooseBankAccount: 'Wybierz konto bankowe, z którym będą uzgadniane płatności kartą Expensify.',
-
settlementAccountReconciliation: ({settlementAccountUrl, lastFourPAN}: SettlementAccountReconciliationParams) =>
`Upewnij się, że to konto pasuje do Twojego <a href="${settlementAccountUrl}">Konto rozliczeniowe karty Expensify</a> (kończący się na ${lastFourPAN}), aby Ciągła Rekonsyliacja działała poprawnie.`,
},
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 6e355462..c5d1abee 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -5380,7 +5380,6 @@ ${amount} para ${merchant} - ${date}`,
`<muted-text-label>Para ativar a reconciliação contínua, habilite a <a href="${accountingAdvancedSettingsLink}">sincronização automática</a> para o ${connectionName}.</muted-text-label>`,
chooseReconciliationAccount: {
chooseBankAccount: 'Escolha a conta bancária na qual os pagamentos do seu Expensify Card serão reconciliados.',
-
settlementAccountReconciliation: ({settlementAccountUrl, lastFourPAN}: SettlementAccountReconciliationParams) =>
`Certifique-se de que esta conta corresponde à sua <a href="${settlementAccountUrl}">Conta de liquidação do Cartão Expensify</a> (terminando em ${lastFourPAN}) para que a Reconciliação Contínua funcione corretamente.`,
},
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 5374e622..0dc051ed 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -5289,7 +5289,6 @@ ${merchant}的${amount} - ${date}`,
`<muted-text-label>要启用持续对账，请启用 ${connectionName} 的<a href="${accountingAdvancedSettingsLink}">自动同步</a>功能。</muted-text-label>`,
chooseReconciliationAccount: {
chooseBankAccount: '选择用于对账您的 Expensify Card 支付的银行账户。',
-
settlementAccountReconciliation: ({settlementAccountUrl, lastFourPAN}: SettlementAccountReconciliationParams) =>
`确保此账户与您的<a href="${settlementAccountUrl}">Expensify Card 结算账户</a>（以 ${lastFourPAN} 结尾）匹配，以便持续对账正常工作。`,
},
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
Contributor
|
LGTM |
. Thank you for your hard work!
Contributor
HelpDot Documentation ReviewAssessment SummaryAfter thorough analysis of PR #73163, this pull request does not contain HelpDot documentation changes that require a HelpDot documentation quality review. PR Content AnalysisThis PR is a technical implementation focused on:
Files Reviewed
RecommendationThis PR should be reviewed by:
No HelpDot documentation review is needed as this PR does not modify user-facing help documentation. This assessment was generated by the HelpDot Documentation Review Bot. For questions about HelpDot documentation reviews, please refer to the documentation review guidelines. |
88 tasks
Contributor
|
🚀 Deployed to staging by https://github.com/stephanieelliott in version: 9.2.37-1 🚀
|
Contributor
|
🚀 Deployed to production by https://github.com/blimpich in version: 9.2.37-8 🚀
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Fixed Issues
$
PROPOSAL:
Tests
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop