From 3f4a233a7f21299f174c09baa56811dd0c00990d Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 6 Dec 2022 14:21:32 +0530
Subject: [PATCH] tweak copy

---
 .../prompts/password_reminder.dart            | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/ui/notification/prompts/password_reminder.dart b/lib/ui/notification/prompts/password_reminder.dart
index 7152f8b3a..66372e639 100644
--- a/lib/ui/notification/prompts/password_reminder.dart
+++ b/lib/ui/notification/prompts/password_reminder.dart
@@ -74,6 +74,7 @@ class _PasswordReminderState extends State<PasswordReminder> {
         "Please authenticate to change your password",
       );
       if (hasAuthenticated) {
+        UserRemoteFlagService.instance.stopPasswordReminder().ignore();
         await routeToPage(
           context,
           const PasswordEntryPage(
@@ -81,6 +82,16 @@ class _PasswordReminderState extends State<PasswordReminder> {
           ),
           forceCustomPageRoute: true,
         );
+        unawaited(
+          Navigator.of(context).pushAndRemoveUntil(
+            MaterialPageRoute(
+              builder: (BuildContext context) {
+                return const HomeWidget();
+              },
+            ),
+            (route) => false,
+          ),
+        );
       }
     } catch (e) {
       showGenericErrorDialog(context);
@@ -117,7 +128,7 @@ class _PasswordReminderState extends State<PasswordReminder> {
             ),
             onPressed: () async {
               Navigator.of(context, rootNavigator: true).pop('dialog');
-              // UserRemoteFlagService.instance.stopPasswordReminder().ignore();
+
               _onChangePasswordClick();
             },
             child: const Text(
@@ -271,14 +282,11 @@ class _PasswordReminderState extends State<PasswordReminder> {
                       const SizedBox(height: 18),
                       Text(
                         "Enter your password to ensure you remember it."
-                        "\n\nThe developer account we use to publish "
-                        "ente on App Store will change in the next "
-                        "version. This will cause you to get logged out when the next version is released. So it "
-                        "is good to make sure you know your password.",
+                        "\n\nThe developer account we use to publish ente on App Store will change in the next version, so you will need to login again when the next version is released.",
                         style: enteTheme.textTheme.small
                             .copyWith(color: enteTheme.colorScheme.textMuted),
                       ),
-                      const SizedBox(height: 12),
+                      const SizedBox(height: 24),
                       TextFormField(
                         autofillHints: const [AutofillHints.password],
                         decoration: InputDecoration(