From 9fbfca6e04fc334cafd311bc91d8a3e5583b6c94 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sat, 27 Feb 2021 10:48:48 +0100
Subject: [PATCH] fix: Minor bugs

---
 .../dialogs/permission_slider_dialog.dart     |  4 +--
 lib/components/user_bottom_sheet.dart         |  8 -----
 lib/views/chat_list.dart                      | 29 ++++++++++++-------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/lib/components/dialogs/permission_slider_dialog.dart b/lib/components/dialogs/permission_slider_dialog.dart
index 5ef2ceab..572e868c 100644
--- a/lib/components/dialogs/permission_slider_dialog.dart
+++ b/lib/components/dialogs/permission_slider_dialog.dart
@@ -71,12 +71,12 @@ class _PermissionSliderDialogState extends State<PermissionSliderDialog> {
     );
     final buttons = [
       AdaptiveFlatButton(
-       label: L10n.of(context).cancel,
+        label: L10n.of(context).cancel,
         onPressed: () =>
             Navigator.of(context, rootNavigator: false).pop<int>(null),
       ),
       AdaptiveFlatButton(
-      label: L10n.of(context).confirm,
+        label: L10n.of(context).confirm,
         onPressed: () =>
             Navigator.of(context, rootNavigator: false).pop<int>(_permission),
       ),
diff --git a/lib/components/user_bottom_sheet.dart b/lib/components/user_bottom_sheet.dart
index f1a0db2a..d4f8a2bb 100644
--- a/lib/components/user_bottom_sheet.dart
+++ b/lib/components/user_bottom_sheet.dart
@@ -12,7 +12,6 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../utils/presence_extension.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
-import 'dialogs/key_verification_dialog.dart';
 
 class UserBottomSheet extends StatelessWidget {
   final User user;
@@ -87,17 +86,10 @@ class UserBottomSheet extends StatelessWidget {
     }
   }
 
-  void _verifyAction(BuildContext context) async {
-    final client = user.room.client;
-    final req = await client.userDeviceKeys[user.id].startVerification();
-    await KeyVerificationDialog(request: req).show(context);
-  }
-
   @override
   Widget build(BuildContext context) {
     final client = user.room.client;
     final presence = client.presences[user.id];
-    final verificationStatus = client.userDeviceKeys[user.id]?.verified;
     var items = <PopupMenuEntry<String>>[];
 
     if (onMention != null) {
diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart
index 29b7aec4..3e375d83 100644
--- a/lib/views/chat_list.dart
+++ b/lib/views/chat_list.dart
@@ -259,17 +259,24 @@ class _ChatListState extends State<ChatList> {
                               IconButton(
                                 icon: Icon(Icons.search_outlined),
                                 tooltip: L10n.of(context).search,
-                                onPressed: () async {
-                                  await _scrollController.animateTo(
-                                    _scrollController.position.minScrollExtent,
-                                    duration: Duration(milliseconds: 200),
-                                    curve: Curves.ease,
-                                  );
-                                  WidgetsBinding.instance.addPostFrameCallback(
-                                    (_) => _searchFieldKey.currentState
-                                        .requestFocus(),
-                                  );
-                                },
+                                onPressed: Matrix.of(context)
+                                        .client
+                                        .rooms
+                                        .isEmpty
+                                    ? null
+                                    : () async {
+                                        await _scrollController.animateTo(
+                                          _scrollController
+                                              .position.minScrollExtent,
+                                          duration: Duration(milliseconds: 200),
+                                          curve: Curves.ease,
+                                        );
+                                        WidgetsBinding.instance
+                                            .addPostFrameCallback(
+                                          (_) => _searchFieldKey.currentState
+                                              .requestFocus(),
+                                        );
+                                      },
                               ),
                             ],
                   title: Text(selectMode == SelectMode.share