[CP Staging] Revert https://github.com/Expensify/App/pull/90029#91721
Merged
Conversation
|
@jayeshmangwani 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] |
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
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 diffdiff --git a/src/languages/es.ts b/src/languages/es.ts
index cf1889979f8..1c0b0f43488 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7796,7 +7796,7 @@ ${amount} para ${merchant} - ${date}`,
amount: {
lessThan: (amount) => `Menos de ${amount ?? ''}`,
greaterThan: (amount) => `Más que ${amount ?? ''}`,
- between: (greaterThan, lessThan) => `Entre ${greaterThan} y ${lessThan}`,
+ between: (greaterThan: string, lessThan: string) => `Entre ${greaterThan} y ${lessThan}`,
equalTo: (amount) => `Igual a ${amount ?? ''}`,
},
current: 'Actual',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 2efe3c162d5..881a138d0f9 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7861,7 +7861,7 @@ ${reportName}
amount: {
lessThan: (amount?: string) => `${amount ?? ''} 未満`,
greaterThan: (amount?: string) => `${amount ?? ''}より大きい`,
- between: (greaterThan: string, lessThan: string) => `${greaterThan} 以上 ${lessThan} 未満`,
+ between: (greaterThan: string, lessThan: string) => `${greaterThan} 以上 ${lessThan} 以下`,
equalTo: (amount?: string) => `${amount ?? ''} に等しい`,
},
card: {
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 1917cb3de9
ℹ️ 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".
Comment on lines
+213
to
+217
| <PopoverWithMeasuredContent | ||
| anchorRef={triggerRef} | ||
| avoidKeyboard | ||
| isVisible={isOverlayVisible} | ||
| onClose={toggleOverlay} |
There was a problem hiding this comment.
The new DropdownButton no longer passes shouldHandleNavigationBack into PopoverWithMeasuredContent, so these overlays use the default false behavior. In web contexts, when a search filter popup is open and the user presses browser back, the app navigates away instead of dismissing the popup first, which is a regression from the previous FilterPopupButton flow and can cause accidental page exits while editing filters.
Useful? React with 👍 / 👎.
Contributor
Author
|
This is a revert, merging |
|
@JS00001 looks like this was merged without a test passing. Please add a note explaining why this was done and remove the |
Contributor
Author
Contributor
|
🚧 @JS00001 has triggered a test Expensify/App build. You can view the workflow run here. |
Contributor
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
54 tasks
Contributor
|
🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.82-1 🚀
Bundle Size Analysis (Sentry): |
Contributor
|
I reviewed the changes in this PR against the help site articles under No help site changes are required. This PR reverts #90029, which modified the internal UI implementation of search filter dropdowns and advanced filter popups. The help site articles that cover search functionality ( @JS00001, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR |
Contributor
|
🚀 Deployed to production by https://github.com/mountiny in version: 9.3.82-3 🚀
|
Contributor
|
🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.83-0 🚀
Bundle Size Analysis (Sentry): |
Contributor
|
I reviewed the changes in this PR against the help site files under No help site changes are required. This PR reverts #90029, which modified internal search filter UI components (filter popups, dropdown buttons, advanced filter layouts, etc.). The existing help site articles describe search and filtering in general, user-facing terms — search operators, search shortcuts, the Spend page filters — without referencing the specific UI implementation details that were added and then reverted here. The conceptual behavior documented in the help site remains accurate after this revert. Articles reviewed:
@JS00001, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR |
Contributor
|
🚀 Deployed to production by https://github.com/mountiny in version: 9.3.83-3 🚀
|
72 tasks
Contributor
|
🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.4.5-0 🚀
Bundle Size Analysis (Sentry): |
Contributor
Help site review — no docs changes requiredI reviewed the changes in this PR against the help site files under Conclusion: No help site updates are required, so I have not created a draft docs PR. Why
@JS00001, no linked help site PR was created because no documentation changes are required for this revert. If you believe a specific article should still be updated, let me know which behavior changed and I'll take another look. |
Contributor
|
🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.5-6 🚀
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Reverts #90029
Fixed Issues
$ #91657
$ #91661
$ #91665
$ #91666
$ #91678
$ #91680
$ #91668
$ #91669
$ #91670
$ #91673
$ #91686
$ #91690
Tests
N/A
Offline tests
N/A
QA Steps
N/A
PR Author Checklist
N/A
### 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