From 022915378ea4247ba22653e878c6dd1e8bbc6091 Mon Sep 17 00:00:00 2001
From: Armand <4831c0@proton.me>
Date: Sat, 28 Feb 2026 13:05:39 +0100
Subject: [PATCH] firka: pop login sheet and navigate to home after OAuth

---
 firka/lib/ui/phone/widgets/login_webview.dart | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/firka/lib/ui/phone/widgets/login_webview.dart b/firka/lib/ui/phone/widgets/login_webview.dart
index 7636fec5..3afe9be3 100644
--- a/firka/lib/ui/phone/widgets/login_webview.dart
+++ b/firka/lib/ui/phone/widgets/login_webview.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:firka/data/models/app_settings_model.dart';
 import 'package:firka/services/live_activity_service.dart';
 import 'package:firka/app/app_state.dart';
+import 'package:firka/app/initialization.dart';
 import 'package:flutter/material.dart';
 import 'package:isar_community/isar.dart';
 import 'package:webview_flutter/webview_flutter.dart';
@@ -12,7 +13,6 @@ import 'package:firka/services/watch_sync_helper.dart';
 import 'package:firka/api/consts.dart';
 import 'package:firka/api/token_grant.dart';
 import 'package:firka/data/models/token_model.dart';
-import 'package:firka/app/initialization_screen.dart';
 import 'package:firka/core/state/firka_state.dart';
 import 'package:firka/core/settings.dart';
 import 'package:firka/ui/theme/style.dart';
@@ -152,7 +152,14 @@ class _LoginWebviewWidgetState extends FirkaState<LoginWebviewWidget>
                   LiveActivityService.clearTokenExpiration();
                 }
 
-                runApp(InitializationScreen());
+                await initializeApp();
+
+                if (!mounted) return NavigationDecision.prevent;
+
+                if (mounted) {
+                  Navigator.of(context).pop();
+                  appRouter?.go('/home');
+                }
               } catch (ex) {
                 if (ex is Error) {
                   logger.shout(