From 1f3d88d09ccc55338266e11db58f1caa82a87910 Mon Sep 17 00:00:00 2001
From: krille-chan <krille-chan@posteo.de>
Date: Tue, 26 Dec 2023 16:32:47 +0100
Subject: [PATCH] fix: Add 3pid email for password reset

---
 .../settings_3pid/settings_3pid_view.dart     |  1 +
 .../settings_password_view.dart               |  8 ++++++++
 .../settings_security_view.dart               | 20 +++++++++----------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/pages/settings_3pid/settings_3pid_view.dart b/lib/pages/settings_3pid/settings_3pid_view.dart
index 1d1fed36..49f8b448 100644
--- a/lib/pages/settings_3pid/settings_3pid_view.dart
+++ b/lib/pages/settings_3pid/settings_3pid_view.dart
@@ -28,6 +28,7 @@ class Settings3PidView extends StatelessWidget {
         ],
       ),
       body: MaxWidthBody(
+        withScrolling: false,
         child: FutureBuilder<List<ThirdPartyIdentifier>?>(
           future: controller.request,
           builder: (
diff --git a/lib/pages/settings_password/settings_password_view.dart b/lib/pages/settings_password/settings_password_view.dart
index 65b89f44..577077a0 100644
--- a/lib/pages/settings_password/settings_password_view.dart
+++ b/lib/pages/settings_password/settings_password_view.dart
@@ -20,6 +20,14 @@ class SettingsPasswordView extends StatelessWidget {
             padding: const EdgeInsets.all(16.0),
             child: Column(
               children: [
+                Center(
+                  child: Icon(
+                    Icons.key_outlined,
+                    color: Theme.of(context).dividerColor,
+                    size: 80,
+                  ),
+                ),
+                const SizedBox(height: 16),
                 TextField(
                   controller: controller.oldPasswordController,
                   obscureText: true,
diff --git a/lib/pages/settings_security/settings_security_view.dart b/lib/pages/settings_security/settings_security_view.dart
index 65a0d0b0..6cbc377a 100644
--- a/lib/pages/settings_security/settings_security_view.dart
+++ b/lib/pages/settings_security/settings_security_view.dart
@@ -53,7 +53,7 @@ class SettingsSecurityView extends StatelessWidget {
                   if (capabilities?.mChangePassword?.enabled == true ||
                       error != null) ...[
                     ListTile(
-                      leading: const Icon(Icons.password_outlined),
+                      leading: const Icon(Icons.key_outlined),
                       trailing: error != null
                           ? null
                           : const Icon(Icons.chevron_right_outlined),
@@ -85,7 +85,6 @@ class SettingsSecurityView extends StatelessWidget {
                           ? null
                           : () => context.go('/rooms/settings/security/3pid'),
                     ),
-                    const Divider(),
                   ],
                   ListTile(
                     leading: const Icon(Icons.block_outlined),
@@ -95,7 +94,6 @@ class SettingsSecurityView extends StatelessWidget {
                         context.go('/rooms/settings/security/ignorelist'),
                   ),
                   if (Matrix.of(context).client.encryption != null) ...{
-                    const Divider(thickness: 1),
                     if (PlatformInfos.isMobile)
                       ListTile(
                         leading: const Icon(Icons.lock_outlined),
@@ -103,14 +101,6 @@ class SettingsSecurityView extends StatelessWidget {
                         title: Text(L10n.of(context)!.appLock),
                         onTap: controller.setAppLockAction,
                       ),
-                    ListTile(
-                      title: Text(L10n.of(context)!.yourPublicKey),
-                      subtitle: Text(
-                        Matrix.of(context).client.fingerprintKey.beautified,
-                        style: const TextStyle(fontFamily: 'monospace'),
-                      ),
-                      leading: const Icon(Icons.vpn_key_outlined),
-                    ),
                   },
                   const Divider(height: 1),
                   ListTile(
@@ -131,6 +121,14 @@ class SettingsSecurityView extends StatelessWidget {
                     ),
                     onTap: controller.deleteAccountAction,
                   ),
+                  ListTile(
+                    title: Text(L10n.of(context)!.yourPublicKey),
+                    subtitle: SelectableText(
+                      Matrix.of(context).client.fingerprintKey.beautified,
+                      style: const TextStyle(fontFamily: 'monospace'),
+                    ),
+                    leading: const Icon(Icons.vpn_key_outlined),
+                  ),
                 ],
               );
             },