From 08711dbc331c09ddcc8b31bd9565fd94e331f8c5 Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Fri, 24 Jul 2026 14:47:16 +0000
Subject: [PATCH] ios: fix app crashing after onboarding (#7299)

---
 .../ios/Shared/Views/Onboarding/ChooseServerOperators.swift | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift b/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift
index b61b81a46b..425f6e022f 100644
--- a/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift
+++ b/apps/ios/Shared/Views/Onboarding/ChooseServerOperators.swift
@@ -184,7 +184,11 @@ struct OnboardingConditionsView: View {
     private func completeOnboarding() {
         let m = ChatModel.shared
         onboardingStageDefault.set(.onboardingComplete)
-        m.onboardingStage = .onboardingComplete
+        // dismiss any presented onboarding sheet and defer the swap, so the deep onboarding
+        // navigation stack isn't torn down mid-transition (crashes UIKit on completion)
+        dismissAllSheets(animated: false) {
+            m.onboardingStage = .onboardingComplete
+        }
     }
 
     private func enabledOperators(_ operators: [ServerOperator]) -> [ServerOperator]? {