diff --git a/lib/features/base/base_controller.dart b/lib/features/base/base_controller.dart index b3555b5b1..d4aef2fb7 100644 --- a/lib/features/base/base_controller.dart +++ b/lib/features/base/base_controller.dart @@ -279,13 +279,10 @@ abstract class BaseController extends GetxController bool _isFcmActivated(Session session, AccountId accountId) => [FirebaseCapability.fcmIdentifier].isSupported(session, accountId) && AppConfig.fcmAvailable; - void goToLogin({LoginArguments? arguments}) async { - await Future.delayed( - const Duration(milliseconds: 500), - () async { - await pushAndPopAll(AppRoutes.login, arguments: arguments); - } - ); + void goToLogin({LoginArguments? arguments}) { + if (Get.currentRoute != AppRoutes.login) { + pushAndPopAll(AppRoutes.login, arguments: arguments); + } } void logout(Session? session, AccountId? accountId) { diff --git a/lib/features/login/presentation/login_bindings.dart b/lib/features/login/presentation/login_bindings.dart index 7b32bfed1..28d27ac9d 100644 --- a/lib/features/login/presentation/login_bindings.dart +++ b/lib/features/login/presentation/login_bindings.dart @@ -54,7 +54,7 @@ class LoginBindings extends BaseBindings { @override void bindingsController() { - Get.lazyPut(() => LoginController( + Get.create(() => LoginController( Get.find(), Get.find(), Get.find(),