Repository navigation
Revert join-workspace onboarding changes - #103649
Conversation
🦜 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 924cd715..014025fe 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -3427,13 +3427,13 @@ ${amount} für ${merchant} – ${date}`,
whereYouWork: 'Wo arbeitest du?',
errorSelection: 'Wähle eine Option, um fortzufahren',
purpose: {
- title: 'Was möchtest du heute tun?',
- errorContinue: 'Bitte auf „Weiter“ drücken, um die Einrichtung abzuschließen',
- errorBackButton: 'Bitte beantworte die Einrichtungsfragen, um die App verwenden zu können',
- [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Ausgaben bei meinem Arbeitgeber einreichen',
- [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Verwalte die Ausgaben meines Teams',
- [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Geschäftsausgaben nachverfolgen',
- [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Meine persönlichen Ausgaben organisieren',
+ title: 'Was möchten Sie heute tun?',
+ errorContinue: 'Bitte drücken Sie auf „Weiter“, um die Einrichtung abzuschließen',
+ errorBackButton: 'Bitte beantworten Sie die Einrichtungsfragen, um die App verwenden zu können',
+ [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Auslagen bei meinem Arbeitgeber einreichen',
+ [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Ausgaben meines Teams verwalten',
+ [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Ausgaben für mein Unternehmen erfassen',
+ [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Meine privaten Ausgaben organisieren',
[CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: 'Etwas anderes',
},
personalTrackGoal: {
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 731444a6..f4baa68a 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -3473,12 +3473,12 @@ ${amount} για ${merchant} - ${date}`,
errorSelection: 'Επιλέξτε μια επιλογή για να συνεχίσετε',
purpose: {
title: 'Τι θέλετε να κάνετε σήμερα;',
- errorContinue: 'Πατήστε «συνέχεια» για να ολοκληρώσετε τη ρύθμιση',
+ errorContinue: 'Πατήστε συνέχεια για να ολοκληρώσετε τη ρύθμιση',
errorBackButton: 'Ολοκληρώστε τις ερωτήσεις ρύθμισης για να αρχίσετε να χρησιμοποιείτε την εφαρμογή',
[CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Υποβολή εξόδων στον εργοδότη μου',
- [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Διαχείριση των εξόδων της ομάδας μου',
- [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Παρακολουθήστε τα έξοδά μου για την επιχείρησή μου',
- [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Οργάνωση των προσωπικών μου δαπανών',
+ [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Διαχειριστείτε τα έξοδα της ομάδας μου',
+ [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Παρακολουθήστε έξοδα για την επιχείρησή σας',
+ [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Οργάνωση των προσωπικών δαπανών μου',
[CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: 'Κάτι άλλο',
},
personalTrackGoal: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 01ee29f5..1f63f985 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3323,13 +3323,13 @@ ${amount} para ${merchant} - ${date}`,
errorSelection: 'Selecciona una opción para continuar',
purpose: {
title: '¿Qué quieres hacer hoy?',
- errorContinue: 'Por favor, haz click en continuar para configurar tu cuenta',
- errorBackButton: 'Por favor, finaliza las preguntas de configuración para empezar a utilizar la aplicación',
- [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Enviar gastos a mi empleador',
- [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Gestionar los gastos de mi equipo',
- [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Controlar gastos de mi negocio',
- [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Organizar mis gastos personales',
- [CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: 'Algo más',
+ errorContinue: 'Pulsa continuar para configurar todo',
+ errorBackButton: 'Termina las preguntas de configuración para empezar a usar la app',
+ [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Enviar gastos a mi empresa',
+ [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Gestiona los gastos de mi equipo',
+ [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Controla los gastos de mi empresa',
+ [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Organiza mis gastos personales',
+ [CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: 'Otra cosa',
},
personalTrackGoal: {
title: '¿Qué estás buscando organizar?',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 6455119f..251548c8 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -3435,9 +3435,9 @@ ${amount} pour ${merchant} - ${date}`,
errorSelection: 'Sélectionnez une option pour continuer',
purpose: {
title: 'Que voulez-vous faire aujourd’hui ?',
- errorContinue: 'Veuillez appuyer sur Continuer pour procéder à la configuration',
+ errorContinue: 'Veuillez appuyer sur Continuer pour terminer la configuration',
errorBackButton: 'Veuillez terminer les questions de configuration pour commencer à utiliser l’application',
- [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Soumettre des dépenses à mon employeur',
+ [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Soumettre des notes de frais à mon employeur',
[CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Gérer les dépenses de mon équipe',
[CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Suivre les dépenses de mon entreprise',
[CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Organiser mes dépenses personnelles',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index c19862c0..48f60c4d 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -3411,12 +3411,12 @@ ${amount} per ${merchant} - ${date}`,
whereYouWork: 'Dove lavori?',
errorSelection: 'Seleziona un’opzione per procedere',
purpose: {
- title: 'Cosa vuoi fare oggi?',
+ title: 'Che cosa vuoi fare oggi?',
errorContinue: 'Premi Continua per completare la configurazione',
errorBackButton: 'Completa le domande di configurazione per iniziare a usare l’app',
- [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Inviare le spese al mio datore di lavoro',
+ [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Invia note spese al mio datore di lavoro',
[CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Gestisci le spese del mio team',
- [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Tieni traccia delle spese aziendali',
+ [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Tieni traccia delle spese per la mia attività',
[CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Organizza le mie spese personali',
[CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: 'Altro',
},
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 2bc11e98..49b0b428 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -3384,12 +3384,12 @@ ${date} の ${merchant} への ${amount}`,
errorSelection: '次に進むオプションを選択してください',
purpose: {
title: '今日は何をしたいですか？',
- errorContinue: '続行を押してセットアップを完了してください',
- errorBackButton: 'アプリを使い始めるには、セットアップの質問にすべて回答してください',
- [CONST.ONBOARDING_CHOICES.EMPLOYER]: '雇用主に経費を提出する',
- [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'チームの経費を管理',
- [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'ビジネスの経費を記録',
- [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: '個人の支出を管理',
+ errorContinue: 'セットアップを行うには「続行」を押してください',
+ errorBackButton: 'アプリを利用開始するには、セットアップの質問に回答してください',
+ [CONST.ONBOARDING_CHOICES.EMPLOYER]: '経費を勤務先に提出する',
+ [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'チームの経費を管理する',
+ [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'ビジネスの経費を管理する',
+ [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: '個人の支出を整理する',
[CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: 'その他',
},
personalTrackGoal: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 36e9f48c..19f4bf65 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -3416,12 +3416,12 @@ ${amount} voor ${merchant} - ${date}`,
errorSelection: 'Selecteer een optie om verder te gaan',
purpose: {
title: 'Wat wil je vandaag doen?',
- errorContinue: 'Druk op ‘Doorgaan’ om de installatie te voltooien',
- errorBackButton: 'Beantwoord eerst de instelvragen om de app te kunnen gebruiken',
- [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Onkosten indienen bij mijn werkgever',
- [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'De onkosten van mijn team beheren',
- [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Zakelijke uitgaven bijhouden',
- [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Mijn persoonlijke uitgaven organiseren',
+ errorContinue: 'Druk op doorgaan om de installatie te voltooien',
+ errorBackButton: 'Beantwoord de installatievragen om de app te gaan gebruiken',
+ [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Declareren bij mijn werkgever',
+ [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Beheer de uitgaven van mijn team',
+ [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Uitgaven voor mijn bedrijf bijhouden',
+ [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Mijn persoonlijke uitgaven ordenen',
[CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: 'Iets anders',
},
personalTrackGoal: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index ba7ac249..ca7ab13a 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -3446,12 +3446,12 @@ ${amount} dla ${merchant} - ${date}`,
errorSelection: 'Wybierz opcję, aby przejść dalej',
purpose: {
title: 'Co chcesz dzisiaj zrobić?',
- errorContinue: 'Naciśnij „Kontynuuj”, aby się skonfigurować',
- errorBackButton: 'Dokończ pytania konfiguracyjne, aby zacząć korzystać z aplikacji',
- [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Zgłoś wydatki pracodawcy',
+ errorContinue: 'Naciśnij „Dalej”, aby dokończyć konfigurację',
+ errorBackButton: 'Dokończ pytania konfiguracji, aby zacząć korzystać z aplikacji',
+ [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Wyślij wydatki do mojego pracodawcy',
[CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Zarządzaj wydatkami mojego zespołu',
- [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Śledź wydatki firmowe',
- [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Organizuj swoje wydatki osobiste',
+ [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Śledź wydatki mojej firmy',
+ [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Porządkuj moje prywatne wydatki',
[CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: 'Coś innego',
},
personalTrackGoal: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 9c2257c2..b5f7f893 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -3405,7 +3405,7 @@ ${amount} para ${merchant} - ${date}`,
title: 'O que você quer fazer hoje?',
errorContinue: 'Pressione continuar para concluir a configuração',
errorBackButton: 'Conclua as perguntas de configuração para começar a usar o app',
- [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Enviar despesas ao meu empregador',
+ [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Enviar despesas para meu empregador',
[CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Gerenciar as despesas da minha equipe',
[CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: 'Controlar despesas do meu negócio',
[CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: 'Organizar meus gastos pessoais',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 0169e014..2552b0bf 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -3301,12 +3301,12 @@ ${amount}，商户：${merchant} - 日期：${date}`,
errorSelection: '选择一个选项以继续',
purpose: {
title: '你今天想做什么？',
- errorContinue: '请按“继续”完成设置',
+ errorContinue: '请点击“继续”完成设置',
errorBackButton: '请完成设置问题以开始使用此应用程序',
- [CONST.ONBOARDING_CHOICES.EMPLOYER]: '向雇主提交费用',
+ [CONST.ONBOARDING_CHOICES.EMPLOYER]: '向我的雇主提交报销',
[CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: '管理我团队的报销',
- [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: '跟踪我的商务开销',
- [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: '管理我的个人支出',
+ [CONST.ONBOARDING_CHOICES.TRACK_BUSINESS]: '记录我的业务支出',
+ [CONST.ONBOARDING_CHOICES.TRACK_PERSONAL]: '整理我的个人支出',
[CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: '其他原因',
},
personalTrackGoal: {
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
|
@parasharrajat @iwiznia One of you needs to 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] |
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
@MelvinBot investiate failing React test |
|
@MelvinBot fix jest test too. |
…ler regression Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>
|
@ikevin127 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] |
|
Fixed the failing React Compiler Compliance check in ee0783e. Cause: The revert changed Fix: I kept the Other failure: I couldn't run the compliance check locally, so please confirm it passes on the new CI run. |
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.
|
|
No Jest fix is needed. All 8 Jest jobs pass on the latest commit (ee0783e), including The earlier failure in The only remaining failure is |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 960deb1782
ℹ️ About Codex in GitHub
Your team has set up Codex to 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 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| jest.clearAllMocks(); | ||
| }); | ||
|
|
||
| it('should not dispatch when navigation is not ready', () => { |
There was a problem hiding this comment.
All four new it blocks in this file omit the mandatory // Given, // When, and // Then explanations. Add those comments to each case so the new suite complies with the repository’s test-documentation requirement. CLAUDE.mdL77-L81
Useful? React with 👍 / 👎.
|
🚧 puneetlath 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! 🧪🧪
|
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
Revert join-workspace onboarding changes (cherry picked from commit 930932b) (cherry-picked to staging by puneetlath)
…37978880059-1 🍒 Cherry pick PR #103649 to staging 🍒
|
🔁 Filed a Staging retest request for deploy blockers #103545 after this PR was cherry-picked to staging. |
|
🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.5.6-6 🚀
|
|
No help site update is needed: this PR removes the join-workspace onboarding option, and no article under Note: the open docs PR [No QA] Docs updates for E/A#99833 Add Join my company workspace option to help article documents the feature this PR reverts. Please close it or put it on hold so it doesn't merge. |
|
🚀 Deployed to production by https://github.com/puneetlath in version: 9.5.6-6 🚀
Bundle Size Analysis (Sentry): |
|
🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.5.7-0 🚀
|
|
No help site update is needed. No published article in One follow-up: [No QA] Docs updates for E/A#99833 Add Join my company workspace option to help article is still open and documents the feature this PR removed. Please close it or put it on hold until the feature comes back, so it doesn't document something users can't see. |
4 participants
Explanation of Change
Directly reverts the merge commits for the join-workspace onboarding feature and its three follow-ups, in reverse dependency order:
The onboarding modal deploy blocker still reproduces on staging build 9.5.6-4 after the attempted fix, so the feature and its dependent fixes need to roll back atomically.
Fixed Issues
$ #103545
PROPOSAL:
Tests
npm test -- --silent tests/ui/OnboardingPurpose.tsx tests/ui/WorkEmailOnboarding.tsx tests/ui/WorkspaceOnboarding.tsx tests/ui/PersonalDetailsOnboarding.tsx tests/unit/OnboardingFlowTest.ts.Offline tests
N/A. This is a direct rollback of an online sign-in and onboarding feature.
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectionAvatar, I verified the components usingAvatarare working as expected)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.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