From dae11b6c7d65d5d86ebb64cd7bd8275e2a2c1f91 Mon Sep 17 00:00:00 2001
From: Beast <idewagedebisma@gmail.com>
Date: Tue, 9 Dec 2025 17:38:50 +0800
Subject: [PATCH] feat: change to in app browser and detect state change

---
 .../screens/account_associations_screen.dart  | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/mobile-app/lib/features/main/screens/account_associations_screen.dart b/mobile-app/lib/features/main/screens/account_associations_screen.dart
index ecf1bf19..9c68c1a9 100644
--- a/mobile-app/lib/features/main/screens/account_associations_screen.dart
+++ b/mobile-app/lib/features/main/screens/account_associations_screen.dart
@@ -26,7 +26,7 @@ class AccountAssociationsScreen extends ConsumerStatefulWidget {
   ConsumerState<AccountAssociationsScreen> createState() => _AccountAssociationsScreenState();
 }
 
-class _AccountAssociationsScreenState extends ConsumerState<AccountAssociationsScreen> {
+class _AccountAssociationsScreenState extends ConsumerState<AccountAssociationsScreen> with WidgetsBindingObserver {
   final TaskmasterService _taskmasterService = TaskmasterService();
 
   final _ethAddress = TextEditingController();
@@ -92,7 +92,7 @@ class _AccountAssociationsScreenState extends ConsumerState<AccountAssociationsS
       final oauthRequest = await _taskmasterService.generateAssociateXLink();
       final Uri url = Uri.parse(oauthRequest.url);
 
-      launchUrl(url, mode: LaunchMode.externalApplication);
+      launchUrl(url, mode: LaunchMode.inAppBrowserView);
     } catch (e) {
       print('Failed associating X account: $e');
 
@@ -111,6 +111,33 @@ class _AccountAssociationsScreenState extends ConsumerState<AccountAssociationsS
     ref.invalidate(accountAssociationsProvider);
   }
 
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    switch (state) {
+      case AppLifecycleState.paused:
+      case AppLifecycleState.inactive:
+      case AppLifecycleState.hidden:
+      case AppLifecycleState.detached:
+        break;
+
+      case AppLifecycleState.resumed:
+        ref.invalidate(accountAssociationsProvider);
+        break;
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final associationsAsync = ref.watch(accountAssociationsProvider);