Merge branch 'main' into fix-jagged-avatar-edges

lib/pages/chat/events/message_download_content.dart

@@ -1,10 +1,12 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_linkify/flutter_linkify.dart';
+import 'package:matrix/matrix.dart';
+
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/file_description.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
 import 'package:fluffychat/utils/url_launcher.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_linkify/flutter_linkify.dart';
-import 'package:matrix/matrix.dart';
 
 class MessageDownloadContent extends StatelessWidget {
   final Event event;

lib/pages/chat_list/client_chooser_button.dart

@@ -56,18 +56,16 @@ class ClientChooserButton extends StatelessWidget {
           ],
         ),
       ),
-      // Currently disabled because of:
+      PopupMenuItem(
-      // https://github.com/matrix-org/matrix-react-sdk/pull/12286
-      /*PopupMenuItem(
         value: SettingsAction.archive,
         child: Row(
           children: [
             const Icon(Icons.archive_outlined),
             const SizedBox(width: 18),
-            Text(L10n.of(context)!.archive),
+            Text(L10n.of(context).archive),
           ],
         ),
-      ),*/
+      ),
       PopupMenuItem(
         value: SettingsAction.settings,
         child: Row(

lib/pages/chat_members/chat_members.dart

@@ -34,11 +34,7 @@ class ChatMembersController extends State<ChatMembersPage> {
 
     final members = this
         .members
-        ?.where(
+        ?.where((member) => member.membership == membershipFilter)
-          (member) =>
-              membershipFilter == Membership.join ||
-              member.membership == membershipFilter,
-        )
         .toList();
 
     if (filter.isEmpty) {

lib/pages/chat_members/chat_members_view.dart

@@ -1,10 +1,9 @@
+import 'package:fluffychat/utils/localized_exception_extension.dart';
 import 'package:flutter/material.dart';
-
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
 import 'package:matrix/matrix.dart';
 
-import 'package:fluffychat/utils/localized_exception_extension.dart';
 import '../../widgets/layouts/max_width_body.dart';
 import '../../widgets/matrix.dart';
 import '../chat_details/participant_list_item.dart';
@@ -145,8 +144,15 @@ class ChatMembersView extends StatelessWidget {
                                             L10n.of(context).banned,
                                           Membership.invite =>
                                             L10n.of(context).invited,
-                                          Membership.join =>
+                                          Membership.join => L10n.of(context)
-                                            L10n.of(context).all,
+                                              .countParticipants(room.summary
+                                                      .mJoinedMemberCount ??
+                                                  controller.members
+                                                      ?.where((member) =>
+                                                          member.membership ==
+                                                          Membership.join)
+                                                      .length ??
+                                                  0),
                                           Membership.knock =>
                                             L10n.of(context).knocking,
                                           Membership.leave =>