Skip to content

fix: defer SSO backend switch until confirmation sheet fully dismisses to avoid presentation race - WPB-28698 🍒 - #5236

Merged
jullianm merged 2 commits into
developfrom
fix/sso-modal-not-showing-cherry-pick
Sep 16, 2026
Merged

jullianm merged 2 commits into
developfrom
fix/sso-modal-not-showing-cherry-pick

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

This PR was automatically cherry-picked based on the following PR:

Original PR description:


BugWPB-28698 [iOS] SSO login hangs at ASWebAuthenticationSession handoff against IdP requesting TLS client certificate (Schwarz)

Issue

SSO login is stuck in infinite loading state after typing an email, the SSO authenticator modal don't show up.
OS error shows: Attempted to present SFAuthenticationViewController from a view controller that is being dismissed: <_TtGC7SwiftUI29PresentationHostingControllerVS_7AnyView_: 0x11fb40700>

Issue is self explanatory : we're trying to present a modal (Web authenticator) when another modal (Backend redirection) is being dismissed.

This issue started to occur with 4.26 prod release. No specific changes were introduced except these ones #4826 but this is not the root cause. I suspect these changes might have triggered a UI-related bug which is why we didn't experience that issue before (UI component remained unchanged in 4.26).

This PR fixes the UI issue by ensuring the presented (backend redirect) modal is fully dismissed before presenting the SSO modal.

Testing

  • Login with provided SSO credential
  • Backend redirect pop up shows up
  • Confirm
  • SSO modal should then show up
  • Repeat this operation multiple times as the initial issue wasn't reproducible every time

Checklist

  • Title contains a reference JIRA issue number like [WPB-XXX].
  • Description is filled and free of optional paragraphs.
  • Adds/updates automated tests.

UI accessibility checklist

If your PR includes UI changes, please utilize this checklist:

  • Make sure you use the API for UI elements that support large fonts.
  • All colors are taken from WireDesign.ColorTheme or constructed using WireDesign.BaseColorPalette.
  • New UI elements have Accessibility strings for VoiceOver.

…s to avoid presentation race - WPB-28698 (#5235)

Co-authored-by: Sam Wyndham <samwyndham@users.noreply.github.com>

@zenkins zenkins left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

✅ Auto-approved cherry-pick PR 🍒.

@jullianm
jullianm enabled auto-merge September 16, 2026 06:31
@github-actions

github-actions Bot commented Sep 16, 2026

Copy link
Copy Markdown
Contributor Author

Test Results

122 tests   122 ✅  9s ⏱️
 24 suites    0 💤
  1 files      0 ❌

Results for commit ef0cf8a.

Summary: workflow run #35064057473
Allure report (download zip): html-report-33426-fix_sso-modal-not-showing-cherry-pick

@jullianm
jullianm added this pull request to the merge queue Sep 16, 2026
Merged via the queue into develop with commit 2698554 Sep 16, 2026
11 checks passed
@jullianm
jullianm deleted the fix/sso-modal-not-showing-cherry-pick branch September 16, 2026 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants