Skip to content

Support groupBy:year and groupBy:quarter in the App#80800

Merged
neil-marcellini merged 32 commits intomainfrom
cristi_support-groupByYearQuarter
Jan 29, 2026
Merged

Support groupBy:year and groupBy:quarter in the App#80800
neil-marcellini merged 32 commits intomainfrom
cristi_support-groupByYearQuarter

Conversation

@cristipaval
Copy link
Contributor

@cristipaval cristipaval commented Jan 28, 2026

Explanation of Change

Fixed Issues

$ #80397
$ #80398
$ #80849
PROPOSAL:

Tests

Prerequisites:

  • Ensure you have expenses with dates spanning multiple years (e.g., expenses from 2024, 2025, 2026)
  • Ensure you have expenses spanning multiple quarters (e.g., Q1, Q2, Q3, Q4 of the same year, and across different years)
  • Ensure you have expenses from different months within quarters (e.g., January, February, March for Q1)

Test 1: Access Group by Year/Quarter via Advanced Filters

For Year:

  1. Open the app and navigate to the Reports page
  2. Go to Expense Section
  3. Tap the filter in the search header
  4. Tap on "Group by" option
  5. Verify "Year" appears in the list of group by options
  6. Select "Year"
  7. Tap "Save"
  8. Verify expenses are now grouped by year with headers showing:
    • Year (e.g., "2026", "2025", "2024")
    • Number of expenses in that year
    • Total amount for that year

For Quarter:

  1. Open the app and navigate to the Reports page
  2. Go to Expense Section
  3. Tap the filter in the search header
  4. Tap on "Group by" option
  5. Verify "Quarter" appears in the list of group by options
  6. Select "Quarter"
  7. Tap "Save"
  8. Verify expenses are now grouped by quarter with headers showing:
    • Quarter label (e.g., "Q1 2026", "Q2 2026", "Q4 2025")
    • Number of expenses in that quarter
    • Total amount for that quarter

Test 2: Verify Year/Quarter Grouping Display (Large Screen)

For Year:

  1. Open the app on desktop/web or tablet in landscape mode
  2. Go to Expense Section
  3. Navigate to Search and apply groupBy:year filter
  4. Verify the table header shows: Year icon | Year | Expenses | Total
  5. Verify each year row displays the calendar icon, year (e.g., "2026"), expense count, and total amount
  6. Verify columns are properly aligned between header and rows

For Quarter:

  1. Open the app on desktop/web or tablet in landscape mode
  2. Go to Expense Section
  3. Navigate to Search and apply groupBy:quarter filter
  4. Verify the table header shows: Quarter icon | Quarter | Expenses | Total
  5. Verify each quarter row displays the calendar icon, quarter label (e.g., "Q1 2026"), expense count, and total amount
  6. Verify columns are properly aligned between header and rows

Test 3: Verify Year/Quarter Grouping Display (Small Screen)

For Year:

  1. Open the app on mobile device
  2. Go to Expense Section
  3. Navigate to Search and apply groupBy:year filter
  4. Verify each year shows the calendar icon, year label, and total amount
  5. Tap the expand arrow on a year row
  6. Verify the individual transactions within that year are displayed

For Quarter:

  1. Open the app on mobile device
  2. Go to Expense Section
  3. Navigate to Search and apply groupBy:quarter filter
  4. Verify each quarter shows the calendar icon, quarter label (e.g., "Q1 2026"), and total amount
  5. Tap the expand arrow on a quarter row
  6. Verify the individual transactions within that quarter are displayed

Test 4: Verify Year/Quarter Grouping Across Multiple Periods

For Year:

  1. Create expenses with dates spanning at least 3 different years (e.g., 2024, 2025, 2026)
  2. Go to Expense Section
  3. Navigate to Search with groupBy:year
  4. Verify expenses are grouped into separate year sections
  5. Verify each year section shows the correct year label
  6. Verify transactions appear only in their respective year groups

For Quarter:

  1. Create expenses with dates spanning at least 3 different quarters (e.g., Q1 2026, Q2 2026, Q4 2025)
  2. Go to Expense Section
  3. Navigate to Search with groupBy:quarter
  4. Verify expenses are grouped into separate quarter sections
  5. Verify each quarter section shows the correct quarter label (e.g., "Q1 2026", "Q2 2026")
  6. Verify transactions appear only in their respective quarter groups

Test 5: Verify Year/Quarter Expand/Collapse

For Year:

  1. Navigate to Search with groupBy:year applied
  2. Tap/click on a year row (e.g., "2026")
  3. Verify the year row expands to show individual transactions within that year
  4. Tap/click on the year row again
  5. Verify the year row collapses to hide the transactions

For Quarter:

  1. Navigate to Search with groupBy:quarter applied
  2. Tap/click on a quarter row (e.g., "Q1 2026")
  3. Verify the quarter row expands to show individual transactions within that quarter
  4. Tap/click on the quarter row again
  5. Verify the quarter row collapses to hide the transactions

Test 6: Verify Sorting

For Year:

  1. Navigate to Search with groupBy:year
  2. Verify years are sorted chronologically (newest first by default, e.g., "2026", "2025", "2024")
  3. Click on the "Year" column header to sort
  4. Verify years sort chronologically (oldest first, then newest first on second click)
  5. Click on the "Total" column header
  6. Verify years sort by total amount (descending, then ascending on second click)

For Quarter:

  1. Navigate to Search with groupBy:quarter
  2. Verify quarters are sorted chronologically (newest first by default, e.g., "Q1 2026", "Q4 2025", "Q3 2025")
  3. Click on the "Quarter" column header to sort
  4. Verify quarters sort chronologically (oldest first, then newest first on second click)
  5. Click on the "Total" column header
  6. Verify quarters sort by total amount (descending, then ascending on second click)

Test 7: Verify Multi-select Checkbox

For Year:

  1. Navigate to Search with groupBy:year
  2. Enable selection mode (long press on mobile, or use bulk select)
  3. Tap the checkbox on a year header row
  4. Verify all transactions within that year become selected

For Quarter:

  1. Navigate to Search with groupBy:quarter
  2. Enable selection mode (long press on mobile, or use bulk select)
  3. Tap the checkbox on a quarter header row
  4. Verify all transactions within that quarter become selected

Test 8: Verify Quarter Grouping Across Year Boundaries

For Quarter:

  1. Create expenses with dates spanning Q4 2025 (October-December 2025) and Q1 2026 (January-March 2026)
  2. Go to Expense Section
  3. Navigate to Search with groupBy:quarter
  4. Verify expenses are grouped into separate quarter sections (e.g., "Q1 2026", "Q4 2025")
  5. Verify transactions appear only in their respective quarter groups
  6. Verify quarters are sorted correctly across year boundaries (newest first, so Q1 2026 appears before Q4 2025)

Test 9: Verify Quarter Boundary Transactions (Critical Edge Case)

For Quarter:

  1. Create expenses on the first day of a quarter (e.g., January 1, 2026 for Q1)
  2. Create expenses on the last day of a quarter (e.g., March 31, 2026 for Q1)
  3. Create expenses on the day before quarter start (e.g., December 31, 2025)
  4. Create expenses on the day after quarter end (e.g., April 1, 2026)
  5. Go to Expense Section
  6. Navigate to Search with groupBy:quarter
  7. Verify expenses from January 1 - March 31 appear in Q1 2026 group
  8. Verify expenses from December 31, 2025 appear in Q4 2025 group
  9. Verify expenses from April 1, 2026 appear in Q2 2026 group
  10. Verify transactions are NOT incorrectly grouped across quarter boundaries

Test 10: Verify Clicking Year/Quarter/Week Group Filters Transactions

For Year:

  1. Navigate to Search with groupBy:year
  2. Click/tap on a year group header (e.g., "2026")
  3. Verify the search query updates to filter by that year's date range (e.g., "2026-01-01" to "2026-12-31")
  4. Verify groupBy is removed from the query
  5. Verify only transactions from that year are displayed as individual items (not grouped)
  6. Verify the date filter shows the year's start and end dates

For Quarter:

  1. Navigate to Search with groupBy:quarter
  2. Click/tap on a quarter group header (e.g., "Q1 2026")
  3. Verify the search query updates to filter by that quarter's date range (e.g., "2026-01-01" to "2026-03-31" for Q1)
  4. Verify groupBy is removed from the query
  5. Verify only transactions from that quarter are displayed as individual items (not grouped)
  6. Verify the date filter shows the quarter's start and end dates

For Week:

  1. Navigate to Reports > Expense
  2. Enter in the Search box field: 'groupBy:week'
  3. Click on a week group header (e.g., "Jan 25 - Jan 31, 2026")
  4. Verify the search query updates to filter by that week's date range
  5. Verify groupBy is removed from the query
  6. Verify only transactions from that week are displayed as individual items (not grouped)

Test 11: Verify Year-to-Date Filter with Year/Quarter Grouping

For Year:

  1. Navigate to Search and apply date:year-to-date filter
  2. Apply groupBy:year filter
  3. Verify only the current year appears in the results
  4. Verify transactions from previous years are filtered out

For Quarter:

  1. Navigate to Search and apply date:year-to-date filter
  2. Apply groupBy:quarter filter
  3. Verify only quarters from the current year appear in the results (e.g., if current date is March 15, 2026, only Q1 2026 should appear)
  4. Verify transactions from previous years' quarters are filtered out
  5. Click on a quarter group (e.g., "Q1 2026")
  6. Verify the date filter correctly intersects with year-to-date (only shows transactions from Q1 2026, not from previous year)

Test 12: Verify Quarter Formatting and Display

For Quarter:

  1. Navigate to Search with groupBy:quarter
  2. Verify quarter labels are formatted correctly:
    • Q1 2026 (January-March)
    • Q2 2026 (April-June)
    • Q3 2026 (July-September)
    • Q4 2026 (October-December)
  3. Verify quarter labels show both the quarter number and year
  4. Verify quarters from different years are clearly distinguishable (e.g., "Q1 2026" vs "Q1 2025")

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

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 followed proper code patterns (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 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 followed the guidelines as stated in the Review Guidelines
  • 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.
  • I verified that similar component doesn't exist in the codebase
  • I verified that all props are defined accurately and each prop has a /** comment above it */
  • I verified that each file is named correctly
  • I verified that each component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
  • I verified that the only data being stored in component state is data necessary for rendering and nothing else
  • In component if we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
  • 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)
  • I verified that component 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)
  • I verified that all JSX used for rendering exists in the render method
  • I verified that each 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

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

@cristipaval cristipaval self-assigned this Jan 28, 2026
@OSBotify

This comment has been minimized.

@OSBotify
Copy link
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 diff
diff --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 pbpaste | git apply 😉

@codecov
Copy link

codecov bot commented Jan 28, 2026

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/CONST/index.ts 87.39% <ø> (ø)
...tionListWithSections/Search/BaseListItemHeader.tsx 100.00% <ø> (ø)
...stWithSections/Search/TransactionGroupListItem.tsx 61.94% <ø> (ø)
...tionListWithSections/Search/YearListItemHeader.tsx 100.00% <100.00%> (ø)
src/libs/DateUtils.ts 64.16% <100.00%> (+0.94%) ⬆️
src/styles/utils/index.ts 49.70% <100.00%> (+0.14%) ⬆️
...nListWithSections/Search/QuarterListItemHeader.tsx 0.00% <0.00%> (ø)
...ts/SelectionListWithSections/SearchTableHeader.tsx 5.40% <0.00%> (-0.40%) ⬇️
src/components/Search/SearchList/index.tsx 2.67% <0.00%> (-0.33%) ⬇️
src/components/Search/index.tsx 30.20% <0.00%> (-1.74%) ⬇️
... and 3 more
... and 4 files with indirect coverage changes

@cristipaval cristipaval marked this pull request as ready for review January 28, 2026 23:21
@cristipaval cristipaval requested review from a team as code owners January 28, 2026 23:21
@melvin-bot melvin-bot bot requested review from eVoloshchak and trjExpensify and removed request for a team January 28, 2026 23:21
@melvin-bot
Copy link

melvin-bot bot commented Jan 28, 2026

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

@melvin-bot melvin-bot bot removed the request for review from a team January 28, 2026 23:21
@cristipaval cristipaval requested review from shubham1206agra and removed request for eVoloshchak January 28, 2026 23:22
@github-actions
Copy link
Contributor

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

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this not required for other groupBy?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lakchote Then, can you please include month in this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't work out of the box for the groupBy month, I suspect because it's not a time interval that is passed

image

Compared to other groups:

image

Since time is running by and we need to keep momentum high, I suggest to handle this in a follow-up since this PR concerns groupBy year and quarter.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More on this here

@shubham1206agra
Copy link
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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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 shown in the product is localized by adding it to src/languages/* files and using the translation method
    • 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 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)
  • 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
  • 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
  • xIf 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.
  • 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.
  • 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

Screen.Recording.2026-01-29.at.8.09.30.PM.mov

@melvin-bot melvin-bot bot requested a review from youssef-lr January 29, 2026 14:42
@melvin-bot
Copy link

melvin-bot bot commented Jan 29, 2026

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

Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

more thoughts...

@cristipaval
Copy link
Contributor Author

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

Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the updates, it looks good now. Unfortunately some checks are failing.

@neil-marcellini neil-marcellini merged commit baadf55 into main Jan 29, 2026
31 checks passed
@neil-marcellini neil-marcellini deleted the cristi_support-groupByYearQuarter branch January 29, 2026 22:36
@OSBotify
Copy link
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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.3.11-16 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Feb 5, 2026

🚀 Deployed to production by https://github.com/Julesssss in version: 9.3.12-1 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants