chore: Design follow up

assets/l10n/intl_en.arb

@@ -2840,5 +2840,6 @@
   "appWantsToUseForLoginDescription": "You hereby allow the app and website to share information about you.",
   "open": "Open",
   "waitingForServer": "Waiting for server...",
-  "appIntroduction": "FluffyChat lets you chat with your friends across different messengers. Learn more at https://matrix.org or just tap *Continue*."
+  "appIntroduction": "FluffyChat lets you chat with your friends across different messengers. Learn more at https://matrix.org or just tap *Continue*.",
+  "newChatRequest": "📩 New chat request"
 }

lib/pages/chat_list/chat_list.dart

@@ -660,7 +660,6 @@ class ChatListController extends State<ChatList>
         return;
       case ChatContextAction.leave:
         final confirmed = await showOkCancelAlertDialog(
-          useRootNavigator: false,
           context: context,
           title: L10n.of(context).areYouSure,
           message: L10n.of(context).archiveRoomDescription,

lib/pages/chat_list/chat_list_item.dart

@@ -45,7 +45,6 @@ class ChatListItem extends StatelessWidget {
         return forgetResult.isValue;
       }
       final confirmed = await showOkCancelAlertDialog(
-        useRootNavigator: false,
         context: context,
         title: L10n.of(context).areYouSure,
         okLabel: L10n.of(context).leave,
@@ -231,8 +230,7 @@ class ChatListItem extends StatelessWidget {
                           size: 16,
                         ),
                       ),
-                    if (room.isFavourite ||
+                    if (room.isFavourite)
-                        room.membership == Membership.invite)
                       Padding(
                         padding: EdgeInsets.only(
                           right: hasNotifications ? 4.0 : 0.0,
@@ -336,9 +334,18 @@ class ChatListItem extends StatelessWidget {
                                   ),
                                   builder: (context, snapshot) => Text(
                                     room.membership == Membership.invite
-                                        ? isDirectChat
+                                        ? room
-                                            ? L10n.of(context).invitePrivateChat
+                                                .getState(
-                                            : L10n.of(context).inviteGroupChat
+                                                  EventTypes.RoomMember,
+                                                  room.client.userID!,
+                                                )
+                                                ?.content
+                                                .tryGet<String>('reason') ??
+                                            (isDirectChat
+                                                ? L10n.of(context)
+                                                    .newChatRequest
+                                                : L10n.of(context)
+                                                    .inviteGroupChat)
                                         : snapshot.data ??
                                             L10n.of(context).emptyChat,
                                     softWrap: false,

lib/pages/chat_list/space_view.dart

@@ -132,12 +132,11 @@ class _SpaceViewState extends State<SpaceView> {
         break;
       case SpaceActions.leave:
         final confirmed = await showOkCancelAlertDialog(
-          useRootNavigator: false,
           context: context,
           title: L10n.of(context).areYouSure,
-          okLabel: L10n.of(context).ok,
-          cancelLabel: L10n.of(context).cancel,
           message: L10n.of(context).archiveRoomDescription,
+          okLabel: L10n.of(context).leave,
+          cancelLabel: L10n.of(context).cancel,
           isDestructive: true,
         );
         if (!mounted) return;

lib/widgets/chat_settings_popup_menu.dart

@@ -56,12 +56,11 @@ class ChatSettingsPopupMenuState extends State<ChatSettingsPopupMenu> {
             switch (choice) {
               case ChatPopupMenuActions.leave:
                 final confirmed = await showOkCancelAlertDialog(
-                  useRootNavigator: false,
                   context: context,
                   title: L10n.of(context).areYouSure,
-                  okLabel: L10n.of(context).ok,
-                  cancelLabel: L10n.of(context).cancel,
                   message: L10n.of(context).archiveRoomDescription,
+                  okLabel: L10n.of(context).leave,
+                  cancelLabel: L10n.of(context).cancel,
                   isDestructive: true,
                 );
                 if (confirmed == OkCancelResult.ok) {