You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
feat: Add count and spend total selectors to the Spend footer - #100674
Adds count and spend total selectors to the Spend footer, next to the existing currency one, in a single menu opened from the footer. Behind the spendFooterSelectors beta.
footerCount, footerTotal and footerCurrency are new search filters, so selections persist with the search. Defaults are left out of the query. None of them changes a query hash, so the list keeps its rows and selection.
Count: Expenses or Reports, applied instantly with no request. The default follows the search type, so Reports searches now open on Reports: N.
Total: Spend, Reimbursable, Non-reimbursable, Billable or Non-billable. The whole-search figure is fetched from the backend, with a skeleton while it loads. Hand-picked rows are summed on the client.
Each search response is stamped with the breakdown its total answers. The footer and Home's spend rows never show a total under the wrong breakdown.
Offline, the footer shows the last answer for the selected breakdown, or no figure.
Total > Reimbursable > Apply. Verify the total shows a reimbursable figure.
Verify that no errors appear in the JS console
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as tests
Verify that no errors appear in the JS console
PR Author Checklist
I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
I added steps for local testing in the Tests section
I added steps for the expected offline behavior in the Offline steps section
I added steps for Staging and/or Production testing in the QA steps section
I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I verified there are no new alerts related to the canBeMissing param for useOnyx
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
If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
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 tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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 new assets were added or existing ones were modified, I verified that:
The assets are optimized and compressed (for SVG files, run npm run compress-svg)
The assets load correctly across all supported platforms.
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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.
Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.
If you want to automatically generate translations for other locales, an Expensify employee will have to:
Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]
Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:
npx bun ./scripts/generateTranslations.ts --help
Typically, you'd want to translate only what you changed by running npx bun ./scripts/generateTranslations.ts --compare-ref main
@mkhutornyi 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]
I found no confirmed regressions against main. With the beta off, the footer, search hashes, Home "Your spend", to-do totals and optimistic inserts behave as they do on main. I compared the code with main and didn't run the app.
I found two low-severity edges. Neither should block the merge:
The offline breakdown check has no beta gate.SearchSelectionFooter.tsx:219 is missing isFooterSelectorsEnabled &&, but the online check at :211 has it. Here's the case: a user had the beta and left a Billable stamp on a snapshot. Then they lost the beta. Offline, their footer hides the total, but main would show it. Fix: add the same gate.
The default-query check is a little looser.isDefaultExpensesQuery and isDefaultExpenseReportsQuery now use hasNonFooterFilters, which only reads flatFilters (SearchQueryUtils.ts:2604-2614). A hand-typed created-by:123 gets parsed but dropped from flatFilters, so the query now counts as default. Standardized queries never carry that key, so real users won't hit this.
What I checked
Hashes and query strings: queries without footer keys produce the same primary, recent and similar hashes as on main. They also produce the same canonical and readable strings and the same form values. The grammar only adds the three keys, and nothing main had was dropped.
Footer with the beta off: the !isFooterSelectorsEnabled branch in SearchPageFooter matches main's markup. The skeleton, count, selected-row sum, currency conversion and shouldShowFooter match too.
Footer with the beta on and default selections: the numbers and visibility match main. The known differences are the Reports-tab default count and the single menu button.
search(): request params, dedupe and the queue are unchanged without footer keys. The only new write is the search.footerTotal: 'total' stamp, and only the footer and Home read it.
Home "Your spend": cached, first-load, offline and failed-request cases show what main shows. There's one exception. If the app was killed mid-request and then opened offline, a snapshot with no stamp and no loaded state hides the row. It clears on the next online fetch.
SearchPage.tsx:145: the new !shouldUseLiveData stops holding stale rows when a filter refinement lands on a to-do query. This affects everyone, but it's a fix, not a regression.
Others:useTodoSearchResults, SearchUpdate, SearchResultsProvider, useSearchBulkActions and the language files have no behavior change without footer keys.
No help site update needed. The new Count and Total selectors in the Spend footer are gated behind the spendFooterSelectors beta, and without the beta the footer renders the same Expenses: count and Total spend: currency picker as before.
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
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.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
!
Explanation of Change
Adds count and spend total selectors to the Spend footer, next to the existing currency one, in a single menu opened from the footer. Behind the
spendFooterSelectorsbeta.footerCount,footerTotalandfooterCurrencyare new search filters, so selections persist with the search. Defaults are left out of the query. None of them changes a query hash, so the list keeps its rows and selection.Reports: N.Fixed Issues
$ #99452
PROPOSAL:
Tests
Reports: X.Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as tests
PR Author Checklist
### 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
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari