From 6583bfdabfbebe3bc78a1a9838b47502c110d690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Tue, 27 May 2025 09:45:19 +0200
Subject: [PATCH 1/2] chore: Follow up everything is html message

---
 lib/pages/chat/events/message_content.dart | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart
index 76e536ee8..5876335eb 100644
--- a/lib/pages/chat/events/message_content.dart
+++ b/lib/pages/chat/events/message_content.dart
@@ -261,6 +261,10 @@ class MessageContent extends StatelessWidget {
             if (event.messageType == MessageTypes.Emote) {
               html = '* $html';
             }
+
+            final bigEmotes = event.onlyEmotes &&
+                event.numberEmotes > 0 &&
+                event.numberEmotes <= 3;
             return Padding(
               padding: const EdgeInsets.symmetric(
                 horizontal: 16,
@@ -270,7 +274,9 @@ class MessageContent extends StatelessWidget {
                 html: html,
                 textColor: textColor,
                 room: event.room,
-                fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize,
+                fontSize: AppConfig.fontSizeFactor *
+                    AppConfig.messageFontSize *
+                    (bigEmotes ? 5 : 1),
                 limitHeight: !selected,
                 linkStyle: TextStyle(
                   color: linkColor,

From 3078e9788f5eaf9857e8355d84d22063f47b019b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= <c.kussowski@famedly.com>
Date: Tue, 27 May 2025 10:40:35 +0200
Subject: [PATCH 2/2] fix: No crash on logging out in client chooser button

---
 lib/pages/chat_list/client_chooser_button.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart
index 40fefe3fc..a9b13e731 100644
--- a/lib/pages/chat_list/client_chooser_button.dart
+++ b/lib/pages/chat_list/client_chooser_button.dart
@@ -156,7 +156,7 @@ class ClientChooserButton extends StatelessWidget {
     var clientCount = 0;
     matrix.accountBundles.forEach((key, value) => clientCount += value.length);
     return FutureBuilder<Profile>(
-      future: matrix.client.fetchOwnProfile(),
+      future: matrix.client.isLogged() ? matrix.client.fetchOwnProfile() : null,
       builder: (context, snapshot) => Material(
         clipBehavior: Clip.hardEdge,
         borderRadius: BorderRadius.circular(99),
@@ -171,7 +171,7 @@ class ClientChooserButton extends StatelessWidget {
             child: Avatar(
               mxContent: snapshot.data?.avatarUrl,
               name:
-                  snapshot.data?.displayName ?? matrix.client.userID!.localpart,
+                  snapshot.data?.displayName ?? matrix.client.userID?.localpart,
               size: 32,
             ),
           ),