From 31b4368f0975243058d91692a9b4e8b4f931068e Mon Sep 17 00:00:00 2001
From: krille-chan <christian-kussowski@posteo.de>
Date: Mon, 17 Feb 2025 19:59:11 +0100
Subject: [PATCH] chore: Make login with matrix id more prominent again

---
 lib/pages/homeserver_picker/homeserver_picker.dart     |  6 +++---
 .../homeserver_picker/homeserver_picker_view.dart      | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart
index d8c584a98..b0a5b0a5d 100644
--- a/lib/pages/homeserver_picker/homeserver_picker.dart
+++ b/lib/pages/homeserver_picker/homeserver_picker.dart
@@ -218,8 +218,8 @@ class HomeserverPickerController extends State<HomeserverPicker> {
 
   void onMoreAction(MoreLoginActions action) {
     switch (action) {
-      case MoreLoginActions.passwordLogin:
-        checkHomeserverAction(legacyPasswordLogin: true);
+      case MoreLoginActions.importBackup:
+        restoreBackup();
       case MoreLoginActions.privacy:
         launchUrlString(AppConfig.privacyUrl);
       case MoreLoginActions.about:
@@ -228,7 +228,7 @@ class HomeserverPickerController extends State<HomeserverPicker> {
   }
 }
 
-enum MoreLoginActions { passwordLogin, privacy, about }
+enum MoreLoginActions { importBackup, privacy, about }
 
 class IdentityProvider {
   final String? id;
diff --git a/lib/pages/homeserver_picker/homeserver_picker_view.dart b/lib/pages/homeserver_picker/homeserver_picker_view.dart
index b1935abd6..935a85996 100644
--- a/lib/pages/homeserver_picker/homeserver_picker_view.dart
+++ b/lib/pages/homeserver_picker/homeserver_picker_view.dart
@@ -38,11 +38,11 @@ class HomeserverPickerView extends StatelessWidget {
             onSelected: controller.onMoreAction,
             itemBuilder: (_) => [
               PopupMenuItem(
-                value: MoreLoginActions.passwordLogin,
+                value: MoreLoginActions.importBackup,
                 child: Row(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    const Icon(Icons.login_outlined),
+                    const Icon(Icons.import_export_outlined),
                     const SizedBox(width: 12),
                     Text(L10n.of(context).loginWithMatrixId),
                   ],
@@ -212,8 +212,10 @@ class HomeserverPickerView extends StatelessWidget {
                             ),
                             onPressed: controller.isLoading
                                 ? null
-                                : controller.restoreBackup,
-                            child: Text(L10n.of(context).hydrate),
+                                : () => controller.checkHomeserverAction(
+                                      legacyPasswordLogin: true,
+                                    ),
+                            child: Text(L10n.of(context).loginWithMatrixId),
                           ),
                         ],
                       ),