Repository navigation
Warn about ongoing GPS trip when switching to OD - #80748
AndrewGable merged 10 commits into
Conversation
|
Hey, I noticed you changed If you want to automatically generate translations for other locales, an Expensify employee will have to:
Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running: npx ts-node ./scripts/generateTranslations.ts --helpTypically, you'd want to translate only what you changed by running |
Codecov Report❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.
|
🦜 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/de.ts b/src/languages/de.ts
index b7341801..4ca4135d 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6995,7 +6995,7 @@ Fordere Spesendetails wie Belege und Beschreibungen an, lege Limits und Standard
[CONST.SEARCH.GROUP_BY.CARD]: 'Karte',
[CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: 'Auszahlungs-ID',
[CONST.SEARCH.GROUP_BY.CATEGORY]: 'Kategorie',
- [CONST.SEARCH.GROUP_BY.TAG]: 'Stichwort',
+ [CONST.SEARCH.GROUP_BY.TAG]: 'Tag',
[CONST.SEARCH.GROUP_BY.MONTH]: 'Monat',
},
feed: 'Feed',
@@ -8200,9 +8200,9 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
notification: {title: 'GPS-Tracking läuft', body: 'Zur App gehen, um abzuschließen'},
signOutWarningTripInProgress: {title: 'GPS-Tracking läuft', prompt: 'Sind Sie sicher, dass Sie die Reise verwerfen und sich abmelden möchten?', confirm: 'Verwerfen und abmelden'},
switchToODWarningTripInProgress: {
- title: 'GPS tracking in progress',
- prompt: 'Are you sure you want to stop GPS tracking and switch to Expensify Classic?',
- confirm: 'Stop and switch',
+ title: 'GPS-Tracking läuft',
+ prompt: 'Sind Sie sicher, dass Sie die GPS-Verfolgung beenden und zu Expensify Classic wechseln möchten?',
+ confirm: 'Anhalten und wechseln',
},
locationServicesRequiredModal: {
title: 'Standortzugriff erforderlich',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 1e990543..1205000d 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8204,11 +8204,7 @@ Voici un *reçu test* pour vous montrer comment cela fonctionne :`,
cancel: 'Afficher le voyage',
},
signOutWarningTripInProgress: {title: 'Suivi GPS en cours', prompt: 'Voulez-vous vraiment abandonner le déplacement et vous déconnecter ?', confirm: 'Ignorer et se déconnecter'},
- switchToODWarningTripInProgress: {
- title: 'GPS tracking in progress',
- prompt: 'Are you sure you want to stop GPS tracking and switch to Expensify Classic?',
- confirm: 'Stop and switch',
- },
+ switchToODWarningTripInProgress: {title: 'Suivi GPS en cours', prompt: 'Voulez-vous vraiment arrêter le suivi GPS et passer à Expensify Classic ?', confirm: 'Arrêter et changer'},
notification: {title: 'Suivi GPS en cours', body: 'Aller dans l’application pour terminer'},
locationServicesRequiredModal: {
title: 'Accès à la localisation requis',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 2b853c82..c4592091 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6985,7 +6985,7 @@ Richiedi dettagli di spesa come ricevute e descrizioni, imposta limiti e valori
[CONST.SEARCH.GROUP_BY.CARD]: 'Carta',
[CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: 'ID prelievo', //_/\__/_/ \_,_/\__/\__/\_,_/
[CONST.SEARCH.GROUP_BY.CATEGORY]: 'Categoria',
- [CONST.SEARCH.GROUP_BY.TAG]: 'Etichetta',
+ [CONST.SEARCH.GROUP_BY.TAG]: 'Tag',
[CONST.SEARCH.GROUP_BY.MONTH]: 'Mese',
},
feed: 'Feed',
@@ -8187,9 +8187,9 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
notification: {title: 'Tracciamento GPS in corso', body: "Vai all'app per terminare"},
signOutWarningTripInProgress: {title: 'Tracciamento GPS in corso', prompt: 'Sei sicuro di voler annullare il viaggio e disconnetterti?', confirm: 'Annulla e disconnettiti'},
switchToODWarningTripInProgress: {
- title: 'GPS tracking in progress',
- prompt: 'Are you sure you want to stop GPS tracking and switch to Expensify Classic?',
- confirm: 'Stop and switch',
+ title: 'Monitoraggio GPS in corso',
+ prompt: 'Sei sicuro di voler interrompere il tracciamento GPS e passare a Expensify Classic?',
+ confirm: 'Interrompi e cambia',
},
locationServicesRequiredModal: {
title: 'È necessario l’accesso alla posizione',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 838ed89a..69e123a3 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6921,7 +6921,7 @@ ${reportName}
reimbursable: '精算対象',
purchaseCurrency: '購入通貨',
groupBy: {
- [CONST.SEARCH.GROUP_BY.FROM]: '送信者',
+ [CONST.SEARCH.GROUP_BY.FROM]: '差出人',
[CONST.SEARCH.GROUP_BY.CARD]: 'カード',
[CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: '出金ID',
[CONST.SEARCH.GROUP_BY.CATEGORY]: 'カテゴリ',
@@ -8092,11 +8092,7 @@ Expensify の使い方をお見せするための*テストレシート*がこ
preciseLocationRequiredModal: {title: '正確な位置情報が必要です', prompt: 'GPS距離の追跡を開始するには、デバイスの設定で「正確な位置情報」を有効にしてください。'},
desktop: {title: 'スマートフォンで距離を記録する', subtitle: 'GPS で自動的にマイルまたはキロメートルを記録し、移動をすぐに経費に変換します。', button: 'アプリをダウンロード'},
signOutWarningTripInProgress: {title: 'GPS追跡を実行中', prompt: 'この出張を破棄してサインアウトしてもよろしいですか?', confirm: '破棄してサインアウト'},
- switchToODWarningTripInProgress: {
- title: 'GPS tracking in progress',
- prompt: 'Are you sure you want to stop GPS tracking and switch to Expensify Classic?',
- confirm: 'Stop and switch',
- },
+ switchToODWarningTripInProgress: {title: 'GPS追跡を実行中', prompt: 'GPS追跡を停止して、Expensify Classic に切り替えてもよろしいですか?', confirm: '停止して切り替える'},
notification: {title: 'GPS追跡を実行中', body: '完了するにはアプリに移動'},
continueGpsTripModal: {
title: 'GPS の走行記録を続けますか?',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 567589b6..61a55a91 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8162,9 +8162,9 @@ Hier is een *testbon* om je te laten zien hoe het werkt:`,
},
signOutWarningTripInProgress: {title: 'GPS-tracking bezig', prompt: 'Weet je zeker dat je de reis wilt weggooien en uitloggen?', confirm: 'Verwerpen en afmelden'},
switchToODWarningTripInProgress: {
- title: 'GPS tracking in progress',
- prompt: 'Are you sure you want to stop GPS tracking and switch to Expensify Classic?',
- confirm: 'Stop and switch',
+ title: 'GPS-tracking bezig',
+ prompt: 'Weet je zeker dat je het volgen via gps wilt stoppen en wilt overschakelen naar Expensify Classic?',
+ confirm: 'Stoppen en overschakelen',
},
locationServicesRequiredModal: {
title: 'Locatietoegang vereist',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 0673a120..28aa1cd2 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6957,7 +6957,7 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
[CONST.SEARCH.GROUP_BY.CARD]: 'Karta',
[CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: 'ID wypłaty',
[CONST.SEARCH.GROUP_BY.CATEGORY]: 'Kategoria',
- [CONST.SEARCH.GROUP_BY.TAG]: 'Etykieta',
+ [CONST.SEARCH.GROUP_BY.TAG]: 'Znacznik',
[CONST.SEARCH.GROUP_BY.MONTH]: 'Miesiąc',
},
feed: 'Kanał',
@@ -8149,9 +8149,9 @@ Oto *paragon testowy*, który pokazuje, jak to działa:`,
notification: {title: 'Śledzenie GPS w toku', body: 'Przejdź do aplikacji, aby dokończyć'},
signOutWarningTripInProgress: {title: 'Śledzenie GPS w toku', prompt: 'Czy na pewno chcesz porzucić podróż i się wylogować?', confirm: 'Odrzuć i wyloguj się'},
switchToODWarningTripInProgress: {
- title: 'GPS tracking in progress',
- prompt: 'Are you sure you want to stop GPS tracking and switch to Expensify Classic?',
- confirm: 'Stop and switch',
+ title: 'Trwa śledzenie GPS',
+ prompt: 'Czy na pewno chcesz zatrzymać śledzenie GPS i przełączyć się na Expensify Classic?',
+ confirm: 'Zatrzymaj i przełącz',
},
locationServicesRequiredModal: {
title: 'Wymagany dostęp do lokalizacji',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 35dec1b0..b6604209 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6956,7 +6956,7 @@ Exija detalhes de despesas como recibos e descrições, defina limites e padrõe
groupBy: {
[CONST.SEARCH.GROUP_BY.FROM]: 'De',
[CONST.SEARCH.GROUP_BY.CARD]: 'Cartão',
- [CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: 'ID da retirada',
+ [CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: 'ID de saque',
[CONST.SEARCH.GROUP_BY.CATEGORY]: 'Categoria',
[CONST.SEARCH.GROUP_BY.TAG]: 'Etiqueta',
[CONST.SEARCH.GROUP_BY.MONTH]: 'Mês',
@@ -8157,9 +8157,9 @@ Aqui está um *recibo de teste* para mostrar como funciona:`,
},
signOutWarningTripInProgress: {title: 'Rastreamento por GPS em andamento', prompt: 'Tem certeza de que deseja descartar a viagem e sair?', confirm: 'Descartar e sair'},
switchToODWarningTripInProgress: {
- title: 'GPS tracking in progress',
- prompt: 'Are you sure you want to stop GPS tracking and switch to Expensify Classic?',
- confirm: 'Stop and switch',
+ title: 'Rastreamento por GPS em andamento',
+ prompt: 'Tem certeza de que deseja parar o rastreamento por GPS e mudar para o Expensify Classic?',
+ confirm: 'Parar e mudar',
},
notification: {title: 'Rastreamento por GPS em andamento', body: 'Ir para o app para finalizar'},
locationServicesRequiredModal: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 86359400..c13b3ebc 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6803,6 +6803,7 @@ ${reportName}
groupBy: {
[CONST.SEARCH.GROUP_BY.FROM]: '来自',
[CONST.SEARCH.GROUP_BY.CARD]: '卡片',
+ //_/\__/_/ \_,_/\__/\__/\_,_/
[CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: '提现 ID',
[CONST.SEARCH.GROUP_BY.CATEGORY]: '类别',
[CONST.SEARCH.GROUP_BY.TAG]: '标签',
@@ -7924,11 +7925,7 @@ ${reportName}
preciseLocationRequiredModal: {title: '需要精确位置', prompt: '请在设备设置中启用“精确位置”以开始 GPS 距离跟踪。'},
desktop: {title: '在手机上跟踪距离', subtitle: '使用 GPS 自动记录英里或公里,并将行程即时转换为报销费用。', button: '下载应用程序'},
signOutWarningTripInProgress: {title: 'GPS 跟踪进行中', prompt: '您确定要放弃此行程并登出吗?', confirm: '放弃并退出'},
- switchToODWarningTripInProgress: {
- title: 'GPS tracking in progress',
- prompt: 'Are you sure you want to stop GPS tracking and switch to Expensify Classic?',
- confirm: 'Stop and switch',
- },
+ switchToODWarningTripInProgress: {title: '正在进行 GPS 跟踪', prompt: '您确定要停止 GPS 追踪并切换到 Expensify Classic 吗?', confirm: '停止并切换'},
notification: {title: '正在进行 GPS 跟踪', body: '前往应用完成'},
continueGpsTripModal: {title: '是否继续记录 GPS 行程?', prompt: '看起来在您上一次的 GPS 行程中应用已关闭。您想从那次行程继续记录吗?', confirm: '继续行程', cancel: '查看行程'},
locationServicesRequiredModal: {title: '需要访问位置信息', confirm: '打开设置', prompt: '请在设备设置中允许位置访问,以开始 GPS 距离跟踪。'},
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
This reverts commit ff82217.
|
@suneox @trjExpensify please ignore, part of GPS project, @dukenv0307 and @AndrewGable will review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 98fc15453e
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
trjExpensify
left a comment
There was a problem hiding this comment.
Core PR for a WN project. 👍
|
@GCyganek Let's revert Mobile-Expensify change, the rest looks good |
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppScreen.Recording.2026-01-30.at.11.28.05.movAndroid: mWeb ChromeiOS: HybridAppScreen.Recording.2026-01-30.at.11.26.35.moviOS: mWeb SafariMacOS: Chrome / SafariScreen.Recording.2026-01-30.at.11.23.30.mov |
|
@GCyganek We got the conflicts |
|
Fixed conflicts and Mobile-Expensify 🫡 |
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚧 @AndrewGable has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.3.16-0 🚀
|
|
🚀 Deployed to production by https://github.com/lakchote in version: 9.3.16-9 🚀
|
Explanation of Change
Adding a warning modal when user has an ongoing trip and tries to switch to OD.
Fixed Issues
$ #80593
PROPOSAL: N/A
Tests
With the ongoing GPS trip:
Switch to Expensify ClassicGPS tracking in progressCancelSwitch to Expensify ClassicagainStop and switchWithout the ongoing GPS trip:
Switch to Expensify ClassicOffline tests
QA Steps
Same as tests
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
Screen.Recording.2026-01-29.at.13.24.45.mov
iOS: Native