From cb2713437413c837d0801e7111f8832f12b89f42 Mon Sep 17 00:00:00 2001
From: Decoder07 <pushpam@100ms.live>
Date: Thu, 1 Aug 2024 14:21:33 +0530
Subject: [PATCH] Fix: Username is not honoured while skip preview is true

---
 packages/hms_room_kit/lib/src/preview_meeting_flow.dart      | 4 +++-
 .../src/widgets/bottom_sheets/change_role_bottom_sheet.dart  | 3 ++-
 .../src/widgets/bottom_sheets/remote_peer_bottom_sheet.dart  | 5 +++--
 .../lib/src/widgets/common_widgets/message_container.dart    | 4 +---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/hms_room_kit/lib/src/preview_meeting_flow.dart b/packages/hms_room_kit/lib/src/preview_meeting_flow.dart
index 9391cc15e..86ccbcc9b 100644
--- a/packages/hms_room_kit/lib/src/preview_meeting_flow.dart
+++ b/packages/hms_room_kit/lib/src/preview_meeting_flow.dart
@@ -42,7 +42,9 @@ class _PreviewMeetingFlowState extends State<PreviewMeetingFlow> {
   Widget build(BuildContext context) {
     return HMSRoomLayout.skipPreview
         ? MeetingScreenController(
-            user: widget.prebuiltOptions?.userId ?? "",
+            user: widget.prebuiltOptions?.userName ??
+                widget.prebuiltOptions?.userId ??
+                "",
             localPeerNetworkQuality: null,
             options: widget.prebuiltOptions,
             tokenData: widget.tokenData,
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/change_role_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/change_role_bottom_sheet.dart
index 3f0454ccc..06b0df5f4 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/change_role_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/change_role_bottom_sheet.dart
@@ -83,7 +83,8 @@ class ChangeRoleBottomSheetState extends State<ChangeRoleBottomSheet> {
                 child: HMSDropDown(
                     dropDownItems: <DropdownMenuItem>[
                   ...widget.roles
-                      .where((role) => ((role.name != widget.peer.role.name) && (role.name != '__internal_recorder')))
+                      .where((role) => ((role.name != widget.peer.role.name) &&
+                          (role.name != '__internal_recorder')))
                       .sortedBy((element) => element.priority.toString())
                       .map((role) => DropdownMenuItem(
                             value: role,
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/remote_peer_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/remote_peer_bottom_sheet.dart
index ff2e637c1..a2259d32e 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/remote_peer_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/remote_peer_bottom_sheet.dart
@@ -222,8 +222,9 @@ class _RemotePeerBottomSheetState extends State<RemotePeerBottomSheet> {
                                 ? HMSThemeColors.onSurfaceLowEmphasis
                                 : HMSThemeColors.onSurfaceHighEmphasis)),
                   if ((widget.meetingStore.localPeer?.role.permissions
-                          .changeRole ??
-                      false) && (widget.meetingStore.roles.length > 1))
+                              .changeRole ??
+                          false) &&
+                      (widget.meetingStore.roles.length > 1))
                     ListTile(
                         horizontalTitleGap: 2,
                         onTap: () async {
diff --git a/packages/hms_room_kit/lib/src/widgets/common_widgets/message_container.dart b/packages/hms_room_kit/lib/src/widgets/common_widgets/message_container.dart
index 86c44e56c..d3753bba5 100644
--- a/packages/hms_room_kit/lib/src/widgets/common_widgets/message_container.dart
+++ b/packages/hms_room_kit/lib/src/widgets/common_widgets/message_container.dart
@@ -97,9 +97,7 @@ class MessageContainer extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.end,
                     children: [
                       HMSSubtitleText(
-                        text: message.time == null
-                            ? ""
-                            : formatter.format(message.time!),
+                        text: formatter.format(message.time),
                         textColor: HMSThemeColors.onSurfaceMediumEmphasis,
                       ),
                       const SizedBox(