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/api/services/change_password_service.dart

@@ -67,4 +67,21 @@ class ChangePasswordService {
     }
     return response.toString();
   }
+
+  Future validateChangeTpin({
+    required String oldTpin,
+    required String newTpin,
+  }) async {
+    final response = await _dio.post(
+      '/api/auth/change/tpin',
+      data: {
+        'oldTpin': oldTpin,
+        'newTpin': newTpin,
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Wrong OTP");
+    }
+    return response.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,16 +62,16 @@ Future<void> setupDependencies() async {
 
   // Register controllers/cubits
   getIt.registerFactory<AuthCubit>(
-      () => AuthCubit(getIt<AuthRepository>(), getIt<UserService>()));
+      () => AuthCubit(getIt<AuthRepository>(), getIt<UserService>(), getIt<SecureStorage>()));
 }
 
 Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-         // 'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
+         'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
       //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
-      'https://kccbmbnk.net', //prod small
+      //'https://kccbmbnk.net', //prod small
       connectTimeout: const Duration(seconds: 60),
       receiveTimeout: const Duration(seconds: 60),
       headers: {

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 {
      emit(AuthLoading());
      try {
-      final users = await _authRepository.login(customerNo, password);
+       final (users, authToken) = await _authRepository.login(customerNo, password);
-      emit(Authenticated(users));
+
+       if (authToken.tnc == false) {
+         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,16 +6,20 @@ 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) {
+   final token = json['token'];
    return AuthToken(
-      accessToken: json['token'],
+     accessToken: token,
-      expiresAt: _decodeExpiryFromToken(json['token']),
+     expiresAt: _decodeExpiryFromToken(token), // Keep existing method for expiry
+     tnc: _decodeTncFromToken(token), // Use new method for tnc
    );
  }
 
@@ -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(
+  //     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(
-      // appBar: AppBar(title: const Text('Login')),
       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 {
+                  // Pop the dialog before the cubit action
+                  Navigator.of(dialogContext).pop();
+                  await context
+                      .read<AuthCubit>()
+                      .onTncDialogResult(true, 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: (_) {
-                      Navigator.of(
+                    // Call the cubit to signal MPIN setup is complete
-                        context,
+                    context.read<AuthCubit>().mpinSetupCompleted();
-                        rootNavigator: true,
-                      ).pushReplacement(
-                        MaterialPageRoute(
-                          builder: (_) => const NavigationScaffold(),
-                        ),
-                      );
                   },
                 ),
               ),
             );
-            } else {
+          } else if (state is Authenticated) {
-              Navigator.of(context).pushReplacement(
+            // 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

@@ -190,12 +190,9 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
      // 1) persist the 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) {
-            Navigator.of(context, rootNavigator: true).pushAndRemoveUntil(
+       widget.onCompleted?.call(pin);
-              MaterialPageRoute(builder: (_) => const NavigationScaffold()),
-              (route) => false,
-            );
      }
    } else {
           setState(() {

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/features/dashboard/screens/dashboard_screen.dart

@@ -147,6 +147,8 @@ class _DashboardScreenState extends State<DashboardScreen>
         return AppLocalizations.of(context).termDeposit;
       case 'rd':
         return AppLocalizations.of(context).recurringDeposit;
+      case 'ca':
+        return "Current Account";
       default:
         return AppLocalizations.of(context).unknownAccount;
     }
@@ -266,6 +268,8 @@ class _DashboardScreenState extends State<DashboardScreen>
             if (state is Authenticated) {
               final users = state.users;
               final currAccount = users[selectedAccountIndex];
+              final accountType = currAccount.accountType?.toLowerCase();
+              final isPaymentDisabled = accountType != 'sa' && accountType != 'sb' && accountType != 'ca';
               // first‐time load
               if (!_txInitialized) {
                 _txInitialized = true;
@@ -493,6 +497,7 @@ class _DashboardScreenState extends State<DashboardScreen>
          ),
        );
      },
+     disable: isPaymentDisabled,
    ),
                           _buildQuickLink(Symbols.send_money,
      AppLocalizations.of(context).fundTransfer, () {
@@ -505,8 +510,10 @@ class _DashboardScreenState extends State<DashboardScreen>
                        .accountNo!,
                remitterName:
                    users[selectedAccountIndex]
-                                                .name!)));
+                       .name!,
-                          }, disable: false),
+               // Pass the full list of accounts
+               accounts: users)));
+ }, disable: isPaymentDisabled),
                           _buildQuickLink(
                             Symbols.server_person,
                             AppLocalizations.of(context).accountInfo,

lib/features/fund_transfer/screens/fund_transfer_screen.dart

@@ -1,30 +1,63 @@
  import 'package:flutter/material.dart';
+ import 'package:flutter_bloc/flutter_bloc.dart';
+ import 'package:kmobile/data/models/user.dart';
+ import 'package:kmobile/features/auth/controllers/auth_cubit.dart';
+ import 'package:kmobile/features/auth/controllers/auth_state.dart';
  import 'package:kmobile/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart';
+ import 'package:kmobile/features/fund_transfer/screens/fund_transfer_self_accounts_screen.dart';
  import 'package:material_symbols_icons/symbols.dart';
-import '../../../l10n/app_localizations.dart';
+ import '../../../l10n/app_localizations.dart'; // Keep localizations
 
  class FundTransferScreen extends StatelessWidget {
    final String creditAccountNo;
    final String remitterName;
+   final List<User> accounts; // Continue to accept the list of accounts
 
    const FundTransferScreen({
      super.key,
      required this.creditAccountNo,
      required this.remitterName,
+     required this.accounts, // It is passed from the dashboard
    });
 
    @override
    Widget build(BuildContext context) {
      return Scaffold(
        appBar: AppBar(
+         // Restore localization for the title
          title: Text(AppLocalizations.of(context)
              .fundTransfer
              .replaceFirst(RegExp('\n'), '')),
        ),
-      body: ListView(
+       // Wrap with BlocBuilder to check the authentication state
+       body: BlocBuilder<AuthCubit, AuthState>(
+         builder: (context, state) {
+           return ListView(
              children: [
+               FundTransferManagementTile(
+                 icon: Symbols.person,
+                 // Restore localization for the label
+                 label: "Self Pay",
+                 onTap: () {
+                   // The accounts list is passed directly from the constructor
+                   Navigator.push(
+                     context,
+                     MaterialPageRoute(
+                       builder: (context) => FundTransferSelfAccountsScreen(
+                         debitAccountNo: creditAccountNo,
+                         remitterName: remitterName,
+                         accounts: accounts,
+                       ),
+                     ),
+                   );
+                 },
+                 // Disable the tile if the state is not Authenticated
+                 disable: state is! Authenticated,
+               ),
+               const Divider(height: 1),
                FundTransferManagementTile(
                  icon: Symbols.input_circle,
+                 // Restore localization for the label
                  label: AppLocalizations.of(context).ownBank,
                  onTap: () {
                    Navigator.push(
@@ -42,6 +75,7 @@ class FundTransferScreen extends StatelessWidget {
                const Divider(height: 1),
                FundTransferManagementTile(
                  icon: Symbols.output_circle,
+                 // Restore localization for the label
                  label: AppLocalizations.of(context).outsideBank,
                  onTap: () {
                    Navigator.push(
@@ -58,6 +92,8 @@ class FundTransferScreen extends StatelessWidget {
                ),
                const Divider(height: 1),
              ],
+           );
+         },
        ),
      );
    }

lib/features/fund_transfer/screens/fund_transfer_self_accounts_screen.dart

@@ -0,0 +1,94 @@
+ import 'package:flutter/material.dart';
+ import 'package:kmobile/data/models/user.dart';
+ import 'package:kmobile/features/fund_transfer/screens/fund_transfer_self_amount_screen.dart';
+ import 'package:kmobile/widgets/bank_logos.dart';
+
+ class FundTransferSelfAccountsScreen extends StatelessWidget {
+   final String debitAccountNo;
+   final String remitterName;
+   final List<User> accounts;
+
+   const FundTransferSelfAccountsScreen({
+     super.key,
+     required this.debitAccountNo,
+     required this.remitterName,
+     required this.accounts,
+   });
+
+   // Helper function to get the full account type name from the short code
+   String _getFullAccountType(String? accountType) {
+     if (accountType == null || accountType.isEmpty) return 'N/A';
+     switch (accountType.toLowerCase()) {
+       case 'sa':
+       case 'sb':
+         return "Savings Account";
+       case 'ln':
+         return "Loan Account";
+       case 'td':
+         return "Term Deposit";
+       case 'rd':
+         return "Recurring Deposit";
+       case 'ca':
+         return "Current Account";
+       default:
+         return "Unknown Account";
+     }
+   }
+
+   @override
+   Widget build(BuildContext context) {
+     // Filter out the account from which the transfer is being made
+     final filteredAccounts =
+         accounts.where((acc) => acc.accountNo != debitAccountNo).toList();
+
+     return Scaffold(
+       appBar: AppBar(
+         title: const Text("Select Account"),
+       ),
+       body: filteredAccounts.isEmpty
+           ? const Center(
+               child: Text("No other accounts found"),
+             )
+           : ListView.builder(
+               itemCount: filteredAccounts.length,
+               itemBuilder: (context, index) {
+                 final account = filteredAccounts[index];
+                 return ListTile(
+                   leading: CircleAvatar(
+                     radius: 24,
+                     backgroundColor: Colors.transparent,
+                     child:
+                         getBankLogo('Kangra Central Co-operative Bank', context),
+                   ),
+                   title: Text(account.name ?? 'N/A'),
+                   subtitle: Column(
+                     crossAxisAlignment: CrossAxisAlignment.start,
+                     children: [
+                       Text(account.accountNo ?? 'N/A'),
+                       Text(
+                         _getFullAccountType(account.accountType),
+                         style:
+                             TextStyle(fontSize: 12, color: Colors.grey[600]),
+                       ),
+                     ],
+                   ),
+                   onTap: () {
+                     // Navigate to the amount screen, passing the selected User object directly.
+                     // No Beneficiary object is created.
+                     Navigator.push(
+                       context,
+                       MaterialPageRoute(
+                         builder: (context) => FundTransferSelfAmountScreen(
+                           debitAccountNo: debitAccountNo,
+                           creditAccount: account, // Pass the User object
+                           remitterName: remitterName,
+                         ),
+                       ),
+                     );
+                   },
+                 );
+               },
+             ),
+     );
+   }
+ }

lib/features/fund_transfer/screens/fund_transfer_self_amount_screen.dart

@@ -0,0 +1,245 @@
+ import 'package:flutter/material.dart';
+ import 'package:intl/intl.dart';
+ import 'package:kmobile/api/services/limit_service.dart';
+ import 'package:kmobile/api/services/payment_service.dart';
+ import 'package:kmobile/data/models/transfer.dart';
+ import 'package:kmobile/data/models/user.dart';
+ import 'package:kmobile/di/injection.dart';
+ import 'package:kmobile/features/fund_transfer/screens/payment_animation.dart';
+ import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
+import 'package:kmobile/widgets/bank_logos.dart';
+
+ class FundTransferSelfAmountScreen extends StatefulWidget {
+   final String debitAccountNo;
+   final User creditAccount;
+   final String remitterName;
+
+   const FundTransferSelfAmountScreen({
+     super.key,
+     required this.debitAccountNo,
+     required this.creditAccount,
+     required this.remitterName,
+   });
+
+   @override
+   State<FundTransferSelfAmountScreen> createState() =>
+       _FundTransferSelfAmountScreenState();
+ }
+
+  class _FundTransferSelfAmountScreenState
+     extends State<FundTransferSelfAmountScreen> {
+   final _formKey = GlobalKey<FormState>();
+   final _amountController = TextEditingController();
+   final _remarksController = TextEditingController();
+
+   // --- Limit Checking Variables ---
+   final _limitService = getIt<LimitService>();
+   Limit? _limit;
+   bool _isLoadingLimit = true;
+   bool _isAmountOverLimit = false;
+   final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
+
+
+   @override
+   void initState() {
+     super.initState();
+     _loadLimit(); // Fetch the daily limit
+     _amountController.addListener(_checkAmountLimit); // Listen for amount changes
+   }
+
+   @override
+   void dispose() {
+     _amountController.removeListener(_checkAmountLimit);
+     _amountController.dispose();
+     _remarksController.dispose();
+     super.dispose();
+   }
+
+   Future<void> _loadLimit() async {
+     setState(() {
+       _isLoadingLimit = true;
+     });
+     try {
+       final limitData = await _limitService.getLimit();
+       setState(() {
+         _limit = limitData;
+         _isLoadingLimit = false;
+       });
+     } catch (e) {
+       setState(() {
+         _isLoadingLimit = false;
+       });
+     }
+   }
+
+   void _checkAmountLimit() {
+     if (_limit == null) return;
+
+     final amount = double.tryParse(_amountController.text) ?? 0;
+     final remainingLimit = _limit!.dailyLimit - _limit!.usedLimit;
+     final bool isOverLimit = amount > remainingLimit;
+
+     if (isOverLimit) {
+       WidgetsBinding.instance.addPostFrameCallback((_) {
+         ScaffoldMessenger.of(context).showSnackBar(
+           SnackBar(
+             content: Text(
+                 'Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
+             backgroundColor: Colors.red,
+           ),
+         );
+       });
+     }
+
+     if (_isAmountOverLimit != isOverLimit) {
+       setState(() {
+         _isAmountOverLimit = isOverLimit;
+       });
+     }
+   }
+
+      void _onProceed() {
+     if (_formKey.currentState!.validate()) {
+       Navigator.push(
+         context,
+         MaterialPageRoute(
+           builder: (context) => TransactionPinScreen(
+             onPinCompleted: (pinScreenContext, tpin) async {
+               final transfer = Transfer(
+                 fromAccount: widget.debitAccountNo,
+                 toAccount: widget.creditAccount.accountNo!,
+                 toAccountType: 'Savings', // Assuming 'SB' for savings
+                 amount: _amountController.text,
+                 tpin: tpin,
+               );
+
+               final paymentService = getIt<PaymentService>();
+               final paymentResponseFuture =
+                   paymentService.processQuickPayWithinBank(transfer);
+
+               Navigator.of(pinScreenContext).pushReplacement(
+                 MaterialPageRoute(
+                   builder: (_) =>
+                       PaymentAnimationScreen(paymentResponse: paymentResponseFuture),
+                 ),
+               );
+             },
+           ),
+         ),
+       );
+     }
+   }
+
+   @override
+ Widget build(BuildContext context) {
+   return Scaffold(
+     appBar: AppBar(
+       title: const Text("Fund Transfer"),
+     ),
+     body: SafeArea(
+       child: Padding(
+         padding: const EdgeInsets.all(16.0),
+         child: Form(
+           key: _formKey,
+           child: Column(
+             crossAxisAlignment: CrossAxisAlignment.start,
+             children: [
+               // Debit Account (User)
+               Text(
+                 "Debit From",
+                 style: Theme.of(context).textTheme.titleSmall,
+               ),
+               Card(
+                 elevation: 0,
+                 margin: const EdgeInsets.symmetric(vertical: 8.0),
+                 child: ListTile(
+                   leading: Image.asset(
+                     'assets/images/logo.png',
+                     width: 40,
+                     height: 40,
+                   ),
+                   title: Text(widget.remitterName),
+                   subtitle: Text(widget.debitAccountNo),
+                 ),
+               ),
+               const SizedBox(height: 24),
+
+               // Credit Account (Self)
+               Text(
+                 "Credited To",
+                 style: Theme.of(context).textTheme.titleSmall,
+               ),
+               Card(
+                 elevation: 0,
+                 margin: const EdgeInsets.symmetric(vertical: 8.0),
+                 child: ListTile(
+                   leading:
+                       getBankLogo('Kangra Central Co-operative Bank', context),
+                   title: Text(widget.creditAccount.name ?? 'N/A'),
+                   subtitle: Text(widget.creditAccount.accountNo ?? 'N/A'),
+                 ),
+               ),
+               const SizedBox(height: 24),
+
+               // Remarks
+               TextFormField(
+                 controller: _remarksController,
+                 decoration: const InputDecoration(
+                   labelText: "Remarks (Optional)",
+                   border: OutlineInputBorder(),
+                 ),
+               ),
+               const SizedBox(height: 24),
+
+               // Amount
+               TextFormField(
+                 controller: _amountController,
+                 keyboardType: TextInputType.number,
+                 decoration: const InputDecoration(
+                   labelText: "Amount",
+                   border: OutlineInputBorder(),
+                   prefixIcon: Icon(Icons.currency_rupee),
+                 ),
+                 validator: (value) {
+                   if (value == null || value.isEmpty) {
+                     return "Amount is required";
+                   }
+                   if (double.tryParse(value) == null ||
+                       double.parse(value) <= 0) {
+                     return "Please enter a valid amount";
+                   }
+                   return null;
+                 },
+               ),
+               const SizedBox(height: 8),
+
+               // Daily Limit Display
+               if (_isLoadingLimit)
+                 const Text('Fetching daily limit...'),
+               if (!_isLoadingLimit && _limit != null)
+                 Text(
+                   'Remaining Daily Limit: ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}',
+                   style: Theme.of(context).textTheme.bodySmall,
+                 ),
+               const Spacer(),
+
+               // Proceed Button
+               SizedBox(
+                 width: double.infinity,
+                 child: ElevatedButton(
+                   onPressed: _isAmountOverLimit ? null : _onProceed,
+                   style: ElevatedButton.styleFrom(
+                     padding: const EdgeInsets.symmetric(vertical: 16),
+                   ),
+                   child: const Text("Proceed"),
+                 ),
+               ),
+               const SizedBox(height: 10),
+             ],
+           ),
+         ),
+       ),
+     ),
+   );
+ }
+  }

lib/features/profile/profile_screen.dart

@@ -5,6 +5,7 @@ import 'package:kmobile/data/repositories/auth_repository.dart';
 import 'package:kmobile/features/profile/change_password/change_password_screen.dart';
 import 'package:kmobile/features/profile/daily_transaction_limit.dart';
 import 'package:kmobile/features/profile/logout_dialog.dart';
+import 'package:kmobile/features/profile/tpin/change_tpin_screen.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -12,6 +13,9 @@ import 'package:shared_preferences/shared_preferences.dart';
 import '../../di/injection.dart';
 import '../../l10n/app_localizations.dart';
 import 'package:kmobile/features/profile/preferences/preference_screen.dart';
+import 'package:kmobile/api/services/auth_service.dart';
+import 'package:kmobile/features/fund_transfer/screens/tpin_set_screen.dart';
+
 
 class ProfileScreen extends StatefulWidget {
   final String mobileNumber;
@@ -35,10 +39,9 @@ class _ProfileScreenState extends State<ProfileScreen> {
   }
 
    Future<void> _loadBiometricStatus() async {
-    final storage = getIt<SecureStorage>();
+   final prefs = await SharedPreferences.getInstance();
-    final isEnabled = await storage.read('biometric_enabled');
    setState(() {
-      _isBiometricEnabled = isEnabled == 'true';
+     _isBiometricEnabled = prefs.getBool('biometric_enabled') ?? false;
    });
  }
 
@@ -53,11 +56,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
 
     Future<void> _handleBiometricToggle(bool enable) async {
    final localAuth = LocalAuthentication();
-    final storage = getIt<SecureStorage>();
+   final prefs = await SharedPreferences.getInstance();
    final canCheck = await localAuth.canCheckBiometrics;
 
    if (!canCheck) {
-      // Optional: Show a snackbar or dialog if biometrics are not available
      ScaffoldMessenger.of(context).showSnackBar(
        SnackBar(
            content: Text(AppLocalizations.of(context).biometricsNotAvailable)),
@@ -66,7 +68,6 @@ class _ProfileScreenState extends State<ProfileScreen> {
    }
 
    if (enable) {
-      // Show "Enable" dialog
      final optIn = await showDialog<bool>(
        context: context,
        barrierDismissible: false,
@@ -96,17 +97,18 @@ class _ProfileScreenState extends State<ProfileScreen> {
            ),
          );
          if (didAuth) {
-            await storage.write('biometric_enabled', 'true');
+           await prefs.setBool('biometric_enabled', true);
+           if (mounted) {
              setState(() {
                _isBiometricEnabled = true;
              });
            }
+         }
        } catch (e) {
-          // Handle authentication errors
+         // Handle exceptions, state remains unchanged.
        }
      }
    } else {
-      // Show "Disable" dialog
      final optOut = await showDialog<bool>(
        context: context,
        barrierDismissible: false,
@@ -127,13 +129,15 @@ class _ProfileScreenState extends State<ProfileScreen> {
      );
 
      if (optOut == true) {
-        await storage.write('biometric_enabled', 'false');
+       await prefs.setBool('biometric_enabled', false);
+       if (mounted) {
          setState(() {
            _isBiometricEnabled = false;
          });
        }
      }
    }
+ }
 
   @override
   Widget build(BuildContext context) {
@@ -171,6 +175,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
    title: Text(AppLocalizations.of(context).enableFingerprintLogin),
    value: _isBiometricEnabled,
    onChanged: (bool value) {
+     // The state is now managed within _handleBiometricToggle
      _handleBiometricToggle(value);
    },
    secondary: const Icon(Icons.fingerprint),
@@ -188,12 +193,57 @@ class _ProfileScreenState extends State<ProfileScreen> {
               );
             },
           ),
-          // ListTile(
+          ListTile(
-          //   leading: const Icon(Icons.password),
+            leading: const Icon(Icons.password),
-          //   title: const Text("Manage TPIN"),
+  title: Text('Change TPIN'),
-          //   onTap: () async {
+  onTap: () async {
-          //   },
+    // 1. Get the AuthService instance
-          // ),
+    final authService = getIt<AuthService>();
+
+    // 2. Call checkTpin() to see if TPIN is set
+    final isTpinSet = await authService.checkTpin();
+
+    // 3. If TPIN is not set, show the dialog
+    if (!isTpinSet) {
+      showDialog(
+        context: context,
+        builder: (BuildContext context) {
+          return AlertDialog(
+            title: Text('TPIN Not Set'),
+            content: Text('You have not set a TPIN yet. Please set a TPIN to proceed.'),
+            actions: <Widget>[
+              TextButton(
+                child: Text('Back'),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+              TextButton(
+                child: Text('Proceed'),
+                onPressed: () {
+                  Navigator.of(context).pop(); // Dismiss the dialog
+                  // Navigate to the TPIN set screen
+                  Navigator.of(context).push(
+                    MaterialPageRoute(
+                      builder: (context) => TpinSetScreen(),
+                    ),
+                  );
+                },
+              ),
+            ],
+          );
+        },
+      );
+    } else {
+      // Case 2: TPIN is set
+Navigator.of(context).push(
+  MaterialPageRoute(
+    builder: (context) => ChangeTpinScreen(mobileNumber: widget.mobileNumber),
+  ),
+);
+    }
+  },
+),
           //           ListTile(
           //   leading: const Icon(Icons.password),
           //   title: const Text("Change Login MPIN"),

lib/features/profile/tpin/change_tpin_otp_screen.dart

@@ -0,0 +1,125 @@
+ import 'package:flutter/material.dart';
+ import 'package:kmobile/di/injection.dart';
+ import 'package:kmobile/widgets/pin_input_field.dart';
+ import '../../../api/services/change_password_service.dart';
+
+ class ChangeTpinOtpScreen extends StatefulWidget {
+   final String oldTpin;
+   final String newTpin;
+   final String mobileNumber;
+
+   const ChangeTpinOtpScreen({
+     super.key,
+     required this.oldTpin,
+     required this.newTpin,
+     required this.mobileNumber,
+   });
+
+   @override
+   State<ChangeTpinOtpScreen> createState() => _ChangeTpinOtpScreenState();
+ }
+
+ class _ChangeTpinOtpScreenState extends State<ChangeTpinOtpScreen> {
+   final _otpController = TextEditingController();
+   final ChangePasswordService _changePasswordService =
+       getIt<ChangePasswordService>();
+   bool _isLoading = false;
+
+   void _handleVerifyOtp() async {
+     if (_otpController.text.length != 6) {
+       ScaffoldMessenger.of(context).showSnackBar(
+         const SnackBar(content: Text('Please enter a valid 6-digit OTP')),
+       );
+       return;
+     }
+
+     setState(() {
+       _isLoading = true;
+     });
+
+     try {
+       // 1. Validate the OTP first.
+       await _changePasswordService.validateOtp(
+         otp: _otpController.text,
+         mobileNumber: widget.mobileNumber,
+       );
+
+       // 2. If OTP is valid, then call validateChangeTpin.
+       await _changePasswordService.validateChangeTpin(
+         oldTpin: widget.oldTpin,
+         newTpin: widget.newTpin,
+       );
+
+       // 3. Show success message.
+       if (mounted) {
+         ScaffoldMessenger.of(context).showSnackBar(
+           const SnackBar(
+             content: Text('TPIN changed successfully!'),
+             backgroundColor: Colors.green,
+           ),
+         );
+         // 4. Navigate back to the profile screen or home.
+         Navigator.of(context).popUntil((route) => route.isFirst);
+       }
+     } catch (e) {
+       if (mounted) {
+         ScaffoldMessenger.of(context).showSnackBar(
+           SnackBar(
+             content: Text('An error occurred: $e'),
+             backgroundColor: Colors.red,
+           ),
+         );
+       }
+     } finally {
+       if (mounted) {
+         setState(() {
+           _isLoading = false;
+         });
+       }
+     }
+   }
+
+   @override
+   Widget build(BuildContext context) {
+     return Scaffold(
+       appBar: AppBar(
+         title: const Text('Verify OTP'),
+       ),
+       body: SingleChildScrollView(
+         padding: const EdgeInsets.all(16.0),
+         child: Column(
+           crossAxisAlignment: CrossAxisAlignment.center,
+           children: [
+             const SizedBox(height: 24),
+             const Text(
+               'Enter the OTP sent to your registered mobile number.',
+               textAlign: TextAlign.center,
+               style: TextStyle(fontSize: 16),
+             ),
+             const SizedBox(height: 32),
+             PinInputField(
+               controller: _otpController,
+             ),
+             const SizedBox(height: 32),
+             SizedBox(
+               width: double.infinity,
+               child: ElevatedButton(
+                 onPressed: _isLoading ? null : _handleVerifyOtp,
+                 child: _isLoading
+                     ? const SizedBox(
+                         height: 24,
+                         width: 24,
+                         child: CircularProgressIndicator(
+                           color: Colors.white,
+                           strokeWidth: 2.5,
+                         ),
+                       )
+                     : const Text('Verify & Change TPIN'),
+               ),
+             ),
+           ],
+         ),
+       ),
+     );
+   }
+ }

lib/features/profile/tpin/change_tpin_screen.dart

@@ -0,0 +1,146 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/di/injection.dart';
+import 'package:kmobile/features/profile/tpin/change_tpin_otp_screen.dart';
+import 'package:kmobile/widgets/pin_input_field.dart';
+import '../../../api/services/change_password_service.dart';
+
+class ChangeTpinScreen extends StatefulWidget {
+  final String mobileNumber;
+  const ChangeTpinScreen({super.key, required this.mobileNumber});
+
+  @override
+  State<ChangeTpinScreen> createState() => _ChangeTpinScreenState();
+}
+
+class _ChangeTpinScreenState extends State<ChangeTpinScreen> {
+  final _formKey = GlobalKey<FormState>();
+  final _oldTpinController = TextEditingController();
+  final _newTpinController = TextEditingController();
+  final _confirmTpinController = TextEditingController();
+  final ChangePasswordService _changePasswordService =
+      getIt<ChangePasswordService>();
+  bool _isLoading = false;
+
+  @override
+  void dispose() {
+    _oldTpinController.dispose();
+    _newTpinController.dispose();
+    _confirmTpinController.dispose();
+    super.dispose();
+  }
+
+  void _handleChangeTpin() async {
+    if (_formKey.currentState!.validate()) {
+      setState(() {
+        _isLoading = true;
+      });
+      try {
+        // 1. Get OTP for TPIN change.
+        await _changePasswordService.getOtpTpin(mobileNumber: widget.mobileNumber);
+
+        // 2. Navigate to the OTP screen on success.
+        if (mounted) {
+          Navigator.of(context).push(
+            MaterialPageRoute(
+              builder: (context) => ChangeTpinOtpScreen(
+                oldTpin: _oldTpinController.text,
+                newTpin: _newTpinController.text,
+                mobileNumber: widget.mobileNumber,
+              ),
+            ),
+          );
+        }
+      } catch (e) {
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text('Failed to send OTP: $e')),
+          );
+        }
+      } finally {
+        if (mounted) {
+          setState(() {
+            _isLoading = false;
+          });
+        }
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Change TPIN'),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16.0),
+        child: Form(
+          key: _formKey,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const Text('Current TPIN'),
+              const SizedBox(height: 8),
+              PinInputField(
+                controller: _oldTpinController,
+                validator: (value) {
+                  if (value == null || value.length != 6) {
+                    return 'Please enter your 6-digit old TPIN';
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 24),
+              const Text('New TPIN'),
+              const SizedBox(height: 8),
+              PinInputField(
+                controller: _newTpinController,
+                validator: (value) {
+                  if (value == null || value.length != 6) {
+                    return 'Please enter a 6-digit new TPIN';
+                  }
+                  if (value == _oldTpinController.text) {
+                    return 'New TPIN must be different from the old one.';
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 24),
+              const Text('Confirm New TPIN'),
+              const SizedBox(height: 8),
+              PinInputField(
+                controller: _confirmTpinController,
+                validator: (value) {
+                  if (value == null || value.length != 6) {
+                    return 'Please confirm your new TPIN';
+                  }
+                  if (value != _newTpinController.text) {
+                    return 'TPINs do not match';
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 32),
+              SizedBox(
+                width: double.infinity,
+                child: ElevatedButton(
+                  onPressed: _isLoading ? null : _handleChangeTpin,
+                  child: _isLoading
+                      ? const SizedBox(
+                          height: 24,
+                          width: 24,
+                          child: CircularProgressIndicator(
+                            color: Colors.white,
+                            strokeWidth: 2.5,
+                          ),
+                        )
+                      : const Text('Proceed'),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/pin_input_field.dart

@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+class PinInputField extends StatelessWidget {
+  final TextEditingController controller;
+  final int length;
+  final FormFieldValidator<String>? validator;
+
+  const PinInputField({
+    super.key,
+    required this.controller,
+    this.length = 6,
+    this.validator,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return FormField<String>(
+      validator: validator,
+      builder: (FormFieldState<String> state) {
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            TextField(
+              controller: controller,
+              keyboardType: TextInputType.number,
+              inputFormatters: [
+                FilteringTextInputFormatter.digitsOnly,
+                LengthLimitingTextInputFormatter(length),
+              ],
+              obscureText: true,
+              obscuringCharacter: '*',
+              decoration: InputDecoration(
+                border: const OutlineInputBorder(),
+                labelText: 'Enter $length-digit PIN',
+                counterText: '', // Hide the counter
+              ),
+              onChanged: (value) {
+                state.didChange(value);
+              },
+            ),
+            if (state.hasError)
+              Padding(
+                padding: const EdgeInsets.only(top: 8.0, left: 12.0),
+                child: Text(
+                  state.errorText!,
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.error,
+                    fontSize: 12,
+                  ),
+                ),
+              ),
+          ],
+        );
+      },
+    );
+  }
+}

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'),
+        ),
+      ],
+    );
+  }
+}