Fix chat UI bugs and message draft logic (#773)

* Fix chat bubble hugging

* Improve and fix message drafts

* Fix chat init-scroll

* Just format

* Push general settings screen changes

* Listen active account changes for drafts

* Handle account switch in chat input provider

* Use logger for draft debug prints

* _hasScheduledInitialScroll

* Prevent duplicate frame callback

* Add post-await mounted check

Author: untreu2

ios/Podfile.lock

@@ -104,25 +104,25 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/workmanager_apple/ios"
 
 SPEC CHECKSUMS:
-  audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
-  emoji_picker_flutter: ece213fc274bdddefb77d502d33080dc54e616cc
+  audio_session: 19e9480dbdd4e5f6c4543826b2e8b0e4ab6145fe
+  emoji_picker_flutter: 8e50ec5caac456a23a78637e02c6293ea0ac8771
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_foreground_task: a159d2c2173b33699ddb3e6c2a067045d7cebb89
-  flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4
-  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
-  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
-  flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
-  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
-  workmanager_apple: 904529ae31e97fc5be632cf628507652294a0778
+  flutter_foreground_task: 21ef182ab0a29a3005cc72cd70e5f45cb7f7f817
+  flutter_local_notifications: df98d66e515e1ca797af436137b4459b160ad8c9
+  flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
+  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
+  flutter_timezone: ac3da59ac941ff1c98a2e1f0293420e020120282
+  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
+  workmanager_apple: 7bac258335c310689a641e2d66e88d4845d372e9
 
 PODFILE CHECKSUM: e30f02f9d1c72c47bb6344a0a748c9d268180865
 

lib/config/providers/chat_input_provider.dart

@@ -30,6 +30,7 @@ class ChatInputNotifier extends FamilyNotifier<ChatInputState, String> {
 
   static final _logger = Logger('ChatInputNotifier');
   late final String _groupId;
+  late String _accountHexPubkey;
   final ImagePickerService _imagePickerService;
   final DraftMessageService _draftMessageService;
   final Duration _draftSaveDelay;
@@ -44,16 +45,54 @@ class ChatInputNotifier extends FamilyNotifier<ChatInputState, String> {
   @override
   ChatInputState build(String groupId) {
     _groupId = groupId;
+    final accountPubkey = ref.read(activePubkeyProvider);
+    _accountHexPubkey = PubkeyFormatter(pubkey: accountPubkey).toHex() ?? '';
+
+    ref.listen<String?>(activePubkeyProvider, (previous, next) {
+      if (previous != next) {
+        final newAccountHexPubkey = PubkeyFormatter(pubkey: next).toHex() ?? '';
+        if (_accountHexPubkey != newAccountHexPubkey) {
+          _draftSaveTimer?.cancel();
+          _accountHexPubkey = newAccountHexPubkey;
+        }
+      }
+    });
+
     ref.onDispose(() {
       _draftSaveTimer?.cancel();
     });
     return const ChatInputState();
   }
 
+  Future<void> handleAccountSwitch({
+    required String? oldPubkey,
+    required String currentText,
+  }) async {
+    if (oldPubkey == null || currentText.isEmpty) return;
+
+    final oldAccountHexPubkey = PubkeyFormatter(pubkey: oldPubkey).toHex();
+    if (oldAccountHexPubkey != null && oldAccountHexPubkey.isNotEmpty) {
+      await _draftMessageService.saveDraft(
+        accountId: oldAccountHexPubkey,
+        chatId: _groupId,
+        message: currentText,
+      );
+    }
+  }
+
   Future<String?> loadDraft() async {
     state = state.copyWith(isLoadingDraft: true);
     try {
-      final draft = await _draftMessageService.loadDraft(chatId: _groupId);
+      final accountPubkey = ref.read(activePubkeyProvider);
+      final accountHexPubkey = PubkeyFormatter(pubkey: accountPubkey).toHex() ?? '';
+      if (accountHexPubkey.isEmpty) return null;
+
+      _accountHexPubkey = accountHexPubkey;
+
+      final draft = await _draftMessageService.loadDraft(
+        accountId: accountHexPubkey,
+        chatId: _groupId,
+      );
       return draft;
     } finally {
       state = state.copyWith(isLoadingDraft: false);
@@ -74,7 +113,17 @@ class ChatInputNotifier extends FamilyNotifier<ChatInputState, String> {
   }
 
   Future<void> _saveDraft(String text) async {
-    await _draftMessageService.saveDraft(chatId: _groupId, message: text);
+    final accountPubkey = ref.read(activePubkeyProvider);
+    final accountHexPubkey = PubkeyFormatter(pubkey: accountPubkey).toHex() ?? '';
+    if (accountHexPubkey.isEmpty) return;
+
+    _accountHexPubkey = accountHexPubkey;
+
+    await _draftMessageService.saveDraft(
+      accountId: accountHexPubkey,
+      chatId: _groupId,
+      message: text,
+    );
   }
 
   void hideMediaSelector() {
@@ -218,7 +267,17 @@ class ChatInputNotifier extends FamilyNotifier<ChatInputState, String> {
 
   Future<void> clear() async {
     _draftSaveTimer?.cancel();
-    await _draftMessageService.clearDraft(chatId: _groupId);
+
+    final accountPubkey = ref.read(activePubkeyProvider);
+    final accountHexPubkey = PubkeyFormatter(pubkey: accountPubkey).toHex() ?? '';
+    if (accountHexPubkey.isNotEmpty) {
+      _accountHexPubkey = accountHexPubkey;
+
+      await _draftMessageService.clearDraft(
+        accountId: accountHexPubkey,
+        chatId: _groupId,
+      );
+    }
     state = state.copyWith(
       showMediaSelector: false,
       isLoadingDraft: false,

lib/domain/services/draft_message_service.dart

@@ -1,53 +1,80 @@
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:logging/logging.dart';
 
 class DraftMessageService {
+  static final Logger _logger = Logger('DraftMessageService');
   static const FlutterSecureStorage _defaultStorage = FlutterSecureStorage();
   static const String _draftPrefix = 'draft_message_';
 
   Future<void> saveDraft({
+    required String accountId,
     required String chatId,
     required String message,
     FlutterSecureStorage? storage,
   }) async {
     final secureStorage = storage ?? _defaultStorage;
     try {
-      final key = '$_draftPrefix$chatId';
+      final key = '$_draftPrefix${accountId}_$chatId';
       if (message.trim().isEmpty) {
         await secureStorage.delete(key: key);
+        _logger.fine('Draft cleared (accountId=$accountId, chatId=$chatId)');
       } else {
         await secureStorage.write(key: key, value: message);
+        _logger.fine(
+          'Draft saved (accountId=$accountId, chatId=$chatId, length=${message.length})',
+        );
       }
     } catch (e) {
       return;
     }
   }
 
   Future<String?> loadDraft({
+    required String accountId,
     required String chatId,
     FlutterSecureStorage? storage,
   }) async {
     final secureStorage = storage ?? _defaultStorage;
     try {
-      final key = '$_draftPrefix$chatId';
+      final key = '$_draftPrefix${accountId}_$chatId';
       return await secureStorage.read(key: key);
     } catch (e) {
       return null;
     }
   }
 
   Future<void> clearDraft({
+    required String accountId,
     required String chatId,
     FlutterSecureStorage? storage,
   }) async {
     final secureStorage = storage ?? _defaultStorage;
     try {
-      final key = '$_draftPrefix$chatId';
+      final key = '$_draftPrefix${accountId}_$chatId';
       await secureStorage.delete(key: key);
     } catch (e) {
       return;
     }
   }
 
+  Future<void> clearDraftsForAccount({
+    required String accountId,
+    FlutterSecureStorage? storage,
+  }) async {
+    final secureStorage = storage ?? _defaultStorage;
+    try {
+      final allKeys = await secureStorage.readAll();
+      final prefix = '$_draftPrefix${accountId}_';
+      final draftKeys = allKeys.keys.where((key) => key.startsWith(prefix));
+      for (final key in draftKeys) {
+        await secureStorage.delete(key: key);
+      }
+      _logger.fine('Cleared drafts for accountId=$accountId');
+    } catch (e) {
+      return;
+    }
+  }
+
   Future<void> clearAllDrafts({FlutterSecureStorage? storage}) async {
     final secureStorage = storage ?? _defaultStorage;
     try {

lib/ui/chat/chat_screen.dart

@@ -46,6 +46,7 @@ class _ChatScreenState extends ConsumerState<ChatScreen> with WidgetsBindingObse
   ProviderSubscription<ChatState>? _chatSubscription;
   bool _hasInitialScrollCompleted = false;
   bool _isKeyboardOpen = false;
+  bool _hasScheduledInitialScroll = false;
 
   static const double _scrollBottomThreshold = 50.0;
 
@@ -75,6 +76,7 @@ class _ChatScreenState extends ConsumerState<ChatScreen> with WidgetsBindingObse
     super.didUpdateWidget(oldWidget);
     if (oldWidget.groupId != widget.groupId) {
       _hasInitialScrollCompleted = false; // Reset for new chat
+      _hasScheduledInitialScroll = false; // Reset scheduling flag
     }
   }
 
@@ -151,9 +153,10 @@ class _ChatScreenState extends ConsumerState<ChatScreen> with WidgetsBindingObse
     final isLoading = next.isGroupLoading(widget.groupId);
     final isLoadingCompleted = wasLoading && !isLoading;
 
-    // Auto-scroll when chat first loads
+    // Auto-scroll when chat first loads (loading transition detected)
     if (isLoadingCompleted && currentMessages.isNotEmpty && !_hasInitialScrollCompleted) {
       _hasInitialScrollCompleted = true;
+      _hasScheduledInitialScroll = true;
       _scrollToBottom(animated: false);
       // Save last read only if user is effectively at bottom
       if (_isAtBottom()) {
@@ -162,6 +165,17 @@ class _ChatScreenState extends ConsumerState<ChatScreen> with WidgetsBindingObse
       return;
     }
 
+    // Handle case where messages are already loaded when widget mounts
+    if (!_hasInitialScrollCompleted && currentMessages.isNotEmpty && !isLoading) {
+      _hasInitialScrollCompleted = true;
+      _hasScheduledInitialScroll = true;
+      _scrollToBottom(animated: false);
+      if (_isAtBottom()) {
+        _saveLastReadForCurrentMessages();
+      }
+      return;
+    }
+
     // Auto-scroll when new messages arrive (after initial load)
     if (_hasInitialScrollCompleted &&
         previousMessages.isNotEmpty &&
@@ -264,6 +278,26 @@ class _ChatScreenState extends ConsumerState<ChatScreen> with WidgetsBindingObse
       chatProvider.select((state) => state.groupMessages[widget.groupId] ?? []),
     );
 
+    final isLoading = ref.watch(
+      chatProvider.select((state) => state.isGroupLoading(widget.groupId)),
+    );
+    if (!_hasInitialScrollCompleted &&
+        !_hasScheduledInitialScroll &&
+        messages.isNotEmpty &&
+        !isLoading) {
+      _hasScheduledInitialScroll = true;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted && !_hasInitialScrollCompleted && _scrollController.hasClients) {
+          _hasInitialScrollCompleted = true;
+          _hasScheduledInitialScroll = false;
+          _scrollToBottom(animated: false);
+        } else {
+          // Reset flag if callback can't execute
+          _hasScheduledInitialScroll = false;
+        }
+      });
+    }
+
     // Move ref.listen calls to the main build method
     ref.listen(chatSearchProvider(widget.groupId), (previous, next) {
       if (next.query.isNotEmpty && next.query != previous?.query) {

lib/ui/chat/widgets/chat_input.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:whitenoise/config/providers/active_pubkey_provider.dart';
 import 'package:whitenoise/config/providers/chat_input_provider.dart';
 import 'package:whitenoise/config/providers/chat_provider.dart';
 import 'package:whitenoise/ui/chat/widgets/chat_input_media_selector.dart';
@@ -40,10 +41,12 @@ class _ChatInputState extends ConsumerState<ChatInput> with WidgetsBindingObserv
   void initState() {
     super.initState();
     WidgetsBinding.instance.addObserver(this);
-    _loadDraftMessage();
     _focusNode.addListener(_handleFocusChange);
     _textController.addListener(_onTextChanged);
     WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted) {
+        _loadDraftMessage();
+      }
       _measureSingleLineHeight();
     });
   }
@@ -57,8 +60,11 @@ class _ChatInputState extends ConsumerState<ChatInput> with WidgetsBindingObserv
 
     if (editingMessage != null &&
         editingMessage.content != chatInputState.previousEditingMessageContent) {
-      chatInputNotifier.setPreviousEditingMessageContent(editingMessage.content);
-      _textController.text = editingMessage.content ?? '';
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (!mounted) return;
+        chatInputNotifier.setPreviousEditingMessageContent(editingMessage.content);
+        _textController.text = editingMessage.content ?? '';
+      });
     }
   }
 
@@ -190,6 +196,30 @@ class _ChatInputState extends ConsumerState<ChatInput> with WidgetsBindingObserv
     final chatNotifier = ref.watch(chatProvider.notifier);
     final chatInputState = ref.watch(chatInputProvider(widget.groupId));
 
+    ref.listen<String?>(activePubkeyProvider, (previous, next) {
+      if (previous != null && next != null && previous != next) {
+        WidgetsBinding.instance.addPostFrameCallback((_) async {
+          if (!mounted) return;
+          final chatState = ref.read(chatProvider);
+          final isEditing = chatState.editingMessage[widget.groupId] != null;
+          if (!isEditing) {
+            final chatInputNotifier = ref.read(chatInputProvider(widget.groupId).notifier);
+            final currentText = _textController.text;
+
+            await chatInputNotifier.handleAccountSwitch(
+              oldPubkey: previous,
+              currentText: currentText,
+            );
+
+            if (!mounted) return;
+
+            _textController.clear();
+            await _loadDraftMessage();
+          }
+        });
+      }
+    });
+
     return SafeArea(
       top: false,
       child: Column(