yobble/ViewModels/LoginViewModel.swift

@@ -12,8 +12,7 @@ class LoginViewModel: ObservableObject {
     @Published var username: String = ""
     @Published var userId: String = ""
     @Published var password: String = ""
-    @Published var isLoading: Bool = false
-    @Published var isInitialLoading: Bool = true    // отдельный флаг для сплэша до завершения автологина
+    @Published var isLoading: Bool = true    // сразу true, чтобы показать спиннер при автологине
     @Published var showError: Bool = false
     @Published var errorMessage: String = ""
     @Published var isLoggedIn: Bool = false
@@ -128,7 +127,6 @@ class LoginViewModel: ObservableObject {
                     self?.socketService.disconnect()
                 }
                 self?.isLoading = false
-                self?.isInitialLoading = false
             }
         }
     }

yobble/Views/Login/LoginView.swift

@@ -125,7 +125,7 @@ struct PasswordLoginView: View {
     var body: some View {
         ScrollView(showsIndicators: false) {
             VStack(alignment: .leading, spacing: 24) {
-                LoginTopBar(openLanguageSettings: openLanguageSettings, onShowModePrompt: hideKeyboardAndShowModePrompt)
+                LoginTopBar(openLanguageSettings: openLanguageSettings, onShowModePrompt: onShowModePrompt)
 
                 Button {
                     focusedField = nil
@@ -299,11 +299,6 @@ struct PasswordLoginView: View {
 #endif
     }
 
-    private func hideKeyboardAndShowModePrompt() {
-        focusedField = nil
-        onShowModePrompt()
-    }
-
     private func openLanguageSettings() {
         guard let url = URL(string: UIApplication.openSettingsURLString) else { return }
         UIApplication.shared.open(url)
@@ -394,7 +389,7 @@ private struct PasswordlessRequestView: View {
     var body: some View {
         ScrollView(showsIndicators: false) {
             VStack(alignment: .leading, spacing: 24) {
-                LoginTopBar(openLanguageSettings: openLanguageSettings, onShowModePrompt: hideKeyboardAndShowModePrompt)
+                LoginTopBar(openLanguageSettings: openLanguageSettings, onShowModePrompt: onShowModePrompt)
 
                 VStack(alignment: .leading, spacing: 8) {
                     Text(NSLocalizedString("Вход", comment: ""))
@@ -507,11 +502,6 @@ private struct PasswordlessRequestView: View {
         .loginErrorAlert(viewModel: viewModel)
     }
 
-    private func hideKeyboardAndShowModePrompt() {
-        isFieldFocused = false
-        onShowModePrompt()
-    }
-
     private func openLanguageSettings() {
         guard let url = URL(string: UIApplication.openSettingsURLString) else { return }
         UIApplication.shared.open(url)
@@ -536,7 +526,7 @@ private struct PasswordlessVerifyView: View {
     var body: some View {
         ScrollView(showsIndicators: false) {
             VStack(alignment: .leading, spacing: 24) {
-                LoginTopBar(openLanguageSettings: openLanguageSettings, onShowModePrompt: hideKeyboardAndShowModePrompt)
+                LoginTopBar(openLanguageSettings: openLanguageSettings, onShowModePrompt: onShowModePrompt)
 
                 VStack(alignment: .leading, spacing: 8) {
                     Text(NSLocalizedString("Введите код", comment: ""))
@@ -630,11 +620,6 @@ private struct PasswordlessVerifyView: View {
         .loginErrorAlert(viewModel: viewModel)
     }
 
-    private func hideKeyboardAndShowModePrompt() {
-        isCodeFieldFocused = false
-        onShowModePrompt()
-    }
-
     private func openLanguageSettings() {
         guard let url = URL(string: UIApplication.openSettingsURLString) else { return }
         UIApplication.shared.open(url)
@@ -828,7 +813,6 @@ struct LoginView_Previews: PreviewProvider {
     private static func preview(step: LoginViewModel.LoginFlowStep) -> some View {
         let viewModel = LoginViewModel()
         viewModel.isLoading = false
-        viewModel.isInitialLoading = false
         viewModel.loginFlowStep = step
         viewModel.passwordlessLogin = "preview@yobble.app"
         viewModel.verificationCode = "123456"

yobble/Views/Login/RegistrationView.swift

@@ -55,7 +55,7 @@ struct RegistrationView: View {
     var body: some View {
         ScrollView(showsIndicators: false) {
             VStack(alignment: .leading, spacing: 24) {
-                LoginTopBar(openLanguageSettings: openLanguageSettings, onShowModePrompt: keyboardDismissingModePrompt)
+                LoginTopBar(openLanguageSettings: openLanguageSettings, onShowModePrompt: onShowModePrompt)
 
                 Button(action: goBack) {
                     HStack(spacing: 6) {
@@ -222,14 +222,6 @@ struct RegistrationView: View {
         }
     }
 
-    private var keyboardDismissingModePrompt: (() -> Void)? {
-        guard let onShowModePrompt else { return nil }
-        return {
-            focusedField = nil
-            onShowModePrompt()
-        }
-    }
-
     private func openLanguageSettings() {
         guard let url = URL(string: UIApplication.openSettingsURLString) else { return }
         UIApplication.shared.open(url)
@@ -241,7 +233,6 @@ struct RegistrationView_Previews: PreviewProvider {
     static var previews: some View {
         let viewModel = LoginViewModel()
         viewModel.isLoading = false // чтобы убрать спиннер
-        viewModel.isInitialLoading = false
         return RegistrationView(viewModel: viewModel, onShowModePrompt: nil)
     }
 }

yobble/yobbleApp.swift

@@ -22,7 +22,7 @@ struct yobbleApp: App {
         WindowGroup {
             ZStack(alignment: .top) {
                 Group {
-                    if viewModel.isInitialLoading {
+                    if viewModel.isLoading {
                         SplashScreenView()
                     } else if viewModel.isLoggedIn {
                         MainView(viewModel: viewModel)