From 47239870dc13fdbb28c963a22081417455ad06f5 Mon Sep 17 00:00:00 2001
From: Tommy Chow <tommyxchow@gmail.com>
Date: Fri, 1 Apr 2022 04:49:25 -0400
Subject: [PATCH] Fix font size not applying to chat user modal

---
 ios/Runner.xcodeproj/project.pbxproj          |  2 +-
 .../channel/chat/widgets/chat_user_modal.dart | 49 ++++++++++---------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 19ae4c45..ee2838de 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -548,4 +548,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
\ No newline at end of file
+}
diff --git a/lib/screens/channel/chat/widgets/chat_user_modal.dart b/lib/screens/channel/chat/widgets/chat_user_modal.dart
index 3334d791..2f11a58b 100644
--- a/lib/screens/channel/chat/widgets/chat_user_modal.dart
+++ b/lib/screens/channel/chat/widgets/chat_user_modal.dart
@@ -76,31 +76,34 @@ class ChatUserModal extends StatelessWidget {
             Expanded(
               child: MediaQuery(
                 data: MediaQuery.of(context).copyWith(textScaleFactor: chatStore.settings.messageScale),
-                child: ListView.separated(
-                  reverse: true,
-                  itemBuilder: (context, index) => InkWell(
-                    onLongPress: () async {
-                      await Clipboard.setData(ClipboardData(text: userMessages[index].message));
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        const SnackBar(
-                          content: Text('Message copied!'),
-                          behavior: SnackBarBehavior.floating,
-                        ),
-                      );
-                    },
-                    child: ChatMessage(
-                      ircMessage: userMessages[index],
-                      assetsStore: chatStore.assetsStore,
-                      settingsStore: chatStore.settings,
+                child: DefaultTextStyle(
+                  style: DefaultTextStyle.of(context).style.copyWith(fontSize: chatStore.settings.fontSize),
+                  child: ListView.separated(
+                    reverse: true,
+                    itemBuilder: (context, index) => InkWell(
+                      onLongPress: () async {
+                        await Clipboard.setData(ClipboardData(text: userMessages[index].message));
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          const SnackBar(
+                            content: Text('Message copied!'),
+                            behavior: SnackBarBehavior.floating,
+                          ),
+                        );
+                      },
+                      child: ChatMessage(
+                        ircMessage: userMessages[index],
+                        assetsStore: chatStore.assetsStore,
+                        settingsStore: chatStore.settings,
+                      ),
                     ),
+                    separatorBuilder: (context, index) => chatStore.settings.showChatMessageDividers
+                        ? Divider(
+                            height: chatStore.settings.messageSpacing,
+                            thickness: 1.0,
+                          )
+                        : SizedBox(height: chatStore.settings.messageSpacing),
+                    itemCount: userMessages.length,
                   ),
-                  separatorBuilder: (context, index) => chatStore.settings.showChatMessageDividers
-                      ? Divider(
-                          height: chatStore.settings.messageSpacing,
-                          thickness: 1.0,
-                        )
-                      : SizedBox(height: chatStore.settings.messageSpacing),
-                  itemCount: userMessages.length,
                 ),
               ),
             ),