lib/src/layouts/functions/account.dart

@@ -55,15 +55,19 @@ class AccountFunction{
     try {
       var tkn = await U.getFcmToken();
       if (tkn == null) {
+        Navigator.of(context).pop();
+        closeLoading(context);
         token.logout();
-        context.router.removeLast();
-                  context.navigateNamedTo("/app/$pid/login");
+        // context.router.removeLast();
+        context.navigateNamedTo("/app/$pid/login");
       } else {
         var param = {'token': tkn, 'whiteListToken': false};
         var res = await apiAuthProvider.postData('/api/fcmTokens/remove/', null, param, context);
         if (res != null && res['success']) {
+          Navigator.of(context).pop();
+          closeLoading(context);
           token.logout();
-          context.router.removeLast();
+          // context.router.removeLast();
           context.navigateNamedTo("/app/$pid/login");
         }
         else{
@@ -72,7 +76,7 @@ class AccountFunction{
       }
     } catch(e) {
       print(e.toString());
-      context.router.removeLast();
+      // context.router.removeLast();
       context.navigateNamedTo("/app/$pid/login");
     }
   }