Merge branch 'main' into release-please--branches--main--components--nebuchadnezzar

Author: Feichtmeier

lib/chat_room/input/draft_model.dart

@@ -59,7 +59,7 @@ class DraftModel extends SafeChangeNotifier {
       printMessageInDebugMode(e, s);
     }
 
-    final textDraft = '${getTextDraft(room.id)}';
+    final textDraft = getTextDraft(room.id) ?? '';
     removeTextDraft(room.id);
     final matrixFiles = List<MatrixFile>.from(getFilesDraft(room.id));
     if (matrixFiles.isNotEmpty) {
@@ -87,7 +87,9 @@ class DraftModel extends SafeChangeNotifier {
             thumbnail: matrixFile.mimeType.startsWith('video') && xFile != null
                 ? await getVideoThumbnail(xFile)
                 : null,
-            extraContent: textDraft.isNotEmpty ? {'body': textDraft} : null,
+            extraContent: textDraft.isNotEmpty && textDraft != 'null'
+                ? {'body': textDraft}
+                : null,
           );
           if (eventId != null) {
             _matrixFilesToXFile.remove(matrixFile);

lib/encryption/view/unlock_chat_page.dart

@@ -14,6 +14,7 @@ import '../../common/view/snackbars.dart';
 import '../../common/view/space.dart';
 import '../../common/view/ui_constants.dart';
 import '../../l10n/l10n.dart';
+import '../../settings/view/chat_settings_logout_button.dart';
 import '../encryption_model.dart';
 import 'key_verification_dialog.dart';
 
@@ -224,6 +225,7 @@ class _UnlockChatPageState extends State<UnlockChatPage> {
                           );
                         },
                 ),
+                const ChatSettingsLogoutButton(),
               ],
             ),
           ),