Merge branch 'refactor/coderabbit-suggestions' of https://github.com/parres-hq/whitenoise_flutter into refactor/coderabbit-suggestions

Author: Quwaysim

ios/Podfile.lock

@@ -84,21 +84,21 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqflite_darwin/darwin"
 
 SPEC CHECKSUMS:
-  audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
-  emoji_picker_flutter: ece213fc274bdddefb77d502d33080dc54e616cc
+  audio_session: 19e9480dbdd4e5f6c4543826b2e8b0e4ab6145fe
+  emoji_picker_flutter: 8e50ec5caac456a23a78637e02c6293ea0ac8771
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
-  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
-  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
-  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
-  just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
-  mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
-  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  rust_lib_whitenoise: 22de658398f8e36a1a396d35b6b6547a0732e6bb
-  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
+  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
+  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
+  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  just_audio: a42c63806f16995daf5b219ae1d679deb76e6a79
+  mobile_scanner: 77265f3dc8d580810e91849d4a0811a90467ed5e
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  rust_lib_whitenoise: 69ef24b69b2aba78a7ebabc09a504b5a39177d21
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
 
 PODFILE CHECKSUM: 251cb053df7158f337c0712f2ab29f4e0fa474ce
 

lib/ui/chat/chat_screen.dart

@@ -91,8 +91,8 @@ class _ChatScreenState extends ConsumerState<ChatScreen> {
 
   void _handleScrollToBottom({bool hasAnimation = true}) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      final double max = _scrollController.position.maxScrollExtent;
       if (!_scrollController.hasClients || !mounted) return;
+      final double max = _scrollController.position.maxScrollExtent;
       if (hasAnimation) {
         _scrollController.animateTo(
           max,
@@ -160,6 +160,31 @@ class _ChatScreenState extends ConsumerState<ChatScreen> {
     final searchNotifier = ref.read(chatSearchProvider(widget.groupId).notifier);
     final isInviteMode = widget.inviteId != null;
 
+    // Watch messages first so they're available for listeners
+    final messages = ref.watch(
+      chatProvider.select((state) => state.groupMessages[widget.groupId] ?? []),
+    );
+
+    // Move ref.listen calls to the main build method
+    ref.listen(chatSearchProvider(widget.groupId), (previous, next) {
+      if (next.query.isNotEmpty && next.query != previous?.query) {
+        searchNotifier.performSearchWithMessages(next.query, messages);
+      }
+    });
+
+    ref.listen(chatSearchProvider(widget.groupId).select((state) => state.currentMatchIndex), (
+      previous,
+      next,
+    ) {
+      final currentMatch = searchNotifier.currentMatch;
+      if (currentMatch != null) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (!mounted) return;
+          _scrollToMessage(currentMatch.messageId);
+        });
+      }
+    });
+
     if (isInviteMode) {
       return ChatInviteScreen(
         groupId: widget.groupId,
@@ -190,28 +215,6 @@ class _ChatScreenState extends ConsumerState<ChatScreen> {
 
         final groupType = groupTypeSnapshot.data!;
 
-        final messages = ref.watch(
-          chatProvider.select((state) => state.groupMessages[widget.groupId] ?? []),
-        );
-
-        ref.listen(chatSearchProvider(widget.groupId), (previous, next) {
-          if (next.query.isNotEmpty && next.query != previous?.query) {
-            searchNotifier.performSearchWithMessages(next.query, messages);
-          }
-        });
-
-        ref.listen(chatSearchProvider(widget.groupId).select((state) => state.currentMatchIndex), (
-          previous,
-          next,
-        ) {
-          final currentMatch = searchNotifier.currentMatch;
-          if (currentMatch != null) {
-            WidgetsBinding.instance.addPostFrameCallback((_) {
-              _scrollToMessage(currentMatch.messageId);
-            });
-          }
-        });
-
         return PopScope(
           onPopInvokedWithResult: (_, _) {
             if (searchState.isSearchActive) {