Skip to content

[CP Staging] Revert "Add currency selector to Search footer total spend" - #94562

Merged
mountiny merged 1 commit into
mainfrom
revert-90777-chaitanya/634354-search-footer-target-currency-app
Jun 25, 2026
Merged

mountiny merged 1 commit into
mainfrom
revert-90777-chaitanya/634354-search-footer-target-currency-app

Conversation

@mountiny

Copy link
Copy Markdown
Contributor

Reverts #90777

Fixed issues

$ #94508
$ #94510
$ #94512
$ #94522
$ #94523
$ #94524
$ #94525
$ #94527
$ #94531

@mountiny mountiny self-assigned this Jun 25, 2026
@mountiny
mountiny requested review from a team as code owners June 25, 2026 10:00
@melvin-bot
melvin-bot Bot requested review from situchan and trjExpensify and removed request for a team June 25, 2026 10:00
@melvin-bot

melvin-bot Bot commented Jun 25, 2026

Copy link
Copy Markdown

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

@NikkiWines NikkiWines 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.

👍

@robertjchen

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
  • 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 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 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)
  • 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)
  • 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.
  • 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

@codecov

codecov Bot commented Jun 25, 2026 •

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/components/Button/index.tsx 91.81% <ø> (-0.10%) ⬇️
.../Search/FilterComponents/ListFilterViewWrapper.tsx 93.33% <100.00%> (ø)
...omponents/Search/FilterComponents/SingleSelect.tsx 65.78% <ø> (ø)
...nents/Search/FilterDropdowns/SingleSelectPopup.tsx 91.66% <ø> (ø)
src/libs/SearchQueryUtils.ts 87.19% <ø> (-0.19%) ⬇️
src/libs/actions/Search.ts 38.55% <ø> (-0.53%) ⬇️
...components/Search/FilterDropdowns/DisplayPopup.tsx 0.00% <0.00%> (ø)
src/components/Search/SearchSelectionFooter.tsx 41.66% <14.28%> (+3.94%) ⬆️
...ents/Search/FilterDropdowns/GroupCurrencyPopup.tsx 0.00% <0.00%> (ø)
src/components/Search/SearchPageFooter.tsx 0.00% <0.00%> (ø)
... and 11 files with indirect coverage changes

@mountiny
mountiny merged commit b3cc25d into main Jun 25, 2026
39 checks passed
@mountiny
mountiny deleted the revert-90777-chaitanya/634354-search-footer-target-currency-app branch June 25, 2026 12:39
@mountiny mountiny changed the title [CP Staging] Revert "[Payment due @ahmedGaber93] Add currency selector to Search footer total spend" [CP Staging] Revert "Add currency selector to Search footer total spend" Jun 25, 2026
@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.

@github-actions

Copy link
Copy Markdown
Contributor

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

OSBotify pushed a commit that referenced this pull request Jun 25, 2026
…4-search-footer-target-currency-app

[CP Staging] Revert "[Payment due @ahmedGaber93] Add currency selector to Search footer total spend"

(cherry picked from commit b3cc25d)

(cherry-picked to staging by mountiny)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jun 25, 2026
@OSBotify OSBotify mentioned this pull request Jun 25, 2026
69 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

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

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes are required for this revert.

This PR reverts #90777, which added a currency selector to the Search footer total spend — an in-app UI affordance only. I reviewed docs/articles and found no help article that documents that footer currency selector, so reverting it leaves the help site accurate as-is. The original PR also did not touch docs/.

How I confirmed this
  • Reverted feature scope: Both [Payment due @ahmedGaber93] Add currency selector to Search footer total spend #90777 and this revert touch only src/ and tests/ files (SearchPageFooter.tsx, SearchSelectionFooter.tsx, CurrencyPopup.tsx, GroupCurrencyPopup.tsx, etc.) — no documentation files.

  • Documented currency features are unaffected: The help site only documents currency in Search via the group-currency: search operator and the Group currency filter:

    This revert restores GroupCurrencyPopup.tsx (45 additions), so the group-currency: operator that those articles describe keeps working.

  • No other search docs reference a footer/selection total-spend currency selector — searched docs/articles/new-expensify/reports-and-expenses/Search-and-Download-Expenses.md, Use-Search-Shortcuts.md, and Use-Search-Operators-to-Filter-and-Analyze.md.

Because nothing in the help site described the reverted feature, no draft docs PR was created.

@mountiny — if you believe this footer currency selector was documented somewhere I missed (or had a pending docs PR of its own), let me know and I'll prepare the corresponding update.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.19-5 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review: no changes required

I reviewed this revert against App/docs/articles and no help-site updates are needed.

Why:

  • This PR reverts #90777, which added a currency selector to the Search footer total spend — a UI control. The diff is entirely internal component code (Button, Search/FilterDropdowns, Search/SearchPageFooter, etc.) with no user-facing concept that the help site documents.
  • The only currency-related Search feature documented on the help site is the group-currency: search operator in Use-Search-Operators-to-Filter-and-Analyze.md. That operator is unaffected — the revert restores GroupCurrencyPopup (the Display dropdown for choosing group currency) and only removes the separate footer CurrencyPopup. The documented behavior still matches the live app.
  • A search of App/docs/articles for "total spend", "currency selector", "search footer", and related terms returned only generic Insights references, none describing the reverted control.

No draft PR was created since no article needs to change.

@mountiny, please confirm the current help site articles still reflect the live behavior after this revert. If you'd like a help site PR created anyway, let me know and I'll open one.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.20-1 🚀

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

Bundle Size Analysis (Sentry):

mountiny pushed a commit that referenced this pull request Jul 30, 2026
…ya/634354-search-footer-target-currency-app"

This reverts commit b3cc25d, reversing
changes made to 38dd266.
@OSBotify OSBotify mentioned this pull request Jul 31, 2026
67 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review — no docs changes required

I reviewed this revert against docs/articles and no help site changes are needed. No draft PR was created.

Why:

  • This PR reverts #90777, which added an interactive currency selector on the Search footer total-spend bar (Search > Expenses) backed by targetCurrency. That feature was brand new and was never documented on the help site — there is no article describing a footer currency picker, so there is nothing to remove.
  • The only currency-conversion feature the help site documents for Search is the group-currency: search operator in Use-Search-Operators-to-Filter-and-Analyze.md. That is a separate, text-based operator, and this revert restores GroupCurrencyPopup rather than removing it — so that documented behavior is unchanged and the article remains accurate.

Note: I could not verify this in a live browser (web driving was unavailable in this run), so the assessment is based on static analysis of the diff and the help-site articles.

Since no docs changes are required, there is no linked help site PR to review or mark Ready for review.

@OSBotify

OSBotify commented Aug 1, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.4.47-7 🚀

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

Bundle Size Analysis (Sentry):

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