Support groupBy:year and groupBy:quarter in the App#80800
Support groupBy:year and groupBy:quarter in the App#80800neil-marcellini merged 32 commits intomainfrom
Conversation
This comment has been minimized.
This comment has been minimized.
🦜 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/it.ts b/src/languages/it.ts
index 3bd6e296..cbe7ad8b 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6988,7 +6988,7 @@ Richiedi dettagli di spesa come ricevute e descrizioni, imposta limiti e valori
groupBy: {
[CONST.SEARCH.GROUP_BY.FROM]: 'Da',
[CONST.SEARCH.GROUP_BY.CARD]: 'Carta',
- [CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: 'ID prelievo', //_/\__/_/ \_,_/\__/\__/\_,_/
+ [CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: 'ID di prelievo',
[CONST.SEARCH.GROUP_BY.CATEGORY]: 'Categoria',
[CONST.SEARCH.GROUP_BY.MERCHANT]: 'Esercente',
[CONST.SEARCH.GROUP_BY.TAG]: 'Etichetta',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index a7fcc3f5..b6ab348d 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6929,7 +6929,7 @@ ${reportName}
[CONST.SEARCH.GROUP_BY.FROM]: '差出人',
[CONST.SEARCH.GROUP_BY.CARD]: 'カード',
[CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: '出金ID',
- [CONST.SEARCH.GROUP_BY.CATEGORY]: 'カテゴリ',
+ [CONST.SEARCH.GROUP_BY.CATEGORY]: 'カテゴリー',
[CONST.SEARCH.GROUP_BY.MERCHANT]: '加盟店',
[CONST.SEARCH.GROUP_BY.TAG]: 'タグ',
[CONST.SEARCH.GROUP_BY.MONTH]: '月',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index fe904ecd..0700afa4 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6963,7 +6963,7 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
[CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: 'ID wypłaty',
[CONST.SEARCH.GROUP_BY.CATEGORY]: 'Kategoria',
[CONST.SEARCH.GROUP_BY.MERCHANT]: 'Sprzedawca',
- [CONST.SEARCH.GROUP_BY.TAG]: 'Tag',
+ [CONST.SEARCH.GROUP_BY.TAG]: 'Etykieta',
[CONST.SEARCH.GROUP_BY.MONTH]: 'Miesiąc',
[CONST.SEARCH.GROUP_BY.WEEK]: 'Tydzień',
[CONST.SEARCH.GROUP_BY.YEAR]: 'Rok',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 49b428fe..7d1367ac 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6961,7 +6961,7 @@ Exija detalhes de despesas como recibos e descrições, defina limites e padrõe
groupBy: {
[CONST.SEARCH.GROUP_BY.FROM]: 'De',
[CONST.SEARCH.GROUP_BY.CARD]: 'Cartão',
- [CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: 'ID de Saque',
+ [CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: 'ID de saque',
[CONST.SEARCH.GROUP_BY.CATEGORY]: 'Categoria',
[CONST.SEARCH.GROUP_BY.MERCHANT]: 'Estabelecimento',
[CONST.SEARCH.GROUP_BY.TAG]: 'Etiqueta',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 3a690d32..fe719767 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6806,10 +6806,9 @@ ${reportName}
reimbursable: '可报销',
purchaseCurrency: '购买货币',
groupBy: {
- [CONST.SEARCH.GROUP_BY.FROM]: '发件人',
+ [CONST.SEARCH.GROUP_BY.FROM]: '来自',
[CONST.SEARCH.GROUP_BY.CARD]: '卡',
- //_/\__/_/ \_,_/\__/\__/\_,_/
- [CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: '提现编号',
+ [CONST.SEARCH.GROUP_BY.WITHDRAWAL_ID]: '提现 ID',
[CONST.SEARCH.GROUP_BY.CATEGORY]: '类别',
[CONST.SEARCH.GROUP_BY.MERCHANT]: '商家',
[CONST.SEARCH.GROUP_BY.TAG]: '标签',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
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.
|
|
@eVoloshchak 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] |
|
🚧 @cristipaval has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 924dd59822
ℹ️ 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".
| const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST, {canBeMissing: true}); | ||
| const shouldOpenGroupOnPress = !isExpenseReportType && (groupBy === CONST.SEARCH.GROUP_BY.YEAR || groupBy === CONST.SEARCH.GROUP_BY.QUARTER); | ||
| const shouldOpenGroupOnPress = | ||
| !isExpenseReportType && (groupBy === CONST.SEARCH.GROUP_BY.YEAR || groupBy === CONST.SEARCH.GROUP_BY.QUARTER || groupBy === CONST.SEARCH.GROUP_BY.WEEK); |
There was a problem hiding this comment.
Is this not required for other groupBy?
There was a problem hiding this comment.
It's limited to week/year/quarter on purpose as those are the time-based groupings where row press should drill down to a date range, while other groupBy types should keep row press for expand/collapse.
There was a problem hiding this comment.
@lakchote Then, can you please include month in this?
There was a problem hiding this comment.
Reviewer Checklist
Screenshots/VideosScreen.Recording.2026-01-29.at.8.09.30.PM.mov |
|
@youssef-lr 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] |
neil-marcellini
left a comment
There was a problem hiding this comment.
As seen in the test videos, expanding a quarter group by group navigates to a new view vs expanding in line as it should. Please fix that.
neil-marcellini
left a comment
There was a problem hiding this comment.
more thoughts...
src/components/SelectionListWithSections/Search/TransactionGroupListItem.tsx
Outdated
Show resolved
Hide resolved
|
Thanks for reviewing @neil-marcellini! This is ready again for review! Here's a video with the group expansion functionality. Screen.Recording.2026-01-29.at.11.51.23.mov |
neil-marcellini
left a comment
There was a problem hiding this comment.
Thanks for the updates, it looks good now. Unfortunately some checks are failing.
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.3.11-16 🚀
|
|
🚀 Deployed to production by https://github.com/Julesssss in version: 9.3.12-1 🚀
|


Explanation of Change
Fixed Issues
$ #80397
$ #80398
$ #80849
PROPOSAL:
Tests
Prerequisites:
Test 1: Access Group by Year/Quarter via Advanced Filters
For Year:
For Quarter:
Test 2: Verify Year/Quarter Grouping Display (Large Screen)
For Year:
groupBy:yearfilterFor Quarter:
groupBy:quarterfilterTest 3: Verify Year/Quarter Grouping Display (Small Screen)
For Year:
groupBy:yearfilterFor Quarter:
groupBy:quarterfilterTest 4: Verify Year/Quarter Grouping Across Multiple Periods
For Year:
groupBy:yearFor Quarter:
groupBy:quarterTest 5: Verify Year/Quarter Expand/Collapse
For Year:
groupBy:yearappliedFor Quarter:
groupBy:quarterappliedTest 6: Verify Sorting
For Year:
groupBy:yearFor Quarter:
groupBy:quarterTest 7: Verify Multi-select Checkbox
For Year:
groupBy:yearFor Quarter:
groupBy:quarterTest 8: Verify Quarter Grouping Across Year Boundaries
For Quarter:
groupBy:quarterTest 9: Verify Quarter Boundary Transactions (Critical Edge Case)
For Quarter:
groupBy:quarterTest 10: Verify Clicking Year/Quarter/Week Group Filters Transactions
For Year:
groupBy:yeargroupByis removed from the queryFor Quarter:
groupBy:quartergroupByis removed from the queryFor Week:
Test 11: Verify Year-to-Date Filter with Year/Quarter Grouping
For Year:
date:year-to-datefiltergroupBy:yearfilterFor Quarter:
date:year-to-datefiltergroupBy:quarterfilterTest 12: Verify Quarter Formatting and Display
For Quarter:
groupBy:quarterOffline tests
QA Steps
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./** comment above it */thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor)thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick)Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-01-28.at.15.19.25.mov