TNC Route Fixed

lib/api/services/auth_service.dart

@@ -141,4 +141,25 @@ class AuthService {
     }
     return;
   }
+
+  Future setTncflag() async{
+    try {
+      final response = await _dio.post(
+        '/api/auth/tnc',
+        data: {"flag": 'Y'},
+      );
+        if (response.statusCode != 200) {
+        throw AuthException('Failed to proceed with T&C');
+      }
+    }
+    on DioException catch (e) {
+      if (kDebugMode) {
+        print(e.toString());
+      }
+      throw NetworkException('Network error during T&C Setup');
+    } catch (e) {
+      throw UnexpectedException(
+          'Unexpected error: ${e.toString()}');
+    }
+  }
 }

lib/config/routes.dart

@@ -10,6 +10,7 @@ import '../features/dashboard/screens/dashboard_screen.dart';
 // import '../features/transactions/screens/transactions_screen.dart';
 // import '../features/payments/screens/payments_screen.dart';
 // import '../features/settings/screens/settings_screen.dart';
+ import 'package:kmobile/features/auth/screens/tnc_required_screen.dart';
 
 class AppRoutes {
   // Private constructor to prevent instantiation
@@ -34,7 +35,8 @@ class AppRoutes {
         return MaterialPageRoute(builder: (_) => const SplashScreen());
       case login:
         return MaterialPageRoute(builder: (_) => const LoginScreen());
-
+      case TncRequiredScreen.routeName: // Renamed class
+        return MaterialPageRoute(builder: (_) => const TncRequiredScreen()); // Renamed class
       case mPin:
         return MaterialPageRoute(
             builder: (_) => const MPinScreen(

lib/data/repositories/auth_repository.dart

@@ -13,10 +13,11 @@ class AuthRepository {
 
   static const _accessTokenKey = 'access_token';
   static const _tokenExpiryKey = 'token_expiry';
+  static const _tncKey = 'tnc';
 
   AuthRepository(this._authService, this._userService, this._secureStorage);
 
-  Future<List<User>> login(String customerNo, String password) async {
+  Future<(List<User>, AuthToken)> login(String customerNo, String password) async {
     // Create credentials and call service
     final credentials =
         AuthCredentials(customerNo: customerNo, password: password);
@@ -27,7 +28,7 @@ class AuthRepository {
 
     // Get and save user profile
     final users = await _userService.getUserDetails();
-    return users;
+    return (users, authToken);
   }
 
   Future<bool> isLoggedIn() async {
@@ -47,6 +48,7 @@ class AuthRepository {
     await _secureStorage.write(_accessTokenKey, token.accessToken);
     await _secureStorage.write(
         _tokenExpiryKey, token.expiresAt.toIso8601String());
+    await _secureStorage.write(_tncKey, token.tnc.toString());
   }
 
   Future<void> clearAuthTokens() async {
@@ -56,13 +58,27 @@ class AuthRepository {
   Future<AuthToken?> _getAuthToken() async {
     final accessToken = await _secureStorage.read(_accessTokenKey);
     final expiryString = await _secureStorage.read(_tokenExpiryKey);
+    final tncString = await _secureStorage.read(_tncKey);
 
     if (accessToken != null && expiryString != null) {
-      return AuthToken(
+      final authToken = AuthToken(
         accessToken: accessToken,
         expiresAt: DateTime.parse(expiryString),
+        tnc: tncString == 'true', // Parse 'true' string to true, otherwise false
       );
+      return authToken;
     }
     return null;
   }
+
+   Future<void> acceptTnc() async {
+   // This method calls the setTncFlag function
+   try {
+     await _authService.setTncflag();
+   } catch (e) {
+     // Handle or rethrow the error as needed
+     print('Error setting TNC flag: $e');
+     rethrow;
+   }
+ }
 }

lib/di/injection.dart

@@ -62,7 +62,7 @@ Future<void> setupDependencies() async {
 
   // Register controllers/cubits
   getIt.registerFactory<AuthCubit>(
-      () => AuthCubit(getIt<AuthRepository>(), getIt<UserService>()));
+      () => AuthCubit(getIt<AuthRepository>(), getIt<UserService>(), getIt<SecureStorage>()));
 }
 
 Dio _createDioClient() {

lib/features/auth/controllers/auth_cubit.dart

@@ -1,14 +1,20 @@
 import 'package:bloc/bloc.dart';
+import 'package:flutter/material.dart';
 import 'package:kmobile/api/services/user_service.dart';
 import 'package:kmobile/core/errors/exceptions.dart';
+import 'package:kmobile/data/models/user.dart';
+import 'package:kmobile/features/auth/models/auth_token.dart';
+import 'package:kmobile/security/secure_storage.dart';
 import '../../../data/repositories/auth_repository.dart';
 import 'auth_state.dart';
 
 class AuthCubit extends Cubit<AuthState> {
   final AuthRepository _authRepository;
   final UserService _userService;
+  final SecureStorage _secureStorage;
 
-  AuthCubit(this._authRepository, this._userService) : super(AuthInitial()) {
+  AuthCubit(this._authRepository, this._userService, this._secureStorage)
+      : super(AuthInitial()) {
     checkAuthStatus();
   }
 
@@ -29,22 +35,64 @@ class AuthCubit extends Cubit<AuthState> {
 
   Future<void> refreshUserData() async {
     try {
-      // emit(AuthLoading());
       final users = await _userService.getUserDetails();
       emit(Authenticated(users));
     } catch (e) {
       emit(AuthError('Failed to refresh user data: ${e.toString()}'));
-      // Optionally, re-emit the previous state or handle as needed
     }
   }
 
-  Future<void> login(String customerNo, String password) async {
+     Future<void> login(String customerNo, String password) async {
-    emit(AuthLoading());
+     emit(AuthLoading());
-    try {
+     try {
-      final users = await _authRepository.login(customerNo, password);
+       final (users, authToken) = await _authRepository.login(customerNo, password);
-      emit(Authenticated(users));
+
-    } catch (e) {
+       if (authToken.tnc == false) {
-      emit(AuthError(e is AuthException ? e.message : e.toString()));
+         emit(ShowTncDialog(authToken, users));
-    }
+       } else {
-  }
+         await _checkMpinAndNavigate(users);
+       }
+     } catch (e) {
+       emit(AuthError(e is AuthException ? e.message : e.toString()));
+     }
+   }
+ 
+
+   Future<void> onTncDialogResult(
+     bool agreed, AuthToken authToken, List<User> users) async {
+   if (agreed) {
+     try {
+       await _authRepository.acceptTnc();
+       // The user is NOT fully authenticated yet. Just check for MPIN.
+       await _checkMpinAndNavigate(users);
+     } catch (e) {
+       emit(AuthError('Failed to accept TNC: $e'));
+     }
+   } else {
+     emit(NavigateToTncRequiredScreen());
+   }
+ }
+
+  void mpinSetupCompleted() {
+   if (state is NavigateToMpinSetupScreen) {
+     final users = (state as NavigateToMpinSetupScreen).users;
+     emit(Authenticated(users));
+   } else {
+     // Handle unexpected state if necessary
+     emit(AuthError("Invalid state during MPIN setup completion."));
+   }
+ }
+
+
+   Future<void> _checkMpinAndNavigate(List<User> users) async {
+   final mpin = await _secureStorage.read('mpin');
+   if (mpin == null) {
+     // No MPIN, tell UI to navigate to MPIN setup, carrying user data
+     emit(NavigateToMpinSetupScreen(users));
+   } else {
+     // MPIN exists, user is authenticated
+     emit(Authenticated(users));
+   }
+ }
+
 }

lib/features/auth/controllers/auth_state.dart

@@ -1,9 +1,12 @@
 import 'package:equatable/equatable.dart';
-import '../../../data/models/user.dart';
+import 'package:kmobile/data/models/user.dart';
+import 'package:kmobile/features/auth/models/auth_token.dart';
 
 abstract class AuthState extends Equatable {
+  const AuthState();
+
   @override
-  List<Object?> get props => [];
+  List<Object> get props => [];
 }
 
 class AuthInitial extends AuthState {}
@@ -12,20 +15,44 @@ class AuthLoading extends AuthState {}
 
 class Authenticated extends AuthState {
   final List<User> users;
-
+  const Authenticated(this.users);
-  Authenticated(this.users);
 
   @override
-  List<Object?> get props => [users];
+  List<Object> get props => [users];
 }
 
 class Unauthenticated extends AuthState {}
 
 class AuthError extends AuthState {
   final String message;
-
+  const AuthError(this.message);
-  AuthError(this.message);
 
   @override
-  List<Object?> get props => [message];
+  List<Object> get props => [message];
 }
+
+// --- New States for Navigation and Dialog ---
+
+// State to indicate that the TNC dialog needs to be shown
+class ShowTncDialog extends AuthState {
+  final AuthToken authToken;
+  final List<User> users;
+  const ShowTncDialog(this.authToken, this.users);
+
+  @override
+  List<Object> get props => [authToken, users];
+}
+
+// States to trigger specific navigations from the UI
+class NavigateToTncRequiredScreen extends AuthState {}
+
+ class NavigateToMpinSetupScreen extends AuthState {
+   final List<User> users;
+
+   const NavigateToMpinSetupScreen(this.users);
+
+   @override
+   List<Object> get props => [users];
+ }
+
+class NavigateToDashboardScreen extends AuthState {}

lib/features/auth/models/auth_token.dart

@@ -6,18 +6,22 @@ import 'package:equatable/equatable.dart';
 class AuthToken extends Equatable {
   final String accessToken;
   final DateTime expiresAt;
+  final bool tnc;
 
   const AuthToken({
     required this.accessToken,
     required this.expiresAt,
+    required this.tnc,
   });
 
-  factory AuthToken.fromJson(Map<String, dynamic> json) {
+   factory AuthToken.fromJson(Map<String, dynamic> json) {
-    return AuthToken(
+   final token = json['token'];
-      accessToken: json['token'],
+   return AuthToken(
-      expiresAt: _decodeExpiryFromToken(json['token']),
+     accessToken: token,
-    );
+     expiresAt: _decodeExpiryFromToken(token), // Keep existing method for expiry
-  }
+     tnc: _decodeTncFromToken(token), // Use new method for tnc
+   );
+ }
 
   static DateTime _decodeExpiryFromToken(String token) {
     try {
@@ -42,8 +46,45 @@ class AuthToken extends Equatable {
     }
   }
   
+  static bool _decodeTncFromToken(String token) {
+  try {
+    final parts = token.split('.');
+    if (parts.length != 3) {
+      throw Exception('Invalid JWT format for TNC decoding');
+    }
+    final payload = parts[1];
+    String normalized = base64Url.normalize(payload);
+    final payloadMap = json.decode(utf8.decode(base64Url.decode(normalized)));
+
+    if (payloadMap is! Map<String, dynamic> || !payloadMap.containsKey('tnc')) {
+      // If 'tnc' is not present in the payload, default to false
+      return false;
+    }
+
+    final tncValue = payloadMap['tnc'];
+
+    // Handle different representations of 'true'
+    if (tncValue is bool) {
+      return tncValue;
+    }
+    if (tncValue is String) {
+      return tncValue.toLowerCase() == 'true';
+    }
+    if (tncValue is int) {
+      return tncValue == 1;
+    }
+
+    // Default to false for any other case
+    return false;
+  } catch (e) {
+    log('Error decoding tnc from token: $e');
+    // Default to false if decoding fails or 'tnc' is not found/invalid
+    return false;
+  }
+}
+
   bool get isExpired => DateTime.now().isAfter(expiresAt);
 
   @override
-  List<Object> get props => [accessToken, expiresAt];
+  List<Object> get props => [accessToken, expiresAt, tnc];
 }

lib/features/auth/screens/login_screen.dart

@@ -1,12 +1,11 @@
-import '../../../l10n/app_localizations.dart';
-
-import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:kmobile/di/injection.dart';
+import 'package:kmobile/app.dart';
 import 'package:kmobile/features/auth/screens/mpin_screen.dart';
 import 'package:kmobile/features/auth/screens/set_password_screen.dart';
-import 'package:kmobile/security/secure_storage.dart';
+import 'package:kmobile/features/auth/screens/tnc_required_screen.dart';
-import '../../../app.dart';
+import 'package:kmobile/widgets/tnc_dialog.dart';
+import '../../../l10n/app_localizations.dart';
+import 'package:flutter/material.dart';
 import '../controllers/auth_cubit.dart';
 import '../controllers/auth_state.dart';
 
@@ -23,7 +22,6 @@ class LoginScreenState extends State<LoginScreen>
   final _customerNumberController = TextEditingController();
   final _passwordController = TextEditingController();
   bool _obscurePassword = true;
-  //bool _showWelcome = true;
 
   @override
   void dispose() {
@@ -43,37 +41,237 @@ class LoginScreenState extends State<LoginScreen>
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+  //   return Scaffold(
-      // appBar: AppBar(title: const Text('Login')),
+  //     body: BlocConsumer<AuthCubit, AuthState>(
+  //       listener: (context, state) async {
+  //         if (state is ShowTncDialog) {
+  //           // The dialog now returns a boolean for the 'disagree' case,
+  //           // or it completes when the 'proceed' action is finished.
+  //           final agreed = await showDialog<bool>(
+  //             context: context,
+  //             barrierDismissible: false,
+  //             builder: (dialogContext) => TncDialog(
+  //               onProceed: () async {
+  //                 // This function is passed to the dialog.
+  //                 // It calls the cubit and completes when the cubit's work is done.
+  //                 await context
+  //                     .read<AuthCubit>()
+  //                     .onTncDialogResult(true, state.authToken, state.users);
+  //               },
+  //             ),
+  //           );
+
+  //           // If 'agreed' is false, it means the user clicked 'Disagree'.
+  //           if (agreed == false) {
+  //             if (!context.mounted) return;
+  //             context
+  //                 .read<AuthCubit>()
+  //                 .onTncDialogResult(false, state.authToken, state.users);
+  //           }
+  //         } else if (state is NavigateToTncRequiredScreen) {
+  //           Navigator.of(context).pushNamed(TncRequiredScreen.routeName);
+  //         } else if (state is NavigateToMpinSetupScreen) {
+  //         Navigator.of(context).push( // Use push, NOT pushReplacement
+  //          MaterialPageRoute(
+  //             builder: (_) => MPinScreen(
+  //          mode: MPinMode.set,
+  //         onCompleted: (_) {
+  //         // This clears the entire stack and pushes the dashboard
+  //         Navigator.of(context, rootNavigator: true).pushAndRemoveUntil(
+  //           MaterialPageRoute(builder: (_) => const NavigationScaffold()),
+  //           (route) => false,
+  //         );
+  //       },
+  //     ),
+  //   ),
+  // );
+  //         } else if (state is NavigateToDashboardScreen) {
+  //           Navigator.of(context).pushReplacement(
+  //             MaterialPageRoute(builder: (_) => const NavigationScaffold()),
+  //           );
+  //         } else if (state is AuthError) {
+  //           if (state.message == 'MIGRATED_USER_HAS_NO_PASSWORD') {
+  //             Navigator.of(context).push(MaterialPageRoute(
+  //                 builder: (_) => SetPasswordScreen(
+  //                       customerNo: _customerNumberController.text.trim(),
+  //                     )));
+  //           } else {
+  //             ScaffoldMessenger.of(context)
+  //                 .showSnackBar(SnackBar(content: Text(state.message)));
+  //           }
+  //         }
+  //       },
+  //       builder: (context, state) {
+  //         // The commented out section is removed for clarity, the logic is now above.
+  //         return Padding(
+  //           padding: const EdgeInsets.all(24.0),
+  //           child: Form(
+  //             key: _formKey,
+  //             child: Column(
+  //               mainAxisAlignment: MainAxisAlignment.center,
+  //               children: [
+  //                 Image.asset(
+  //                   'assets/images/logo.png',
+  //                   width: 150,
+  //                   height: 150,
+  //                   errorBuilder: (context, error, stackTrace) {
+  //                     return Icon(
+  //                       Icons.account_balance,
+  //                       size: 100,
+  //                       color: Theme.of(context).primaryColor,
+  //                     );
+  //                   },
+  //                 ),
+  //                 const SizedBox(height: 16),
+  //                 Text(
+  //                   AppLocalizations.of(context).kccb,
+  //                   style: TextStyle(
+  //                     fontSize: 32,
+  //                     fontWeight: FontWeight.bold,
+  //                     color: Theme.of(context).primaryColor,
+  //                   ),
+  //                 ),
+  //                 const SizedBox(height: 48),
+  //                 TextFormField(
+  //                   controller: _customerNumberController,
+  //                   decoration: InputDecoration(
+  //                     labelText: AppLocalizations.of(context).customerNumber,
+  //                     border: const OutlineInputBorder(),
+  //                     isDense: true,
+  //                     filled: true,
+  //                     fillColor: Theme.of(context).scaffoldBackgroundColor,
+  //                     enabledBorder: OutlineInputBorder(
+  //                       borderSide: BorderSide(
+  //                           color: Theme.of(context).colorScheme.outline),
+  //                     ),
+  //                     focusedBorder: OutlineInputBorder(
+  //                       borderSide: BorderSide(
+  //                           color: Theme.of(context).colorScheme.primary,
+  //                           width: 2),
+  //                     ),
+  //                   ),
+  //                   keyboardType: TextInputType.number,
+  //                   textInputAction: TextInputAction.next,
+  //                   validator: (value) {
+  //                     if (value == null || value.isEmpty) {
+  //                       return AppLocalizations.of(context).pleaseEnterUsername;
+  //                     }
+  //                     return null;
+  //                   },
+  //                 ),
+  //                 const SizedBox(height: 24),
+  //                 TextFormField(
+  //                   controller: _passwordController,
+  //                   obscureText: _obscurePassword,
+  //                   textInputAction: TextInputAction.done,
+  //                   onFieldSubmitted: (_) => _submitForm(),
+  //                   decoration: InputDecoration(
+  //                     labelText: AppLocalizations.of(context).password,
+  //                     border: const OutlineInputBorder(),
+  //                     isDense: true,
+  //                     filled: true,
+  //                     fillColor: Theme.of(context).scaffoldBackgroundColor,
+  //                     enabledBorder: OutlineInputBorder(
+  //                       borderSide: BorderSide(
+  //                           color: Theme.of(context).colorScheme.outline),
+  //                     ),
+  //                     focusedBorder: OutlineInputBorder(
+  //                       borderSide: BorderSide(
+  //                           color: Theme.of(context).colorScheme.primary,
+  //                           width: 2),
+  //                     ),
+  //                     suffixIcon: IconButton(
+  //                       icon: Icon(
+  //                         _obscurePassword
+  //                             ? Icons.visibility
+  //                             : Icons.visibility_off,
+  //                       ),
+  //                       onPressed: () {
+  //                         setState(() {
+  //                           _obscurePassword = !_obscurePassword;
+  //                         });
+  //                       },
+  //                     ),
+  //                   ),
+  //                   validator: (value) {
+  //                     if (value == null || value.isEmpty) {
+  //                       return AppLocalizations.of(context).pleaseEnterPassword;
+  //                     }
+  //                     return null;
+  //                   },
+  //                 ),
+  //                 const SizedBox(height: 24),
+  //                 SizedBox(
+  //                   width: 250,
+  //                   child: ElevatedButton(
+  //                     onPressed: state is AuthLoading ? null : _submitForm,
+  //                     style: ElevatedButton.styleFrom(
+  //                       shape: const StadiumBorder(),
+  //                       padding: const EdgeInsets.symmetric(vertical: 16),
+  //                       backgroundColor:
+  //                           Theme.of(context).scaffoldBackgroundColor,
+  //                       foregroundColor: Theme.of(context).primaryColorDark,
+  //                       side: BorderSide(
+  //                           color: Theme.of(context).colorScheme.outline,
+  //                           width: 1),
+  //                       elevation: 0,
+  //                     ),
+  //                     child: state is AuthLoading
+  //                         ? const CircularProgressIndicator()
+  //                         : Text(
+  //                             AppLocalizations.of(context).login,
+  //                             style: TextStyle(
+  //                                 color: Theme.of(context)
+  //                                     .colorScheme
+  //                                     .onPrimaryContainer),
+  //                           ),
+  //                   ),
+  //                 ),
+  //                 const SizedBox(height: 25),
+  //               ],
+  //             ),
+  //           ),
+  //         );
+  //       },
+  //     ),
+  //   );
+      return Scaffold(
       body: BlocConsumer<AuthCubit, AuthState>(
-        listener: (context, state) async {
+        listener: (context, state) {
-          if (state is Authenticated) {
+          if (state is ShowTncDialog) {
-            final storage = getIt<SecureStorage>();
+            showDialog<bool>(
-            final mpin = await storage.read('mpin');
+              context: context,
-            if (!context.mounted) return;
+              barrierDismissible: false,
-            if (mpin == null) {
+              builder: (dialogContext) => TncDialog(
-              Navigator.of(context).pushReplacement(
+                onProceed: () async {
-                MaterialPageRoute(
+                  // Pop the dialog before the cubit action
-                  builder: (_) => MPinScreen(
+                  Navigator.of(dialogContext).pop();
-                    mode: MPinMode.set,
+                  await context
-                    onCompleted: (_) {
+                      .read<AuthCubit>()
-                      Navigator.of(
+                      .onTncDialogResult(true, state.authToken, state.users);
-                        context,
+                },
-                        rootNavigator: true,
+              ),
-                      ).pushReplacement(
+            );
-                        MaterialPageRoute(
+          } else if (state is NavigateToTncRequiredScreen) {
-                          builder: (_) => const NavigationScaffold(),
+            Navigator.of(context).pushNamed(TncRequiredScreen.routeName);
-                        ),
+          } else if (state is NavigateToMpinSetupScreen) {
-                      );
+            Navigator.of(context).push( // Use push, NOT pushReplacement
-                    },
+              MaterialPageRoute(
-                  ),
+                builder: (_) => MPinScreen(
+                  mode: MPinMode.set,
+                  onCompleted: (_) {
+                    // Call the cubit to signal MPIN setup is complete
+                    context.read<AuthCubit>().mpinSetupCompleted();
+                  },
                 ),
-              );
+              ),
-            } else {
+            );
-              Navigator.of(context).pushReplacement(
+          } else if (state is Authenticated) {
-                MaterialPageRoute(builder: (_) => const NavigationScaffold()),
+            // This is the single source of truth for navigating to the dashboard
-              );
+            Navigator.of(context, rootNavigator: true).pushAndRemoveUntil(
-            }
+              MaterialPageRoute(builder: (_) => const NavigationScaffold()),
+              (route) => false,
+            );
           } else if (state is AuthError) {
             if (state.message == 'MIGRATED_USER_HAS_NO_PASSWORD') {
               Navigator.of(context).push(MaterialPageRoute(
@@ -87,6 +285,7 @@ class LoginScreenState extends State<LoginScreen>
           }
         },
         builder: (context, state) {
+          // The builder part remains largely the same, focusing on UI display
           return Padding(
             padding: const EdgeInsets.all(24.0),
             child: Form(
@@ -107,7 +306,6 @@ class LoginScreenState extends State<LoginScreen>
                     },
                   ),
                   const SizedBox(height: 16),
-                  // Title
                   Text(
                     AppLocalizations.of(context).kccb,
                     style: TextStyle(
@@ -117,12 +315,10 @@ class LoginScreenState extends State<LoginScreen>
                     ),
                   ),
                   const SizedBox(height: 48),
-
                   TextFormField(
                     controller: _customerNumberController,
                     decoration: InputDecoration(
                       labelText: AppLocalizations.of(context).customerNumber,
-                      // prefixIcon: Icon(Icons.person),
                       border: const OutlineInputBorder(),
                       isDense: true,
                       filled: true,
@@ -147,7 +343,6 @@ class LoginScreenState extends State<LoginScreen>
                     },
                   ),
                   const SizedBox(height: 24),
-                  // Password
                   TextFormField(
                     controller: _passwordController,
                     obscureText: _obscurePassword,
@@ -189,7 +384,6 @@ class LoginScreenState extends State<LoginScreen>
                     },
                   ),
                   const SizedBox(height: 24),
-                  //Login Button
                   SizedBox(
                     width: 250,
                     child: ElevatedButton(
@@ -216,40 +410,7 @@ class LoginScreenState extends State<LoginScreen>
                             ),
                     ),
                   ),
-                  const SizedBox(height: 15),
-
-                  // Padding(
-                  //   padding: const EdgeInsets.symmetric(vertical: 16),
-                  //   child: Row(
-                  //     children: [
-                  //       const Expanded(child: Divider()),
-                  //       Padding(
-                  //         padding: const EdgeInsets.symmetric(horizontal: 8),
-                  //         child: Text(AppLocalizations.of(context).or),
-                  //       ),
-                  //       //const Expanded(child: Divider()),
-                  //     ],
-                  //   ),
-                  // ),
-
                   const SizedBox(height: 25),
-
-                  // Register Button
-                  // SizedBox(
-                  //   width: 250,
-                  //   child: ElevatedButton(
-                  //     //disable until registration is implemented
-                  //     onPressed: null,
-                  //     style: OutlinedButton.styleFrom(
-                  //       shape: const StadiumBorder(),
-                  //       padding: const EdgeInsets.symmetric(vertical: 16),
-                  //       backgroundColor: Theme.of(context).colorScheme.primary,
-                  //       foregroundColor: Theme.of(context).colorScheme.onPrimary,
-                  //     ),
-                  //     child: Text(AppLocalizations.of(context).register,
-                  //    style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),),
-                  //   ),
-                  // ),
                 ],
               ),
             ),

lib/features/auth/screens/mpin_screen.dart

@@ -185,19 +185,16 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
           ),
         );
         break;
-      case MPinMode.confirm:
+       case MPinMode.confirm:
-        if (widget.initialPin == pin) {
+   if (widget.initialPin == pin) {
-          // 1) persist the pin
+     // 1) persist the pin
-          await storage.write('mpin', pin);
+     await storage.write('mpin', pin);
 
-          // 3) now clear the entire navigation stack and go to your main scaffold
+     // 2) Call the onCompleted callback to let the parent handle navigation
-          if (mounted) {
+     if (mounted) {
-            Navigator.of(context, rootNavigator: true).pushAndRemoveUntil(
+       widget.onCompleted?.call(pin);
-              MaterialPageRoute(builder: (_) => const NavigationScaffold()),
+     }
-              (route) => false,
+   } else {
-            );
-          }
-        } else {
           setState(() {
             _isError = true;
             errorText = AppLocalizations.of(context).pinsDoNotMatch;

lib/features/auth/screens/tnc_required_screen.dart

@@ -0,0 +1,39 @@
+ import 'package:flutter/material.dart';
+
+ class TncRequiredScreen extends StatelessWidget { // Renamed class
+   const TncRequiredScreen({Key? key}) : super(key: key);
+
+   static const routeName = '/tnc-required';
+
+   @override
+   Widget build(BuildContext context) {
+     return Scaffold(
+       appBar: AppBar(
+         title: const Text('Terms and Conditions'),
+       ),
+       body: Center(
+         child: Padding(
+           padding: const EdgeInsets.all(16.0),
+           child: Column(
+             mainAxisAlignment: MainAxisAlignment.center,
+             children: [
+               const Text(
+                 'You must accept the Terms and Conditions to use the application.',
+                 textAlign: TextAlign.center,
+                 style: TextStyle(fontSize: 18),
+               ),
+               const SizedBox(height: 20),
+               ElevatedButton(
+                 onPressed: () {
+                   // This will take the user back to the previous screen
+                   Navigator.of(context).pop();
+                 },
+                 child: const Text('Go Back'),
+               ),
+             ],
+           ),
+         ),
+       ),
+     );
+   }
+ }

lib/widgets/tnc_dialog.dart

@@ -0,0 +1,99 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/features/auth/screens/tnc_required_screen.dart';
+
+class TncDialog extends StatefulWidget {
+  // Add a callback function for when the user proceeds
+  final Future<void> Function() onProceed;
+
+  const TncDialog({Key? key, required this.onProceed}) : super(key: key);
+
+  @override
+  _TncDialogState createState() => _TncDialogState();
+}
+
+class _TncDialogState extends State<TncDialog> {
+  bool _isAgreed = false;
+  bool _isLoading = false;
+
+  void _handleProceed() async {
+    if (_isLoading) return;
+
+    setState(() {
+      _isLoading = true;
+    });
+
+    // Call the provided onProceed function, which will trigger the cubit
+    await widget.onProceed();
+
+    // The dialog will be dismissed by the navigation that happens in the BlocListener
+    // so we don't need to pop here. If for some reason it's still visible,
+    // we can add a mounted check and pop.
+    if (mounted) {
+       setState(() {
+        _isLoading = false;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: const Text('Terms and Conditions'),
+      content: SingleChildScrollView(
+        child: _isLoading
+            ? const Center(
+                child: Padding(
+                  padding: EdgeInsets.all(16.0),
+                  child: CircularProgressIndicator(),
+                ),
+              )
+            : Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const Text(
+                      'Please read and accept our terms and conditions to continue. '
+                      'This is a placeholder for the actual terms and conditions text.'),
+                  const SizedBox(height: 16),
+                  Row(
+                    children: [
+                      Checkbox(
+                        value: _isAgreed,
+                        onChanged: (bool? value) {
+                          setState(() {
+                            _isAgreed = value ?? false;
+                          });
+                        },
+                      ),
+                      const Flexible(
+                          child: Text('I agree to the Terms and Conditions')),
+                    ],
+                  ),
+                ],
+              ),
+      ),
+      actions: [
+        TextButton(
+          // Disable button while loading
+          onPressed: _isLoading
+              ? null
+              : () {
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    const SnackBar(
+                      content: Text(
+                          'You must agree to the terms and conditions to proceed.'),
+                      behavior: SnackBarBehavior.floating,
+                    ),
+                  );
+                },
+          child: const Text('Disagree'),
+        ),
+        ElevatedButton(
+          // Disable button if not agreed or while loading
+          onPressed: _isAgreed && !_isLoading ? _handleProceed : null,
+          child: const Text('Proceed'),
+        ),
+      ],
+    );
+  }
+}