diff --git a/lib/core/global_keys.dart b/lib/core/global_keys.dart new file mode 100644 index 0000000..8ae3c31 --- /dev/null +++ b/lib/core/global_keys.dart @@ -0,0 +1,6 @@ +import 'package:flutter/material.dart'; + +class GlobalKeys { + static final GlobalKey scaffoldMessengerKey = + GlobalKey(); +} \ No newline at end of file diff --git a/lib/login/view/login_email_bottomsheet.dart b/lib/login/view/login_email_bottomsheet.dart index 57cbecf..43675a9 100644 --- a/lib/login/view/login_email_bottomsheet.dart +++ b/lib/login/view/login_email_bottomsheet.dart @@ -52,6 +52,7 @@ class _LoginEmailBottomsheetState extends State { ), ); } else if (state is LoginError) { + Navigator.pop(context); ScaffoldMessenger.of(context).showSnackBar( SnackBar( content: Text(state.errorMessage), diff --git a/lib/login/view/verify_otp_bottomsheet.dart b/lib/login/view/verify_otp_bottomsheet.dart index 7269a30..e93986c 100644 --- a/lib/login/view/verify_otp_bottomsheet.dart +++ b/lib/login/view/verify_otp_bottomsheet.dart @@ -77,6 +77,7 @@ class _VerifyOtpBottomsheetState extends State { ), ); } else if (state is VerifyOtpError) { + Navigator.pop(context); ScaffoldMessenger.of(context).showSnackBar( SnackBar( content: Text(state.errorMessage), diff --git a/lib/main.dart b/lib/main.dart index 30028fe..a125755 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -11,6 +11,7 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:flutter_stripe/flutter_stripe.dart'; // ADD THIS import 'cart/blocs/myPassCart/my_pass_cart_bloc.dart'; import 'core/app_router.dart'; +import 'core/global_keys.dart'; import 'home/bloc/FirstTimeUserHome/first_time_user_home_bloc.dart'; import 'home/bloc/FirstTimeUserHome/first_time_user_home_event.dart'; import 'home/bloc/registeredHome/home_bloc.dart'; @@ -99,6 +100,7 @@ class MyApp extends StatelessWidget { ) ], child: MaterialApp( + scaffoldMessengerKey: GlobalKeys.scaffoldMessengerKey, onGenerateRoute: _appRouter.onGenerateRoute, initialRoute: RouteConstants.splash, debugShowCheckedModeBanner: false,