Keep SSO button loading until AuthScreens mounts by Julesssss · Pull Request #90092 · Expensify/App

Julesssss · 2026-05-09T00:15:28Z

Explanation of Change

When signing in with SSO on Android, the SSO button on the sign-in page shows a loading indicator during the SAML flow, but the loading indicator was removed before the user is navigated away to the main app. This looked buggy.

Fixed Issues

$ #90089
PROPOSAL: N/A

Tests

Open the app on Android (likely also reproducible on iOS, but not)
Tap the Google/Apple SSO button
Complete SSO sign in
Observe: after the modal closes and before the main app appears, the SSO button briefly reverts from spinner to Continue

Offline tests

N/A — SSO requires network.

QA Steps

Same as Tests.

InternalQA: We'll verify this on staging, SSO doesn't work on AdHoc builds

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-05-09T00:15:35Z

@Ollyws 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 · 2026-05-09T00:15:39Z

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

github-actions · 2026-05-09T00:21:50Z

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

github-actions · 2026-05-09T00:26:45Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f888681-7a85951-98880efdd777d7554d98975a3fe8d1c1a8e17aed/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f888681-7a85951-08ef4e69c298179cc4a051dd230c9319b466075b/index.html

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

👀 View the workflow run that generated this build 👀

marufsharifi · 2026-05-09T13:10:07Z

@Julesssss, Just to confirm, the SSO buttons aren’t displayed in development builds. Is there a way to test them, or is it okay to review this PR without adding any test records? Thanks.

marufsharifi · 2026-05-11T05:50:39Z

I commented this condition locally, but it doesn't seem to be reproducible for me on the latest main.

video_2026-075-09_15-36-45.mp4

* main: (287 commits) Update Mobile-Expensify submodule version to 9.3.69-18 Update version to 9.3.69-18 Stop clearing routes on success to preserve map preview Auto-tighten eslint-seatbelt baseline Update Mobile-Expensify submodule version to 9.3.69-17 Update version to 9.3.69-17 Update Mobile-Expensify submodule version to 9.3.69-16 Update version to 9.3.69-16 Auto-tighten eslint-seatbelt baseline fix seatbelt Revert SearchUIUtilsTest.ts to match main Revert test change: restore shouldRedirectToExpensifyClassic in SearchUIUtilsTest revert manually adding seatbelt update Revert isTripStopped change per review feedback chore: add USD useSubStep files to eslint-seatbelt baseline Remove stale shouldRedirectToExpensifyClassic property from test Remove unrelated change to SearchUIUtilsTest.ts fix: use named import from @libs/ErrorUtils in ConfirmationUBO Fix: remove shouldRedirectToExpensifyClassic from test call site Remove stale shouldRedirectToExpensifyClassic property from test ...

Julesssss · 2026-05-11T23:56:54Z

Just to confirm, the SSO buttons aren’t displayed in development builds. Is there a way to test them, or is it okay to review this PR without adding any test records? Thanks.

Hi @marufsharifi, a code review is totally fine here. We'll handle testing once it hits staging as SSO is tricky to verify. I have just made a simplification to the PR with a final commit

marufsharifi · 2026-05-12T01:53:25Z

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

marufsharifi · 2026-05-12T03:14:12Z

-                    isLoading={account?.isLoading}
+                    isLoading={!!account?.isLoading || !!authToken}


@Julesssss, I’m not sure these are the right changes, as the issue seems to be related to the Continue button rather than the Use single sign-on. Could you let me know if I’m missing something?

@Julesssss, have you had a chance to check this? Thanks.

Hi @marufsharifi. Sorry, this was supposed to be a draft, didn't realise it was assigned to you and you're right about the change. My bad. Will tag you when I resubmit it.

joekaufmanexpensify

Good for product

Julesssss added 2 commits May 8, 2026 17:03

Keep SSO button loading until AuthScreens mounts

2fb1783

Reset signedInWithSAML on failure and use selector

233f66d

Julesssss requested review from a team as code owners May 9, 2026 00:15

melvin-bot Bot assigned Julesssss May 9, 2026

melvin-bot Bot requested review from a team, Ollyws and joekaufmanexpensify and removed request for a team and Ollyws May 9, 2026 00:15

melvin-bot Bot requested a review from marufsharifi May 9, 2026 00:15

melvin-bot Bot removed the request for review from a team May 9, 2026 00:15

Simplify comments

f888681

Julesssss added the InternalQA This pull request required internal QA label May 9, 2026

Julesssss added 2 commits May 11, 2026 16:11

simplify solution

783aea7

Julesssss requested review from cristipaval and removed request for cristipaval May 11, 2026 23:45

marufsharifi reviewed May 12, 2026

View reviewed changes

joekaufmanexpensify approved these changes May 12, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Keep SSO button loading until AuthScreens mounts#90092

Keep SSO button loading until AuthScreens mounts#90092
Julesssss wants to merge 5 commits into
mainfrom
jules-fixSsoLoadingFlicker

Julesssss commented May 9, 2026 •

edited

Loading

Uh oh!

melvin-bot Bot commented May 9, 2026

Uh oh!

melvin-bot Bot commented May 9, 2026

Uh oh!

github-actions Bot commented May 9, 2026

Uh oh!

github-actions Bot commented May 9, 2026

Uh oh!

marufsharifi commented May 9, 2026

Uh oh!

marufsharifi commented May 11, 2026

Uh oh!

Julesssss commented May 11, 2026

Uh oh!

marufsharifi commented May 12, 2026

Uh oh!

marufsharifi May 12, 2026

Uh oh!

marufsharifi May 14, 2026

Uh oh!

Julesssss May 14, 2026

Uh oh!

joekaufmanexpensify left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		isLoading={account?.isLoading}
		isLoading={!!account?.isLoading \|\| !!authToken}

Conversation

Julesssss commented May 9, 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 May 9, 2026

Uh oh!

melvin-bot Bot commented May 9, 2026

Uh oh!

github-actions Bot commented May 9, 2026

Uh oh!

github-actions Bot commented May 9, 2026

Uh oh!

marufsharifi commented May 9, 2026

Uh oh!

marufsharifi commented May 11, 2026

Uh oh!

Julesssss commented May 11, 2026

Uh oh!

marufsharifi commented May 12, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

marufsharifi May 12, 2026

Choose a reason for hiding this comment

Uh oh!

marufsharifi May 14, 2026

Choose a reason for hiding this comment

Uh oh!

Julesssss May 14, 2026

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Julesssss commented May 9, 2026 •

edited

Loading