fix: add report owner check when computing outstanding state of chat … by CosminStreteaCS · Pull Request #79893 · Expensify/App

CosminStreteaCS · 2026-01-19T12:27:53Z

Explanation of Change

Integrate the logic for displaying the Submit button as primary or secondary on a draft report from chat into the hasOutstandingChildRequest function to avoid mistakenly displaying the GBR for the chat.

Fixed Issues

$78881
PROPOSAL:
Initial proposal

Tests

As user A, create a workspace and invite user B to be able to submit reports
As user B, create a report with an expense but do not submit it.
As user B, create another report but this time submit it.
As user A, mark the latest submitted report as paid.
On the user A side, the GBR should not be displayed even if there is still a draft report in the chat submitted by user B

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-02-04.at.15.19.45.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-02-04.at.15.21.45.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-02-04.at.14.46.47.mov

codecov · 2026-01-19T12:37:24Z

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 Δ
...ReportPreview/MoneyRequestReportPreviewContent.tsx	`61.14% <100.00%> (-0.24%)`	⬇️
src/libs/ReportUtils.ts	`76.92% <95.00%> (+0.15%)`	⬆️
... and 15 files with indirect coverage changes

…report

aimane-chnaif · 2026-02-03T15:59:20Z

+        return (
+            canIOUBePaid(iouReport, chatReport, policy, bankAccountList, transactions) ||
+            canApproveIOU(iouReport, policy, reportMetadata, transactions) ||
+            canSubmitAndIsAwaitingForCurrentUser


Can we create new function - canSubmitAndIsAwaitingForCurrentUser and use it in both places?
We wanna avoid duplicated code.

melvin-bot · 2026-02-04T13:59:31Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7f82afc5ce

ℹ️ 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".

chatgpt-codex-connector · 2026-02-04T14:09:47Z

+        const shouldWaitForSubmission = shouldCurrentUserSubmitReport(iouReport, chatReport, policy, reportActions);
+        const canSubmitAndIsAwaitingForCurrentUser =
+            !hasAutoRejectedTransactionsForManager &&
+            canSubmitReport(iouReport, policy, transactions, undefined, false, currentUserEmailParam, currentUserAccountIDParam) &&
+            shouldWaitForSubmission;


Pass child report actions to reopened/retracted check

This call passes reportActions from the parent chat report into shouldCurrentUserSubmitReport, but that helper falls back to scanning actions when iouReport.hasReportBeenReopened/hasReportBeenRetracted is missing. For older reports or partial Onyx data where those flags aren’t set, the reopened/retracted action lives on the child IOU report, not the chat report. In that case shouldWaitForSubmission becomes false, so canSubmitAndIsAwaitingForCurrentUser won’t mark the child as outstanding and the submit state/GBR can disappear even though the report was retracted. Consider passing getAllReportActions(iouReportID) (or similar) instead of the chat report actions here.

Useful? React with 👍 / 👎.

what do you think about this?

aimane-chnaif · 2026-02-10T12:09:23Z

 import React, {useCallback, useContext, useDeferredValue, useEffect, useMemo, useRef, useState} from 'react';
-import {FlatList, View} from 'react-native';
 import type {ListRenderItemInfo, ViewToken} from 'react-native';
+import {FlatList, View} from 'react-native';


There are some unnecessary changes like this.

aimane-chnaif · 2026-02-10T12:09:52Z

+/**
+ * Determines if the current user should submit the report
+ */
+function shouldCurrentUserSubmitReport(iouReport: OnyxEntry<Report>, chatReport: OnyxEntry<Report>, policy: OnyxEntry<Policy>, reportActions?: OnyxEntry<ReportActions> | ReportAction[]) {


Please add unit test for this util function

…-ws-reports

…ract canSubmitAndIsAwaitingForCurrentUser

…ndIsAwaitingForCurrentUser

TMisiukiewicz · 2026-02-19T09:06:46Z

Took it over and resolved all the comments 🙏

aimane-chnaif · 2026-02-23T09:44:34Z

@TMisiukiewicz please merge main. Conflicts!

…atus-between-platforms-on-ws-reports

TMisiukiewicz · 2026-02-23T09:51:50Z

@aimane-chnaif done!

aimane-chnaif · 2026-02-24T19:59:13Z

job 5 still failing

chatgpt-codex-connector · 2026-02-24T20:18:40Z

Codex Review: Didn't find any major issues. Breezy!

ℹ️ 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".

…atus-between-platforms-on-ws-reports

TMisiukiewicz · 2026-02-25T07:56:00Z

@aimane-chnaif should be good now 🙏

aimane-chnaif · 2026-02-26T07:08:22Z

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
- MacOS: Desktop
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
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.
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

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

aimane-chnaif · 2026-02-26T07:08:29Z

Conflicts this time

…atus-between-platforms-on-ws-reports

TMisiukiewicz · 2026-02-26T08:03:41Z

@aimane-chnaif resolved!

chatgpt-codex-connector · 2026-03-01T15:39:34Z

Codex Review: Didn't find any major issues. 🚀

ℹ️ 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".

…atus-between-platforms-on-ws-reports

mountiny

LGTM, thank you

github-actions · 2026-03-06T10:16:18Z

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

github-actions · 2026-03-06T10:21:04Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #79893.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-1d30179-5430cbd-9eba66f84415d5769f4f6c4deadc0b5869c2bc16/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-1d30179-5430cbd-40aca5860ad240782784277d27d7a632bce92337/index.html

Web 🕸️
https://79893.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-06T10:23:45Z

✋ 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 · 2026-03-06T23:01:59Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.3.33-0 🚀

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

OSBotify · 2026-03-09T20:37:14Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.33-5 🚀

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

melvin-bot Bot assigned CosminStreteaCS Jan 19, 2026

CosminStreteaCS mentioned this pull request Jan 20, 2026

[$250] [Due for payment 2026-03-16] Investigate the GBR diverging between platforms #78881

Closed

CosminStreteaCS added 2 commits February 3, 2026 17:06

fix: add report owner check when computing outstanding state of chat …

46a1103

…report

fix: update fix to match the submit primary/secondary action color logic

9823ea3

CosminStreteaCS force-pushed the fix/78881-sync-GBR-status-between-platforms-on-ws-reports branch from 563058b to 9823ea3 Compare February 3, 2026 15:13

fix: prettier update

cafe364

aimane-chnaif reviewed Feb 3, 2026

View reviewed changes

feat: extract logic in function

afdfaa9

CosminStreteaCS requested a review from aimane-chnaif February 3, 2026 16:45

chore: remove unnecessary additional comment

7f82afc

CosminStreteaCS marked this pull request as ready for review February 4, 2026 13:59

CosminStreteaCS requested review from a team as code owners February 4, 2026 13:59

melvin-bot Bot requested review from Valforte and heyjennahay and removed request for a team and Valforte February 4, 2026 13:59

melvin-bot Bot removed the request for review from a team February 4, 2026 13:59

chatgpt-codex-connector Bot reviewed Feb 4, 2026

View reviewed changes

aimane-chnaif reviewed Feb 10, 2026

View reviewed changes

TMisiukiewicz added 3 commits February 19, 2026 08:32

Merge origin/main into fix/78881-sync-GBR-status-between-platforms-on…

4f4c1a7

…-ws-reports

fix: pass IOU report actions to shouldCurrentUserSubmitReport and ext…

8d929da

…ract canSubmitAndIsAwaitingForCurrentUser

test: add unit tests for shouldCurrentUserSubmitReport and canSubmitA…

9269a17

…ndIsAwaitingForCurrentUser

fix: rename negated variable in test

a619ad8

Merge remote-tracking branch 'origin/main' into fix/78881-sync-GBR-st…

eb0cc21

…atus-between-platforms-on-ws-reports

fix prettier

42500f3

TMisiukiewicz added 2 commits February 25, 2026 08:38

Merge remote-tracking branch 'origin/main' into fix/78881-sync-GBR-st…

f0884ee

…atus-between-platforms-on-ws-reports

fix test

61ab69d

Merge remote-tracking branch 'origin/main' into fix/78881-sync-GBR-st…

aca9919

…atus-between-platforms-on-ws-reports

mountiny requested a review from Valforte March 1, 2026 22:19

aimane-chnaif approved these changes Mar 2, 2026

View reviewed changes

TMisiukiewicz added 2 commits March 5, 2026 10:41

Merge remote-tracking branch 'origin/main' into fix/78881-sync-GBR-st…

60e35a9

…atus-between-platforms-on-ws-reports

Merge remote-tracking branch 'origin/main' into fix/78881-sync-GBR-st…

c1ee01c

…atus-between-platforms-on-ws-reports

mountiny approved these changes Mar 6, 2026

View reviewed changes

mountiny merged commit 1d30179 into Expensify:main Mar 6, 2026
29 checks passed

OSBotify mentioned this pull request Mar 6, 2026

Deploy Checklist: New Expensify 2026-03-06 #84466

Closed

52 tasks

Conversation

CosminStreteaCS commented Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Jan 19, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

aimane-chnaif Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Feb 4, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

TMisiukiewicz commented Feb 19, 2026

Uh oh!

aimane-chnaif commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TMisiukiewicz commented Feb 23, 2026

Uh oh!

aimane-chnaif commented Feb 24, 2026

Uh oh!

chatgpt-codex-connector Bot commented Feb 24, 2026

Uh oh!

TMisiukiewicz commented Feb 25, 2026

Uh oh!

aimane-chnaif commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Feb 26, 2026

Uh oh!

TMisiukiewicz commented Feb 26, 2026

Uh oh!

chatgpt-codex-connector Bot commented Mar 1, 2026

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Mar 6, 2026

Uh oh!

github-actions Bot commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

OSBotify commented Mar 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

CosminStreteaCS commented Jan 19, 2026 •

edited

Loading

codecov Bot commented Jan 19, 2026 •

edited by github-actions Bot

Loading

aimane-chnaif commented Feb 23, 2026 •

edited

Loading

aimane-chnaif commented Feb 26, 2026 •

edited

Loading