fix: pop loading dialog when loading finished for send forgot password request

Author: JacquesDIconica

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.3.2
+
+- Fixed infinite loading when closing the forgotPasswordSucces screen and ForgotPasswordUnsuccessfull screen.
+
 ## 6.3.1
 
 - Fixed a bug where the keyboard for the login username and password fields was closing because of a different LoginOptions.hashCode with the same LoginOptions values.

packages/firebase_user_repository/pubspec.yaml

@@ -1,6 +1,6 @@
 name: firebase_user_repository
 description: "firebase_user_repository for flutter_user package"
-version: 6.3.1
+version: 6.3.2
 repository: https://github.com/Iconica-Development/flutter_user
 
 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
@@ -14,7 +14,7 @@ dependencies:
     sdk: flutter
   user_repository_interface:
     hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub/
-    version: ^6.3.1
+    version: ^6.3.2
   cloud_firestore: ^5.4.2
   firebase_auth: ^5.3.0
 

packages/flutter_user/lib/src/flutter_user_navigator_userstory.dart

@@ -173,15 +173,15 @@ class _FlutterUserNavigatorUserstoryState
       var requestPasswordReponse =
           await userService!.requestChangePassword(email: email);
 
-      if (requestPasswordReponse.requestSuccesfull) {
-        if (context.mounted) {
-          await pushReplacement(_forgotPasswordSuccessScreen());
-        }
-      } else {
-        if (context.mounted) {
-          await push(_forgotPasswordUnsuccessfullScreen());
-        }
+      if (!mounted) return;
+      Navigator.of(context).pop();
+
+      if (!requestPasswordReponse.requestSuccesfull) {
+        await push(_forgotPasswordUnsuccessfullScreen());
+        return;
       }
+
+      await pushReplacement(_forgotPasswordSuccessScreen());
     }
 
     return ForgotPasswordForm(
@@ -272,7 +272,7 @@ class _FlutterUserNavigatorUserstoryState
 
   Future<void> pushReplacement(Widget screen) async {
     if (!context.mounted) return;
-    await Navigator.of(context).push(
+    await Navigator.of(context).pushReplacement(
       MaterialPageRoute(
         builder: (context) => screen,
       ),

packages/flutter_user/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_user
 description: "Flutter Userstory for onboarding, login, and registration."
-version: 6.3.1
+version: 6.3.2
 repository: https://github.com/Iconica-Development/flutter_user
 
 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
@@ -22,7 +22,7 @@ dependencies:
     version: ^4.1.0
   user_repository_interface:
     hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub/
-    version: ^6.3.1
+    version: ^6.3.2
   flutter_accessibility:
     hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
     version: ^0.0.3

packages/user_repository_interface/pubspec.yaml

@@ -1,6 +1,6 @@
 name: user_repository_interface
 description: "user_repository_interface for flutter_user package"
-version: 6.3.1
+version: 6.3.2
 repository: https://github.com/Iconica-Development/flutter_user
 
 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub