[Part 1] Remove Onyx.connect(ONYXKEYS.SESSION) in /Session/index.ts: thread sesion through isSupportAuthToken by truph01 · Pull Request #96368 · Expensify/App

truph01 · 2026-07-17T03:23:50Z

Explanation of Change

isSupportAuthToken — Renamed the module-level session variable to deprecatedSession. Added a session parameter to isSupportAuthToken with a fallback to deprecatedSession for unrefactored callers. Updated InitialSettingsPage.tsx to pass session from its existing useOnyx subscription.
isSupportAuthToken → shouldInitialize (Fullstory) — Threaded session through the full Fullstory chain: init → consentAndIdentify → shouldInitialize → isSupportAuthToken. Made session a required parameter across all Fullstory types and both platform implementations. Updated FullstoryInitHandler.tsx to subscribe to ONYXKEYS.SESSION via useOnyx and pass it down. Added a dedicated fullstorySession variable via connectWithoutView for the Onyx callback path, avoiding use of deprecatedSession.

Fixed Issues

$ #67782
PROPOSAL:

Tests

Login to ND
Open Account tab
Verify the "Sign out" button is shown

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

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-07-17.at.10.37.05.mov

melvin-bot · 2026-07-17T03:23:56Z

@shubham1206agra @DylanDylann One of you needs to 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]

github-actions · 2026-07-17T03:24:01Z

This PR adds a new Onyx.connectWithoutView call, so I've requested a review from the Onyx performance reviewers (@tgolen, @mountiny, @luacmartins) — a review from any one of them is enough. Please add a link in your PR description to the Slack discussion where the @frontend-performance team approved using connectWithoutView here.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d2c751e11b

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

codecov · 2026-07-17T03:27:39Z

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/pages/settings/InitialSettingsPage.tsx	`87.31% <100.00%> (ø)`
src/FullstoryInitHandler.tsx	`80.00% <75.00%> (-5.72%)`	⬇️
src/FullstoryUserContextHandler.tsx	`45.65% <0.00%> (ø)`
src/libs/Fullstory/index.native.ts	`0.00% <0.00%> (ø)`
src/libs/actions/Session/index.ts	`43.09% <82.35%> (-0.12%)`	⬇️
src/libs/Fullstory/index.ts	`0.00% <0.00%> (ø)`
... and 9 files with indirect coverage changes

trjExpensify · 2026-07-17T11:06:05Z

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

tgolen · 2026-07-17T15:11:42Z

 });

+let fullstorySession: Session = {};
+// Use connectWithoutView because it is only for fullstory initialization


I'd really love for all the full story stuff to exist in its own module. That will also help isolate the connectWithoutView() calls a bit more. Would you mind doing the small refactor? I'm not sure how much it would involve, so we could do that in a separate issue if it's too much.

@MelvinBot, give me plan to do it

@tgolen Resolved via fc0285b

MelvinBot · 2026-07-18T10:20:19Z

Here's a plan to finish the job this PR starts — fully removing the module-level Onyx.connect(ONYXKEYS.SESSION) at src/libs/actions/Session/index.ts:92 that populates deprecatedSession.

Goal: every read of deprecatedSession disappears, so the Onyx.connect block that feeds it can be deleted. Same TDD flow the issue asks for (unit test → refactor → verify), one small PR per group so each stays reviewable.

Remaining deprecatedSession consumers, grouped by difficulty:

Group A — pure read helpers (easy, same pattern as Part 1: add a session param, thread it from the caller's useOnyx):

isSupportalSession() — L154 (isSupportAuthTokenUsed)
isAnonymousUser() — L315 (already takes sessionParam; just drop the deprecatedSession fallback and make callers pass it)
hasAuthToken() — L326

Group B — imperative call-time reads inside signOutAndRedirectToSignIn/stash logic. These run in response to a user action, so the cleanest fix is to read the current session once via Onyx.connect's replacement — an await OnyxUtils.get(ONYXKEYS.SESSION) (or thread it in from the calling component) at the top of the function and pass it down:

signOut args — L388 (signedInWithSAML, authToken)
STASHED_SESSION: deprecatedSession — L401 and L729
accountID — L423
anonymous-account cleanup — L630-631

Group C — genuinely reactive uses. These fire on session change inside the Onyx.connect callback, so they can't just take a param — this is the last group and the one to think hardest about:

waitForUserSignIn() / authPromiseResolver — L1462 resolves a promise when authToken becomes truthy via the callback at L100.
creationDate defaulting (L97-99) — this actually writes a default back into the in-memory session; needs to move to wherever the session is first written, not a subscription.
HybridApp sendAuthToken on auth-token arrival (L104-105).

Suggested PR sequence:

Part 2 — Group A (three read helpers + their callers).
Part 3 — Group B (signOut/stash path; scope it to that one function tree).
Part 4 — Group C, the reactive bits. Options: move the auth-token/HybridApp side effects into a small handler component that subscribes with useOnyx + useEffect (mirrors what Part 1 did for Fullstory), and convert waitForUserSignIn to resolve off that same subscription. Get frontend-performance sign-off if you keep any connectWithoutView here.
Final — once no deprecatedSession reads remain, delete let deprecatedSession and the Onyx.connect(ONYXKEYS.SESSION) block at L92-108.

Notes:

Per group, write the unit test first against current behavior, refactor, confirm it still passes — then add functional + QA steps as the issue requires.
The issue's step about decrementing an ESLint warning count in package.json#L48 looks stale — the repo now grandfathers these via eslint-seatbelt, so the count drops automatically as each Onyx.connect is removed. Run npm run lint-changed and update the seatbelt file if it prompts, rather than hand-editing a number.
Leave the two connectWithoutView(ONYXKEYS.SESSION) calls (L112, L118) out of scope — the issue targets Onyx.connect, and those are the intentionally-approved Fullstory path from this PR.

truph01 · 2026-07-18T10:24:42Z

@codex review

chatgpt-codex-connector · 2026-07-18T10:27:50Z

Codex Review: Didn't find any major issues. Keep them coming!

Reviewed commit: fc0285b163

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

shubham1206agra · 2026-07-22T10:17:45Z


+OnyxUtils.get(ONYXKEYS.USER_METADATA).then((userMetadata) => {
+    FS.consentAndIdentify(userMetadata, fullstorySession);
+});


@truph01 I believe you should do this after initialize call to avoid race conditions.

@shubham1206agra Which initialize do you mean here?

Onyx.init() (src/setup/index.ts)

FullStory's own init().

@truph01 Revert the change. @mountiny told me this variable changes and this function re-initializes FS on call.

Yeah the user_metadata can change, not often, but it might

@shubham1206agra I reverted it

mountiny · 2026-07-24T18:11:44Z

@shubham1206agra how is this looking?

shubham1206agra · 2026-07-28T04:49:06Z


    useEffect(() => {
-        FS.init(userMetadata);
+        FS.init(userMetadata, session);


@truph01 You should wait for session to be loaded completely first.

@shubham1206agra I resolved your comment in 14d9284

shubham1206agra · 2026-08-02T12:04:30Z

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 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 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)
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)
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.
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-08-02.at.5.30.40.PM.mov

danieldoglas · 2026-08-03T15:16:58Z

ops. Sorry @tgolen @luacmartins I ended up merging without your reviews. My bad.

OSBotify · 2026-08-03T15:26:14Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-08-03T15:26:46Z

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

github-actions · 2026-08-03T15:34:29Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-0aed48e2bac-2c5d336-9216baa9999aad3fe5c67483f4aaafb8fc5be802/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-0aed48e-2c5d336-b15e513ed89588e1c674e76cebb67272ae6ce00b/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-08-03T23:50:37Z

🚀 Deployed to staging by https://github.com/danieldoglas in version: 9.4.49-0 🚀

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

MelvinBot · 2026-08-03T23:54:21Z

🤖 I reviewed the changes in this PR against Expensify's help site content under App/docs/articles.

Conclusion: No help site changes are required.

This PR is a purely internal code refactor with no user-facing impact:

Renames the module-level session variable to deprecatedSession and adds an explicit session parameter to isSupportAuthToken (with a fallback for unrefactored callers).
Threads session through the Fullstory init chain (init → consentAndIdentify → shouldInitialize → isSupportAuthToken) and subscribes to ONYXKEYS.SESSION where needed.

None of these changes alter any feature, flow, UI label, button, setting, or product behavior that the help site documents. It only changes how the session Onyx value is passed around internally (and how Fullstory analytics initialization reads it). Since the help site describes customer-facing behavior — which is unchanged here — there's nothing to update, so I did not open a draft docs PR.

@truph01, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review.

(Note: no help site PR was created because no documentation changes are needed. If you believe a specific article should be updated, let me know which behavior changed and I'll draft it.)

OSBotify · 2026-08-04T21:44:01Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.4.49-3 🚀

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

Bundle Size Analysis (Sentry):

Android

refactor: thread session to isSupportAuthToken

d2c751e

truph01 requested review from a team as code owners July 17, 2026 03:23

melvin-bot Bot assigned truph01 Jul 17, 2026

melvin-bot Bot requested review from DylanDylann, shubham1206agra and trjExpensify and removed request for a team July 17, 2026 03:23

melvin-bot Bot removed the request for review from a team July 17, 2026 03:23

github-actions Bot requested review from luacmartins, mountiny and tgolen July 17, 2026 03:24

chatgpt-codex-connector Bot reviewed Jul 17, 2026

View reviewed changes

Comment thread src/FullstoryInitHandler.tsx Outdated

truph01 added 3 commits July 17, 2026 10:28

fix: add test

4b55783

fix: remove session from useEffect dep

297fd3d

fix: type

e275d10

truph01 mentioned this pull request Jul 17, 2026

Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/actions/Session/index.ts #67782

Open

trjExpensify removed their request for review July 17, 2026 11:06

tgolen previously approved these changes Jul 17, 2026

View reviewed changes

Merge branch 'Expensify:main' into fix/67782-v1

93959fa

fix: move fullstory stuff to FullStory folder

fc0285b

truph01 dismissed tgolen’s stale review via fc0285b July 18, 2026 10:23

mjasikowski removed the request for review from DylanDylann July 20, 2026 09:34

fix: move connectWithoutView to top

5e67abc

truph01 dismissed luacmartins’s stale review via 5e67abc July 22, 2026 08:06

truph01 added 2 commits July 22, 2026 15:41

fix: move Onyx.connectWithoutView after FS

9967df0

fix: use OnyxUtils.get

9cee60a

shubham1206agra reviewed Jul 22, 2026

View reviewed changes

truph01 added 4 commits July 23, 2026 10:13

fix: revert to use Onyx.connectWithoutView with ONYXKEYS.USER_METADATA

db3ee4e

Merge branch 'Expensify:main' into fix/67782-v1

7b45486

fix: lint

d3a3b42

fix: typecheck

e015b68

shubham1206agra reviewed Jul 28, 2026

View reviewed changes

truph01 added 5 commits July 28, 2026 14:31

fix: conflicts

60d6c3e

fix: conflicts

c868cc6

fix: wait until session is loaded

14d9284

Merge branch 'Expensify:main' into fix/67782-v1

0528f47

Merge branch 'Expensify:main' into fix/67782-v1

1e1ed71

shubham1206agra approved these changes Aug 2, 2026

View reviewed changes

melvin-bot Bot requested review from danieldoglas and mountiny August 2, 2026 12:04

danieldoglas approved these changes Aug 3, 2026

View reviewed changes

danieldoglas merged commit 0aed48e into Expensify:main Aug 3, 2026
35 checks passed

OSBotify mentioned this pull request Aug 3, 2026

Deploy Checklist: New Expensify 2026-08-03 #97732

Closed

77 tasks

Uh oh!

Conversation

truph01 commented Jul 17, 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!

melvin-bot Bot commented Jul 17, 2026

Uh oh!

github-actions Bot commented Jul 17, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

codecov Bot commented Jul 17, 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!

trjExpensify commented Jul 17, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Jul 18, 2026

Uh oh!

truph01 commented Jul 18, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 18, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mountiny commented Jul 24, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Aug 2, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

danieldoglas commented Aug 3, 2026

Uh oh!

OSBotify commented Aug 3, 2026

Uh oh!

github-actions Bot commented Aug 3, 2026

Uh oh!

github-actions Bot commented Aug 3, 2026

Uh oh!

OSBotify commented Aug 3, 2026

Uh oh!

MelvinBot commented Aug 3, 2026

Uh oh!

OSBotify commented Aug 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

truph01 commented Jul 17, 2026 •

edited

Loading

codecov Bot commented Jul 17, 2026 •

edited by github-actions Bot

Loading