🍒 Cherry pick PR #94333 to staging 🍒#94357
Conversation
(cherry picked from commit 815f013) (cherry-picked to staging by blimpich)
os-botify
Bot
added
Engineering
Hourly
melvin-bot
Bot
requested review from
jasperhuangg
and removed request for
a team
|
@jasperhuangg 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] |
![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: a3760f3291
ℹ️ 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".
| { | ||
| "name": "new.expensify", | ||
| "version": "9.4.17-2", | ||
| "version": "9.4.17-3", |
There was a problem hiding this comment.
This conflict-resolution commit only bumps the 9.4.17-3 release metadata and the submodule pointer; it never applies the actual changes from PR #94333 (e.g. the submit-flow revert in SubmitPrimaryAction.tsx, SubmitActionButton.tsx, search/report components, and tests all remain exactly as in parent cc67462). Merging this as the staging CP would ship a new build number without the revert it was created to deploy, so the reported submit-button behavior remains unfixed.
Useful? React with 👍 / 👎.
[CP Staging] Revert: Submit button with manager email prompt (cherry picked from commit a7895e2) (cherry-picked to staging by blimpich)
melvin-bot
Bot
requested review from
trjExpensify
and removed request for
a team
🦜 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 019213baa17..e19b44b741c 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9812,7 +9812,6 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index cc6645d3974..81e48ed1e26 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9844,7 +9844,6 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index cb21b7c97d1..89c4f9030ad 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9800,7 +9800,6 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 1538171707c..c801c8667a7 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -9677,7 +9677,6 @@ ${reportName}`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 432e8cadd24..161886e76b4 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9766,7 +9766,6 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index f3fed1259b2..6824bf7c9d7 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9751,7 +9751,6 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 4ba5c6508d3..725abc22c08 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9755,7 +9755,6 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 6eac298f128..96949a66759 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -9493,7 +9493,6 @@ ${reportName}`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
|
🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.4.17-3 🚀
Bundle Size Analysis (Sentry): |
|
🤖 No help site changes required. This PR is an emergency revert of #87998 ("Submit button with manager email prompt"), which removes the in-app Submit report to popover that let a submitter pick a workspace member or type an email address as the submission recipient. The removed strings ( I reviewed
Because the help site already reflects the current (post-revert) behavior, there is nothing to update and no draft PR was created. @carlosmiceli, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR |
|
🚀 Deployed to production by https://github.com/blimpich in version: 9.4.17-3 🚀
|
1 similar comment
|
🚀 Deployed to production by https://github.com/blimpich in version: 9.4.17-3 🚀
|
5 participants
🍒 Cherry pick #94333 to staging 🍒
This PR had conflicts when we tried to cherry-pick it to staging. You'll need to manually perform the cherry-pick, using the following steps:
Then manually resolve conflicts, and commit the change with
git cherry-pick --continue. Lastly, please run:This last part is important. It will help us keep track of who triggered this CP, and will ensure that version bumps are tracked correctly. Once all that's done, push your changes with
git push origin cherry-pick-staging-94333-28050388663-1, and then open this PR for review.Note that you must test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main.
Important
This PR should ideally be merged by a member of the mobile-deployers team. If it is merged by someone who is not a deployer, the staging deploy triggered by the merge will fail and will need to be manually re-triggered (not just retried) via the deploy workflow.
Pro-tip: If this PR appears to have conflicts against the staging base, it means that the version on staging has been updated. The easiest thing to do if you see this is to close the PR and re-run the CP.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)Avatar, 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