[No QA] Fix log email race condition by capturing email per log line by roryabraham · Pull Request #81263 · Expensify/App

roryabraham · 2026-02-03T06:57:38Z

HOLD: This PR depends on Expensify/expensify-common#893 being merged and published first.

Explanation of Change

Fixes race condition where logs lose user email association when Onyx.clear is called between log creation and upload. Changes consume updated expensify-common Logger that captures email per log line.

Fixed Issues

$ #81259

Tests

Added unit tests in tests/unit/LogTest.ts that verify logs retain user email even when session is cleared:

logs include user email when sent while user is signed in
logs queued while signed in retain user email after session is cleared
logs during reauthentication flow retain user context

Offline tests

N/A

QA Steps

N/A

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Basic smoke test only:

Co-authored-by: Cursor <cursoragent@cursor.com>

This version includes the fix for capturing email per log line. Co-authored-by: Cursor <cursoragent@cursor.com>

roryabraham · 2026-02-04T23:36:13Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d0ee00ecd9

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

src/libs/Log.ts

roryabraham · 2026-02-05T00:01:54Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2c78f8a08a

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

src/libs/Log.ts

roryabraham · 2026-02-05T00:31:23Z

@codex review

chatgpt-codex-connector · 2026-02-05T00:36:23Z

Codex Review: Didn't find any major issues. Another round soon, please!

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

melvin-bot · 2026-02-05T00:39:43Z

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

huult · 2026-02-05T00:40:33Z

yes

codecov · 2026-02-05T00:44:40Z

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/libs/CurrentUserStore.ts	`100.00% <100.00%> (ø)`
src/libs/Network/NetworkStore.ts	`98.14% <ø> (-0.13%)`	⬇️
src/libs/Log.ts	`78.18% <86.95%> (+3.18%)`	⬆️
... and 15 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d297eecf3b

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

src/libs/Log.ts

roryabraham · 2026-02-05T00:52:58Z

@codex review

chatgpt-codex-connector · 2026-02-05T01:00:22Z

Codex Review: Didn't find any major issues. Keep it up!

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

amyevans

Looks great! Nice test coverage 🙌

amyevans · 2026-02-05T16:05:51Z

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

amyevans · 2026-02-05T16:08:56Z

Can you merge main to fix the HybridApp build failure?

huult · 2026-02-05T16:36:16Z

Do you need me to review?

roryabraham and others added 3 commits February 2, 2026 18:38

Add tests to cover log bug

2f4e0b6

Clean up test

4dab0b1

Fix log email race condition by capturing email per log line

2a6c529

Co-authored-by: Cursor <cursoragent@cursor.com>

melvin-bot bot assigned roryabraham Feb 3, 2026

roryabraham and others added 3 commits February 4, 2026 15:08

Merge branch 'main' into Rory-LogInfoRaceCondition

1a6504e

Bump expensify-common to 2.0.171

b202071

This version includes the fix for capturing email per log line. Co-authored-by: Cursor <cursoragent@cursor.com>

Don't use a caret for versions in package.json

d0ee00e

roryabraham changed the title ~~[HOLD][No QA] Fix log email race condition by capturing email per log line~~ [No QA] Fix log email race condition by capturing email per log line Feb 4, 2026

chatgpt-codex-connector bot reviewed Feb 4, 2026

View reviewed changes

src/libs/Log.ts Outdated Show resolved Hide resolved

Batch requests by email

2c78f8a

chatgpt-codex-connector bot reviewed Feb 5, 2026

View reviewed changes

src/libs/Log.ts Outdated Show resolved Hide resolved

roryabraham added 3 commits February 4, 2026 16:22

Only retry log command if ALL requests fail

c11878e

Merge branch 'main' into Rory-LogInfoRaceCondition

3a9c9c0

Fix lint and prettier

d297eec

roryabraham requested a review from amyevans February 5, 2026 00:39

roryabraham marked this pull request as ready for review February 5, 2026 00:39

roryabraham requested review from a team as code owners February 5, 2026 00:39

melvin-bot bot requested review from heyjennahay and huult and removed request for a team and huult February 5, 2026 00:39

chatgpt-codex-connector bot reviewed Feb 5, 2026

View reviewed changes

src/libs/Log.ts Outdated Show resolved Hide resolved

Extract CurrentUserStore to avoid circular dependency

17cecee

Fix prettier

e0bacf1

amyevans approved these changes Feb 5, 2026

View reviewed changes

Conversation

roryabraham commented Feb 3, 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!

roryabraham commented Feb 4, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

roryabraham commented Feb 5, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

roryabraham commented Feb 5, 2026

Uh oh!

chatgpt-codex-connector bot commented Feb 5, 2026

Uh oh!

melvin-bot bot commented Feb 5, 2026

Uh oh!

huult commented Feb 5, 2026

Uh oh!

codecov bot commented Feb 5, 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!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

roryabraham commented Feb 5, 2026

Uh oh!

chatgpt-codex-connector bot commented Feb 5, 2026

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

amyevans commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

amyevans commented Feb 5, 2026

Uh oh!

huult commented Feb 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

roryabraham commented Feb 3, 2026 •

edited

Loading

codecov bot commented Feb 5, 2026 •

edited by github-actions bot

Loading

amyevans commented Feb 5, 2026 •

edited

Loading