[CP Staging] Revert "Make Copilot switching discoverable with a dedicated Switch button on the Accounts page"#95748
Conversation
…utton on the Accounts page"
melvin-bot
Bot
requested review from
flaviadefaria and
stitesExpensify
and removed request for
a team
|
@stitesExpensify 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] |
🦜 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/es.ts b/src/languages/es.ts
index 3d2611ddadf..d2d28c0419d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -10184,7 +10184,7 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
productTrainingTooltip: {
conciergeLHNGBR: '<tooltip>¡Comienza <strong>aquí</strong>!</tooltip>',
saveSearchTooltip: '<tooltip><strong>Renombra tus búsquedas guardadas</strong> aquí</tooltip>',
- accountSwitcher: '<tooltip>Accede a tus <strong>cuentas copiloto</strong> aquí</tooltip>',
+ accountSwitcher: '<tooltip>Accede a tus <strong>cuentas Copilot</strong> aquí</tooltip>',
outstandingFilter: '<tooltip>Filtra los gastos\nque <strong>necesitan aprobación</strong></tooltip>',
scanTestDriveTooltip: '<tooltip>¡Envía este recibo para\n<strong>completar la prueba</strong>!</tooltip>',
gpsTooltip: '<tooltip>¡Seguimiento por GPS en curso! Cuando termines, detén el seguimiento a continuación.</tooltip>',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index c72fe038527..913cc70d278 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9989,7 +9989,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
productTrainingTooltip: {
conciergeLHNGBR: '<tooltip>Begin <strong>hier!</strong></tooltip>',
saveSearchTooltip: '<tooltip><strong>Hernoem hier je opgeslagen zoekopdrachten</strong>!</tooltip>',
- accountSwitcher: '<tooltip>Krijg hier toegang tot je <strong>Copilot-accounts</strong></tooltip>',
+ accountSwitcher: '<tooltip>Je <strong>Copilot-accounts</strong> vind je hier</tooltip>',
outstandingFilter: '<tooltip>Filter voor uitgaven\ndie <strong>goedkeuring nodig hebben</strong></tooltip>',
scanTestDriveTooltip: '<tooltip>Stuur deze bon om\n<strong>de proefrit te voltooien!</strong></tooltip>',
gpsTooltip: '<tooltip>GPS-tracking bezig! Als je klaar bent, stop dan hieronder met bijhouden.</tooltip>',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 6bdb3473d4d..bf2839c754e 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9963,7 +9963,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
productTrainingTooltip: {
conciergeLHNGBR: '<tooltip>Rozpocznij <strong>tutaj!</strong></tooltip>',
saveSearchTooltip: '<tooltip><strong>Zmień nazwę zapisanych wyszukiwań</strong> tutaj!</tooltip>',
- accountSwitcher: '<tooltip>Uzyskaj tutaj dostęp do <strong>kont Copilot</strong></tooltip>',
+ accountSwitcher: '<tooltip>Uzyskaj dostęp do swoich <strong>kont Copilot</strong> tutaj</tooltip>',
outstandingFilter: '<tooltip>Filtruj wydatki,\nktóre <strong>wymagają zatwierdzenia</strong></tooltip>',
scanTestDriveTooltip: '<tooltip>Wyślij ten paragon, aby\n<strong>zakończyć jazdę próbną!</strong></tooltip>',
gpsTooltip: '<tooltip>Śledzenie GPS w toku! Gdy skończysz, zatrzymaj śledzenie poniżej.</tooltip>',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 367a9053251..da72260dd96 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9978,7 +9978,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
productTrainingTooltip: {
conciergeLHNGBR: '<tooltip>Comece <strong>aqui!</strong></tooltip>',
saveSearchTooltip: '<tooltip><strong>Renomeie suas buscas salvas</strong> aqui!</tooltip>',
- accountSwitcher: '<tooltip>Acesse suas <strong>contas Copilot</strong> aqui</tooltip>',
+ accountSwitcher: '<tooltip>Acesse suas <strong>contas do Copilot</strong> aqui</tooltip>',
outstandingFilter: '<tooltip>Filtrar despesas\nque <strong>precisam de aprovação</strong></tooltip>',
scanTestDriveTooltip: '<tooltip>Envie este recibo para\n<strong>concluir o test drive!</strong></tooltip>',
gpsTooltip: '<tooltip>Rastreamento por GPS em andamento! Quando terminar, pare o rastreamento abaixo.</tooltip>',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 971d7aaa182..3543891cca9 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -9682,7 +9682,7 @@ ${reportName}`,
productTrainingTooltip: {
conciergeLHNGBR: '<tooltip>从<strong>这里</strong>开始！</tooltip>',
saveSearchTooltip: '<tooltip>在这里<strong>重命名已保存的搜索</strong>！</tooltip>',
- accountSwitcher: '<tooltip>在此访问你的<strong>Copilot 账户</strong></tooltip>',
+ accountSwitcher: '<tooltip>在这里访问你的<strong>Copilot 账户</strong></tooltip>',
outstandingFilter: '<tooltip>筛选<strong>待审批</strong>的报销</tooltip>',
scanTestDriveTooltip: '<tooltip>发送此收据以\n<strong>完成试用体验！</strong></tooltip>',
gpsTooltip: '<tooltip>正在进行 GPS 跟踪！完成后，请在下方停止跟踪。</tooltip>',
Note You can apply these changes to your branch by copying the patch to your clipboard, then 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.
|
![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: 658bde1c7e
ℹ️ 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".
| shiftVertical: variables.accountSwitcherTooltipShiftVertical, | ||
| shiftHorizontal: variables.accountSwitcherTooltipShiftHorizontal, | ||
| wrapperStyle: styles.productTrainingTooltipWrapper, | ||
| onTooltipPress: onPressSwitcher, | ||
| // The switcher lives in the settings sidebar, which isn't the navigation-focused screen on wide layouts. | ||
| // Without this the educational tooltip is suppressed (it relies on the screen being focused), so keep it shown until dismissed. | ||
| shouldHideOnNavigate: false, | ||
| } |
There was a problem hiding this comment.
When the Accounts page is shown in the wide settings split with a right-hand settings pane focused, BaseEducationalTooltip defaults shouldHideOnNavigate to true and suppresses itself whenever useIsFocused() is false. This switcher is gated with useIsSidebarRouteActive instead, so removing the shouldHideOnNavigate={false} override means the Copilot product-training tooltip can register but never become visible for desktop users with delegators. Please keep that override on the educational tooltip props.
Useful? React with 👍 / 👎.
mountiny
changed the title
…pilot-switch-button Revert "Make Copilot switching discoverable with a dedicated Switch button on the Accounts page" (cherry picked from commit 8119a52) (cherry-picked to staging by Julesssss)
|
🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.4.32-3 🚀
|
|
🤖 Help site review: no changes required. I reviewed the changes in this PR against the help site articles under What this PR does: It reverts Expensify/App#93393, removing the dedicated Switch button that had been added to the account switcher at the top of the Account page and restoring the original avatar + name + caret UI (you tap the account owner's name to open the account switcher). It also restores the status picker button and reverts the Why no docs change is needed:
Since the help site already reflects the post-revert behavior, I did not create a docs PR. @inimaga, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR (Note: no help site PR was created because no documentation changes are required — see above.) |
|
🚀 Deployed to production by https://github.com/grgia in version: 9.4.32-3 🚀
Bundle Size Analysis (Sentry): |
|
🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.4.33-0 🚀
|
Help site review — no changes required ✅I reviewed the changes in this PR against the help site articles under Why: This PR reverts #93393 ("Make Copilot switching discoverable with a dedicated Switch button on the Accounts page"). The revert removes that dedicated button and restores the previous behavior — the account switcher is opened by pressing the account name/avatar area (which shows a caret), and the status picker button is re-added next to it. The diff is limited to The only customer-facing help article that describes this UI is
The tooltip/product-training copy changes (e.g. @inimaga, since no help site changes are required, I did not open a draft docs PR. If you believe the account-switcher flow should be documented differently, let me know and I can draft one. |
5 participants
Reverts #93393
Fixes a multitude of deploy blockers including:
Original issue: #92253
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectionAvatar, 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.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