Skip to content

[CP Staging] Reverts #75328#75675

Merged
mountiny merged 1 commit into
mainfrom
valforte/revert75328
Nov 21, 2025
Merged

[CP Staging] Reverts #75328#75675
mountiny merged 1 commit into
mainfrom
valforte/revert75328

Conversation

@Valforte

@Valforte Valforte commented Nov 20, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

Manual revert of #75328

After migrating from OldDot to NewDot experience in native app, the app crashes when moved to new experience the app is crashing, this PR is a culprit for for the RCA

Fixed Issues

#75629

@Valforte
Valforte requested review from a team as code owners November 20, 2025 14:39
@Valforte
Valforte requested review from mountiny and removed request for a team November 20, 2025 14:39
@Valforte Valforte self-assigned this Nov 20, 2025
@melvin-bot
melvin-bot Bot requested review from tgolen and trjExpensify November 20, 2025 14:39
@melvin-bot

melvin-bot Bot commented Nov 20, 2025

Copy link
Copy Markdown

@tgolen 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]

@OSBotify

Copy link
Copy Markdown
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 diff
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 2ed9e23b..7178ffec 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7441,12 +7441,12 @@ ${
     },
     migratedUserWelcomeModal: {
         title: 'Willkommen bei New Expensify!',
-        subtitle: 'New Expensify hat die gleiche großartige Automatisierung, aber jetzt mit erstaunlicher Zusammenarbeit:',
+        subtitle: 'Das neue Expensify bietet die gleiche hervorragende Automatisierung, aber jetzt mit beeindruckender Zusammenarbeit:',
         confirmText: "Los geht's!",
         features: {
-            chat: '<strong>Chatten Sie direkt über jede Ausgabe</strong>, jeden Bericht oder Arbeitsbereich',
-            scanReceipt: '<strong>Belege scannen</strong> und Rückerstattung erhalten',
-            crossPlatform: 'Erledigen Sie <strong>alles</strong> von Ihrem Telefon oder Browser aus',
+            chat: '<strong>Direkt in jeder Ausgabe chatten</strong>, in jedem Bericht oder Arbeitsbereich',
+            scanReceipt: '<strong>Belege scannen</strong> und Geld zurückbekommen',
+            crossPlatform: 'Erledigen Sie <strong>alles</strong> auf Ihrem Handy oder im Browser',
         },
     },
     productTrainingTooltip: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 558c64d7..07a52eda 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7446,12 +7446,12 @@ ${
     },
     migratedUserWelcomeModal: {
         title: 'Bienvenue sur New Expensify !',
-        subtitle: 'New Expensify a la même excellente automatisation, mais maintenant avec une collaboration incroyable :',
+        subtitle: 'Le nouveau Expensify offre la même excellente automatisation, mais désormais avec une collaboration incroyable :',
         confirmText: 'Allons-y !',
         features: {
-            chat: "<strong>Discutez directement sur n'importe quelle dépense</strong>, rapport ou espace de travail",
-            scanReceipt: '<strong>Scannez les reçus</strong> et soyez remboursé',
-            crossPlatform: 'Faites <strong>tout</strong> depuis votre téléphone ou navigateur',
+            chat: "<strong>Discutez directement sur n'importe quelle dépense</strong>, un rapport ou un espace de travail",
+            scanReceipt: '<strong>Scannez des reçus</strong> et faites-vous rembourser',
+            crossPlatform: 'Faites <strong>tout</strong> depuis votre téléphone ou votre navigateur',
         },
     },
     productTrainingTooltip: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 7e1f9ad4..795d3754 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7424,12 +7424,12 @@ ${
     },
     migratedUserWelcomeModal: {
         title: 'Benvenuto in New Expensify!',
-        subtitle: 'Il nuovo Expensify ha la stessa fantastica automazione, ma ora con una collaborazione straordinaria:',
+        subtitle: 'Il nuovo Expensify ha la stessa eccellente automazione, ma ora con una collaborazione eccezionale:',
         confirmText: 'Andiamo!',
         features: {
             chat: '<strong>Chatta direttamente su qualsiasi spesa</strong>, report o spazio di lavoro',
-            scanReceipt: '<strong>Scansiona le ricevute</strong> e ricevi il rimborso',
-            crossPlatform: 'Fai <strong>tutto</strong> dal tuo telefono o browser',
+            scanReceipt: '<strong>Scansiona le ricevute</strong> e ricevi un rimborso',
+            crossPlatform: 'Fai <strong>tutto</strong> dal tuo telefono o dal browser',
         },
     },
     productTrainingTooltip: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index c656c5f7..678ab2c6 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7356,12 +7356,12 @@ ${
     },
     migratedUserWelcomeModal: {
         title: 'New Expensifyへようこそ!',
-        subtitle: '新しいExpensifyは、素晴らしい自動化機能に加えて、驚くべきコラボレーション機能を備えています。',
+        subtitle: '新しい Expensify は、これまでと同じ優れた自動化に加え、今では驚くべきコラボレーションも備えています:',
         confirmText: '行きましょう!',
         features: {
-            chat: '<strong>任意の経費</strong>、レポート、またはワークスペースで直接チャット',
-            scanReceipt: '<strong>領収書をスキャン</strong>して払い戻しを受ける',
-            crossPlatform: '<strong>すべて</strong>を携帯電話やブラウザから行う',
+            chat: '<strong>あらゆる経費で直接チャット</strong>、レポートやワークスペースでも可能です',
+            scanReceipt: '<strong>領収書をスキャン</strong>して払い戻しを受け取る',
+            crossPlatform: 'スマートフォンやブラウザから<strong>すべて</strong>を行えます',
         },
     },
     productTrainingTooltip: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 38820abc..5a1b7681 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7404,12 +7404,12 @@ ${
     },
     migratedUserWelcomeModal: {
         title: 'Welkom bij New Expensify!',
-        subtitle: 'Nieuwe Expensify heeft dezelfde geweldige automatisering, maar nu met geweldige samenwerking:',
+        subtitle: 'New Expensify heeft dezelfde geweldige automatisering, maar nu met fantastische samenwerking:',
         confirmText: 'Laten we gaan!',
         features: {
-            chat: '<strong>Chat direct op elke uitgave</strong>, rapport of werkruimte',
-            scanReceipt: '<strong>Scan bonnetjes</strong> en krijg je geld terugbetaald',
-            crossPlatform: 'Doe <strong>alles</strong> vanaf je telefoon of browser',
+            chat: '<strong>Chat rechtstreeks op elke uitgave</strong>, rapport of werkruimte',
+            scanReceipt: '<strong>Scan bonnetjes</strong> en krijg je geld terug',
+            crossPlatform: 'Doe <strong>alles</strong> op je telefoon of in je browser',
         },
     },
     productTrainingTooltip: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 0134fdca..90dc109b 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7392,12 +7392,12 @@ ${
     },
     migratedUserWelcomeModal: {
         title: 'Witamy w New Expensify!',
-        subtitle: 'Nowy Expensify ma tę samą świetną automatyzację, ale teraz z niesamowitą współpracą:',
+        subtitle: 'Nowy Expensify oferuje tę samą świetną automatyzację, ale teraz także niesamowitą współpracę:',
         confirmText: 'Zaczynajmy!',
         features: {
-            chat: '<strong>Czatuj bezpośrednio na dowolnym wydatku</strong>, raporcie lub przestrzeni roboczej',
-            scanReceipt: '<strong>Skanuj paragony</strong> i otrzymuj zwrot pieniędzy',
-            crossPlatform: 'Rób <strong>wszystko</strong> z telefonu lub przeglądarki',
+            chat: '<strong>Czatuj bezpośrednio przy każdym wydatku</strong>, raporcie lub przestrzeni roboczej',
+            scanReceipt: '<strong>Zeskanuj paragony</strong> i otrzymaj zwrot',
+            crossPlatform: 'Rób <strong>wszystko</strong> z poziomu telefonu lub przeglądarki',
         },
     },
     productTrainingTooltip: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 262a3242..53ff4844 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7406,8 +7406,8 @@ ${
         confirmText: 'Vamos lá!',
         features: {
             chat: '<strong>Converse diretamente em qualquer despesa</strong>, relatório ou espaço de trabalho',
-            scanReceipt: '<strong>Escaneie recibos</strong> e receba o reembolso',
-            crossPlatform: 'Faça <strong>tudo</strong> do seu telefone ou navegador',
+            scanReceipt: '<strong>Digitalize recibos</strong> e receba o reembolso',
+            crossPlatform: 'Faça <strong>tudo</strong> pelo seu celular ou navegador',
         },
     },
     productTrainingTooltip: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index a0f83fdf..54c99f8c 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7243,13 +7243,9 @@ ${
     },
     migratedUserWelcomeModal: {
         title: '欢迎使用 New Expensify!',
-        subtitle: '新Expensify拥有同样出色的自动化功能,但现在增加了令人惊叹的协作功能:',
+        subtitle: '全新 Expensify 具备同样出色的自动化功能,如今更拥有卓越的协作能力:',
         confirmText: '我们走吧!',
-        features: {
-            chat: '<strong>直接在任何费用</strong>、报告或工作区上聊天',
-            scanReceipt: '<strong>扫描收据</strong>并获得报销',
-            crossPlatform: '通过手机或浏览器完成<strong>所有操作</strong>',
-        },
+        features: {chat: '<strong>在任何费用上直接聊天</strong>、报表或工作区', scanReceipt: '<strong>扫描收据</strong>并获得报销', crossPlatform: '用手机或浏览器完成<strong>一切</strong>'},
     },
     productTrainingTooltip: {
         // TODO: CONCIERGE_LHN_GBR tooltip will be replaced by a tooltip in the #admins room

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply 😉

@codecov

codecov Bot commented Nov 20, 2025

Copy link
Copy Markdown

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.

Files with missing lines Coverage Δ
src/CONST/index.ts 85.71% <ø> (ø)
src/components/MigratedUserWelcomeModal.tsx 9.09% <0.00%> (-6.54%) ⬇️
... and 6 files with indirect coverage changes

@stitesExpensify

Copy link
Copy Markdown
Contributor

@Valforte did you confirm that this revert fixes the original issue?

@mountiny

Copy link
Copy Markdown
Contributor

Running a build so it could be tested

@github-actions

Copy link
Copy Markdown
Contributor

🚧 @mountiny has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

Copy link
Copy Markdown
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
Built from App PR #75675.

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/75675/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/75675/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/75675/NewExpensify.dmg https://75675.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@tgolen

tgolen commented Nov 20, 2025

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@tgolen tgolen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please update the PR description to include the context about why this PR needed to be reverted?

@mountiny

Copy link
Copy Markdown
Contributor

I have asked QA to retest on this PR as they could reproduce in staging https://expensify.slack.com/archives/C9YU7BX5M/p1763675233297339

@mountiny mountiny changed the title Reverts #75328 [CP Staging] Reverts #75328 Nov 20, 2025

@mountiny mountiny left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

QA confirmed here that the blocker is fixed on this branch and remains on staging so we can proceed with the CP https://expensify.slack.com/archives/C9YU7BX5M/p1763683650416879?thread_ts=1763675233.297339&cid=C9YU7BX5M

@mountiny
mountiny merged commit 24df67a into main Nov 21, 2025
35 of 40 checks passed
@mountiny
mountiny deleted the valforte/revert75328 branch November 21, 2025 00:16
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Nov 21, 2025
marcaaron pushed a commit that referenced this pull request Nov 21, 2025
[CP Staging] Reverts #75328

(cherry picked from commit 24df67a)

(cherry-picked to staging by marcaaron)
@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

grgia added a commit that referenced this pull request Nov 21, 2025
…555581075-1

🍒 Cherry pick PR #75675 to staging 🍒
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.2.61-5 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.2.61-5 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.2.62-0 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.2.62-5 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants