From e11251d5298b21f7716f86606785034642a25c2e Mon Sep 17 00:00:00 2001
From: Yogesh Singh <yogesh@100ms.live>
Date: Tue, 19 Dec 2023 12:20:54 +0530
Subject: [PATCH 01/10] updated packages

---
 .../example/android/Gemfile.lock              | 10 +++----
 .../hmssdk_flutter/example/ios/Gemfile.lock   | 10 +++----
 packages/hmssdk_flutter/example/pubspec.lock  | 24 ++++++++---------
 packages/hmssdk_flutter/pubspec.lock          | 26 +++++++++----------
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/packages/hmssdk_flutter/example/android/Gemfile.lock b/packages/hmssdk_flutter/example/android/Gemfile.lock
index a8c843f4a..5c0424dfc 100644
--- a/packages/hmssdk_flutter/example/android/Gemfile.lock
+++ b/packages/hmssdk_flutter/example/android/Gemfile.lock
@@ -13,13 +13,13 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.867.0)
+    aws-partitions (1.869.0)
     aws-sdk-core (3.190.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.74.0)
+    aws-sdk-kms (1.75.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.141.0)
@@ -41,7 +41,7 @@ GEM
     domain_name (0.6.20231109)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.106.0)
+    excon (0.108.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -114,7 +114,7 @@ GEM
     fastlane-plugin-firebase_app_distribution (0.7.4)
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.53.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
@@ -198,7 +198,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     tzinfo (2.0.6)
diff --git a/packages/hmssdk_flutter/example/ios/Gemfile.lock b/packages/hmssdk_flutter/example/ios/Gemfile.lock
index bddaabd61..301551d57 100644
--- a/packages/hmssdk_flutter/example/ios/Gemfile.lock
+++ b/packages/hmssdk_flutter/example/ios/Gemfile.lock
@@ -13,13 +13,13 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.867.0)
+    aws-partitions (1.869.0)
     aws-sdk-core (3.190.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.74.0)
+    aws-sdk-kms (1.75.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.141.0)
@@ -41,7 +41,7 @@ GEM
     domain_name (0.6.20231109)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.106.0)
+    excon (0.108.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -115,7 +115,7 @@ GEM
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
     fastlane-plugin-versioning (0.5.2)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.53.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
@@ -199,7 +199,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     tzinfo (2.0.6)
diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock
index a891652ac..b07b194ce 100644
--- a/packages/hmssdk_flutter/example/pubspec.lock
+++ b/packages/hmssdk_flutter/example/pubspec.lock
@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -363,10 +363,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
@@ -656,18 +656,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -688,10 +688,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   tuple:
     dependency: transitive
     description:
@@ -848,10 +848,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
   win32:
     dependency: transitive
     description:
diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock
index c3cc2c33e..53939cd59 100644
--- a/packages/hmssdk_flutter/pubspec.lock
+++ b/packages/hmssdk_flutter/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   fake_async:
     dependency: transitive
     description:
@@ -79,10 +79,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   path:
     dependency: transitive
     description:
@@ -108,18 +108,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -140,10 +140,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   vector_math:
     dependency: transitive
     description:
@@ -156,10 +156,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
 sdks:
-  dart: ">=3.1.0-185.0.dev <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=2.10.0"

From 2c6698a473b492916c0368932509ab2af74136a9 Mon Sep 17 00:00:00 2001
From: Yogesh Singh <yogesh@100ms.live>
Date: Tue, 19 Dec 2023 16:26:24 +0530
Subject: [PATCH 02/10] added key for skipping preview for role change

---
 .github/styles/Vocab/HMSVocab/accept.txt                 | 9 +++++++++
 .../lib/src/layout_api/hms_conferencing_items.dart       | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/.github/styles/Vocab/HMSVocab/accept.txt b/.github/styles/Vocab/HMSVocab/accept.txt
index 10a66beae..c33e50a1f 100644
--- a/.github/styles/Vocab/HMSVocab/accept.txt
+++ b/.github/styles/Vocab/HMSVocab/accept.txt
@@ -175,3 +175,12 @@ iOS
 authToken
 issue_tracker
 publish_to
+bool
+prominentRoles
+isOverlay
+roleName
+forceChange
+previousRole
+peerMetadata
+toRole
+forPeer
\ No newline at end of file
diff --git a/packages/hms_room_kit/lib/src/layout_api/hms_conferencing_items.dart b/packages/hms_room_kit/lib/src/layout_api/hms_conferencing_items.dart
index 15dd5129a..c0048875c 100644
--- a/packages/hms_room_kit/lib/src/layout_api/hms_conferencing_items.dart
+++ b/packages/hms_room_kit/lib/src/layout_api/hms_conferencing_items.dart
@@ -140,12 +140,14 @@ class OnStageExp {
   String? removeFromStageLabel;
   String? onStageRole;
   List<String>? offStageRoles;
+  bool? skipPreviewForRoleChange;
 
   OnStageExp({
     this.bringToStageLabel,
     this.removeFromStageLabel,
     this.onStageRole,
     this.offStageRoles,
+    this.skipPreviewForRoleChange,
   });
 
   OnStageExp.fromJson(Map<String, dynamic>? json) {
@@ -154,6 +156,7 @@ class OnStageExp {
       removeFromStageLabel = null;
       onStageRole = null;
       offStageRoles = null;
+      skipPreviewForRoleChange = null;
       return;
     }
     bringToStageLabel = json['bring_to_stage_label'];
@@ -163,6 +166,9 @@ class OnStageExp {
         json.containsKey('off_stage_roles') && json['off_stage_roles'] is List
             ? List<String>.from(json['off_stage_roles'])
             : null;
+    skipPreviewForRoleChange = json.containsKey('skip_preview_for_role_change')
+        ? json['skip_preview_for_role_change']
+        : null;
   }
 
   Map<String, dynamic> toJson() {
@@ -173,6 +179,7 @@ class OnStageExp {
     if (offStageRoles != null && offStageRoles!.isNotEmpty) {
       data['off_stage_roles'] = offStageRoles;
     }
+    data['skip_preview_for_role_change'] = skipPreviewForRoleChange;
     return data;
   }
 }

From b19753a21979fe626de8f00ab7bd84e7a5b353d7 Mon Sep 17 00:00:00 2001
From: Yogesh Singh <yogesh@100ms.live>
Date: Tue, 19 Dec 2023 16:30:21 +0530
Subject: [PATCH 03/10] performing force role change based on skip preview
 option

---
 .../lib/src/meeting/meeting_store.dart        | 19 +++++++++++++++++++
 .../participants_bottom_sheet.dart            |  8 ++++++--
 .../participants_view_all_bottom_sheet.dart   |  5 ++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
index 67964737d..ffc81f0f9 100644
--- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
+++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
@@ -513,6 +513,25 @@ class MeetingStore extends ChangeNotifier
     return false;
   }
 
+  bool shouldSkipPreviewForRoleChange() {
+    if (HMSRoomLayout.peerType == PeerRoleType.conferencing) {
+      return HMSRoomLayout.roleLayoutData?.screens?.conferencing?.defaultConf
+              ?.elements?.onStageExp?.skipPreviewForRoleChange ??
+          false;
+    } else if (HMSRoomLayout.peerType == PeerRoleType.hlsViewer) {
+      return HMSRoomLayout
+              .roleLayoutData
+              ?.screens
+              ?.conferencing
+              ?.hlsLiveStreaming
+              ?.elements
+              ?.onStageExp
+              ?.skipPreviewForRoleChange ??
+          false;
+    }
+    return false;
+  }
+
   void changeTrackState(HMSTrack track, bool mute) {
     return _hmsSDKInteractor.changeTrackState(track, mute, this);
   }
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
index 858278a11..ffe0a8887 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
@@ -125,7 +125,8 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                             meetingStore.changeRoleOfPeer(
                                 peer: peer,
                                 roleName: offStageRole,
-                                forceChange: true);
+                                forceChange: meetingStore
+                                    .shouldSkipPreviewForRoleChange());
                             return;
                           } catch (e) {
                             log(e.toString());
@@ -138,7 +139,10 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                   HMSRole? onStageRole = meetingStore.getOnStageRole();
                   if (onStageRole != null) {
                     meetingStore.changeRoleOfPeer(
-                        peer: peer, roleName: onStageRole, forceChange: false);
+                        peer: peer,
+                        roleName: onStageRole,
+                        forceChange:
+                            meetingStore.shouldSkipPreviewForRoleChange());
                     meetingStore.removeToast(HMSToastsType.roleChangeToast,
                         data: peer);
                   }
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
index 2a0ecb79e..17d43c6f9 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
@@ -131,7 +131,10 @@ class _ParticipantsViewAllBottomSheetState
                   HMSRole? onStageRole = meetingStore.getOnStageRole();
                   if (onStageRole != null) {
                     meetingStore.changeRoleOfPeer(
-                        peer: peer, roleName: onStageRole, forceChange: false);
+                        peer: peer,
+                        roleName: onStageRole,
+                        forceChange:
+                            meetingStore.shouldSkipPreviewForRoleChange());
                     meetingStore.removeToast(HMSToastsType.roleChangeToast,
                         data: peer);
                   }

From 5298ca9d492376a947b82dc7b3d38dfc9cec4bce Mon Sep 17 00:00:00 2001
From: Yogesh Singh <yogesh@100ms.live>
Date: Tue, 19 Dec 2023 16:43:55 +0530
Subject: [PATCH 04/10] updated conditions

---
 .../src/widgets/bottom_sheets/participants_bottom_sheet.dart   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
index ffe0a8887..a84607805 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
@@ -125,8 +125,7 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                             meetingStore.changeRoleOfPeer(
                                 peer: peer,
                                 roleName: offStageRole,
-                                forceChange: meetingStore
-                                    .shouldSkipPreviewForRoleChange());
+                                forceChange: true);
                             return;
                           } catch (e) {
                             log(e.toString());

From 5ac81690c24e80198ec12b9dc8adca9309c42fed Mon Sep 17 00:00:00 2001
From: Decoder07 <pushpam@100ms.live>
Date: Thu, 21 Dec 2023 03:27:59 +0530
Subject: [PATCH 05/10] Updated skip preview implementation

---
 packages/hms_room_kit/example/pubspec.lock    | 80 +++++++++----------
 .../lib/src/layout_api/hms_room_layout.dart   |  7 ++
 .../lib/src/meeting/meeting_store.dart        | 27 ++-----
 .../participants_bottom_sheet.dart            |  3 +-
 .../participants_view_all_bottom_sheet.dart   |  3 +-
 packages/hms_room_kit/pubspec.lock            | 80 +++++++++----------
 6 files changed, 91 insertions(+), 109 deletions(-)

diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock
index 4e805361c..48b873f92 100644
--- a/packages/hms_room_kit/example/pubspec.lock
+++ b/packages/hms_room_kit/example/pubspec.lock
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.2"
   convert:
     dependency: transitive
     description:
@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e
+      sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+8"
+    version: "0.3.3+7"
   crypto:
     dependency: transitive
     description:
@@ -227,10 +227,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.0"
   http_parser:
     dependency: transitive
     description:
@@ -299,10 +299,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   mime:
     dependency: transitive
     description:
@@ -387,58 +387,50 @@ packages:
     dependency: transitive
     description:
       name: permission_handler
-      sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78"
+      sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8"
       url: "https://pub.dev"
     source: hosted
-    version: "11.1.0"
+    version: "11.0.1"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6"
+      sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.1"
+    version: "11.1.0"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.2.0"
-  permission_handler_html:
-    dependency: transitive
-    description:
-      name: permission_handler_html
-      sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df"
+      sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.0+2"
+    version: "9.1.4"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1
+      sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "3.12.0"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
-      sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004"
+      sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.1.3"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "5.4.0"
   platform:
     dependency: transitive
     description:
@@ -531,10 +523,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21"
+      sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.1"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -568,18 +560,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -600,10 +592,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.6.0"
   tuple:
     dependency: transitive
     description:
@@ -672,10 +664,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9"
+      sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.0"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -736,10 +728,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.1.4-beta"
   win32:
     dependency: transitive
     description:
@@ -760,10 +752,10 @@ packages:
     dependency: transitive
     description:
       name: xml
-      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.0"
+    version: "6.3.0"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.1.0 <4.0.0"
+  flutter: ">=3.13.0"
diff --git a/packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart b/packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart
index 6394e0201..53aaa3cd5 100644
--- a/packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart
+++ b/packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart
@@ -217,6 +217,7 @@ class HMSRoomLayout {
   static bool isParticipantsListEnabled = true;
   static bool isBRBEnabled = true;
   static List<String>? offStageRoles = [];
+  static bool skipPreviewForRole = false;
 
   static Future<void> getRoomLayout(
       {required HMSSDKInteractor hmsSDKInteractor,
@@ -263,6 +264,9 @@ class HMSRoomLayout {
               null;
       offStageRoles = roleLayoutData?.screens?.conferencing?.defaultConf
           ?.elements?.onStageExp?.offStageRoles;
+      skipPreviewForRole = roleLayoutData?.screens?.conferencing?.defaultConf
+              ?.elements?.onStageExp?.skipPreviewForRoleChange ??
+          false;
     } else {
       chatData = roleLayoutData
           ?.screens?.conferencing?.hlsLiveStreaming?.elements?.chat;
@@ -274,6 +278,9 @@ class HMSRoomLayout {
           null;
       offStageRoles = roleLayoutData?.screens?.conferencing?.hlsLiveStreaming
           ?.elements?.onStageExp?.offStageRoles;
+      skipPreviewForRole = roleLayoutData?.screens?.conferencing?.hlsLiveStreaming
+              ?.elements?.onStageExp?.skipPreviewForRoleChange ??
+          false;
     }
   }
 
diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
index ffc81f0f9..8073f5409 100644
--- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
+++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
@@ -470,6 +470,14 @@ class MeetingStore extends ChangeNotifier
         hmsActionResultListener: this);
   }
 
+  void setPreviousRole(String oldRole) {
+    if (HMSRoomLayout.skipPreviewForRole) {
+      _hmsSDKInteractor.changeMetadata(
+          metadata: "{\"isBRBOn\":false,\"prevRole\":\"$oldRole\"}",
+          hmsActionResultListener: this);
+    }
+  }
+
   Future<List<HMSRole>> getRoles() async {
     return await _hmsSDKInteractor.getRoles();
   }
@@ -513,25 +521,6 @@ class MeetingStore extends ChangeNotifier
     return false;
   }
 
-  bool shouldSkipPreviewForRoleChange() {
-    if (HMSRoomLayout.peerType == PeerRoleType.conferencing) {
-      return HMSRoomLayout.roleLayoutData?.screens?.conferencing?.defaultConf
-              ?.elements?.onStageExp?.skipPreviewForRoleChange ??
-          false;
-    } else if (HMSRoomLayout.peerType == PeerRoleType.hlsViewer) {
-      return HMSRoomLayout
-              .roleLayoutData
-              ?.screens
-              ?.conferencing
-              ?.hlsLiveStreaming
-              ?.elements
-              ?.onStageExp
-              ?.skipPreviewForRoleChange ??
-          false;
-    }
-    return false;
-  }
-
   void changeTrackState(HMSTrack track, bool mute) {
     return _hmsSDKInteractor.changeTrackState(track, mute, this);
   }
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
index a84607805..d03d2099f 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
@@ -141,7 +141,8 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                         peer: peer,
                         roleName: onStageRole,
                         forceChange:
-                            meetingStore.shouldSkipPreviewForRoleChange());
+                            HMSRoomLayout.skipPreviewForRole);
+                    meetingStore.setPreviousRole(peer.role.name);
                     meetingStore.removeToast(HMSToastsType.roleChangeToast,
                         data: peer);
                   }
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
index 17d43c6f9..43ddadeab 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
@@ -134,7 +134,8 @@ class _ParticipantsViewAllBottomSheetState
                         peer: peer,
                         roleName: onStageRole,
                         forceChange:
-                            meetingStore.shouldSkipPreviewForRoleChange());
+                            HMSRoomLayout.skipPreviewForRole);
+                    meetingStore.setPreviousRole(peer.role.name);
                     meetingStore.removeToast(HMSToastsType.roleChangeToast,
                         data: peer);
                   }
diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock
index 46d48a3b6..6e1e92425 100644
--- a/packages/hms_room_kit/pubspec.lock
+++ b/packages/hms_room_kit/pubspec.lock
@@ -61,10 +61,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.2"
   convert:
     dependency: transitive
     description:
@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e
+      sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+8"
+    version: "0.3.3+7"
   crypto:
     dependency: transitive
     description:
@@ -212,10 +212,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.0"
   http_parser:
     dependency: transitive
     description:
@@ -284,10 +284,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   mime:
     dependency: transitive
     description:
@@ -372,58 +372,50 @@ packages:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78"
+      sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8"
       url: "https://pub.dev"
     source: hosted
-    version: "11.1.0"
+    version: "11.0.1"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6"
+      sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.1"
+    version: "11.1.0"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.2.0"
-  permission_handler_html:
-    dependency: transitive
-    description:
-      name: permission_handler_html
-      sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df"
+      sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.0+2"
+    version: "9.1.4"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1
+      sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "3.12.0"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
-      sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004"
+      sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.1.3"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "5.4.0"
   platform:
     dependency: transitive
     description:
@@ -516,10 +508,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21"
+      sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.1"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -553,18 +545,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -585,10 +577,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.6.0"
   tuple:
     dependency: "direct main"
     description:
@@ -657,10 +649,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9"
+      sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.0"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -721,10 +713,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.1.4-beta"
   win32:
     dependency: transitive
     description:
@@ -745,10 +737,10 @@ packages:
     dependency: transitive
     description:
       name: xml
-      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.0"
+    version: "6.3.0"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.1.0 <4.0.0"
+  flutter: ">=3.13.0"

From 562b71d6a1f645ef5ff15d4c8d4a62bec7e78c9d Mon Sep 17 00:00:00 2001
From: Decoder07 <Decoder07@users.noreply.github.com>
Date: Wed, 20 Dec 2023 21:59:40 +0000
Subject: [PATCH 06/10] =?UTF-8?q?=F0=9F=A4=96=20Automated=20Format=20and?=
 =?UTF-8?q?=20Fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hms_room_kit/lib/src/layout_api/hms_room_layout.dart | 9 +++++++--
 .../widgets/bottom_sheets/participants_bottom_sheet.dart | 3 +--
 .../participants_view_all_bottom_sheet.dart              | 3 +--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart b/packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart
index 53aaa3cd5..8265bd311 100644
--- a/packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart
+++ b/packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart
@@ -278,8 +278,13 @@ class HMSRoomLayout {
           null;
       offStageRoles = roleLayoutData?.screens?.conferencing?.hlsLiveStreaming
           ?.elements?.onStageExp?.offStageRoles;
-      skipPreviewForRole = roleLayoutData?.screens?.conferencing?.hlsLiveStreaming
-              ?.elements?.onStageExp?.skipPreviewForRoleChange ??
+      skipPreviewForRole = roleLayoutData
+              ?.screens
+              ?.conferencing
+              ?.hlsLiveStreaming
+              ?.elements
+              ?.onStageExp
+              ?.skipPreviewForRoleChange ??
           false;
     }
   }
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
index d03d2099f..798daf327 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
@@ -140,8 +140,7 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                     meetingStore.changeRoleOfPeer(
                         peer: peer,
                         roleName: onStageRole,
-                        forceChange:
-                            HMSRoomLayout.skipPreviewForRole);
+                        forceChange: HMSRoomLayout.skipPreviewForRole);
                     meetingStore.setPreviousRole(peer.role.name);
                     meetingStore.removeToast(HMSToastsType.roleChangeToast,
                         data: peer);
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
index 43ddadeab..4a55f0b0c 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
@@ -133,8 +133,7 @@ class _ParticipantsViewAllBottomSheetState
                     meetingStore.changeRoleOfPeer(
                         peer: peer,
                         roleName: onStageRole,
-                        forceChange:
-                            HMSRoomLayout.skipPreviewForRole);
+                        forceChange: HMSRoomLayout.skipPreviewForRole);
                     meetingStore.setPreviousRole(peer.role.name);
                     meetingStore.removeToast(HMSToastsType.roleChangeToast,
                         data: peer);

From eb5451002ab47ab70ccce5a8a9087f76d47f8176 Mon Sep 17 00:00:00 2001
From: Decoder07 <pushpam@100ms.live>
Date: Thu, 21 Dec 2023 17:35:51 +0530
Subject: [PATCH 07/10] Added metadata change update

---
 packages/hms_room_kit/lib/src/meeting/meeting_store.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
index a4f6ef8df..4be49ee3b 100644
--- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
+++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
@@ -1412,6 +1412,9 @@ class MeetingStore extends ChangeNotifier
         }
         notifyListeners();
       }
+      else if(peerUpdate == HMSPeerUpdate.metadataChanged){
+        participantsInMeetingMap[peer.role.name]?[index].updatePeer(peer);
+      }
     } else {
       if (peerUpdate == HMSPeerUpdate.roleUpdated) {
         if (oldRole != null) {

From 292cd38f721c06e38a7a814a8930c5543465f64a Mon Sep 17 00:00:00 2001
From: Decoder07 <pushpam@100ms.live>
Date: Fri, 22 Dec 2023 13:42:44 +0530
Subject: [PATCH 08/10] Fixed participants list

---
 .../lib/src/meeting/meeting_store.dart        | 18 ++++++-
 .../participants_bottom_sheet.dart            | 51 +++++++++++--------
 .../participants_view_all_bottom_sheet.dart   |  1 -
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
index 4be49ee3b..24a84a3a5 100644
--- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
+++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
@@ -482,6 +482,9 @@ class MeetingStore extends ChangeNotifier
           metadata: "{\"isBRBOn\":false,\"prevRole\":\"$oldRole\"}",
           hmsActionResultListener: this);
     }
+    if(isRaisedHand){
+      toggleLocalPeerHandRaise();
+    }
   }
 
   Future<List<HMSRole>> getRoles() async {
@@ -729,19 +732,31 @@ class MeetingStore extends ChangeNotifier
     }
     log("Calling refresh PeerList Method $peerListIterators");
     peerListIterators.clear();
+
+    ///Here we get off stage roles
     List<String>? offStageRoles = HMSRoomLayout.roleLayoutData?.screens
         ?.conferencing?.defaultConf?.elements?.onStageExp?.offStageRoles;
+
+    ///For each off stage role we get the peer list iterator
     offStageRoles?.forEach((role) async {
       var peerListIterator = await _hmsSDKInteractor.getPeerListIterator(
           peerListIteratorOptions:
               PeerListIteratorOptions(limit: 10, byRoleName: role));
+
+      ///If the peerListIterator is not null then we add it to the map
       if (peerListIterator != null && peerListIterator is HMSPeerListIterator) {
         peerListIterators[role] = peerListIterator;
+
+        ///Here we subtract the number of participants in meeting with the number of participants in the iterator
         participantsInMeeting -= participantsInMeetingMap[role]?.length ?? 0;
         participantsInMeetingMap[role]?.clear();
+
+        ///Here we get the first set of peers from the iterator
         dynamic nonRealTimePeers = await peerListIterator.next();
         if (nonRealTimePeers is List<HMSPeer>) {
-          log("Calling refresh PeerList Method $nonRealTimePeers");
+          log("Calling refresh PeerList Method here $nonRealTimePeers");
+
+          ///Here we add the peers to the participantsInMeetingMap
           if (nonRealTimePeers.isNotEmpty) {
             for (var peer in nonRealTimePeers) {
               addPeer(peer);
@@ -1473,6 +1488,7 @@ class MeetingStore extends ChangeNotifier
       case HMSPeerUpdate.roleUpdated:
         if (peer.isLocal) {
           getSpotlightPeer();
+          setPreviousRole(peer.role.name);
           resetLayout(peer.role.name);
           localPeer = peer;
         }
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
index 798daf327..9cda09cbd 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
@@ -141,7 +141,8 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                         peer: peer,
                         roleName: onStageRole,
                         forceChange: HMSRoomLayout.skipPreviewForRole);
-                    meetingStore.setPreviousRole(peer.role.name);
+
+                    ///TODO: ADD this in onSuccess for HMSActionResultListener
                     meetingStore.removeToast(HMSToastsType.roleChangeToast,
                         data: peer);
                   }
@@ -338,19 +339,26 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
               //     child: TextField(),
               //   ),
               // ),
-              Selector<MeetingStore,
-                      Tuple2<Map<String, List<ParticipantsStore>>, int>>(
-                  selector: (_, meetingStore) => Tuple2(
-                      meetingStore.participantsInMeetingMap,
-                      meetingStore.participantsInMeeting),
-                  builder: (_, data, __) {
-                    return ListView.builder(
-                        physics: const NeverScrollableScrollPhysics(),
-                        shrinkWrap: true,
-                        itemCount: data.item1.keys.length,
-                        itemBuilder: (context, index) {
-                          String role = data.item1.keys.elementAt(index);
-                          return (data.item1[role]?.isNotEmpty ?? false)
+              ListView.builder(
+                  physics: const NeverScrollableScrollPhysics(),
+                  shrinkWrap: true,
+                  itemCount: context
+                      .read<MeetingStore>()
+                      .participantsInMeetingMap
+                      .keys
+                      .length,
+                  itemBuilder: (context, index) {
+                    String role = context
+                        .read<MeetingStore>()
+                        .participantsInMeetingMap
+                        .keys
+                        .elementAt(index);
+                    return Selector<MeetingStore, Tuple2<int,List<ParticipantsStore>?>>(
+                        selector: (_, meetingStore) =>
+                            Tuple2(meetingStore.participantsInMeetingMap[role]?.length??0,meetingStore.participantsInMeetingMap[role]),
+                        builder: (_, participantsPerRole, __) {
+                          return (participantsPerRole.item2?.isNotEmpty ??
+                                  false)
                               ? Column(
                                   children: [
                                     ClipRRect(
@@ -379,29 +387,28 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                                             .onSurfaceHighEmphasis,
                                         title: HMSSubheadingText(
                                           text:
-                                              "${data.item1.keys.elementAt(index)} (${(HMSRoomLayout.offStageRoles?.contains(role) ?? false) ? context.read<MeetingStore>().peerListIterators[role]?.totalCount ?? 0 : data.item1[role]?.length}) ",
+                                              "${context.read<MeetingStore>().participantsInMeetingMap.keys.elementAt(index)} (${(HMSRoomLayout.offStageRoles?.contains(role) ?? false) ? context.read<MeetingStore>().peerListIterators[role]?.totalCount ?? 0 :participantsPerRole.item1}) ",
                                           textColor: HMSThemeColors
                                               .onSurfaceMediumEmphasis,
                                           letterSpacing: 0.1,
                                         ),
                                         children: [
                                           SizedBox(
-                                            height: data.item1[role] == null
+                                            height: participantsPerRole.item2 == null
                                                 ? 0
-                                                : (data.item1[role]!.length) *
+                                                : (participantsPerRole.item1) *
                                                     54,
                                             child: Center(
                                               child: ListView.builder(
                                                   physics:
                                                       const NeverScrollableScrollPhysics(),
-                                                  itemCount: data.item1[role]
-                                                          ?.length ??
-                                                      0,
+                                                  itemCount: participantsPerRole
+                                                          .item1,
                                                   itemBuilder:
                                                       (context, peerIndex) {
                                                     ParticipantsStore
                                                         currentPeer =
-                                                        data.item1[role]![
+                                                        participantsPerRole.item2![
                                                             peerIndex];
                                                     return Padding(
                                                       padding:
@@ -450,7 +457,7 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                                                                           __) {
                                                                         return HMSTitleText(
                                                                             text:
-                                                                                peerName + ((data.item1[role]![peerIndex].peer.isLocal) ? " (You)" : ""),
+                                                                                peerName + ((participantsPerRole.item2![peerIndex].peer.isLocal) ? " (You)" : ""),
                                                                             fontSize: 14,
                                                                             lineHeight: 20,
                                                                             letterSpacing: 0.1,
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
index 4a55f0b0c..6a6844f16 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_view_all_bottom_sheet.dart
@@ -134,7 +134,6 @@ class _ParticipantsViewAllBottomSheetState
                         peer: peer,
                         roleName: onStageRole,
                         forceChange: HMSRoomLayout.skipPreviewForRole);
-                    meetingStore.setPreviousRole(peer.role.name);
                     meetingStore.removeToast(HMSToastsType.roleChangeToast,
                         data: peer);
                   }

From 542ecdc79700161a1d3116dc89817c8f89bb8fbc Mon Sep 17 00:00:00 2001
From: Decoder07 <pushpam@100ms.live>
Date: Fri, 22 Dec 2023 17:41:46 +0530
Subject: [PATCH 09/10] Fixed preview for role bug

---
 .../lib/src/meeting/meeting_page.dart         |  2 +-
 .../lib/src/meeting/meeting_store.dart        | 16 ++---
 .../lib/src/preview/preview_store.dart        |  2 +
 .../lib/src/screen_controller.dart            | 12 ++--
 .../lib/src/service/app_debug_config.dart     |  6 +-
 .../lib/app_settings_bottom_sheet.dart        | 69 +------------------
 .../example/lib/qr_code_screen.dart           |  2 +
 packages/hmssdk_flutter/example/pubspec.lock  | 26 +++----
 packages/hmssdk_flutter/pubspec.lock          | 26 +++----
 9 files changed, 47 insertions(+), 114 deletions(-)

diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_page.dart b/packages/hms_room_kit/lib/src/meeting/meeting_page.dart
index 8c75bdbc1..0df2a3260 100644
--- a/packages/hms_room_kit/lib/src/meeting/meeting_page.dart
+++ b/packages/hms_room_kit/lib/src/meeting/meeting_page.dart
@@ -411,7 +411,7 @@ class _MeetingPageState extends State<MeetingPage> {
                                                                               color: HMSThemeColors.backgroundDim,
                                                                               child: (isVideoOn && previewForRoleTracks.item1 != null)
                                                                                   ? Center(
-                                                                                      child: HMSVideoView(
+                                                                                      child: HMSTextureView(
                                                                                         scaleType: ScaleType.SCALE_ASPECT_FILL,
                                                                                         track: previewForRoleTracks.item1!,
                                                                                         setMirror: true,
diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
index 24a84a3a5..3d73ffab8 100644
--- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
+++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
@@ -477,12 +477,10 @@ class MeetingStore extends ChangeNotifier
   }
 
   void setPreviousRole(String oldRole) {
-    if (HMSRoomLayout.skipPreviewForRole) {
-      _hmsSDKInteractor.changeMetadata(
-          metadata: "{\"isBRBOn\":false,\"prevRole\":\"$oldRole\"}",
-          hmsActionResultListener: this);
-    }
-    if(isRaisedHand){
+    _hmsSDKInteractor.changeMetadata(
+        metadata: "{\"isBRBOn\":false,\"prevRole\":\"$oldRole\"}",
+        hmsActionResultListener: this);
+    if (isRaisedHand) {
       toggleLocalPeerHandRaise();
     }
   }
@@ -591,14 +589,14 @@ class MeetingStore extends ChangeNotifier
       if (indexForVideoTrack != -1) {
         previewForRoleVideoTrack =
             result[indexForVideoTrack] as HMSLocalVideoTrack;
-        isVideoOn = true;
+        isVideoOn = !(previewForRoleVideoTrack?.isMute ?? true);
       }
       var indexForAudioTrack = result.indexWhere(
           (element) => element.kind == HMSTrackKind.kHMSTrackKindAudio);
       if (indexForAudioTrack != -1) {
         previewForRoleAudioTrack =
             result[indexForAudioTrack] as HMSLocalAudioTrack;
-        isMicOn = true;
+        isMicOn = !(previewForRoleAudioTrack?.isMute ?? true);
       }
       notifyListeners();
     }
@@ -1488,7 +1486,7 @@ class MeetingStore extends ChangeNotifier
       case HMSPeerUpdate.roleUpdated:
         if (peer.isLocal) {
           getSpotlightPeer();
-          setPreviousRole(peer.role.name);
+          setPreviousRole(localPeer?.role.name ?? "");
           resetLayout(peer.role.name);
           localPeer = peer;
         }
diff --git a/packages/hms_room_kit/lib/src/preview/preview_store.dart b/packages/hms_room_kit/lib/src/preview/preview_store.dart
index 971273c6e..fdacdf39b 100644
--- a/packages/hms_room_kit/lib/src/preview/preview_store.dart
+++ b/packages/hms_room_kit/lib/src/preview/preview_store.dart
@@ -103,6 +103,8 @@ class PreviewStore extends ChangeNotifier
     getRoles();
     getCurrentAudioDevice();
     getAudioDevicesList();
+    toggleCameraMuteState();
+    toggleMicMuteState();
     notifyListeners();
   }
 
diff --git a/packages/hms_room_kit/lib/src/screen_controller.dart b/packages/hms_room_kit/lib/src/screen_controller.dart
index 9b0090649..006576058 100644
--- a/packages/hms_room_kit/lib/src/screen_controller.dart
+++ b/packages/hms_room_kit/lib/src/screen_controller.dart
@@ -104,8 +104,8 @@ class _ScreenControllerState extends State<ScreenController> {
     }
     _hmsSDKInteractor = HMSSDKInteractor(
         iOSScreenshareConfig: widget.options?.iOSScreenshareConfig,
-        joinWithMutedAudio: AppDebugConfig.joinWithMutedAudio,
-        joinWithMutedVideo: AppDebugConfig.joinWithMutedVideo,
+        joinWithMutedAudio: true,
+        joinWithMutedVideo: true,
         isSoftwareDecoderDisabled: AppDebugConfig.isSoftwareDecoderDisabled,
         isAudioMixerDisabled: AppDebugConfig.isAudioMixerDisabled,
         isPrebuilt: true);
@@ -125,9 +125,11 @@ class _ScreenControllerState extends State<ScreenController> {
           });
     } else {
       _hmsSDKInteractor.toggleAlwaysScreenOn();
-      setState(() {
-        isLoading = false;
-      });
+      if (mounted) {
+        setState(() {
+          isLoading = false;
+        });
+      }
       Constant.debugMode = AppDebugConfig.isDebugMode;
     }
   }
diff --git a/packages/hms_room_kit/lib/src/service/app_debug_config.dart b/packages/hms_room_kit/lib/src/service/app_debug_config.dart
index 0c6a78d27..c039d1561 100644
--- a/packages/hms_room_kit/lib/src/service/app_debug_config.dart
+++ b/packages/hms_room_kit/lib/src/service/app_debug_config.dart
@@ -6,8 +6,6 @@ class AppDebugConfig {
   Setting these values to defaults and can be toggled from the application
   This will not be shipped with the ui_kit package and only used for internal testing
   */
-  static bool joinWithMutedAudio = false;
-  static bool joinWithMutedVideo = false;
   static bool skipPreview = false;
   static bool mirrorCamera = true;
   static bool showStats = false;
@@ -23,9 +21,7 @@ class AppDebugConfig {
   static HMSIOSScreenshareConfig? iOSScreenshareConfig;
 
   /// Resets the debug configuration to default values
-  static void resetToDefault() {
-    joinWithMutedAudio = true;
-    joinWithMutedVideo = true;
+  static void resetToDefault() {  
     skipPreview = false;
     mirrorCamera = true;
     showStats = false;
diff --git a/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart b/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
index 978aeb86c..6509439f3 100644
--- a/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
+++ b/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
@@ -17,8 +17,7 @@ class AppSettingsBottomSheet extends StatefulWidget {
 }
 
 class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
-  bool joinWithMutedAudio = false;
-  bool joinWithMutedVideo = false;
+
   bool skipPreview = false;
   bool mirrorCamera = true;
   bool showStats = false;
@@ -51,10 +50,6 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
     if (Platform.isAndroid && versions['android'] == null) {
       throw const FormatException("android version not found");
     }
-    joinWithMutedAudio =
-        await Utilities.getBoolData(key: 'join-with-muted-audio') ?? false;
-    joinWithMutedVideo =
-        await Utilities.getBoolData(key: 'join-with-muted-video') ?? false;
     skipPreview = await Utilities.getBoolData(key: 'skip-preview') ?? false;
     mirrorCamera = await Utilities.getBoolData(key: 'mirror-camera') ?? true;
     showStats = await Utilities.getBoolData(key: 'show-stats') ?? false;
@@ -87,8 +82,6 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
     AppDebugConfig.isAudioMixerDisabled = isAudioMixerDisabled;
     AppDebugConfig.isAutoSimulcast = isAutoSimulcast;
     AppDebugConfig.isSoftwareDecoderDisabled = isSoftwareDecoderDisabled;
-    AppDebugConfig.joinWithMutedAudio = joinWithMutedAudio;
-    AppDebugConfig.joinWithMutedVideo = joinWithMutedVideo;
     AppDebugConfig.mirrorCamera = mirrorCamera;
     AppDebugConfig.showStats = showStats;
     AppDebugConfig.skipPreview = skipPreview;
@@ -225,66 +218,6 @@ class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
                               setState(() {})
                             }),
                   ),
-                  ListTile(
-                    horizontalTitleGap: 2,
-                    enabled: false,
-                    contentPadding: EdgeInsets.zero,
-                    leading: SvgPicture.asset(
-                      "packages/hms_room_kit/lib/src/assets/icons/mic_state_off.svg",
-                      fit: BoxFit.scaleDown,
-                      colorFilter:
-                          ColorFilter.mode(themeDefaultColor, BlendMode.srcIn),
-                    ),
-                    title: Text(
-                      "Join with muted audio",
-                      semanticsLabel: "fl_join_with_muted_audio",
-                      style: HMSTextStyle.setTextStyle(
-                          fontSize: 14,
-                          color: themeDefaultColor,
-                          letterSpacing: 0.25,
-                          fontWeight: FontWeight.w600),
-                    ),
-                    trailing: CupertinoSwitch(
-                        activeColor: hmsdefaultColor,
-                        value: joinWithMutedAudio,
-                        onChanged: (value) => {
-                              joinWithMutedAudio = value,
-                              Utilities.saveBoolData(
-                                  key: 'join-with-muted-audio', value: value),
-                              AppDebugConfig.joinWithMutedAudio = value,
-                              setState(() {})
-                            }),
-                  ),
-                  ListTile(
-                    horizontalTitleGap: 2,
-                    enabled: false,
-                    contentPadding: EdgeInsets.zero,
-                    leading: SvgPicture.asset(
-                      "packages/hms_room_kit/lib/src/assets/icons/cam_state_off.svg",
-                      fit: BoxFit.scaleDown,
-                      colorFilter:
-                          ColorFilter.mode(themeDefaultColor, BlendMode.srcIn),
-                    ),
-                    title: Text(
-                      "Join with muted video",
-                      semanticsLabel: "fl_join_with_muted_video",
-                      style: HMSTextStyle.setTextStyle(
-                          fontSize: 14,
-                          color: themeDefaultColor,
-                          letterSpacing: 0.25,
-                          fontWeight: FontWeight.w600),
-                    ),
-                    trailing: CupertinoSwitch(
-                        activeColor: hmsdefaultColor,
-                        value: joinWithMutedVideo,
-                        onChanged: (value) => {
-                              joinWithMutedVideo = value,
-                              Utilities.saveBoolData(
-                                  key: 'join-with-muted-video', value: value),
-                              AppDebugConfig.joinWithMutedVideo = value,
-                              setState(() {})
-                            }),
-                  ),
                   // ListTile(
                   //   horizontalTitleGap: 2,
                   //   enabled: false,
diff --git a/packages/hmssdk_flutter/example/lib/qr_code_screen.dart b/packages/hmssdk_flutter/example/lib/qr_code_screen.dart
index 54a78eddc..0eb7d3e17 100644
--- a/packages/hmssdk_flutter/example/lib/qr_code_screen.dart
+++ b/packages/hmssdk_flutter/example/lib/qr_code_screen.dart
@@ -74,6 +74,8 @@ class _QRCodeScreenState extends State<QRCodeScreen> {
         } else {
           Constant.roomCode = scanData.code!.trim();
         }
+        Utilities.saveStringData(
+            key: "meetingLink", value: scanData.code!.trim());
         Navigator.of(context).pushReplacement(MaterialPageRoute(
             builder: (_) => HMSPrebuilt(
                 roomCode: Constant.roomCode,
diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock
index 7e77208de..4eae8065f 100644
--- a/packages/hmssdk_flutter/example/pubspec.lock
+++ b/packages/hmssdk_flutter/example/pubspec.lock
@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.2"
   convert:
     dependency: transitive
     description:
@@ -362,10 +362,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   mime:
     dependency: transitive
     description:
@@ -647,18 +647,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -679,10 +679,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.6.0"
   tuple:
     dependency: transitive
     description:
@@ -839,10 +839,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.1.4-beta"
   win32:
     dependency: transitive
     description:
@@ -868,5 +868,5 @@ packages:
     source: hosted
     version: "6.3.0"
 sdks:
-  dart: ">=3.2.0-194.0.dev <4.0.0"
+  dart: ">=3.1.0 <4.0.0"
   flutter: ">=3.13.0"
diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock
index 53939cd59..c3cc2c33e 100644
--- a/packages/hmssdk_flutter/pubspec.lock
+++ b/packages/hmssdk_flutter/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.2"
   fake_async:
     dependency: transitive
     description:
@@ -79,10 +79,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
@@ -108,18 +108,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -140,10 +140,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.6.0"
   vector_math:
     dependency: transitive
     description:
@@ -156,10 +156,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.1.4-beta"
 sdks:
-  dart: ">=3.2.0-194.0.dev <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=2.10.0"

From 867f946868f996ddeb48dea4087dfc49e90f6fac Mon Sep 17 00:00:00 2001
From: Decoder07 <Decoder07@users.noreply.github.com>
Date: Fri, 22 Dec 2023 12:16:10 +0000
Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=A4=96=20Automated=20Format=20and?=
 =?UTF-8?q?=20Fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/src/meeting/meeting_store.dart        |  3 +--
 .../lib/src/service/app_debug_config.dart     |  2 +-
 .../participants_bottom_sheet.dart            | 23 +++++++++-------
 .../lib/app_settings_bottom_sheet.dart        |  1 -
 packages/hmssdk_flutter/example/pubspec.lock  | 26 +++++++++----------
 packages/hmssdk_flutter/pubspec.lock          | 26 +++++++++----------
 6 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
index 70e8aede8..b42867592 100644
--- a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
+++ b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
@@ -1426,8 +1426,7 @@ class MeetingStore extends ChangeNotifier
         notifyListeners();
       } else if (peerUpdate == HMSPeerUpdate.metadataChanged) {
         participantsInMeetingMap[peer.role.name]?[index].updatePeer(peer);
-      }
-      else if(peerUpdate == HMSPeerUpdate.metadataChanged){
+      } else if (peerUpdate == HMSPeerUpdate.metadataChanged) {
         participantsInMeetingMap[peer.role.name]?[index].updatePeer(peer);
       }
     } else {
diff --git a/packages/hms_room_kit/lib/src/service/app_debug_config.dart b/packages/hms_room_kit/lib/src/service/app_debug_config.dart
index c039d1561..39573c59a 100644
--- a/packages/hms_room_kit/lib/src/service/app_debug_config.dart
+++ b/packages/hms_room_kit/lib/src/service/app_debug_config.dart
@@ -21,7 +21,7 @@ class AppDebugConfig {
   static HMSIOSScreenshareConfig? iOSScreenshareConfig;
 
   /// Resets the debug configuration to default values
-  static void resetToDefault() {  
+  static void resetToDefault() {
     skipPreview = false;
     mirrorCamera = true;
     showStats = false;
diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
index a0d15f1cb..7d2f70b23 100644
--- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
+++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/participants_bottom_sheet.dart
@@ -351,9 +351,13 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                         .participantsInMeetingMap
                         .keys
                         .elementAt(index);
-                    return Selector<MeetingStore, Tuple2<int,List<ParticipantsStore>?>>(
-                        selector: (_, meetingStore) =>
-                            Tuple2(meetingStore.participantsInMeetingMap[role]?.length??0,meetingStore.participantsInMeetingMap[role]),
+                    return Selector<MeetingStore,
+                            Tuple2<int, List<ParticipantsStore>?>>(
+                        selector: (_, meetingStore) => Tuple2(
+                            meetingStore
+                                    .participantsInMeetingMap[role]?.length ??
+                                0,
+                            meetingStore.participantsInMeetingMap[role]),
                         builder: (_, participantsPerRole, __) {
                           return (participantsPerRole.item2?.isNotEmpty ??
                                   false)
@@ -385,14 +389,15 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                                             .onSurfaceHighEmphasis,
                                         title: HMSSubheadingText(
                                           text:
-                                              "${context.read<MeetingStore>().participantsInMeetingMap.keys.elementAt(index)} (${(HMSRoomLayout.offStageRoles?.contains(role) ?? false) ? context.read<MeetingStore>().peerListIterators[role]?.totalCount ?? 0 :participantsPerRole.item1}) ",
+                                              "${context.read<MeetingStore>().participantsInMeetingMap.keys.elementAt(index)} (${(HMSRoomLayout.offStageRoles?.contains(role) ?? false) ? context.read<MeetingStore>().peerListIterators[role]?.totalCount ?? 0 : participantsPerRole.item1}) ",
                                           textColor: HMSThemeColors
                                               .onSurfaceMediumEmphasis,
                                           letterSpacing: 0.1,
                                         ),
                                         children: [
                                           SizedBox(
-                                            height: participantsPerRole.item2 == null
+                                            height: participantsPerRole.item2 ==
+                                                    null
                                                 ? 0
                                                 : (participantsPerRole.item1) *
                                                     54,
@@ -400,14 +405,14 @@ class _ParticipantsBottomSheetState extends State<ParticipantsBottomSheet> {
                                               child: ListView.builder(
                                                   physics:
                                                       const NeverScrollableScrollPhysics(),
-                                                  itemCount: participantsPerRole
-                                                          .item1,
+                                                  itemCount:
+                                                      participantsPerRole.item1,
                                                   itemBuilder:
                                                       (context, peerIndex) {
                                                     ParticipantsStore
                                                         currentPeer =
-                                                        participantsPerRole.item2![
-                                                            peerIndex];
+                                                        participantsPerRole
+                                                            .item2![peerIndex];
                                                     return Padding(
                                                       padding:
                                                           const EdgeInsets.only(
diff --git a/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart b/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
index 6509439f3..7186aecb3 100644
--- a/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
+++ b/packages/hmssdk_flutter/example/lib/app_settings_bottom_sheet.dart
@@ -17,7 +17,6 @@ class AppSettingsBottomSheet extends StatefulWidget {
 }
 
 class _AppSettingsBottomSheetState extends State<AppSettingsBottomSheet> {
-
   bool skipPreview = false;
   bool mirrorCamera = true;
   bool showStats = false;
diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock
index 4eae8065f..7e77208de 100644
--- a/packages/hmssdk_flutter/example/pubspec.lock
+++ b/packages/hmssdk_flutter/example/pubspec.lock
@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -362,10 +362,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
@@ -647,18 +647,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -679,10 +679,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   tuple:
     dependency: transitive
     description:
@@ -839,10 +839,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
   win32:
     dependency: transitive
     description:
@@ -868,5 +868,5 @@ packages:
     source: hosted
     version: "6.3.0"
 sdks:
-  dart: ">=3.1.0 <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=3.13.0"
diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock
index c3cc2c33e..53939cd59 100644
--- a/packages/hmssdk_flutter/pubspec.lock
+++ b/packages/hmssdk_flutter/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   fake_async:
     dependency: transitive
     description:
@@ -79,10 +79,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   path:
     dependency: transitive
     description:
@@ -108,18 +108,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -140,10 +140,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   vector_math:
     dependency: transitive
     description:
@@ -156,10 +156,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
 sdks:
-  dart: ">=3.1.0-185.0.dev <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=2.10.0"