TNC Route Fixed

(for migrated users)

analysis_options.yaml

@@ -10,6 +10,7 @@
 analyzer:
   errors:
     dead_code: ignore
+    non_constant_identifier_names: ignore
 include: package:flutter_lints/flutter.yaml
 
 linter:

android/app/src/main/kotlin/com/example/kmobile/MainActivity.kt

@@ -1,5 +1,12 @@
 package com.example.kmobile
-
 import io.flutter.embedding.android.FlutterFragmentActivity
+ import io.flutter.embedding.android.FlutterActivity
+ import android.view.WindowManager.LayoutParams
+ import android.os.Bundle
 
-class MainActivity: FlutterFragmentActivity() 
+class MainActivity: FlutterFragmentActivity() {
+         override fun onCreate(savedInstanceState: Bundle?) {
+         super.onCreate(savedInstanceState)
+         window.addFlags(LayoutParams.FLAG_SECURE)
+     }
+ }

ios/Runner.xcodeproj/project.pbxproj

@@ -427,7 +427,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -484,7 +484,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

ios/Runner/Info.plist

@@ -47,5 +47,19 @@
 	<true/>
 	<key>NSFaceIDUsageDescription</key>
     <string>We use Face ID to secure your data.</string>
+	 <key>LSApplicationQueriesSchemes</key>
+     <array>
+             <string>https</string>
+             <string>http</string>
+     </array>
+     <key>NSCameraUsageDescription</key>
+     <string>This app needs camera access to scan QR codes and take pictures.</string>
+     <key>NSPhotoLibraryUsageDescription</key>
+     <string>This app needs photo library access to save and share images.</string>
+     <key>NSContactsUsageDescription</key>
+     <string>This app needs contacts access to easily send money to your contacts.</string>
+     <key>NSMicrophoneUsageDescription</key>
+     <string>This app needs microphone access for voice commands.</string>
+
 </dict>
 </plist>

lib/api/services/auth_service.dart

@@ -25,7 +25,8 @@ class AuthService {
         print(e.toString());
       }
       if (e.response?.statusCode == 401) {
-        throw AuthException('Invalid credentials');
+        throw AuthException(
+            e.response?.data['error'] ?? 'SOMETHING WENT WRONG');
       }
       throw NetworkException('Network error during login');
     } catch (e) {
@@ -91,4 +92,74 @@ class AuthService {
           'Unexpected error during TPIN setup: ${e.toString()}');
     }
   }
-}
+
+  Future<void> sendOtpForSettingPassword(String customerNo) async {
+    try {
+      final response =
+          await _dio.get('/api/otp/send/set-password', queryParameters: {
+        'customerNo': customerNo,
+      });
+      if (response.statusCode != 200) {
+        throw Exception(response.data['error'] ?? 'Failed to send OTP');
+      }
+      return;
+    } on DioException catch (e) {
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      throw Exception('Unexpected error: ${e.toString()}');
+    }
+  }
+
+  Future<String> verifyOtpForSettingPassword(
+      String customerNo, String otp) async {
+    try {
+      final response = await _dio.get(
+        '/api/otp/verify/set-password',
+        queryParameters: {'customerNo': customerNo, 'otp': otp},
+      );
+
+      if (response.statusCode == 200) {
+        return response.data['token'];
+      } else {
+        throw Exception(response.data['error'] ?? 'Failed to verify OTP');
+      }
+    } on DioException catch (e) {
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      throw Exception('Unexpected error: ${e.toString()}');
+    }
+  }
+
+  Future changePassword(String newPassword, String token) async {
+    final response = await _dio.post(
+      '/api/auth/login_password',
+      data: {'login_password': newPassword},
+      options: Options(headers: {'Authorization': 'Bearer $token'}),
+    );
+    if (response.statusCode != 200) {
+      throw Exception('Error setting password');
+    }
+    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/beneficiary_service.dart

@@ -1,5 +1,6 @@
 import 'dart:developer';
 import 'package:dio/dio.dart';
+import 'package:kmobile/core/errors/exceptions.dart';
 import 'package:kmobile/data/models/ifsc.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
 
@@ -39,9 +40,12 @@ class BeneficiaryService {
     } on DioException catch (e) {
       if (e.response?.statusCode == 404) {
         throw Exception('INVALID IFSC CODE');
+      } else if (e.response?.statusCode == 401) {
+        throw Exception('INVALID IFSC CODE');
       }
     } catch (e) {
-      rethrow;
+      throw UnexpectedException(
+          'Unexpected error during login: ${e.toString()}');
     }
     return Ifsc.fromJson({});
   }
@@ -59,6 +63,10 @@ class BeneficiaryService {
         'ifscCode': ifscCode,
         'remitterName': remitterName,
       },
+      options: Options(
+        sendTimeout: const Duration(seconds: 60),
+        receiveTimeout: const Duration(seconds: 60),
+      ),
     );
     if (response.statusCode != 200) {
       throw Exception("Invalid Beneficiary Details");
@@ -66,7 +74,7 @@ class BeneficiaryService {
     return response.data['name'];
   }
 
-  // Send Data for Validation
+  // Beneficiary Validate And ADD
   Future<bool> sendForValidation(Beneficiary beneficiary) async {
     try {
       final response = await _dio.post(

lib/api/services/change_password_service.dart

@@ -0,0 +1,87 @@
+import 'package:dio/dio.dart';
+
+class ChangePasswordService {
+  final Dio _dio;
+
+  ChangePasswordService(this._dio);
+
+  Future getOtp({
+    required String mobileNumber,
+  }) async {
+    final response = await _dio.post(
+      '/api/otp/send',
+      data: {'mobileNumber': mobileNumber, 'type': "CHANGE_LPWORD"},
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Invalid Mobile Number/Type");
+    }
+    print(response.toString());
+    return response.toString();
+  }
+
+  Future getOtpTpin({
+    required String mobileNumber,
+  }) async {
+    final response = await _dio.post(
+      '/api/otp/send',
+      data: {'mobileNumber': mobileNumber, 'type': "CHANGE_TPIN"},
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Invalid Mobile Number/Type");
+    }
+    print(response.toString());
+    return response.toString();
+  }
+
+  Future validateOtp({
+    required String otp,
+    required String mobileNumber,
+  }) async {
+    final response = await _dio.post(
+      '/api/otp/verify?mobileNumber=$mobileNumber',
+      data: {
+        'otp': otp,
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Wrong OTP");
+    }
+    return response.toString();
+  }
+
+  Future validateChangePwd({
+    required String OldLPsw,
+    required String newLPsw,
+    required String confirmLPsw,
+  }) async {
+    final response = await _dio.post(
+      '/api/auth/change/login_password',
+      data: {
+        'OldLPsw': OldLPsw,
+        'newLPsw': newLPsw,
+        'confirmLPsw': confirmLPsw,
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Wrong OTP");
+    }
+    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/api/services/limit_service.dart

@@ -0,0 +1,57 @@
+// ignore_for_file: collection_methods_unrelated_type
+import 'dart:developer';
+import 'package:dio/dio.dart';
+
+class Limit {
+  final double dailyLimit;
+  final double usedLimit;
+
+  Limit({
+    required this.dailyLimit,
+    required this.usedLimit,
+  });
+
+  factory Limit.fromJson(Map<String, dynamic> json) {
+    return Limit(
+      dailyLimit: json['dailyLimit']!,
+      usedLimit: json['usedLimit']!,
+    );
+  }
+}
+
+class LimitService {
+  final Dio _dio;
+  LimitService(this._dio);
+
+  Future<Limit> getLimit() async {
+    try {
+      final response = await _dio.get('/api/customer/daily-limit');
+      if (response.statusCode == 200) {
+        log('Response: ${response.data}');
+        return Limit.fromJson(response.data);
+      } else {
+        throw Exception('Failed to load');
+      }
+    } on DioException catch (e) {
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      throw Exception('Unexpected error: ${e.toString()}');
+    }
+  }
+
+  void editLimit( double newLimit) async {
+    try {
+      final response = await _dio.post('/api/customer/daily-limit',
+      data: '{"amount": $newLimit}');
+      if (response.statusCode == 200) {
+        log('Response: ${response.data}');
+      } else {
+        throw Exception('Failed to load');
+      }
+    } on DioException catch (e) {
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      throw Exception('Unexpected error: ${e.toString()}');
+    }
+  }
+}

lib/api/services/user_service.dart

@@ -10,7 +10,7 @@ class UserService {
 
   Future<List<User>> getUserDetails() async {
     try {
-      final response = await _dio.get('/api/customer/details');
+      final response = await _dio.get('/api/customer');
       if (response.statusCode == 200) {
         log('Response: ${response.data}');
         return (response.data as List)

lib/app.dart

@@ -20,6 +20,7 @@ import 'features/dashboard/screens/dashboard_screen.dart';
 import 'features/auth/screens/mpin_screen.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'dart:async';
 
 class KMobile extends StatefulWidget {
   const KMobile({super.key});
@@ -34,13 +35,15 @@ class KMobile extends StatefulWidget {
   }
 }
 
-class _KMobileState extends State<KMobile> {
+class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
+  Timer? _backgroundTimer;
   bool showSplash = true;
   Locale? _locale;
 
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
     loadPreferences();
     Future.delayed(const Duration(seconds: 3), () {
       setState(() {
@@ -49,10 +52,35 @@ class _KMobileState extends State<KMobile> {
     });
   }
 
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    _backgroundTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    switch (state) {
+      case AppLifecycleState.resumed:
+        _backgroundTimer?.cancel();
+        break;
+      case AppLifecycleState.paused:
+        _backgroundTimer = Timer(const Duration(minutes: 2), () {
+          if (Platform.isAndroid) {
+            SystemNavigator.pop();
+          }
+          exit(0);
+        });
+        break;
+      default:
+        break;
+    }
+  }
+
   Future<void> loadPreferences() async {
     final prefs = await SharedPreferences.getInstance();
-
-    // Load Locale
     final String? langCode = prefs.getString('locale');
     if (langCode != null) {
       setState(() {
@@ -117,7 +145,6 @@ class _KMobileState extends State<KMobile> {
 
 class AuthGate extends StatefulWidget {
   const AuthGate({super.key});
-
   @override
   State<AuthGate> createState() => _AuthGateState();
 }
@@ -180,7 +207,6 @@ class _AuthGateState extends State<AuthGate> {
     if (_checking) {
       return const SplashScreen();
     }
-
     if (_isLoggedIn) {
       if (_hasMPin) {
         if (_biometricEnabled) {
@@ -190,11 +216,9 @@ class _AuthGateState extends State<AuthGate> {
               if (snapshot.connectionState == ConnectionState.waiting) {
                 return const SplashScreen();
               }
-
               if (snapshot.data == true) {
-                return const NavigationScaffold(); // Authenticated
+                return const NavigationScaffold();
               }
-
               return MPinScreen(
                 mode: MPinMode.enter,
                 onCompleted: (_) {
@@ -225,7 +249,6 @@ class _AuthGateState extends State<AuthGate> {
           onCompleted: (_) async {
             final storage = getIt<SecureStorage>();
             final localAuth = LocalAuthentication();
-
             final optIn = await showDialog<bool>(
               context: context,
               barrierDismissible: false,
@@ -246,7 +269,6 @@ class _AuthGateState extends State<AuthGate> {
                 ],
               ),
             );
-
             if (optIn == true) {
               final canCheck = await localAuth.canCheckBiometrics;
               bool didAuth = false;
@@ -254,7 +276,6 @@ class _AuthGateState extends State<AuthGate> {
               if (context.mounted) {
                 authEnable = AppLocalizations.of(context).authenticateToEnable;
               }
-
               if (canCheck) {
                 didAuth = await localAuth.authenticate(
                   localizedReason: authEnable,
@@ -269,7 +290,6 @@ class _AuthGateState extends State<AuthGate> {
                 await storage.write('biometric_enabled', 'false');
               }
             }
-
             if (context.mounted) {
               Navigator.of(context).pushReplacement(
                 MaterialPageRoute(
@@ -287,7 +307,6 @@ class _AuthGateState extends State<AuthGate> {
 
 class NavigationScaffold extends StatefulWidget {
   const NavigationScaffold({super.key});
-
   @override
   State<NavigationScaffold> createState() => _NavigationScaffoldState();
 }
@@ -295,7 +314,6 @@ class NavigationScaffold extends StatefulWidget {
 class _NavigationScaffoldState extends State<NavigationScaffold> {
   final PageController _pageController = PageController();
   int _selectedIndex = 0;
-
   final List<Widget> _pages = [
     const DashboardScreen(),
     const CardManagementScreen(),
@@ -342,10 +360,9 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
         bottomNavigationBar: BottomNavigationBar(
           currentIndex: _selectedIndex,
           type: BottomNavigationBarType.fixed,
-          backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-          selectedItemColor: Theme.of(context).colorScheme.primary,
-          unselectedItemColor:
-              Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
+          backgroundColor: const Color(0XFF1E58AD),
+          selectedItemColor: Theme.of(context).colorScheme.onPrimary,
+          unselectedItemColor: Theme.of(context).colorScheme.onSecondary,
           onTap: (index) {
             setState(() {
               _selectedIndex = index;
@@ -372,11 +389,9 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
   }
 }
 
-// Add this widget at the end of the file
 class BiometricPromptScreen extends StatelessWidget {
   final VoidCallback onCompleted;
   const BiometricPromptScreen({super.key, required this.onCompleted});
-
   Future<void> _handleBiometric(BuildContext context) async {
     final localAuth = LocalAuthentication();
     final canCheck = await localAuth.canCheckBiometrics;

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/models/imps_transaction.dart

@@ -6,6 +6,7 @@ class ImpsTransaction {
   final String? remitterName;
   final String beneficiaryName;
   final String tpin;
+  final String? remarks;
 
   ImpsTransaction({
     required this.fromAccount,
@@ -15,6 +16,7 @@ class ImpsTransaction {
     this.remitterName,
     required this.beneficiaryName,
     required this.tpin,
+    this.remarks,
   });
 
   Map<String, dynamic> toJson() {
@@ -26,6 +28,7 @@ class ImpsTransaction {
       'remitterName': remitterName,
       'beneficiaryName': beneficiaryName,
       'tpin': tpin,
+      'remarks': remarks,
     };
   }
 }

lib/data/models/neft_transaction.dart

@@ -6,6 +6,7 @@ class NeftTransaction {
   final String remitterName;
   final String beneficiaryName;
   final String tpin;
+  final String? remarks;
 
   NeftTransaction({
     required this.fromAccount,
@@ -15,6 +16,7 @@ class NeftTransaction {
     required this.remitterName,
     required this.beneficiaryName,
     required this.tpin,
+    this.remarks,
   });
 
   Map<String, dynamic> toJson() {
@@ -26,6 +28,7 @@ class NeftTransaction {
       'remitterName': remitterName,
       'beneficiaryName': beneficiaryName,
       'tpin': tpin,
+      'remarks': remarks,
     };
   }
 }

lib/data/models/rtgs_transaction.dart

@@ -6,6 +6,7 @@ class RtgsTransaction {
   final String remitterName;
   final String beneficiaryName;
   final String tpin;
+  final String? remarks;
 
   RtgsTransaction({
     required this.fromAccount,
@@ -15,6 +16,7 @@ class RtgsTransaction {
     required this.remitterName,
     required this.beneficiaryName,
     required this.tpin,
+    this.remarks,
   });
 
   Map<String, dynamic> toJson() {
@@ -26,6 +28,7 @@ class RtgsTransaction {
       'remitterName': remitterName,
       'beneficiaryName': beneficiaryName,
       'tpin': tpin,
+      'remarks': remarks,
     };
   }
 }

lib/data/models/transaction.dart

@@ -4,8 +4,18 @@ class Transaction {
   final String? date;
   final String? amount;
   final String? type;
+  final String? balance;
+  final String? balanceType;
+
+  Transaction(
+      {this.id,
+      this.name,
+      this.date,
+      this.amount,
+      this.type,
+      this.balance,
+      this.balanceType});
 
-  Transaction({this.id, this.name, this.date, this.amount, this.type});
   Map<String, dynamic> toJson() {
     return {
       'id': id,
@@ -13,16 +23,19 @@ class Transaction {
       'date': date,
       'amount': amount,
       'type': type,
+      'balance': balance,
+      'balanceType': balanceType
     };
   }
 
   factory Transaction.fromJson(Map<String, dynamic> json) {
     return Transaction(
-      id: json['id'] as String?,
-      name: json['name'] as String?,
-      date: json['date'] as String?,
-      amount: json['amount'] as String?,
-      type: json['type'] as String?,
-    );
+        id: json['id'] as String?,
+        name: json['name'] as String?,
+        date: json['date'] as String?,
+        amount: json['amount'] as String?,
+        type: json['type'] as String?,
+        balance: json['balance'] as String?,
+        balanceType: json['balanceType'] as String?);
   }
 }

lib/data/models/transfer.dart

@@ -4,6 +4,7 @@ class Transfer {
   final String toAccountType;
   final String amount;
   String? tpin;
+  String? remarks;
 
   Transfer({
     required this.fromAccount,
@@ -11,6 +12,7 @@ class Transfer {
     required this.toAccountType,
     required this.amount,
     this.tpin,
+    this.remarks,
   });
 
   Map<String, dynamic> toJson() {
@@ -20,6 +22,7 @@ class Transfer {
       'toAccountType': toAccountType,
       'amount': amount,
       'tpin': tpin,
+      'remarks': remarks,
     };
   }
 }

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,24 +48,37 @@ 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 {
+  Future<void> clearAuthTokens() async {
     await _secureStorage.deleteAll();
-
   }
 
-
   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/data/repositories/transaction_repository.dart

@@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:dio/dio.dart';
 import 'package:intl/intl.dart';
 import 'package:kmobile/data/models/transaction.dart';
@@ -25,8 +23,6 @@ class TransactionRepositoryImpl implements TransactionRepository {
       queryParameters['toDate'] = DateFormat('ddMMyyyy').format(toDate);
     }
 
-    log('query params below');
-    log(queryParameters.toString());
     final resp = await _dio.get(
       '/api/transactions/account/$accountNo',
       queryParameters: queryParameters.isNotEmpty ? queryParameters : null,

lib/di/injection.dart

@@ -1,3 +1,4 @@
+import 'package:kmobile/api/services/limit_service.dart';
 import 'package:kmobile/api/services/rtgs_service.dart';
 import 'package:kmobile/api/services/neft_service.dart';
 import 'package:kmobile/api/services/imps_service.dart';
@@ -11,6 +12,7 @@ import 'package:kmobile/features/auth/controllers/theme_cubit.dart';
 import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
 import '../api/services/auth_service.dart';
 import '../api/interceptors/auth_interceptor.dart';
+import '../api/services/change_password_service.dart';
 import '../data/repositories/auth_repository.dart';
 import '../features/auth/controllers/auth_cubit.dart';
 import '../security/secure_storage.dart';
@@ -45,9 +47,13 @@ Future<void> setupDependencies() async {
 
   getIt.registerSingleton<PaymentService>(PaymentService(getIt<Dio>()));
   getIt.registerSingleton<BeneficiaryService>(BeneficiaryService(getIt<Dio>()));
+  getIt.registerSingleton<LimitService>(LimitService(getIt<Dio>()));
   getIt.registerSingleton<NeftService>(NeftService(getIt<Dio>()));
   getIt.registerSingleton<RtgsService>(RtgsService(getIt<Dio>()));
   getIt.registerSingleton<ImpsService>(ImpsService(getIt<Dio>()));
+  getIt.registerLazySingleton<ChangePasswordService>(
+    () => ChangePasswordService(getIt<Dio>()),
+  );
 
   // Add auth interceptor after repository is available
   getIt<Dio>().interceptors.add(
@@ -56,20 +62,22 @@ 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',
-      //'http://localhost:8081',
-      connectTimeout: const Duration(seconds: 5),
-      receiveTimeout: const Duration(seconds: 10),
+         '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
+      connectTimeout: const Duration(seconds: 60),
+      receiveTimeout: const Duration(seconds: 60),
       headers: {
         'Content-Type': 'application/json',
         'Accept': 'application/json',
+        'X-Login-Type': 'MB',
       },
     ),
   );

lib/features/accounts/screens/account_statement_screen.dart

@@ -1,4 +1,6 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:shimmer/shimmer.dart';
 import 'package:kmobile/data/models/transaction.dart';
@@ -6,14 +8,21 @@ import 'package:kmobile/data/repositories/transaction_repository.dart';
 import 'package:kmobile/di/injection.dart';
 import '../../../l10n/app_localizations.dart';
 import 'transaction_details_screen.dart';
+import 'package:pdf/widgets.dart' as pw;
+import 'package:permission_handler/permission_handler.dart';
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:share_plus/share_plus.dart';
 
 class AccountStatementScreen extends StatefulWidget {
   final String accountNo;
   final String balance;
+  final String accountType;
   const AccountStatementScreen({
     super.key,
     required this.accountNo,
     required this.balance,
+    required this.accountType,
   });
 
   @override
@@ -27,6 +36,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
   List<Transaction> _transactions = [];
   final _minAmountController = TextEditingController();
   final _maxAmountController = TextEditingController();
+  //Future<Map<String, dynamic>?>? accountStatementsFuture;
 
   @override
   void initState() {
@@ -279,15 +289,26 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                               ),
                               subtitle: Text(
                                 tx.name != null
-                                    ? (tx.name!.length > 18
+                                    ? (tx.name!.length > 22
                                         ? tx.name!.substring(0, 22)
                                         : tx.name!)
                                     : '',
                                 style: const TextStyle(fontSize: 12),
                               ),
-                              trailing: Text(
-                                "₹${tx.amount}",
-                                style: const TextStyle(fontSize: 17),
+                              trailing: Column(
+                                crossAxisAlignment: CrossAxisAlignment.end,
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  Text(
+                                    "₹${tx.amount}",
+                                    style: const TextStyle(fontSize: 17),
+                                  ),
+                                  Text(
+                                    "Bal: ₹${tx.balance}",
+                                    style: const TextStyle(
+                                        fontSize: 12), // Style matches tx.name
+                                  ),
+                                ],
                               ),
                               onTap: () {
                                 Navigator.push(
@@ -308,9 +329,191 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
           ],
         ),
       ),
+      floatingActionButton: FloatingActionButton(
+        onPressed: () {
+          _exportToPdf();
+        },
+        child: const Icon(Icons.download),
+      ),
     );
   }
 
+  Future<void> _exportToPdf() async {
+    // Step 1: Check if there are any transactions to export.
+    if (_transactions.isEmpty) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('No transactions to export.'),
+          ),
+        );
+      }
+      return;
+    }
+
+    var logo = await rootBundle.load('assets/images/logo.png');
+    var rubik = await rootBundle.load("assets/fonts/Rubik-Regular.ttf");
+    final pdf = pw.Document();
+
+    pdf.addPage(pw.MultiPage(
+        margin: const pw.EdgeInsets.all(20),
+        build: (pw.Context context) {
+          return [
+            pw.Row(
+                mainAxisAlignment: pw.MainAxisAlignment.start,
+                crossAxisAlignment: pw.CrossAxisAlignment.center,
+                children: [
+                  pw.Image(pw.MemoryImage(logo.buffer.asUint8List()),
+                      width: 50, height: 50),
+                  pw.SizedBox(width: 20),
+                  pw.Text('Account Statement - KCCB',
+                      style: pw.TextStyle(
+                          fontSize: 24, fontWeight: pw.FontWeight.bold)),
+                ]),
+            pw.SizedBox(height: 20),
+            pw.Row(
+                mainAxisAlignment: pw.MainAxisAlignment.spaceBetween,
+                children: [
+                  pw.Text('Account Number: ${widget.accountNo}',
+                      style:
+                          pw.TextStyle(font: pw.Font.ttf(rubik), fontSize: 15)),
+                  pw.Text('Account Type: ${widget.accountType}',
+                      style: pw.TextStyle(
+                        fontSize: 15,
+                        font: pw.Font.ttf(rubik),
+                      )),
+                ]),
+            pw.SizedBox(height: 20),
+            pw.Table(border: pw.TableBorder.all(), columnWidths: {
+              0: const pw.FractionColumnWidth(0.2),
+              1: const pw.FractionColumnWidth(0.45),
+              2: const pw.FractionColumnWidth(0.15),
+              3: const pw.FractionColumnWidth(0.20),
+            }, children: [
+              pw.TableRow(
+                children: [
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Date')),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Description', softWrap: true)),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Amount')),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Balance')),
+                ],
+              ),
+              ..._transactions.map<pw.TableRow>((tx) {
+                return pw.TableRow(children: [
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text(tx.date ?? '',
+                          style: pw.TextStyle(
+                            fontSize: 12,
+                            font: pw.Font.ttf(rubik),
+                          ))),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text(tx.name ?? '',
+                          style: pw.TextStyle(
+                              fontSize: 12, font: pw.Font.ttf(rubik)))),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text("₹${tx.amount} ${tx.type}",
+                          style: pw.TextStyle(
+                            fontSize: 12,
+                            font: pw.Font.ttf(rubik),
+                          ))),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text("₹${tx.balance} ${tx.balanceType}",
+                          style: pw.TextStyle(
+                            fontSize: 12,
+                            font: pw.Font.ttf(rubik),
+                          ))),
+                ]);
+              }),
+            ])
+          ];
+        },
+        footer: (pw.Context context) {
+          return pw.Container(
+            alignment: pw.Alignment.centerRight,
+            margin: const pw.EdgeInsets.only(top: 10),
+            child: pw.Text(
+              'Kangra Central Co-Operative Bank Pvt Ltd. ©. All rights reserved.',
+              style: pw.TextStyle(
+                font: pw.Font.ttf(rubik),
+                fontSize: 8,
+              ),
+            ),
+          );
+        }));
+
+    //Logic For all platforms
+    try {
+      final Uint8List pdfBytes = await pdf.save();
+      final String timestamp = DateTime.now().millisecondsSinceEpoch.toString();
+      final String fileName = 'account_statement_$timestamp.pdf';
+
+      // For Android
+      if (Platform.isAndroid) {
+        final androidInfo = await DeviceInfoPlugin().androidInfo;
+        if (androidInfo.version.sdkInt < 29) {
+          final status = await Permission.storage.status;
+          if (status.isDenied) {
+            final result = await Permission.storage.request();
+            if (result.isDenied) {
+              if (mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(
+                    content: Text('Storage permission is required to save PDF'),
+                  ),
+                );
+              }
+              return;
+            }
+          }
+        }
+
+        final directory = Directory('/storage/emulated/0/Download');
+        final file = File('${directory.path}/$fileName');
+        await file.writeAsBytes(pdfBytes);
+
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text('PDF saved to: ${file.path}'),
+            ),
+          );
+        }
+      }
+      // Add for IOS
+      else if (Platform.isIOS) {
+        // On iOS, we save to a temporary directory and then open the share sheet.
+        final tempDir = await getTemporaryDirectory();
+        final file = await File('${tempDir.path}/$fileName').create();
+        await file.writeAsBytes(pdfBytes);
+
+        // Use share_plus to open the iOS share dialog
+        await Share.shareXFiles(
+          [XFile(file.path)],
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Error saving PDF: $e'),
+          ),
+        );
+      }
+    }
+  }
+
   Widget buildDateBox(String label, DateTime? date) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 16),

lib/features/accounts/screens/transaction_details_screen.dart

@@ -66,13 +66,15 @@ class TransactionDetailsScreen extends StatelessWidget {
                       transaction.type ?? ""),
                   _buildDetailRow(AppLocalizations.of(context).transferType,
                       transaction.name.split("/").first ?? ""),
-                  if (transaction.name.length > 12) ...[
-                    _buildDetailRow(AppLocalizations.of(context).utrNo,
-                        transaction.name.split("= ")[1].split(" ")[0] ?? ""),
-                    _buildDetailRow(
-                        AppLocalizations.of(context).beneficiaryAccountNo,
-                        transaction.name.split("A/C ").last ?? "")
-                  ]
+                  // if (transaction.name.length > 12) ...[
+                  //   _buildDetailRow(AppLocalizations.of(context).utrNo,
+                  //       transaction.name.split("= ")[1].split(" ")[0] ?? ""),
+                  //   _buildDetailRow(
+                  //       AppLocalizations.of(context).beneficiaryAccountNo,
+                  //       transaction.name.split("A/C ").last ?? "")
+                  // ]
+                  _buildDetailRow(
+                      AppLocalizations.of(context).details, transaction.name),
                 ],
               ),
             ),

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);
-      emit(Authenticated(users));
-    } catch (e) {
-      emit(AuthError(e is AuthException ? e.message : e.toString()));
-    }
-  }
+     Future<void> login(String customerNo, String password) async {
+     emit(AuthLoading());
+     try {
+       final (users, authToken) = await _authRepository.login(customerNo, password);
+
+       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;
-
-  Authenticated(this.users);
+  const 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;
-
-  AuthError(this.message);
+  const 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/controllers/theme_state.dart

@@ -16,26 +16,23 @@ class ThemeState extends Equatable {
   List<Object?> get props => [themeType];
 }*/
 
-
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:kmobile/config/theme_type.dart';
 import 'package:kmobile/config/themes.dart';
+
 class ThemeState extends Equatable {
   final ThemeType themeType;
   const ThemeState({required this.themeType});
 
-    ThemeData getLightThemeData() {
-      return AppThemes.getLightTheme(themeType);
-    }
-
-    ThemeData getDarkThemeData() {
-      return AppThemes.getDarkTheme(themeType);
-    }
-
-    @override
-    List<Object?> get props => [themeType];
+  ThemeData getLightThemeData() {
+    return AppThemes.getLightTheme(themeType);
   }
 
+  ThemeData getDarkThemeData() {
+    return AppThemes.getDarkTheme(themeType);
+  }
 
-
+  @override
+  List<Object?> get props => [themeType];
+}

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) {
-    return AuthToken(
-      accessToken: json['token'],
-      expiresAt: _decodeExpiryFromToken(json['token']),
-    );
-  }
+   factory AuthToken.fromJson(Map<String, dynamic> json) {
+   final token = json['token'];
+   return AuthToken(
+     accessToken: token,
+     expiresAt: _decodeExpiryFromToken(token), // Keep existing method for expiry
+     tnc: _decodeTncFromToken(token), // Use new method for tnc
+   );
+ }
 
   static DateTime _decodeExpiryFromToken(String token) {
     try {
@@ -41,9 +45,46 @@ class AuthToken extends Equatable {
       return DateTime.now().add(const Duration(hours: 1));
     }
   }
+  
+  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,11 +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/security/secure_storage.dart';
-import '../../../app.dart';
+import 'package:kmobile/features/auth/screens/set_password_screen.dart';
+import 'package:kmobile/features/auth/screens/tnc_required_screen.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';
 
@@ -22,7 +22,6 @@ class LoginScreenState extends State<LoginScreen>
   final _customerNumberController = TextEditingController();
   final _passwordController = TextEditingController();
   bool _obscurePassword = true;
-  //bool _showWelcome = true;
 
   @override
   void dispose() {
@@ -42,44 +41,251 @@ class LoginScreenState extends State<LoginScreen>
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      // appBar: AppBar(title: const Text('Login')),
+  //   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(
       body: BlocConsumer<AuthCubit, AuthState>(
-        listener: (context, state) async {
-          if (state is Authenticated) {
-            final storage = getIt<SecureStorage>();
-            final mpin = await storage.read('mpin');
-            if (!context.mounted) return;
-            if (mpin == null) {
-              Navigator.of(context).pushReplacement(
-                MaterialPageRoute(
-                  builder: (_) => MPinScreen(
-                    mode: MPinMode.set,
-                    onCompleted: (_) {
-                      Navigator.of(
-                        context,
-                        rootNavigator: true,
-                      ).pushReplacement(
-                        MaterialPageRoute(
-                          builder: (_) => const NavigationScaffold(),
-                        ),
-                      );
-                    },
-                  ),
+        listener: (context, state) {
+          if (state is ShowTncDialog) {
+            showDialog<bool>(
+              context: context,
+              barrierDismissible: false,
+              builder: (dialogContext) => TncDialog(
+                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: (_) {
+                    // Call the cubit to signal MPIN setup is complete
+                    context.read<AuthCubit>().mpinSetupCompleted();
+                  },
                 ),
-              );
-            } else {
-              Navigator.of(context).pushReplacement(
-                MaterialPageRoute(builder: (_) => const NavigationScaffold()),
-              );
-            }
+              ),
+            );
+          } else if (state is Authenticated) {
+            // 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) {
-            ScaffoldMessenger.of(
-              context,
-            ).showSnackBar(SnackBar(content: Text(state.message)));
+            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 builder part remains largely the same, focusing on UI display
           return Padding(
             padding: const EdgeInsets.all(24.0),
             child: Form(
@@ -100,7 +306,6 @@ class LoginScreenState extends State<LoginScreen>
                     },
                   ),
                   const SizedBox(height: 16),
-                  // Title
                   Text(
                     AppLocalizations.of(context).kccb,
                     style: TextStyle(
@@ -110,21 +315,22 @@ 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,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
                       enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.outline),
                       ),
                       focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.primary,
+                            width: 2),
                       ),
                     ),
                     keyboardType: TextInputType.number,
@@ -137,7 +343,6 @@ class LoginScreenState extends State<LoginScreen>
                     },
                   ),
                   const SizedBox(height: 24),
-                  // Password
                   TextFormField(
                     controller: _passwordController,
                     obscureText: _obscurePassword,
@@ -150,10 +355,13 @@ class LoginScreenState extends State<LoginScreen>
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
                       enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.outline),
                       ),
                       focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.primary,
+                            width: 2),
                       ),
                       suffixIcon: IconButton(
                         icon: Icon(
@@ -176,7 +384,6 @@ class LoginScreenState extends State<LoginScreen>
                     },
                   ),
                   const SizedBox(height: 24),
-                  //Login Button
                   SizedBox(
                     width: 250,
                     child: ElevatedButton(
@@ -187,51 +394,23 @@ class LoginScreenState extends State<LoginScreen>
                         backgroundColor:
                             Theme.of(context).scaffoldBackgroundColor,
                         foregroundColor: Theme.of(context).primaryColorDark,
-                        side: BorderSide(color: Theme.of(context).colorScheme.outline, width: 1),
+                        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),
+                              style: TextStyle(
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onPrimaryContainer),
                             ),
                     ),
                   ),
-                  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:
-        if (widget.initialPin == pin) {
-          // 1) persist the pin
-          await storage.write('mpin', pin);
+       case MPinMode.confirm:
+   if (widget.initialPin == pin) {
+     // 1) persist the pin
+     await storage.write('mpin', pin);
 
-          // 3) now clear the entire navigation stack and go to your main scaffold
-          if (mounted) {
-            Navigator.of(context, rootNavigator: true).pushAndRemoveUntil(
-              MaterialPageRoute(builder: (_) => const NavigationScaffold()),
-              (route) => false,
-            );
-          }
-        } else {
+     // 2) Call the onCompleted callback to let the parent handle navigation
+     if (mounted) {
+       widget.onCompleted?.call(pin);
+     }
+   } else {
           setState(() {
             _isError = true;
             errorText = AppLocalizations.of(context).pinsDoNotMatch;

lib/features/auth/screens/set_password_screen.dart

@@ -0,0 +1,296 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/api/services/auth_service.dart';
+import 'package:kmobile/di/injection.dart';
+import 'package:kmobile/features/auth/screens/login_screen.dart';
+
+import '../../../l10n/app_localizations.dart';
+
+class SetPasswordScreen extends StatefulWidget {
+  final String customerNo;
+  const SetPasswordScreen({super.key, required this.customerNo});
+
+  @override
+  State<SetPasswordScreen> createState() => _SetPasswordScreenState();
+}
+
+enum SetPasswordStep { initial, otp, setPassword, success }
+
+class _SetPasswordScreenState extends State<SetPasswordScreen> {
+  final _authService = getIt<AuthService>();
+  SetPasswordStep _currentStep = SetPasswordStep.initial;
+  bool _isLoading = false;
+  String? _error;
+  String? _otpToken;
+
+  final _otpController = TextEditingController();
+  final _passwordController = TextEditingController();
+  final _confirmPasswordController = TextEditingController();
+
+  bool _obscurePassword = true;
+  bool _obscureConfirmPassword = true;
+
+  @override
+  void dispose() {
+    _otpController.dispose();
+    _passwordController.dispose();
+    _confirmPasswordController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _sendOtp() async {
+    setState(() {
+      _isLoading = true;
+      _error = null;
+    });
+    try {
+      await _authService.sendOtpForSettingPassword(widget.customerNo);
+      setState(() {
+        _currentStep = SetPasswordStep.otp;
+        _isLoading = false;
+      });
+    } catch (e) {
+      setState(() {
+        _error = e.toString();
+        _isLoading = false;
+      });
+    }
+  }
+
+  Future<void> _verifyOtp() async {
+    if (_otpController.text.isEmpty) {
+      setState(() {
+        _error = 'Please enter OTP';
+      });
+      return;
+    }
+    setState(() {
+      _isLoading = true;
+      _error = null;
+    });
+    try {
+      final token = await _authService.verifyOtpForSettingPassword(
+          widget.customerNo, _otpController.text);
+      setState(() {
+        _otpToken = token;
+        _currentStep = SetPasswordStep.setPassword;
+        _isLoading = false;
+      });
+    } catch (e) {
+      setState(() {
+        _error = AppLocalizations.of(context).invalidOtp;
+        _isLoading = false;
+      });
+    }
+  }
+
+  Future<void> _setPassword() async {
+    if (_passwordController.text.isEmpty ||
+        _confirmPasswordController.text.isEmpty) {
+      setState(() {
+        _error = 'Please fill both password fields';
+      });
+      return;
+    }
+    if (_passwordController.text != _confirmPasswordController.text) {
+      setState(() {
+        _error = 'Passwords do not match';
+      });
+      return;
+    }
+    if (_otpToken == null) {
+      setState(() {
+        _error = 'OTP token is missing. Please restart the process.';
+        _currentStep = SetPasswordStep.initial;
+      });
+      return;
+    }
+
+    setState(() {
+      _isLoading = true;
+      _error = null;
+    });
+
+    try {
+      await _authService.changePassword(_passwordController.text, _otpToken!);
+      setState(() {
+        _currentStep = SetPasswordStep.success;
+        _isLoading = false;
+      });
+    } catch (e) {
+      setState(() {
+        _error = e.toString();
+        _isLoading = false;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Set New Password'),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(24.0),
+        child: Center(
+          child: SingleChildScrollView(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                if (_error != null) ...[
+                  Text(
+                    _error!,
+                    style: const TextStyle(
+                        color: Colors.red,
+                        fontWeight: FontWeight.bold,
+                        fontSize: 20),
+                    textAlign: TextAlign.center,
+                  ),
+                  const SizedBox(height: 16),
+                ],
+                if (_isLoading)
+                  const CircularProgressIndicator()
+                else
+                  _buildStepContent(),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStepContent() {
+    switch (_currentStep) {
+      case SetPasswordStep.initial:
+        return _buildInitialStep();
+      case SetPasswordStep.otp:
+        return _buildOtpStep();
+      case SetPasswordStep.setPassword:
+        return _buildSetPasswordStep();
+      case SetPasswordStep.success:
+        return _buildSuccessStep();
+    }
+  }
+
+  Widget _buildInitialStep() {
+    return Column(
+      children: [
+        const Text(
+          'You need to set a new password to continue. We will send an OTP to your registered mobile number.',
+          textAlign: TextAlign.center,
+          style: TextStyle(fontSize: 16),
+        ),
+        const SizedBox(height: 24),
+        ElevatedButton(
+          onPressed: _sendOtp,
+          child: const Text('Proceed'),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildOtpStep() {
+    return Column(
+      children: [
+        const Text(
+          'An OTP has been sent to your registered mobile number. Please enter it below.',
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(height: 24),
+        TextField(
+          controller: _otpController,
+          decoration: const InputDecoration(
+            labelText: 'Enter OTP',
+            border: OutlineInputBorder(),
+          ),
+          keyboardType: TextInputType.number,
+        ),
+        const SizedBox(height: 24),
+        ElevatedButton(
+          onPressed: _verifyOtp,
+          child: const Text('Verify OTP'),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildSetPasswordStep() {
+    return Column(
+      children: [
+        TextFormField(
+          controller: _passwordController,
+          obscureText: _obscurePassword,
+          decoration: InputDecoration(
+            labelText: 'New Password',
+            border: const OutlineInputBorder(),
+            suffixIcon: IconButton(
+              icon: Icon(
+                _obscurePassword ? Icons.visibility : Icons.visibility_off,
+              ),
+              onPressed: () {
+                setState(() {
+                  _obscurePassword = !_obscurePassword;
+                });
+              },
+            ),
+          ),
+        ),
+        const SizedBox(height: 24),
+        TextFormField(
+          controller: _confirmPasswordController,
+          obscureText: _obscureConfirmPassword,
+          decoration: InputDecoration(
+            labelText: 'Confirm New Password',
+            border: const OutlineInputBorder(),
+            suffixIcon: IconButton(
+              icon: Icon(
+                _obscureConfirmPassword
+                    ? Icons.visibility
+                    : Icons.visibility_off,
+              ),
+              onPressed: () {
+                setState(() {
+                  _obscureConfirmPassword = !_obscureConfirmPassword;
+                });
+              },
+            ),
+          ),
+        ),
+        const SizedBox(height: 24),
+        ElevatedButton(
+          onPressed: _setPassword,
+          child: const Text('Set Password'),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildSuccessStep() {
+    return Column(
+      children: [
+        const Icon(Icons.check_circle, color: Colors.green, size: 80),
+        const SizedBox(height: 24),
+        const Text(
+          'Password set successfully!',
+          style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+        ),
+        const SizedBox(height: 8),
+        const Text(
+          'You can now log in with your new password.',
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(height: 24),
+        ElevatedButton(
+          onPressed: () {
+            Navigator.of(context).pushAndRemoveUntil(
+              MaterialPageRoute(builder: (_) => const LoginScreen()),
+              (route) => false,
+            );
+          },
+          child: const Text('Back to Login'),
+        ),
+      ],
+    );
+  }
+}

lib/features/auth/screens/splash_screen.dart

@@ -1,3 +1,5 @@
+import 'package:package_info_plus/package_info_plus.dart';
+
 import '../../../l10n/app_localizations.dart';
 
 import 'package:flutter/material.dart';
@@ -10,11 +12,29 @@ class SplashScreen extends StatefulWidget {
 }
 
 class _SplashScreenState extends State<SplashScreen> {
+  String _version = '';
+  @override
+  void initState() {
+    super.initState();
+    _loadVersion();
+  }
+
+  Future<void> _loadVersion() async {
+    final PackageInfo info = await PackageInfo.fromPlatform();
+    if (mounted) {
+      // Check if the widget is still in the tree
+      setState(() {
+        _version = 'Version ${info.version} (${info.buildNumber})';
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       body: Stack(
-        children: [
+        fit: StackFit.expand,
+        children: <Widget>[
           Positioned.fill(
             child: Image.asset(
               'assets/images/kconnect2.webp',
@@ -26,7 +46,7 @@ class _SplashScreenState extends State<SplashScreen> {
               mainAxisSize: MainAxisSize.min,
               children: [
                 Text(
-                  AppLocalizations.of(context).kconnect,
+                  AppLocalizations.of(context).kccbMobile,
                   style: const TextStyle(
                     fontSize: 36,
                     fontWeight: FontWeight.bold,
@@ -51,8 +71,20 @@ class _SplashScreenState extends State<SplashScreen> {
             left: 0,
             right: 0,
             child: Center(
-              child: CircularProgressIndicator(
-                  color: Color(0xFFFFFFFF)),
+              child: CircularProgressIndicator(color: Color(0xFFFFFFFF)),
+            ),
+          ),
+          Positioned(
+            bottom: 90,
+            left: 0,
+            right: 0,
+            child: Text(
+              _version,
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                color: Color(0xFFFFFFFF),
+                fontSize: 14,
+              ),
             ),
           ),
         ],

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/beneficiaries/screens/add_beneficiary_screen.dart

@@ -23,7 +23,9 @@ class AddBeneficiaryScreen extends StatefulWidget {
 
 class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final _formKey = GlobalKey<FormState>();
-
+  final _accountNumberFieldKey = GlobalKey<FormFieldState>();
+  final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
+  final _ifscFieldKey = GlobalKey<FormFieldState>();
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
@@ -32,6 +34,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final TextEditingController branchNameController = TextEditingController();
   final TextEditingController ifscController = TextEditingController();
   final TextEditingController phoneController = TextEditingController();
+  final _ifscFocusNode = FocusNode();
   final service = getIt<BeneficiaryService>();
 
   bool _isValidating = false;
@@ -43,6 +46,11 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   @override
   void initState() {
     super.initState();
+    _ifscFocusNode.addListener(() {
+      if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
+        _validateIFSC();
+      }
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
         accountType = 'Savings';
@@ -50,23 +58,54 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
     });
   }
 
+  @override
+  void dispose() {
+    accountNumberController.dispose();
+    confirmAccountNumberController.dispose();
+    nameController.dispose();
+    bankNameController.dispose();
+    branchNameController.dispose();
+    ifscController.dispose();
+    phoneController.dispose();
+    _ifscFocusNode.dispose();
+    super.dispose();
+  }
+
   void _validateIFSC() async {
     var beneficiaryService = getIt<BeneficiaryService>();
     final ifsc = ifscController.text.trim().toUpperCase();
     if (ifsc.isEmpty) return;
 
-    final result = await beneficiaryService.validateIFSC(ifsc);
+    try {
+      final result = await beneficiaryService.validateIFSC(ifsc);
+
+      if (mounted) {
+        if (result.bankName.isEmpty) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          );
+          bankNameController.clear();
+          branchNameController.clear();
+        } else {
+          bankNameController.text = result.bankName;
+          branchNameController.text = result.branchName;
+        }
+      }
+    } catch (e) {
+      if (mounted) {
+        final errorMessage = e.toString().toUpperCase();
+        String snackbarMessage =
+            AppLocalizations.of(context).somethingWentWrong;
+
+        if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
+          snackbarMessage = AppLocalizations.of(context).invalidIfsc;
+        }
 
-    if (mounted) {
-      if (result.bankName == '') {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          SnackBar(content: Text(snackbarMessage)),
         );
         bankNameController.clear();
         branchNameController.clear();
-      } else {
-        bankNameController.text = result.bankName;
-        branchNameController.text = result.branchName;
       }
     }
   }
@@ -237,6 +276,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                     child: Column(
                       children: [
                         TextFormField(
+                          key: _accountNumberFieldKey,
                           controller: accountNumberController,
                           decoration: InputDecoration(
                             labelText: AppLocalizations.of(
@@ -267,6 +307,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                         const SizedBox(height: 24),
                         // Confirm Account Number
                         TextFormField(
+                          key: _confirmAccountNumberFieldKey,
                           controller: confirmAccountNumberController,
                           decoration: InputDecoration(
                             labelText: AppLocalizations.of(
@@ -294,6 +335,8 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                         ),
                         const SizedBox(height: 24),
                         TextFormField(
+                          focusNode: _ifscFocusNode,
+                          key: _ifscFieldKey,
                           controller: ifscController,
                           maxLength: 11,
                           inputFormatters: [
@@ -306,16 +349,15 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                           ),
                           textCapitalization: TextCapitalization.characters,
                           textInputAction: TextInputAction.next,
-                          onFieldSubmitted: (_) {
-                            _validateIFSC();
-                          },
                           onChanged: (value) {
-                            final trimmed = value.trim().toUpperCase();
-                            if (trimmed.length < 11) {
-                              // clear bank/branch if backspace or changed
-                              bankNameController.clear();
-                              branchNameController.clear();
-                            }
+                            setState(() {
+                              final trimmed = value.trim().toUpperCase();
+                              if (trimmed.length < 11) {
+                                // clear bank/branch if backspace or changed
+                                bankNameController.clear();
+                                branchNameController.clear();
+                              }
+                            });
                           },
                           validator: (value) {
                             final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
@@ -332,7 +374,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                           },
                         ),
                         const SizedBox(height: 24),
-                        // 🔹 Bank Name (Disabled)
+                        //  Bank Name (Disabled)
                         TextFormField(
                           controller: bankNameController,
                           enabled: false, // changed from readOnly to disabled
@@ -390,18 +432,25 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             child: SizedBox(
                               width: double.infinity,
                               child: ElevatedButton(
-                                onPressed: _isValidating
+                                onPressed: _isValidating ||
+                                        ifscController.text.length != 11
                                     ? null
                                     : () {
-                                        if (confirmAccountNumberController
-                                                .text ==
-                                            accountNumberController.text) {
+                                        final isAccountValid =
+                                            _accountNumberFieldKey.currentState!
+                                                .validate();
+                                        final isConfirmAccountValid =
+                                            _confirmAccountNumberFieldKey
+                                                .currentState!
+                                                .validate();
+                                        final isIfscValid = _ifscFieldKey
+                                            .currentState!
+                                            .validate();
+
+                                        if (isAccountValid &&
+                                            isConfirmAccountValid &&
+                                            isIfscValid) {
                                           _validateBeneficiary();
-                                        } else {
-                                          setState(() {
-                                            _validationError =
-                                                'Please enter a valid and matching account number.';
-                                          });
                                         }
                                       },
                                 child: _isValidating

lib/features/beneficiaries/screens/beneficiary_details_screen.dart

@@ -65,7 +65,6 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
             TextButton(
               child: const Text('Delete'),
               onPressed: () {
-                //Navigator.of(context).pop();
                 _deleteBeneficiary(context);
               },
             ),

lib/features/beneficiaries/screens/beneficiary_result_page.dart

@@ -90,7 +90,10 @@ class _BeneficiaryResultPageState extends State<BeneficiaryResultPage> {
                 ),
                 child: Text(
                   AppLocalizations.of(context).done,
-                  style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer), // slightly bigger text
+                  style: TextStyle(
+                      color: Theme.of(context)
+                          .colorScheme
+                          .onPrimaryContainer), // slightly bigger text
                 ),
               ),
             ),

lib/features/card/screens/card_management_screen.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: unused_import
+
 import 'package:flutter/material.dart';
 import 'package:kmobile/features/card/screens/block_card_screen.dart';
 import 'package:kmobile/features/card/screens/card_details_screen.dart';
@@ -29,6 +31,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
             icon: Symbols.add,
             label: AppLocalizations.of(context).applyDebitCard,
             onTap: () {},
+            disabled: true, // Add this
           ),
           const Divider(height: 1),
           CardManagementTile(
@@ -42,6 +45,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 ),
               );
             },
+            disabled: true,
           ),
           const Divider(height: 1),
           CardManagementTile(
@@ -55,6 +59,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 ),
               );
             },
+            disabled: true,
           ),
           const Divider(height: 1),
           CardManagementTile(
@@ -68,6 +73,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 ),
               );
             },
+            disabled: true,
           ),
           const Divider(height: 1),
         ],
@@ -80,21 +86,36 @@ class CardManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
   final VoidCallback onTap;
+  final bool disabled;
 
   const CardManagementTile({
     super.key,
     required this.icon,
     required this.label,
     required this.onTap,
+    this.disabled = false,
   });
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     return ListTile(
-      leading: Icon(icon),
-      title: Text(label),
-      trailing: const Icon(Symbols.arrow_right, size: 20),
-      onTap: onTap,
+      leading: Icon(
+        icon,
+        color: disabled ? theme.disabledColor : null,
+      ),
+      title: Text(
+        label,
+        style: TextStyle(
+          color: disabled ? theme.disabledColor : null,
+        ),
+      ),
+      trailing: Icon(
+        Symbols.arrow_right,
+        size: 20,
+        color: disabled ? theme.disabledColor : null,
+      ),
+      onTap: disabled ? null : onTap,
     );
   }
 }

lib/features/customer_info/screens/customer_info_screen.dart

@@ -13,6 +13,15 @@ class CustomerInfoScreen extends StatefulWidget {
 
 class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
   late final User user = widget.user;
+
+  String _maskPrimaryId(String? primaryId) {
+    if (primaryId == null || primaryId.length <= 4) {
+      return primaryId ?? 'N/A';
+    }
+    final lastFour = primaryId.substring(primaryId.length - 4);
+    return '*' * (primaryId.length - 4) + lastFour;
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -85,7 +94,7 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                   ), // Replace with Aadhar if available
                   InfoField(
                     label: AppLocalizations.of(context).primaryId,
-                    value: user.primaryId ?? 'N/A',
+                    value: _maskPrimaryId(user.primaryId),
                   ), // Replace with PAN if available
                 ],
               ),

lib/features/dashboard/screens/dashboard_screen.dart

@@ -30,7 +30,8 @@ class DashboardScreen extends StatefulWidget {
   State<DashboardScreen> createState() => _DashboardScreenState();
 }
 
-class _DashboardScreenState extends State<DashboardScreen> {
+class _DashboardScreenState extends State<DashboardScreen>
+    with SingleTickerProviderStateMixin {
   int selectedAccountIndex = 0;
   bool isVisible = false;
   bool isRefreshing = false;
@@ -137,6 +138,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
     // Convert to title case
     switch (accountType.toLowerCase()) {
       case 'sa':
+        return AppLocalizations.of(context).savingsAccount;        
+      case 'sb':
         return AppLocalizations.of(context).savingsAccount;
       case 'ln':
         return AppLocalizations.of(context).loanAccount;
@@ -144,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;
     }
@@ -209,41 +214,51 @@ class _DashboardScreenState extends State<DashboardScreen> {
         backgroundColor: theme.scaffoldBackgroundColor,
         appBar: AppBar(
           backgroundColor: theme.scaffoldBackgroundColor,
-          automaticallyImplyLeading: false,
+          leading: Padding(
+            padding: const EdgeInsets.only(left: 10.0),
+            child: InkWell(
+              borderRadius: BorderRadius.circular(20),
+              onTap: () {
+                final authState = context.read<AuthCubit>().state;
+                String mobileNumberToPass = '';
+
+                if (authState is Authenticated) {
+                  if (selectedAccountIndex >= 0 &&
+                      selectedAccountIndex < authState.users.length) {
+                    mobileNumberToPass =
+                        authState.users[selectedAccountIndex].mobileNo ?? '';
+                  }
+                }
+
+                Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) =>
+                        ProfileScreen(mobileNumber: mobileNumberToPass),
+                  ),
+                );
+              },
+              child: CircleAvatar(
+                backgroundColor: Colors.grey[200],
+                radius: 20,
+                child: SvgPicture.asset(
+                  'assets/images/avatar_male.svg',
+                  width: 40,
+                  height: 40,
+                  fit: BoxFit.cover,
+                ),
+              ),
+            ),
+          ),
           title: Text(
-            AppLocalizations.of(context).kconnect,
+            AppLocalizations.of(context).kccbMobile,
+            textAlign: TextAlign.left,
             style: TextStyle(
               color: theme.colorScheme.primary,
               fontWeight: FontWeight.w700,
             ),
           ),
           centerTitle: true,
-          actions: [
-            Padding(
-              padding: const EdgeInsets.only(right: 10.0),
-              child: InkWell(
-                borderRadius: BorderRadius.circular(20),
-                onTap: () {
-                  Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                      builder: (context) => const ProfileScreen(),
-                    ),
-                  );
-                },
-                child: CircleAvatar(
-                  backgroundColor: Colors.grey[200],
-                  radius: 20,
-                  child: SvgPicture.asset(
-                    'assets/images/avatar_male.svg',
-                    width: 40,
-                    height: 40,
-                    fit: BoxFit.cover,
-                  ),
-                ),
-              ),
-            ),
-          ],
         ),
         body: BlocBuilder<AuthCubit, AuthState>(
           builder: (context, state) {
@@ -253,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;
@@ -289,7 +306,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                           vertical: 10,
                         ),
                         decoration: BoxDecoration(
-                          color: theme.colorScheme.primary,
+                          color: Color(0xFF01A04C),
                           borderRadius: BorderRadius.circular(16),
                         ),
                         child: Column(
@@ -467,33 +484,36 @@ class _DashboardScreenState extends State<DashboardScreen> {
                               );
                             },
                           ),
-                          _buildQuickLink(
-                            Symbols.currency_rupee,
-                            AppLocalizations.of(context).quickPay,
-                            () {
-                              Navigator.push(
-                                context,
-                                MaterialPageRoute(
-                                  builder: (context) => QuickPayScreen(
-                                    debitAccount: currAccount.accountNo!,
-                                  ),
-                                ),
-                              );
-                            },
-                          ),
+                             _buildQuickLink(
+     Symbols.currency_rupee,
+     AppLocalizations.of(context).quickPay,
+     () {
+       Navigator.push(
+         context,
+         MaterialPageRoute(
+           builder: (context) => QuickPayScreen(
+             debitAccount: currAccount.accountNo!,
+           ),
+         ),
+       );
+     },
+     disable: isPaymentDisabled,
+   ),
                           _buildQuickLink(Symbols.send_money,
-                              AppLocalizations.of(context).fundTransfer, () {
-                            Navigator.push(
-                                context,
-                                MaterialPageRoute(
-                                    builder: (context) => FundTransferScreen(
-                                        creditAccountNo:
-                                            users[selectedAccountIndex]
-                                                .accountNo!,
-                                        remitterName:
-                                            users[selectedAccountIndex]
-                                                .name!)));
-                          }, disable: false),
+     AppLocalizations.of(context).fundTransfer, () {
+   Navigator.push(
+       context,
+       MaterialPageRoute(
+           builder: (context) => FundTransferScreen(
+               creditAccountNo:
+                   users[selectedAccountIndex]
+                       .accountNo!,
+               remitterName:
+                   users[selectedAccountIndex]
+                       .name!,
+               // Pass the full list of accounts
+               accounts: users)));
+ }, disable: isPaymentDisabled),
                           _buildQuickLink(
                             Symbols.server_person,
                             AppLocalizations.of(context).accountInfo,
@@ -521,6 +541,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                               .accountNo!,
                                           balance: users[selectedAccountIndex]
                                               .availableBalance!,
+                                          accountType:
+                                              users[selectedAccountIndex]
+                                                  .accountType!,
                                         )));
                           }),
                           _buildQuickLink(Symbols.checkbook,
@@ -573,7 +596,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                             ),
                             subtitle: Text(
                               tx.name != null
-                                  ? (tx.name!.length > 18
+                                  ? (tx.name!.length > 22
                                       ? tx.name!.substring(0, 22)
                                       : tx.name!)
                                   : '',

lib/features/dashboard/widgets/account_card.dart

@@ -72,4 +72,3 @@ class AccountCard extends StatelessWidget {
     );
   }
 }
-

lib/features/enquiry/screens/enquiry_screen.dart

@@ -30,6 +30,16 @@ class _EnquiryScreen extends State<EnquiryScreen> {
     }
   }
 
+  Future<void> _launchUrl(String url) async {
+    final Uri uri = Uri.parse(url);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      // Consider adding a 'urlLaunchError' key to your AppLocalizations
+      debugPrint('Could not launch $url');
+    }
+  }
+
   Widget _buildContactItem(String role, String email, String phone) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -65,18 +75,26 @@ class _EnquiryScreen extends State<EnquiryScreen> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            // … existing Mail us / Call us / Write to us …
-            const SizedBox(height: 20),
-            Text(
-              AppLocalizations.of(context).writeToUs,
-            ),
-            const SizedBox(height: 4),
-            Text(
-              "complaint@kccb.in",
-              style: TextStyle(color: Theme.of(context).colorScheme.primary),
-            ),
-
             const SizedBox(height: 20),
+            GestureDetector(
+                onTap: () => _launchUrl("https://kccb.in/complaint-form"),
+                child: Row(mainAxisSize: MainAxisSize.min, children: [
+                  Text(
+                    "Complaint Form",
+                    style: TextStyle(
+                      fontSize: 17,
+                      color: Theme.of(context).colorScheme.primary,
+                      decorationColor: Theme.of(context).colorScheme.primary,
+                    ),
+                  ),
+                  const SizedBox(width: 4),
+                  Icon(
+                    Icons.open_in_new,
+                    color: Theme.of(context).colorScheme.primary,
+                    size: 16.0,
+                  ),
+                ])),
+            const SizedBox(height: 40),
             Text(
               AppLocalizations.of(context).keyContacts,
               style: TextStyle(

lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart

@@ -2,6 +2,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:kmobile/api/services/limit_service.dart';
 import 'package:kmobile/api/services/neft_service.dart';
 import 'package:kmobile/api/services/rtgs_service.dart';
 import 'package:kmobile/api/services/imps_service.dart';
@@ -40,13 +42,69 @@ class FundTransferAmountScreen extends StatefulWidget {
 }
 
 class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
+  final _limitService = getIt<LimitService>();
+Limit? _limit;
+bool _isLoadingLimit = true;
+bool _isAmountOverLimit = false;
+final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
   final _amountController = TextEditingController();
+  final _remarksController = TextEditingController();
   final _formKey = GlobalKey<FormState>();
   TransactionMode _selectedMode = TransactionMode.neft;
 
+@override
+void initState() {
+  super.initState();
+  _loadLimit(); // Call the new method
+  _amountController.addListener(_checkAmountLimit);
+}
+   Future<void> _loadLimit() async {
+   setState(() {
+     _isLoadingLimit = true;
+   });
+   try {
+     final limitData = await _limitService.getLimit();
+     setState(() {
+       _limit = limitData;
+       _isLoadingLimit = false;
+     });
+   } catch (e) {
+     // Handle error if needed
+     setState(() {
+       _isLoadingLimit = false;
+     });
+   }
+ }
+
+ // Add this method to check the amount against the limit
+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) {
+    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;
+    });
+  }
+}
+
   @override
   void dispose() {
+    _amountController.removeListener(_checkAmountLimit);
     _amountController.dispose();
+    _remarksController.dispose();
     super.dispose();
   }
 
@@ -113,6 +171,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final neftService = getIt<NeftService>();
                   final completer = Completer<PaymentResponse>();
@@ -180,6 +239,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final impsService = getIt<ImpsService>();
                   final completer = Completer<PaymentResponse>();
@@ -236,6 +296,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final rtgsService = getIt<RtgsService>();
                   final completer = Completer<PaymentResponse>();
@@ -396,6 +457,15 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   ),
                   const SizedBox(height: 24),
                 ],
+                //Remarks
+                TextFormField(
+                  controller: _remarksController,
+                  decoration: InputDecoration(
+                    labelText: AppLocalizations.of(context).remarks,
+                    border: const OutlineInputBorder(),
+                  ),
+                ),
+                const SizedBox(height: 24),
                 // Amount
                 TextFormField(
                   controller: _amountController,
@@ -416,19 +486,27 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     return null;
                   },
                 ),
+                 const SizedBox(height: 8),
+ 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: _onProceed,
-                    style: ElevatedButton.styleFrom(
-                      padding: const EdgeInsets.symmetric(vertical: 16),
-                    ),
-                    child: Text(AppLocalizations.of(context).proceed),
-                  ),
-                ),
+  width: double.infinity,
+  child: ElevatedButton(
+    onPressed: _isAmountOverLimit ? null : _onProceed, 
+    style: ElevatedButton.styleFrom(
+      padding: const EdgeInsets.symmetric(vertical: 16),
+    ),
+    child: Text(AppLocalizations.of(context).proceed),
+  ),
+),
                 const SizedBox(height: 10),
               ],
             ),

lib/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart

@@ -39,9 +39,8 @@ class _FundTransferBeneficiaryScreenState
     setState(() {
       _beneficiaries = data
           .where((b) => widget.isOwnBank
-              ? b.bankName ==
-                  'THE KANGRA CENTRAL CO-OP BANK LIMITED' // Assuming 'KCCB' is your bank's name
-              : b.bankName != 'THE KANGRA CENTRAL CO-OP BANK LIMITED')
+              ? b.bankName!.toLowerCase().contains('kangra central')
+              : !b.bankName!.toLowerCase().contains('kangra central'))
           .toList();
       _isLoading = false;
     });

lib/features/fund_transfer/screens/fund_transfer_screen.dart

@@ -1,90 +1,126 @@
-import 'package:flutter/material.dart';
-import 'package:kmobile/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart';
-import 'package:material_symbols_icons/symbols.dart';
-import '../../../l10n/app_localizations.dart';
+ 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'; // Keep localizations
 
-class FundTransferScreen extends StatelessWidget {
-  final String creditAccountNo;
-  final String remitterName;
+ 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,
-  });
+   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(
-        title: Text(AppLocalizations.of(context)
-            .fundTransfer
-            .replaceFirst(RegExp('\n'), '')),
-      ),
-      body: ListView(
-        children: [
-          FundTransferManagementTile(
-            icon: Symbols.input_circle,
-            label: AppLocalizations.of(context).ownBank,
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => FundTransferBeneficiaryScreen(
-                    creditAccountNo: creditAccountNo,
-                    remitterName: remitterName,
-                    isOwnBank: true,
-                  ),
-                ),
-              );
-            },
-          ),
-          const Divider(height: 1),
-          FundTransferManagementTile(
-            icon: Symbols.output_circle,
-            label: AppLocalizations.of(context).outsideBank,
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => FundTransferBeneficiaryScreen(
-                    creditAccountNo: creditAccountNo,
-                    remitterName: remitterName,
-                    isOwnBank: false,
-                  ),
-                ),
-              );
-            },
-          ),
-          const Divider(height: 1),
-        ],
-      ),
-    );
-  }
-}
+   @override
+   Widget build(BuildContext context) {
+     return Scaffold(
+       appBar: AppBar(
+         // Restore localization for the title
+         title: Text(AppLocalizations.of(context)
+             .fundTransfer
+             .replaceFirst(RegExp('\n'), '')),
+       ),
+       // 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(
+                     context,
+                     MaterialPageRoute(
+                       builder: (context) => FundTransferBeneficiaryScreen(
+                         creditAccountNo: creditAccountNo,
+                         remitterName: remitterName,
+                         isOwnBank: true,
+                       ),
+                     ),
+                   );
+                 },
+               ),
+               const Divider(height: 1),
+               FundTransferManagementTile(
+                 icon: Symbols.output_circle,
+                 // Restore localization for the label
+                 label: AppLocalizations.of(context).outsideBank,
+                 onTap: () {
+                   Navigator.push(
+                     context,
+                     MaterialPageRoute(
+                       builder: (context) => FundTransferBeneficiaryScreen(
+                         creditAccountNo: creditAccountNo,
+                         remitterName: remitterName,
+                         isOwnBank: false,
+                       ),
+                     ),
+                   );
+                 },
+               ),
+               const Divider(height: 1),
+             ],
+           );
+         },
+       ),
+     );
+   }
+ }
 
-class FundTransferManagementTile extends StatelessWidget {
-  final IconData icon;
-  final String label;
-  final VoidCallback onTap;
-  final bool disable;
+ class FundTransferManagementTile extends StatelessWidget {
+   final IconData icon;
+   final String label;
+   final VoidCallback onTap;
+   final bool disable;
 
-  const FundTransferManagementTile({
-    super.key,
-    required this.icon,
-    required this.label,
-    required this.onTap,
-    this.disable = false,
-  });
+   const FundTransferManagementTile({
+     super.key,
+     required this.icon,
+     required this.label,
+     required this.onTap,
+     this.disable = false,
+   });
 
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      leading: Icon(icon),
-      title: Text(label),
-      trailing: const Icon(Symbols.arrow_right, size: 20),
-      onTap: onTap,
-      enabled: !disable,
-    );
-  }
-}
+   @override
+   Widget build(BuildContext context) {
+     return ListTile(
+       leading: Icon(icon),
+       title: Text(label),
+       trailing: const Icon(Symbols.arrow_right, size: 20),
+       onTap: onTap,
+       enabled: !disable,
+     );
+   }
+ }

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/fund_transfer/screens/payment_animation.dart

@@ -209,26 +209,22 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
                       onPressed: _shareScreenshot,
                       icon: Icon(
                         Icons.share_rounded,
-                        color: Theme.of(context).primaryColor,
+                        color: Theme.of(context).colorScheme.primary,
                       ),
                       label: Text(
                         AppLocalizations.of(context).share,
-                        style: TextStyle(color: Theme.of(context).primaryColor),
+                        style: TextStyle(
+                            color: Theme.of(context).colorScheme.primary),
                       ),
                       style: ElevatedButton.styleFrom(
-                        backgroundColor:
-                            Theme.of(context).scaffoldBackgroundColor,
                         padding: const EdgeInsets.symmetric(
-                            horizontal: 32, vertical: 12),
+                            horizontal: 45, vertical: 12),
                         shape: RoundedRectangleBorder(
-                          side: BorderSide(
-                              color: Theme.of(context).primaryColor, width: 1),
                           borderRadius: BorderRadius.circular(30),
                         ),
                         textStyle: const TextStyle(
                           fontSize: 18,
                           fontWeight: FontWeight.w600,
-                          color: Colors.black,
                         ),
                       ),
                     ),

lib/features/fund_transfer/screens/tpin_otp_screen.dart

@@ -1,20 +1,26 @@
 import '../../../l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:kmobile/features/fund_transfer/screens/tpin_set_screen.dart';
+import 'package:kmobile/api/services/change_password_service.dart';
+import 'package:kmobile/di/injection.dart';
 
 class TpinOtpScreen extends StatefulWidget {
-  const TpinOtpScreen({super.key});
+  final String mobileNumber;
+  const TpinOtpScreen({super.key, required this.mobileNumber});
 
   @override
   State<TpinOtpScreen> createState() => _TpinOtpScreenState();
 }
 
 class _TpinOtpScreenState extends State<TpinOtpScreen> {
-  final List<FocusNode> _focusNodes = List.generate(4, (_) => FocusNode());
+  final List<FocusNode> _focusNodes = List.generate(6, (_) => FocusNode());
   final List<TextEditingController> _controllers = List.generate(
-    4,
+    6,
     (_) => TextEditingController(),
   );
+  bool _isLoading = false;
+  final ChangePasswordService _changePasswordService =
+      getIt<ChangePasswordService>();
 
   @override
   void dispose() {
@@ -28,7 +34,7 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
   }
 
   void _onOtpChanged(int idx, String value) {
-    if (value.length == 1 && idx < 3) {
+    if (value.length == 1 && idx < 5) {
       _focusNodes[idx + 1].requestFocus();
     }
     if (value.isEmpty && idx > 0) {
@@ -39,16 +45,35 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
 
   String get _enteredOtp => _controllers.map((c) => c.text).join();
 
-  void _verifyOtp() {
-    if (_enteredOtp == '0000') {
-      Navigator.pushReplacement(
-        context,
-        MaterialPageRoute(builder: (_) => TpinSetScreen()),
-      );
-    } else {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
+  void _verifyOtp() async {
+    setState(() {
+      _isLoading = true;
+    });
+
+    try {
+      await _changePasswordService.validateOtp(
+        otp: _enteredOtp,
+        mobileNumber: widget.mobileNumber,
       );
+
+      if (mounted) {
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(builder: (_) => const TpinSetScreen()),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
     }
   }
 
@@ -64,7 +89,6 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
       body: Center(
         child: SingleChildScrollView(
           child: Column(
-            // mainAxisSize: MainAxisSize.min,
             children: [
               Icon(
                 Icons.lock_outline,
@@ -90,9 +114,9 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
               const SizedBox(height: 32),
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: List.generate(4, (i) {
+                children: List.generate(6, (i) {
                   return Container(
-                    width: 48,
+                    width: 32,
                     margin: const EdgeInsets.symmetric(horizontal: 8),
                     child: TextField(
                       controller: _controllers[i],
@@ -101,7 +125,7 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
                       textAlign: TextAlign.center,
                       maxLength: 1,
                       obscureText: true,
-                      obscuringCharacter: '⬤',
+                      obscuringCharacter: '*',
                       decoration: InputDecoration(
                         counterText: '',
                         filled: true,
@@ -128,14 +152,23 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
               ),
               const SizedBox(height: 32),
               ElevatedButton.icon(
-                icon: const Icon(Icons.verified_user_rounded),
+                icon: _isLoading
+                    ? const SizedBox(
+                        width: 20,
+                        height: 20,
+                        child: CircularProgressIndicator(
+                          color: Colors.white,
+                          strokeWidth: 2,
+                        ),
+                      )
+                    : const Icon(Icons.verified_user_rounded),
                 label: Text(
                   AppLocalizations.of(context).verifyOtp,
                   style: const TextStyle(
                       fontSize: 18, fontWeight: FontWeight.w600),
                 ),
                 style: ElevatedButton.styleFrom(
-                  backgroundColor: theme.colorScheme.primary,
+                  backgroundColor: theme.colorScheme.onPrimary,
                   padding: const EdgeInsets.symmetric(
                     vertical: 14,
                     horizontal: 28,
@@ -144,12 +177,15 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
                     borderRadius: BorderRadius.circular(30),
                   ),
                 ),
-                onPressed: _enteredOtp.length == 4 ? _verifyOtp : null,
+                // Update onPressed to handle loading state
+                onPressed: (_enteredOtp.length == 6 && !_isLoading)
+                    ? _verifyOtp
+                    : null,
               ),
               const SizedBox(height: 16),
               TextButton(
                 onPressed: () {
-                  // Resend OTP logic here
+                  // You can also add a getOtp call here for resending
                   ScaffoldMessenger.of(context).showSnackBar(
                     SnackBar(
                       content: Text(AppLocalizations.of(context).otpResent),

lib/features/fund_transfer/screens/tpin_prompt_screen.dart

@@ -1,10 +1,65 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:kmobile/features/auth/controllers/auth_cubit.dart';
+import 'package:kmobile/features/auth/controllers/auth_state.dart';
+
 import '../../../l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:kmobile/features/fund_transfer/screens/tpin_otp_screen.dart';
+import 'package:kmobile/api/services/change_password_service.dart'; // <-- Add this import
+import 'package:kmobile/di/injection.dart'; // <-- Add this import
 
-class TpinSetupPromptScreen extends StatelessWidget {
+class TpinSetupPromptScreen extends StatefulWidget {
   const TpinSetupPromptScreen({super.key});
 
+  @override
+  State<TpinSetupPromptScreen> createState() => _TpinSetupPromptScreenState();
+}
+
+class _TpinSetupPromptScreenState extends State<TpinSetupPromptScreen> {
+  int selectedAccountIndex = 0;
+  bool _isLoading = false;
+  final ChangePasswordService _changePasswordService =
+      getIt<ChangePasswordService>();
+  Future<void> _getOtp() async {
+    setState(() {
+      _isLoading = true;
+    });
+
+    try {
+      final authState = context.read<AuthCubit>().state;
+      String mobileNumberToPass = '';
+      if (authState is Authenticated) {
+        if (selectedAccountIndex >= 0 &&
+            selectedAccountIndex < authState.users.length) {
+          mobileNumberToPass =
+              authState.users[selectedAccountIndex].mobileNo ?? '';
+        }
+      }
+      await _changePasswordService.getOtpTpin(mobileNumber: mobileNumberToPass);
+      if (mounted) {
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(
+              builder: (_) => TpinOtpScreen(
+                    mobileNumber: mobileNumberToPass,
+                  )),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Error: ${e.toString()}')),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -38,14 +93,23 @@ class TpinSetupPromptScreen extends StatelessWidget {
             ),
             const SizedBox(height: 32),
             ElevatedButton.icon(
-              icon: const Icon(Icons.arrow_forward_rounded),
+              icon: _isLoading
+                  ? const SizedBox(
+                      width: 20,
+                      height: 20,
+                      child: CircularProgressIndicator(
+                        color: Colors.white,
+                        strokeWidth: 2,
+                      ),
+                    )
+                  : const Icon(Icons.arrow_forward_rounded),
               label: Text(
                 AppLocalizations.of(context).setTpin,
                 style:
                     const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
               ),
               style: ElevatedButton.styleFrom(
-                backgroundColor: theme.colorScheme.primary,
+                backgroundColor: theme.colorScheme.onPrimary,
                 padding: const EdgeInsets.symmetric(
                   vertical: 14,
                   horizontal: 32,
@@ -54,12 +118,8 @@ class TpinSetupPromptScreen extends StatelessWidget {
                   borderRadius: BorderRadius.circular(10),
                 ),
               ),
-              onPressed: () {
-                Navigator.pushReplacement(
-                  context,
-                  MaterialPageRoute(builder: (_) => const TpinOtpScreen()),
-                );
-              },
+              onPressed:
+                  _isLoading ? null : _getOtp, // <-- Use the new function
             ),
             const SizedBox(height: 18),
             Padding(

lib/features/fund_transfer/screens/transaction_pin_screen.dart

@@ -212,4 +212,3 @@ class _TransactionPinScreenState extends State<TransactionPinScreen>
     );
   }
 }
-

lib/features/fund_transfer/screens/transaction_success_screen.dart

@@ -67,13 +67,23 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
                   const SizedBox(height: 6),
                   Text(
                     "On $transactionDate",
-                    style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6)),
+                    style: TextStyle(
+                        fontSize: 14,
+                        color: Theme.of(context)
+                            .colorScheme
+                            .onSurface
+                            .withOpacity(0.6)),
                     textAlign: TextAlign.center,
                   ),
                   const SizedBox(height: 16),
                   Text(
                     "${AppLocalizations.of(context).toAccountNumber}: $creditAccount",
-                     style: TextStyle(fontSize: 12, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8)),
+                    style: TextStyle(
+                        fontSize: 12,
+                        color: Theme.of(context)
+                            .colorScheme
+                            .onSurface
+                            .withOpacity(0.8)),
                     textAlign: TextAlign.center,
                   ),
                 ],
@@ -91,8 +101,12 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
                       child: OutlinedButton.icon(
                         onPressed: _shareScreenshot,
                         icon: const Icon(Icons.share, size: 18),
-                        label: Text(AppLocalizations.of(context).share,
-                        style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
+                        label: Text(
+                          AppLocalizations.of(context).share,
+                          style: TextStyle(
+                              color: Theme.of(context)
+                                  .colorScheme
+                                  .onPrimaryContainer),
                         ),
                         style: ElevatedButton.styleFrom(
                           shape: const StadiumBorder(),

lib/features/profile/change_password/change_password_otp_screen.dart

@@ -0,0 +1,110 @@
+import 'package:flutter/material.dart';
+
+import '../../../api/services/change_password_service.dart';
+import '../../../di/injection.dart';
+import '../../../l10n/app_localizations.dart';
+
+class ChangePasswordOTPScreen extends StatefulWidget {
+  final String currentPassword;
+  final String newPassword;
+  final String confirmPassword;
+  final String mobileNumber;
+
+  // ignore: use_key_in_widget_constructors
+  const ChangePasswordOTPScreen({
+    required this.currentPassword,
+    required this.newPassword,
+    required this.confirmPassword,
+    required this.mobileNumber,
+  });
+
+  @override
+  State<ChangePasswordOTPScreen> createState() =>
+      _ChangePasswordOTPScreenState();
+}
+
+class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
+  bool _isLoading = true;
+  final TextEditingController otpController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    // Simulate OTP sending delay
+    Future.delayed(const Duration(seconds: 2), () {
+      setState(() {
+        _isLoading = false;
+      });
+    });
+  }
+
+  final changePasswordService = getIt<ChangePasswordService>();
+  Future<void> _validateOTP() async {
+    try {
+      await changePasswordService.validateOtp(
+        otp: otpController.text,
+        mobileNumber: widget.mobileNumber,
+      );
+
+      // If OTP is valid, then change the password
+      await changePasswordService.validateChangePwd(
+        OldLPsw: widget.currentPassword,
+        newLPsw: widget.newPassword,
+        confirmLPsw: widget.confirmPassword,
+      );
+
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(AppLocalizations.of(context).pwdchangeSuccess)),
+      );
+
+      // Navigate back to profile or login
+      Navigator.of(context).popUntil((route) => route.isFirst);
+    } catch (e) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text(AppLocalizations.of(context).otpVerification)),
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: _isLoading
+            ? const Center(child: CircularProgressIndicator())
+            : Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Text(
+                    AppLocalizations.of(context).otpSent,
+                    textAlign: TextAlign.center,
+                    style: const TextStyle(fontSize: 16),
+                  ),
+                  const SizedBox(height: 24),
+                  TextFormField(
+                    controller: otpController,
+                    keyboardType: TextInputType.number,
+                    decoration: InputDecoration(
+                      labelText: AppLocalizations.of(context).enterOTP,
+                      border: const OutlineInputBorder(),
+                    ),
+                  ),
+                  const SizedBox(height: 24),
+                  SizedBox(
+                    width: double.infinity,
+                    child: ElevatedButton(
+                      onPressed: _validateOTP,
+                      style: ElevatedButton.styleFrom(
+                        padding: const EdgeInsets.symmetric(vertical: 16),
+                      ),
+                      child: Text(AppLocalizations.of(context).validateOTP),
+                    ),
+                  ),
+                ],
+              ),
+      ),
+    );
+  }
+}

lib/features/profile/change_password/change_password_screen.dart

@@ -0,0 +1,157 @@
+// ignore_for_file: use_key_in_widget_constructors
+
+import 'package:flutter/material.dart';
+import '../../../api/services/change_password_service.dart';
+import '../../../di/injection.dart';
+import '../../../l10n/app_localizations.dart';
+import 'change_password_otp_screen.dart';
+
+class ChangePasswordScreen extends StatefulWidget {
+  final String mobileNumber;
+  const ChangePasswordScreen({super.key, required this.mobileNumber});
+
+  @override
+  State<ChangePasswordScreen> createState() => _ChangePasswordScreenState();
+}
+
+class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
+  final _formKey = GlobalKey<FormState>();
+  final currentPasswordController = TextEditingController();
+  final newPasswordController = TextEditingController();
+  final confirmPasswordController = TextEditingController();
+
+  bool _showCurrentPassword = false;
+  bool _showNewPassword = false;
+  bool _showConfirmPassword = false;
+
+  final passwordRegex =
+      RegExp(r'^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).{8,}$');
+
+  String? validateCurrentPassword(String? value) {
+    if (value == null || value.isEmpty) {
+      return AppLocalizations.of(context).currentpwdrqd;
+    }
+    return null;
+  }
+
+  String? validateNewPassword(String? value) {
+    if (value == null || value.isEmpty) {
+      return AppLocalizations.of(context).newpwdrqd;
+    }
+    if (!passwordRegex.hasMatch(value)) {
+      return AppLocalizations.of(context).pwdFormat;
+    }
+    if (value == currentPasswordController.text) {
+      return AppLocalizations.of(context).newoldpwddiff;
+    }
+    return null;
+  }
+
+  String? validateConfirmPassword(String? value) {
+    if (value == null || value.isEmpty) {
+      return AppLocalizations.of(context).confirmpwdrqd;
+    }
+    if (value != newPasswordController.text) {
+      return AppLocalizations.of(context).pwdmismatch;
+    }
+    return null;
+  }
+
+  final ChangePasswordService _changePasswordService =
+      getIt<ChangePasswordService>();
+  void _proceed() async {
+    if (_formKey.currentState!.validate()) {
+      try {
+        await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
+
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => ChangePasswordOTPScreen(
+              currentPassword: currentPasswordController.text,
+              newPassword: newPasswordController.text,
+              confirmPassword: confirmPasswordController.text,
+              mobileNumber: widget.mobileNumber,
+            ),
+          ),
+        );
+      } catch (e) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+              content:
+                  Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
+        );
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar:
+          AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
+      body: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Form(
+          key: _formKey,
+          child: Column(
+            children: [
+              TextFormField(
+                controller: currentPasswordController,
+                obscureText: !_showCurrentPassword,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).currentpwd,
+                  suffixIcon: IconButton(
+                    icon: Icon(_showCurrentPassword
+                        ? Icons.visibility
+                        : Icons.visibility_off),
+                    onPressed: () => setState(
+                        () => _showCurrentPassword = !_showCurrentPassword),
+                  ),
+                ),
+                validator: validateCurrentPassword,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: newPasswordController,
+                obscureText: !_showNewPassword,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).newpwd,
+                  suffixIcon: IconButton(
+                    icon: Icon(_showNewPassword
+                        ? Icons.visibility
+                        : Icons.visibility_off),
+                    onPressed: () =>
+                        setState(() => _showNewPassword = !_showNewPassword),
+                  ),
+                ),
+                validator: validateNewPassword,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: confirmPasswordController,
+                obscureText: !_showConfirmPassword,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).confirmpwd,
+                  suffixIcon: IconButton(
+                    icon: Icon(_showConfirmPassword
+                        ? Icons.visibility
+                        : Icons.visibility_off),
+                    onPressed: () => setState(
+                        () => _showConfirmPassword = !_showConfirmPassword),
+                  ),
+                ),
+                validator: validateConfirmPassword,
+              ),
+              const SizedBox(height: 24),
+              ElevatedButton(
+                onPressed: _proceed,
+                child: Text(AppLocalizations.of(context).proceed),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/profile/daily_transaction_limit.dart

@@ -0,0 +1,228 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:kmobile/api/services/limit_service.dart';
+import 'package:kmobile/di/injection.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
+import 'package:intl/intl.dart';
+
+class DailyLimitScreen extends StatefulWidget {
+  const DailyLimitScreen({super.key});
+  @override
+  State<DailyLimitScreen> createState() => _DailyLimitScreenState();
+}
+
+class _DailyLimitScreenState extends State<DailyLimitScreen> {
+  double? _currentLimit;
+  double? _spentAmount = 0.0;
+  final _limitController = TextEditingController();
+  var service = getIt<LimitService>();
+ Limit? limit;
+ bool _isLoading = true;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadlimits();
+  }
+  
+  Future<void> _loadlimits() async {
+     setState(() {
+   _isLoading = true;
+ });
+    final limit_data = await service.getLimit();
+    setState(() {
+   limit = limit_data;
+   _isLoading = false;
+ });
+  }
+
+  @override
+  void dispose() {
+    _limitController.dispose();
+    super.dispose();
+  }
+
+Future<void> _showAddOrEditLimitDialog() async {
+  _limitController.text = _currentLimit?.toStringAsFixed(0) ?? '';
+  final newLimit = await showDialog<double>(
+    context: context,
+    builder: (dialogContext) {
+      final localizations = AppLocalizations.of(dialogContext);
+      final theme = Theme.of(dialogContext);
+      return AlertDialog(
+        title: Text(
+          _currentLimit == null
+              ? localizations.addLimit
+              : localizations.editLimit,
+        ),
+        content: TextField(
+          controller: _limitController,
+          autofocus: true,
+          keyboardType: TextInputType.number,
+          inputFormatters: [
+            FilteringTextInputFormatter.allow(RegExp(r'^\d+')),
+          ],
+          decoration: InputDecoration(
+            labelText: localizations.limitAmount,
+            prefixText: '₹',
+            border: const OutlineInputBorder(),
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(dialogContext).pop(),
+            child: Text(localizations.cancel),
+          ),
+          ElevatedButton(
+            onPressed: () {
+              final value = double.tryParse(_limitController.text);
+              if (value == null || value <= 0) return;
+
+              if (value > 200000) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: const Text("Limit To be Set must be less than 200000"),
+                    behavior: SnackBarBehavior.floating,
+                    backgroundColor: theme.colorScheme.error,
+                  ),
+                );
+              } else {
+                service.editLimit(value);
+                Navigator.of(dialogContext).pop(value);
+              }
+            },
+            child: Text(localizations.save),
+          ),
+        ],
+      );
+    },
+  );
+
+  if (newLimit != null) {
+    _loadlimits();
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      const SnackBar(
+        content: Text("Limit Updated"),
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
+  }
+}
+
+
+  void _removeLimit() {
+    setState(() {
+      _currentLimit = null;
+    });
+  }
+
+   @override
+ Widget build(BuildContext context) {
+  if (_isLoading) {
+  final localizations = AppLocalizations.of(context);
+  return Scaffold(
+    appBar: AppBar(
+      title: Text(localizations.dailylimit),
+    ),
+    body: const Center(
+      child: CircularProgressIndicator(),
+    ),
+  );
+}
+    _currentLimit = limit?.dailyLimit;
+    _spentAmount = limit?.usedLimit;
+   final localizations = AppLocalizations.of(context);
+   final theme = Theme.of(context);
+   final formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
+   final remainingLimit = _currentLimit != null ? _currentLimit! - _spentAmount! : 0.0;
+
+   return Scaffold(
+     appBar: AppBar(
+       title: Text(localizations.dailylimit),
+     ),
+     body: Center(
+       child: Padding(
+         padding: const EdgeInsets.all(16.0),
+         child: Column(
+           mainAxisAlignment: MainAxisAlignment.center,
+           crossAxisAlignment: CrossAxisAlignment.center,
+           children: [
+             Text(
+               localizations.currentDailyLimit,
+               style: theme.textTheme.headlineSmall?.copyWith(
+                 color: theme.colorScheme.onSurface.withOpacity(0.7),
+               ),
+             ),
+             const SizedBox(height: 16),
+             Text(
+               _currentLimit == null
+                   ? localizations.noLimitSet
+                   : formatCurrency.format(_currentLimit),
+               style: theme.textTheme.headlineMedium?.copyWith(
+                 fontWeight: FontWeight.bold,
+                 color: _currentLimit == null
+                     ? theme.colorScheme.secondary
+                     : theme.colorScheme.primary,
+               ),
+             ),
+             if (_currentLimit != null) ...[
+               const SizedBox(height: 24),
+               Text(
+                 "Remaining Limit Today", // This should be localized
+                 style: theme.textTheme.titleMedium,
+               ),
+               const SizedBox(height: 4),
+               Text(
+                 formatCurrency.format(remainingLimit),
+                 style: theme.textTheme.headlineSmall?.copyWith(
+                   fontWeight: FontWeight.bold,
+                   color: remainingLimit > 0
+                       ? Colors.green
+                       : theme.colorScheme.error,
+                 ),
+               ),
+             ],
+             const SizedBox(height: 48),
+             if (_currentLimit == null)
+               ElevatedButton.icon(
+                 onPressed: _showAddOrEditLimitDialog,
+                 icon: const Icon(Icons.add_circle_outline),
+                 label: Text(localizations.addLimit),
+                 style: ElevatedButton.styleFrom(
+                   padding: const EdgeInsets.symmetric(
+                       horizontal: 24, vertical: 12),
+                   textStyle: theme.textTheme.titleMedium,
+                 ),
+               )
+             else
+               Column(
+                 children: [
+                   ElevatedButton.icon(
+                     onPressed: _showAddOrEditLimitDialog,
+                     icon: const Icon(Icons.edit_outlined),
+                     label: Text(localizations.editLimit),
+                     style: ElevatedButton.styleFrom(
+                       padding: const EdgeInsets.symmetric(
+                           horizontal: 24, vertical: 12),
+                       textStyle: theme.textTheme.titleMedium,
+                     ),
+                   ),
+                   const SizedBox(height: 16),
+                  //  TextButton.icon(
+                  //    onPressed: _removeLimit,
+                  //    icon: const Icon(Icons.remove_circle_outline),
+                  //    label: Text(localizations.removeLimit),
+                  //    style: TextButton.styleFrom(
+                  //      foregroundColor: theme.colorScheme.error,
+                  //    ),
+                  //  ),
+                 ],
+               ),
+           ],
+         ),
+       ),
+     ),
+   );
+ }
+}

lib/features/profile/logout_dialog.dart

@@ -1,23 +1,25 @@
 import 'package:flutter/material.dart';
 
+import '../../l10n/app_localizations.dart';
+
 class LogoutDialog extends StatelessWidget {
   const LogoutDialog({super.key});
 
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
-      title: const Text("Logout"),
-      content: const Text("Are you sure you want to logout?"),
+      title: Text(AppLocalizations.of(context).deregister),
+      content: Text(AppLocalizations.of(context).deregistercheck),
       actions: [
         TextButton(
           onPressed: () => Navigator.pop(context, false), // dismiss
-          child: const Text("No"),
+          child: Text(AppLocalizations.of(context).no),
         ),
         TextButton(
           onPressed: () => Navigator.pop(context, true), // confirm
-          child: const Text("Yes"),
+          child: Text(AppLocalizations.of(context).yes),
         ),
       ],
     );
   }
-}
+}

lib/features/profile/preferences/preference_screen.dart

@@ -22,6 +22,12 @@ class PreferenceScreen extends StatelessWidget {
         builder: (context, state) {
           return ListView(
             children: [
+              //Set Prefered Username
+              //  ListTile(
+              //     leading: const Icon(Icons.person),
+              //     title: const Text("Set Prefered Username"),
+              //     onTap: () {
+              //     }),
               // Language Selection
               ListTile(
                 leading: const Icon(Icons.language),

lib/features/profile/preferences/theme_mode_dialog.dart

@@ -1,21 +1,34 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
+import '../../../l10n/app_localizations.dart';
+
+String _getThemeModeText(ThemeMode mode, AppLocalizations l10n) {
+  switch (mode) {
+    case ThemeMode.system:
+      return l10n.themeModeSystem;
+    case ThemeMode.light:
+      return l10n.themeModeLight;
+    case ThemeMode.dark:
+      return l10n.themeModeDark;
+  }
+}
 
 Future<void> showThemeModeDialog(BuildContext context) async {
   final cubit = context.read<ThemeModeCubit>();
   final currentMode = context.read<ThemeModeCubit>().state.mode;
+  final l10n = AppLocalizations.of(context);
 
   await showDialog(
     context: context,
     builder: (context) {
       return AlertDialog(
-        title: const Text("Select Theme Mode"),
+        title: Text(l10n.selectThemeMode),
         content: Column(
           mainAxisSize: MainAxisSize.min,
           children: ThemeMode.values.map((mode) {
             return RadioListTile<ThemeMode>(
-              title: Text(mode.toString().split('.').last.toUpperCase()),
+              title: Text(_getThemeModeText(mode, l10n)),
               value: mode,
               groupValue: currentMode,
               onChanged: (value) {

lib/features/profile/profile_screen.dart

@@ -1,16 +1,51 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:kmobile/data/repositories/auth_repository.dart';
-import 'package:kmobile/features/profile/preferences/logout_dialog.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';
 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 StatelessWidget {
-  const ProfileScreen({super.key});
-  
 
-    Future<void> _handleLogout(BuildContext context) async {
+class ProfileScreen extends StatefulWidget {
+  final String mobileNumber;
+  const ProfileScreen({super.key, required this.mobileNumber});
+
+  @override
+  State<ProfileScreen> createState() => _ProfileScreenState();
+}
+
+class _ProfileScreenState extends State<ProfileScreen> {
+  bool _isBiometricEnabled = false;
+  @override
+  void initState() {
+    super.initState();
+    _loadBiometricStatus();
+  }
+
+  Future<String> _getAppVersion() async {
+    final PackageInfo info = await PackageInfo.fromPlatform();
+    return 'Version ${info.version} (${info.buildNumber})';
+  }
+
+   Future<void> _loadBiometricStatus() async {
+   final prefs = await SharedPreferences.getInstance();
+   setState(() {
+     _isBiometricEnabled = prefs.getBool('biometric_enabled') ?? false;
+   });
+ }
+
+  Future<void> _handleLogout(BuildContext context) async {
     final auth = getIt<AuthRepository>();
     final prefs = await SharedPreferences.getInstance();
     await prefs.clear(); // clear saved session/token
@@ -19,6 +54,91 @@ class ProfileScreen extends StatelessWidget {
     Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false);
   }
 
+    Future<void> _handleBiometricToggle(bool enable) async {
+   final localAuth = LocalAuthentication();
+   final prefs = await SharedPreferences.getInstance();
+   final canCheck = await localAuth.canCheckBiometrics;
+
+   if (!canCheck) {
+     ScaffoldMessenger.of(context).showSnackBar(
+       SnackBar(
+           content: Text(AppLocalizations.of(context).biometricsNotAvailable)),
+     );
+     return;
+   }
+
+   if (enable) {
+     final optIn = await showDialog<bool>(
+       context: context,
+       barrierDismissible: false,
+       builder: (ctx) => AlertDialog(
+         title: Text(AppLocalizations.of(context).enableFingerprintLogin),
+         content: Text(AppLocalizations.of(context).enableFingerprintMessage),
+         actions: [
+           TextButton(
+             onPressed: () => Navigator.of(ctx).pop(false),
+             child: Text(AppLocalizations.of(context).no),
+           ),
+           TextButton(
+             onPressed: () => Navigator.of(ctx).pop(true),
+             child: Text(AppLocalizations.of(context).yes),
+           ),
+         ],
+       ),
+     );
+
+     if (optIn == true) {
+       try {
+         final didAuth = await localAuth.authenticate(
+           localizedReason: AppLocalizations.of(context).authenticateToEnable,
+           options: const AuthenticationOptions(
+             stickyAuth: true,
+             biometricOnly: true,
+           ),
+         );
+         if (didAuth) {
+           await prefs.setBool('biometric_enabled', true);
+           if (mounted) {
+             setState(() {
+               _isBiometricEnabled = true;
+             });
+           }
+         }
+       } catch (e) {
+         // Handle exceptions, state remains unchanged.
+       }
+     }
+   } else {
+     final optOut = await showDialog<bool>(
+       context: context,
+       barrierDismissible: false,
+       builder: (ctx) => AlertDialog(
+         title: Text(AppLocalizations.of(context).disableFingerprintLogin),
+         content: Text(AppLocalizations.of(context).disableFingerprintMessage),
+         actions: [
+           TextButton(
+             onPressed: () => Navigator.of(ctx).pop(false),
+             child: Text(AppLocalizations.of(context).no),
+           ),
+           TextButton(
+             onPressed: () => Navigator.of(ctx).pop(true),
+             child: Text(AppLocalizations.of(context).yes),
+           ),
+         ],
+       ),
+     );
+
+     if (optOut == true) {
+       await prefs.setBool('biometric_enabled', false);
+       if (mounted) {
+         setState(() {
+           _isBiometricEnabled = false;
+         });
+       }
+     }
+   }
+ }
+
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
@@ -31,7 +151,7 @@ class ProfileScreen extends StatelessWidget {
         children: [
           ListTile(
             leading: const Icon(Icons.settings),
-            title: Text(loc.preferences), 
+            title: Text(loc.preferences),
             onTap: () {
               Navigator.push(
                 context,
@@ -40,10 +160,150 @@ class ProfileScreen extends StatelessWidget {
               );
             },
           ),
-          // You can add more profile options here later
+          ListTile(
+            leading: const Icon(Icons.currency_rupee),
+            title: Text(AppLocalizations.of(context).dailylimit),
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                    builder: (context) => const DailyLimitScreen()),
+              );
+            },
+          ),
+          SwitchListTile(
+   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),
+ ),
+          ListTile(
+            leading: const Icon(Icons.password),
+            title: Text(loc.changeLoginPassword),
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                    builder: (context) => ChangePasswordScreen(
+                          mobileNumber: widget.mobileNumber,
+                        )),
+              );
+            },
+          ),
+          ListTile(
+            leading: const Icon(Icons.password),
+  title: Text('Change TPIN'),
+  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"),
+          //   onTap: () async {
+          //   },
+          // ),
+          ListTile(
+            leading: const Icon(Icons.smartphone),
+            title: const Text("App Version"),
+            trailing: FutureBuilder<String>(
+              future: _getAppVersion(),
+              builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
+                if (snapshot.connectionState == ConnectionState.waiting) {
+                  // Show a loading indicator while waiting for the future to complete
+                  return const CircularProgressIndicator();
+                } else if (snapshot.hasError) {
+                  return const Text("Error");
+                } else {
+                  // Display the version number once the future is complete
+                  return Text(
+                    snapshot.data ?? "N/A",
+                    selectionColor: const Color(0xFFFFFFFF),
+                  );
+                }
+              },
+            ),
+          ),
+          ListTile(
+            leading: const Icon(Icons.exit_to_app),
+            title: Text(AppLocalizations.of(context).logout),
+            onTap: () async {
+              final shouldExit = await showDialog<bool>(
+                context: context,
+                builder: (context) => AlertDialog(
+                  title: Text(AppLocalizations.of(context).logout),
+                  content: Text(AppLocalizations.of(context).logoutCheck),
+                  actions: [
+                    TextButton(
+                      onPressed: () => Navigator.of(context).pop(false),
+                      child: Text(AppLocalizations.of(context).no),
+                    ),
+                    TextButton(
+                      onPressed: () => Navigator.of(context).pop(true),
+                      child: Text(AppLocalizations.of(context).yes),
+                    ),
+                  ],
+                ),
+              );
+
+              if (shouldExit == true) {
+                if (Platform.isAndroid) {
+                  SystemNavigator.pop();
+                }
+                exit(0);
+              }
+            },
+          ),
           ListTile(
             leading: const Icon(Icons.logout),
-            title: const Text("Logout"), 
+            title: Text(AppLocalizations.of(context).deregister),
             onTap: () async {
               final shouldLogout = await showDialog<bool>(
                 context: context,

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/features/quick_pay/screens/quick_pay_outside_bank_screen.dart

@@ -2,7 +2,9 @@ import 'dart:async';
 import 'dart:developer';
 import 'package:dio/dio.dart';
 import 'package:flutter/services.dart';
+import 'package:intl/intl.dart';
 import 'package:kmobile/api/services/imps_service.dart';
+import 'package:kmobile/api/services/limit_service.dart';
 import 'package:kmobile/api/services/neft_service.dart';
 import 'package:kmobile/api/services/rtgs_service.dart';
 import 'package:kmobile/data/models/imps_transaction.dart';
@@ -28,7 +30,10 @@ class QuickPayOutsideBankScreen extends StatefulWidget {
 
 class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   final _formKey = GlobalKey<FormState>();
-
+  final _limitService = getIt<LimitService>();
+Limit? _limit;
+bool _isLoadingLimit = true;
+final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
   // Controllers
   final accountNumberController = TextEditingController();
   final confirmAccountNumberController = TextEditingController();
@@ -38,7 +43,10 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   final ifscController = TextEditingController();
   final phoneController = TextEditingController();
   final amountController = TextEditingController();
+  final remarksController = TextEditingController();
+  final _ifscFocusNode = FocusNode();
   final service = getIt<BeneficiaryService>();
+  bool _isAmountOverLimit = false;
 
   late String accountType;
   bool _isValidating = false;
@@ -48,29 +56,96 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   @override
   void initState() {
     super.initState();
+     _loadLimit();
+    _ifscFocusNode.addListener(() {
+      if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
+        _validateIFSC();
+      }
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
         accountType = 'Savings';
       });
     });
+    amountController.addListener(_checkAmountLimit);
   }
 
+Future<void> _loadLimit() async {
+  setState(() {
+    _isLoadingLimit = true;
+  });
+  try {
+    final limitData = await _limitService.getLimit();
+    setState(() {
+      _limit = limitData;
+      _isLoadingLimit = false;
+    });
+  } catch (e) {
+    // Handle error if needed
+    setState(() {
+      _isLoadingLimit = false;
+    });
+  }
+}
+
+// Add this method to check the amount against the limit
+ 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) {
+     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 _validateIFSC() async {
     final ifsc = ifscController.text.trim().toUpperCase();
     if (ifsc.isEmpty) return;
 
-    final result = await service.validateIFSC(ifsc);
+    try {
+      final result = await service.validateIFSC(ifsc);
+
+      if (mounted) {
+        if (result.bankName.isEmpty) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          );
+          bankNameController.clear();
+          branchNameController.clear();
+        } else {
+          bankNameController.text = result.bankName;
+          branchNameController.text = result.branchName;
+        }
+      }
+    } catch (e) {
+      if (mounted) {
+        final errorMessage = e.toString().toUpperCase();
+        String snackbarMessage =
+            AppLocalizations.of(context).somethingWentWrong;
+
+        if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
+          snackbarMessage = AppLocalizations.of(context).invalidIfsc;
+        }
 
-    if (mounted) {
-      if (result.bankName == '') {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          SnackBar(content: Text(snackbarMessage)),
         );
         bankNameController.clear();
         branchNameController.clear();
-      } else {
-        bankNameController.text = result.bankName;
-        branchNameController.text = result.branchName;
       }
     }
   }
@@ -86,7 +161,6 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
 
     final String accountNo = accountNumberController.text.trim();
     final String ifsc = ifscController.text.trim();
-    // ignore: prefer_const_declarations
     final String remitter = "Unknown";
 
     final service = getIt<BeneficiaryService>();
@@ -137,7 +211,9 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     ifscController.dispose();
     phoneController.dispose();
     amountController.dispose();
+    remarksController.dispose();
     super.dispose();
+    _ifscFocusNode.dispose();
   }
 
   void _onProceedToPay() {
@@ -189,6 +265,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   remitterName: "Unknown",
                   beneficiaryName: nameController.text,
                   tpin: tpin,
+                  remarks: remarksController.text,
                 );
                 final neftService = getIt<NeftService>();
                 final completer = Completer<PaymentResponse>();
@@ -254,6 +331,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   remitterName: "Unknown",
                   beneficiaryName: nameController.text,
                   tpin: tpin,
+                  remarks: remarksController.text,
                 );
                 final impsService = getIt<ImpsService>();
                 final completer = Completer<PaymentResponse>();
@@ -313,6 +391,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   remitterName: "Unknown",
                   beneficiaryName: nameController.text,
                   tpin: tpin,
+                  remarks: remarksController.text,
                 );
                 final rtgsService = getIt<RtgsService>();
                 final completer = Completer<PaymentResponse>();
@@ -475,6 +554,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 children: [
                   Expanded(
                     child: TextFormField(
+                      focusNode: _ifscFocusNode,
                       maxLength: 11,
                       inputFormatters: [
                         LengthLimitingTextInputFormatter(11),
@@ -497,16 +577,15 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                       ),
                       controller: ifscController,
                       textInputAction: TextInputAction.next,
-                      onFieldSubmitted: (_) {
-                        _validateIFSC();
-                      },
                       onChanged: (value) {
-                        final trimmed = value.trim().toUpperCase();
-                        if (trimmed.length < 11) {
-                          // clear bank/branch if backspace or changed
-                          bankNameController.clear();
-                          branchNameController.clear();
-                        }
+                        setState(() {
+                          final trimmed = value.trim().toUpperCase();
+                          if (trimmed.length < 11) {
+                            // clear bank/branch if backspace or changed
+                            bankNameController.clear();
+                            branchNameController.clear();
+                          }
+                        });
                       },
                       validator: (value) {
                         final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
@@ -609,20 +688,21 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   child: SizedBox(
                     width: double.infinity,
                     child: ElevatedButton(
-                      onPressed: _isValidating
-                          ? null
-                          : () {
-                              if (confirmAccountNumberController.text ==
-                                  accountNumberController.text) {
-                                _validateBeneficiary();
-                              } else {
-                                setState(() {
-                                  _validationError =
-                                      AppLocalizations.of(context)
-                                          .accountMismatch;
-                                });
-                              }
-                            },
+                      onPressed:
+                          _isValidating || ifscController.text.length != 11
+                              ? null
+                              : () {
+                                  if (confirmAccountNumberController.text ==
+                                      accountNumberController.text) {
+                                    _validateBeneficiary();
+                                  } else {
+                                    setState(() {
+                                      _validationError =
+                                          AppLocalizations.of(context)
+                                              .accountMismatch;
+                                    });
+                                  }
+                                },
                       child: _isValidating
                           ? const SizedBox(
                               width: 20,
@@ -669,6 +749,28 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 },
               ),
               const SizedBox(height: 25),
+              TextFormField(
+                controller: remarksController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).remarks,
+                  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),
+                  ),
+                ),
+              ),
+              const SizedBox(height: 25),
+              Column(
+  crossAxisAlignment: CrossAxisAlignment.start,
+  children: [
               Row(
                 children: [
                   Expanded(
@@ -734,6 +836,22 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   ),
                 ],
               ),
+               ],
+              ),
+              const SizedBox(height: 8),
+if (_isLoadingLimit)
+  const Padding(
+    padding: EdgeInsets.only(left: 8.0),
+    child: Text('Fetching daily limit...'),
+  ),
+if (!_isLoadingLimit && _limit != null)
+  Padding(
+    padding: const EdgeInsets.only(left: 8.0),
+    child: Text(
+      'Remaining Daily Limit: ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}',
+      style: Theme.of(context).textTheme.bodySmall,
+    ),
+  ),
               const SizedBox(height: 30),
               Row(
                 children: [
@@ -746,24 +864,31 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 ],
               ),
               const SizedBox(height: 45),
-              Align(
-                alignment: Alignment.center,
-                child: SwipeButton.expand(
-                  thumb: Icon(Icons.arrow_forward,
-                      color: Theme.of(context).dialogBackgroundColor),
-                  activeThumbColor: Theme.of(context).colorScheme.primary,
-                  activeTrackColor:
-                      Theme.of(context).colorScheme.secondary.withAlpha(100),
-                  borderRadius: BorderRadius.circular(30),
-                  height: 56,
-                  onSwipe: _onProceedToPay,
-                  child: Text(
-                    AppLocalizations.of(context).swipeToPay,
-                    style: const TextStyle(
-                        fontSize: 16, fontWeight: FontWeight.bold),
-                  ),
-                ),
-              ),
+                             Align(
+                 alignment: Alignment.center,
+                 child: SwipeButton.expand(
+                   thumb: Icon(Icons.arrow_forward,
+                       color: _isAmountOverLimit ? Colors.grey : Theme.of(context).dialogBackgroundColor),
+                   activeThumbColor: _isAmountOverLimit ? Colors.grey.shade700 :
+ Theme.of(context).colorScheme.primary,
+                   activeTrackColor: _isAmountOverLimit
+                       ? Colors.grey.shade300
+                       : Theme.of(context).colorScheme.secondary.withAlpha(100),
+                   borderRadius: BorderRadius.circular(30),
+                   height: 56,
+                   onSwipe: () {
+                     if (_isAmountOverLimit) {
+                       return; // Do nothing if amount is over the limit
+                     }
+                     _onProceedToPay();
+                   },
+                   child: Text(
+                     AppLocalizations.of(context).swipeToPay,
+                     style: const TextStyle(
+                         fontSize: 16, fontWeight: FontWeight.bold),
+                   ),
+                 ),
+               ),
             ],
           ),
         ),

lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart

@@ -1,7 +1,9 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_swipe_button/flutter_swipe_button.dart';
+import 'package:intl/intl.dart';
 import 'package:kmobile/api/services/beneficiary_service.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/di/injection.dart';
@@ -19,13 +21,17 @@ class QuickPayWithinBankScreen extends StatefulWidget {
 
 class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
   final _formKey = GlobalKey<FormState>();
-
+  final _limitService = getIt<LimitService>();
+Limit? _limit;
+bool _isLoadingLimit = true;
+final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
   final TextEditingController amountController = TextEditingController();
+  final TextEditingController remarksController = TextEditingController();
   String? _selectedAccountType;
-
+  bool _isAmountOverLimit = false;
   String? _beneficiaryName;
   bool _isValidating = false;
   bool _isBeneficiaryValidated = false;
@@ -34,10 +40,54 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
   @override
   void initState() {
     super.initState();
+    _loadLimit();
     accountNumberController.addListener(_resetBeneficiaryValidation);
     confirmAccountNumberController.addListener(_resetBeneficiaryValidation);
+    amountController.addListener(_checkAmountLimit);
   }
 
+Future<void> _loadLimit() async {
+  setState(() {
+    _isLoadingLimit = true;
+  });
+  try {
+    final limitData = await _limitService.getLimit();
+    setState(() {
+      _limit = limitData;
+      _isLoadingLimit = false;
+    });
+  } catch (e) {
+    // Handle error if needed
+    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) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text('Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
+        backgroundColor: Colors.red,
+      ),
+    );
+  }
+
+  // Update state only if it changes to avoid unnecessary rebuilds
+  if (_isAmountOverLimit != isOverLimit) {
+    setState(() {
+      _isAmountOverLimit = isOverLimit;
+    });
+  }
+}
+
   void _resetBeneficiaryValidation() {
     if (_isBeneficiaryValidated ||
         _beneficiaryName != null ||
@@ -52,11 +102,13 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
 
   @override
   void dispose() {
+    amountController.removeListener(_checkAmountLimit);
     accountNumberController.removeListener(_resetBeneficiaryValidation);
     confirmAccountNumberController.removeListener(_resetBeneficiaryValidation);
     accountNumberController.dispose();
     confirmAccountNumberController.dispose();
     amountController.dispose();
+    remarksController.dispose();
     super.dispose();
   }
 
@@ -100,7 +152,8 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
         padding: const EdgeInsets.all(16.0),
         child: Form(
           key: _formKey,
-          child: Column(
+          child: SingleChildScrollView(
+  child: Column(
             children: [
               const SizedBox(height: 10),
               TextFormField(
@@ -276,6 +329,26 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                 },
               ),
               const SizedBox(height: 25),
+              TextFormField(
+                controller: remarksController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).remarks,
+                  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),
+                  ),
+                ),
+              ),
+              const SizedBox(height: 25),
+              
               TextFormField(
                 decoration: InputDecoration(
                   labelText: AppLocalizations.of(context).amount,
@@ -306,65 +379,81 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                   return null;
                 },
               ),
+              const SizedBox(height: 8),
+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 SizedBox(height: 45),
-              Align(
-                alignment: Alignment.center,
-                child: SwipeButton.expand(
-                  thumb: Icon(Icons.arrow_forward,
-                      color: Theme.of(context).dialogBackgroundColor),
-                  activeThumbColor: Theme.of(context).colorScheme.primary,
-                  activeTrackColor: Theme.of(
-                    context,
-                  ).colorScheme.secondary.withAlpha(100),
-                  borderRadius: BorderRadius.circular(30),
-                  height: 56,
-                  child: Text(
-                    AppLocalizations.of(context).swipeToPay,
-                    style: const TextStyle(fontSize: 16),
-                  ),
-                  onSwipe: () {
-                    if (_formKey.currentState!.validate()) {
-                      if (!_isBeneficiaryValidated) {
-                        setState(() {
-                          _validationError = AppLocalizations.of(context)
-                              .validateBeneficiaryproceeding;
-                        });
-                        return;
-                      }
-                      // Perform payment logic
-                      Navigator.push(
-                        context,
-                        MaterialPageRoute(
-                          builder: (context) => TransactionPinScreen(
-                            onPinCompleted: (pinScreenContext, tpin) async {
-                              final transfer = Transfer(
-                                fromAccount: widget.debitAccount,
-                                toAccount: accountNumberController.text,
-                                toAccountType: _selectedAccountType!,
-                                amount: amountController.text,
-                                tpin: tpin,
-                              );
+                             Align(
+                 alignment: Alignment.center,
+                 child: SwipeButton.expand(
+                   thumb: Icon(Icons.arrow_forward,
+                       color: _isAmountOverLimit ? Colors.grey : Theme.of(context).dialogBackgroundColor),
+                   activeThumbColor: _isAmountOverLimit ? Colors.grey.shade700 :
+ Theme.of(context).colorScheme.primary,
+                   activeTrackColor: _isAmountOverLimit
+                       ? Colors.grey.shade300
+                       : Theme.of(
+                     context,
+                   ).colorScheme.secondary.withAlpha(100),
+                   borderRadius: BorderRadius.circular(30),
+                   height: 56,
+                   child: Text(
+                     AppLocalizations.of(context).swipeToPay,
+                     style: const TextStyle(fontSize: 16),
+                   ),
+                   onSwipe: () {
+                     if (_isAmountOverLimit) {
+                       return; // Do nothing if amount is over limit
+                     }
+                     if (_formKey.currentState!.validate()) {
+                       if (!_isBeneficiaryValidated) {
+                         setState(() {
+                           _validationError = AppLocalizations.of(context)
+                               .validateBeneficiaryproceeding;
+                         });
+                         return;
+                       }
+                       // Perform payment logic
+                       Navigator.push(
+                         context,
+                         MaterialPageRoute(
+                           builder: (context) => TransactionPinScreen(
+                             onPinCompleted: (pinScreenContext, tpin) async {
+                               final transfer = Transfer(
+                                 fromAccount: widget.debitAccount,
+                                 toAccount: accountNumberController.text,
+                                 toAccountType: _selectedAccountType!,
+                                 amount: amountController.text,
+                                 tpin: tpin,
+                                 remarks: remarksController.text,
+                               );
 
-                              final paymentService = getIt<PaymentService>();
-                              final paymentResponseFuture = paymentService
-                                  .processQuickPayWithinBank(transfer);
+                               final paymentService = getIt<PaymentService>();
+                               final paymentResponseFuture = paymentService
+                                   .processQuickPayWithinBank(transfer);
 
-                              Navigator.of(pinScreenContext).pushReplacement(
-                                MaterialPageRoute(
-                                  builder: (_) => PaymentAnimationScreen(
-                                      paymentResponse: paymentResponseFuture),
-                                ),
-                              );
-                            },
-                          ),
-                        ),
-                      );
-                    }
-                  },
-                ),
-              ),
+                               Navigator.of(pinScreenContext).pushReplacement(
+                                 MaterialPageRoute(
+                                   builder: (_) => PaymentAnimationScreen(
+                                       paymentResponse: paymentResponseFuture),
+                                 ),
+                               );
+                             },
+                           ),
+                         ),
+                       );
+                     }
+                   },
+                 ),
+               ),
             ],
           ),
+          ),
         ),
       ),
     );

lib/features/security/security_error_screen.dart

@@ -5,7 +5,8 @@ import 'package:lottie/lottie.dart';
 class SecurityErrorScreen extends StatelessWidget {
   final String message;
 
-  const SecurityErrorScreen({Key? key, required this.message}) : super(key: key);
+  const SecurityErrorScreen({Key? key, required this.message})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -24,7 +25,8 @@ class SecurityErrorScreen extends StatelessWidget {
             ),
             const SizedBox(height: 40),
             ElevatedButton(
-              onPressed: () => SystemChannels.platform.invokeMethod('SystemNavigator.pop'),
+              onPressed: () =>
+                  SystemChannels.platform.invokeMethod('SystemNavigator.pop'),
               child: const Text('Okay'),
             ),
           ],

lib/features/service/screens/branch_locator_screen.dart

@@ -1,17 +1,24 @@
-import '../../../l10n/app_localizations.dart';
+// ignore_for_file: unused_element
+
 import 'package:flutter/material.dart';
+import '../../../l10n/app_localizations.dart';
 
-class Branch {
+// Enum to define the type of location
+enum LocationType { branch, atm }
+
+class Location {
   final String name;
-  final String code;
-  final String ifsc;
+  final String? code; // Nullable for ATMs
+  final String? ifsc; // Nullable for ATMs
   final String address;
+  final LocationType type;
 
-  Branch({
+  Location({
     required this.name,
-    required this.code,
-    required this.ifsc,
+    this.code,
+    this.ifsc,
     required this.address,
+    required this.type,
   });
 }
 
@@ -25,83 +32,80 @@ class BranchLocatorScreen extends StatefulWidget {
 class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
   final TextEditingController _searchController = TextEditingController();
 
-// Static list of 5 branches
-  final List<Branch> _branches = [
-    Branch(
-        name: "Dharamsala - Head Office",
-        code: "002",
-        ifsc: "KACE0000002",
-        address: "Civil Lines Dharmashala, Kangra, HP - 176215"),
-    Branch(
-        name: "Kangra",
-        code: "033",
-        ifsc: "KACE0000033",
-        address: "Rajput Bhawankangrapo Kangra, Kangra, HP "),
+  final List<Location> _allLocations = [
+    Location(
+      name: "Dharamsala - Head Office",
+      code: "002",
+      ifsc: "KACE0000002",
+      address: "Civil Lines Dharmashala, Kangra, HP - 176215",
+      type: LocationType.branch,
+    ),
+    Location(
+      name: "Kangra",
+      code: "033",
+      ifsc: "KACE0000033",
+      address: "Rajput Bhawankangrapo, Kangra, HP ",
+      type: LocationType.branch,
+    ),
+    Location(
+      name: "Dharamsala ATM",
+      address: "Near Main Square, Dharamsala",
+      type: LocationType.atm,
+    ),
+    Location(
+      name: "Kangra ATM",
+      address: "Opposite Bus Stand, Kangra",
+      type: LocationType.atm,
+    ),
   ];
 
-  List<Branch> _filteredBranches = [];
+  List<Location> _filteredLocations = [];
+  bool _isLoading = false;
 
   @override
   void initState() {
     super.initState();
-    _filteredBranches = _branches; // Initially show all branches
+    // _fetchAndSetLocations();
+    _filteredLocations = _allLocations;
   }
 
-  void _filterBranches(String query) {
+// Example of a future API fetching function
+/*
+Future<void> _fetchAndSetLocations() async {
+  setState(() {
+    _isLoading = true;
+  });
+  try {
+    // final locations = await yourApiService.getLocations();
+    // setState(() {
+    //   _allLocations = locations;
+    //   _filteredLocations = locations;
+    // });
+  } catch (e) {
+    // Handle error
+  } finally {
+    setState(() {
+      _isLoading = false;
+    });
+  }
+}
+*/
+  void _filterLocations(String query) {
     setState(() {
       if (query.isEmpty) {
-        _filteredBranches = _branches;
+        _filteredLocations = _allLocations;
       } else {
-        _filteredBranches = _branches.where((branch) {
+        _filteredLocations = _allLocations.where((location) {
           final lowerQuery = query.toLowerCase();
-          return branch.name.toLowerCase().contains(lowerQuery) ||
-              branch.code.toLowerCase().contains(lowerQuery) ||
-              branch.ifsc.toLowerCase().contains(lowerQuery) ||
-              branch.address.toLowerCase().contains(lowerQuery);
+          return location.name.toLowerCase().contains(lowerQuery) ||
+              (location.code?.toLowerCase().contains(lowerQuery) ?? false) ||
+              (location.ifsc?.toLowerCase().contains(lowerQuery) ?? false) ||
+              location.address.toLowerCase().contains(lowerQuery);
         }).toList();
       }
     });
   }
 
-//   @override
-//   Widget build(BuildContext context) {
-//     return Scaffold(
-//       appBar: AppBar(
-//         title: Text(AppLocalizations.of(context).branchLocator),
-//       ),
-//       body: Center(
-//         child: Column(
-//           mainAxisAlignment: MainAxisAlignment.center,
-//           children: [
-//             Icon(
-//               Icons.location_on,
-//               size: 80,
-//               color: Theme.of(context).primaryColor,
-//             ),
-//             const SizedBox(height: 16),
-//             Text(
-//               AppLocalizations.of(context).findnearbybranched,
-//               style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
-//             ),
-//             const SizedBox(height: 24),
-//             ElevatedButton.icon(
-//               icon: const Icon(Icons.search),
-//               label: Text( AppLocalizations.of(context).searchbranch),
-//               onPressed: () {
-//                 // Place API here
-
-//                 // ScaffoldMessenger.of(context).showSnackBar(
-//                 //   SnackBar(content: Text( AppLocalizations.of(context).branchsearchsoon)),
-//                 // );
-//               },
-//             ),
-//           ],
-//         ),
-//       ),
-//     );
-//   }
-// }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -110,12 +114,11 @@ class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
       ),
       body: Column(
         children: [
-// Search bar
           Padding(
             padding: const EdgeInsets.all(12.0),
             child: TextField(
               controller: _searchController,
-              onChanged: _filterBranches,
+              onChanged: _filterLocations,
               decoration: InputDecoration(
                 hintText: AppLocalizations.of(context).searchbranchby,
                 prefixIcon: const Icon(Icons.search),
@@ -126,38 +129,60 @@ class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
             ),
           ),
 
-// List of branches
+          // Content area
           Expanded(
-            child: _filteredBranches.isEmpty
-                ? const Center(child: Text("No matching branches found"))
-                : ListView.builder(
-                    itemCount: _filteredBranches.length,
-                    itemBuilder: (context, index) {
-                      final branch = _filteredBranches[index];
-                      return Card(
-                        margin: const EdgeInsets.symmetric(
-                            horizontal: 12, vertical: 6),
-                        child: ListTile(
-                          leading: Icon(Icons.location_city,
-                              color: Theme.of(context).primaryColor),
-                          title: Text(branch.name,
-                              style:
-                                  const TextStyle(fontWeight: FontWeight.bold)),
-                          subtitle: Text(
-                              "Code: ${branch.code} | IFSC: ${branch.ifsc} \nBranch Address: ${branch.address}"),
-                          onTap: () {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                  content: Text("Selected ${branch.name}")),
-                            );
-                          },
-                        ),
-                      );
-                    },
-                  ),
+            child: _isLoading
+                ? const Center(child: CircularProgressIndicator())
+                : _filteredLocations.isEmpty
+                    ? const Center(child: Text("No matching locations found"))
+                    : ListView.builder(
+                        itemCount: _filteredLocations.length,
+                        itemBuilder: (context, index) {
+                          final location = _filteredLocations[index];
+                          return _buildLocationItem(location);
+                        },
+                      ),
           ),
         ],
       ),
     );
   }
+
+  Widget _buildHeader(String title) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+      child: Text(
+        title,
+        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+              fontWeight: FontWeight.bold,
+              color: Theme.of(context).colorScheme.primary,
+            ),
+      ),
+    );
+  }
+
+// Helper widget to build a single location item
+  Widget _buildLocationItem(Location location) {
+    final isBranch = location.type == LocationType.branch;
+    return Card(
+      margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      child: ListTile(
+        leading: CircleAvatar(
+          child: Icon(isBranch ? Icons.location_city : Icons.currency_rupee),
+        ),
+        title: Text(location.name,
+            style: const TextStyle(fontWeight: FontWeight.bold)),
+        subtitle: Text(
+          isBranch
+              ? "Code: ${location.code} | IFSC: ${location.ifsc}\nAddress: ${location.address}"
+              : "Address: ${location.address}",
+        ),
+        onTap: () {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text("Selected ${location.name}")),
+          );
+        },
+      ),
+    );
+  }
 }

lib/features/service/screens/faqs_screen.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
+
+class FaqsScreen extends StatefulWidget {
+  const FaqsScreen({super.key});
+
+  @override
+  State<FaqsScreen> createState() => _FaqsScreenState();
+}
+
+class _FaqsScreenState extends State<FaqsScreen> {
+  @override
+  void initState() {
+    super.initState();
+    _getFaqs();
+  }
+
+  // A placeholder for your future API call
+  Future<void> _getFaqs() async {
+    // TODO: Implement API call to fetch FAQs data
+    // For now, simulating a network call with a delay
+    await Future.delayed(const Duration(seconds: 1));
+    // In a real implementation, you would process the API response here
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Row(
+          children: [
+            Flexible(
+              child: Text(
+                AppLocalizations.of(context).faq,
+                softWrap: true,
+                style: const TextStyle(
+                  fontSize: 16.5,
+                ),
+                textAlign: TextAlign.left,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/features/service/screens/quick_links_screen.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
+
+class QuickLinksScreen extends StatefulWidget {
+  const QuickLinksScreen({super.key});
+
+  @override
+  State<QuickLinksScreen> createState() => _QuickLinksScreenState();
+}
+
+class _QuickLinksScreenState extends State<QuickLinksScreen> {
+  @override
+  void initState() {
+    super.initState();
+    _getQuickLinks();
+  }
+
+  // A placeholder for your future API call
+  Future<void> _getQuickLinks() async {
+    // TODO: Implement API call to fetch quick links data
+    // For now, simulating a network call with a delay
+    await Future.delayed(const Duration(seconds: 1));
+    // In a real implementation, you would process the API response here
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).quickLinks),
+      ),
+    );
+  }
+}

lib/features/service/screens/service_screen.dart

@@ -1,9 +1,10 @@
 import 'package:kmobile/features/service/screens/branch_locator_screen.dart';
 
 import '../../../l10n/app_localizations.dart';
-
 import 'package:flutter/material.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
+import 'package:kmobile/features/service/screens/quick_links_screen.dart';
+import 'package:kmobile/features/service/screens/faqs_screen.dart';
 
 class ServiceScreen extends StatefulWidget {
   const ServiceScreen({super.key});
@@ -29,22 +30,41 @@ class _ServiceScreen extends State<ServiceScreen> {
             icon: Symbols.add,
             label: AppLocalizations.of(context).accountOpeningDeposit,
             onTap: () {},
+            disabled: true,
           ),
           const Divider(height: 1),
           ServiceManagementTile(
             icon: Symbols.add,
             label: AppLocalizations.of(context).accountOpeningLoan,
             onTap: () {},
+            disabled: true,
           ),
           const Divider(height: 1),
           ServiceManagementTile(
             icon: Symbols.captive_portal,
             label: AppLocalizations.of(context).quickLinks,
-            onTap: () {},
+            onTap: () {
+              Navigator.of(context).push(
+                MaterialPageRoute(
+                    builder: (context) => const QuickLinksScreen()),
+              );
+            },
+            disabled: true,
           ),
           const Divider(height: 1),
           ServiceManagementTile(
-            icon: Symbols.missing_controller,
+            icon: Symbols.question_mark,
+            label: AppLocalizations.of(context).faq,
+            onTap: () {
+              Navigator.of(context).push(
+                MaterialPageRoute(builder: (context) => const FaqsScreen()),
+              );
+            },
+            disabled: true,
+          ),
+          const Divider(height: 1),
+          ServiceManagementTile(
+            icon: Symbols.location_pin,
             label: AppLocalizations.of(context).branchLocator,
             onTap: () {
               Navigator.push(
@@ -52,6 +72,7 @@ class _ServiceScreen extends State<ServiceScreen> {
                   MaterialPageRoute(
                       builder: (context) => const BranchLocatorScreen()));
             },
+            disabled: true,
           ),
           const Divider(height: 1),
         ],
@@ -64,21 +85,36 @@ class ServiceManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
   final VoidCallback onTap;
+  final bool disabled;
 
   const ServiceManagementTile({
     super.key,
     required this.icon,
     required this.label,
     required this.onTap,
+    this.disabled = false,
   });
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     return ListTile(
-      leading: Icon(icon),
-      title: Text(label),
-      trailing: const Icon(Symbols.arrow_right, size: 20),
-      onTap: onTap,
+      leading: Icon(
+        icon,
+        color: disabled ? theme.disabledColor : null,
+      ),
+      title: Text(
+        label,
+        style: TextStyle(
+          color: disabled ? theme.disabledColor : null,
+        ),
+      ),
+      trailing: Icon(
+        Symbols.arrow_right,
+        size: 20,
+        color: disabled ? theme.disabledColor : null,
+      ),
+      onTap: disabled ? null : onTap,
     );
   }
 }

lib/l10n/app_en.arb

@@ -98,7 +98,7 @@
 "accountOpeningDeposit": "Account Opening Request - Deposit",
 "accountOpeningLoan": "Account Opening Request - Loan",
 "quickLinks": "Quick Links",
-"branchLocator": "Branch Locator",
+"branchLocator": "Branch and ATM Locator",
 "emailLaunchError": "Could not launch email client for",
 "dialerLaunchError": "Could not launch dialer for",
 "writeToUs": "Write to us",
@@ -169,7 +169,7 @@
 "invalidOtp": "Invalid OTP",
 "enterOtp": "Enter OTP",
 "otpVerification": "OTP Verification",
-"otpSentMessage": "Enter the 4-digit OTP sent to your mobile number",
+"otpSentMessage": "Enter the 6-digit OTP sent to your mobile number",
 "verifyOtp": "Verify OTP",
 "otpResent": "OTP Resent",
 "resendOtp": "Resend OTP",
@@ -248,7 +248,7 @@
   "validateBeneficiaryproceeding": "Please validate beneficiary before proceeding",
   "findnearbybranched": "Find nearby branches",
   "searchbranch": "Search Branch",
-  "searchbranchby": "Search by Branch Name / Code / IFSC",
+  "searchbranchby":  "Name / Code / IFSC / Address",
   "branchsearchsoon": "Branch search coming soon...",
   "loginFailed": "Login failed",
 "invalidCredentials": "Invalid credentials",
@@ -289,5 +289,47 @@
 "beneficiarydetails": "Beneficiary Details",
 "delete": "Delete",
 "search": "Search",
-"viewCardDeatils": "View Card Details"
+"viewCardDeatils": "View Card Details",
+"logout": "Logout",
+"logoutCheck": "Are you sure you want to logout?",
+"changeLoginPassword": "Change Login Password",
+"currentpwdrqd": "Current password is required",
+"newpwdrqd": "New password is required",
+"pwdFormat": "At least 8 characters(upper & lower case), digit, special char",
+"newoldpwddiff": "New password must differ from current",
+"confirmpwdrqd": "Confirm password is required",
+"pwdmismatch": "Passwords do not match",
+"failedtosentOTP": "Failed to send OTP",
+"currentpwd": "Current Password",
+"newpwd": "New Password",
+"confirmpwd": "Confirm New Password",
+"pwdchangeSuccess": "Password changed successfully!",
+"failedToValidate": "Failed to Validate",
+"otpVerification": "OTP Verification",
+"otpSent": "An OTP has been sent to your registered mobile number.",
+"enterOTP": "Enter OTP",
+"validateOTP": "Validate OTP",
+ "selectThemeMode": "Select Theme Mode",
+ "themeModeSystem": "System",
+ "themeModeLight": "Light",
+ "themeModeDark": "Dark",
+ "details": "Details",
+ "remarks": "Remarks (Optional)",
+ "kccbMobile": "KCCB Mobile",
+ "faq": "Frequently Asked Questions(FAQs)",
+ "branches": "Branches",
+ "atms": "ATMs",
+ "dailylimit": "Daily Transaction Limit",
+ "currentDailyLimit": "Current Daily Limit",
+ "noLimitSet": "No Limit Set",
+ "addLimit": "Add Limit",
+ "editLimit": "Edit Limit",
+ "removeLimit": "Remove Limit",
+ "limitAmount": "Limit Amount",
+ "save": "Save",
+ "deregister": "De-Register",
+ "deregistercheck": "Are you sure you want to De-Register?", 
+ "biometricsNotAvailable": "Biometrics not available on this device",
+ "disableFingerprintLogin": "Disable Fingerprint Login",
+ "disableFingerprintMessage": "Are you sure you want to disable fingerprint login?"
 }

lib/l10n/app_hi.arb

@@ -98,7 +98,7 @@
 "accountOpeningDeposit": "खाता खोलने का अनुरोध - जमा",
 "accountOpeningLoan": "खाता खोलने का अनुरोध - ऋण",
 "quickLinks": "त्वरित लिंक",
-"branchLocator": "शाखा लोकेटर",
+"branchLocator": "शाखा और एटीएम लोकेटर",
 "emailLaunchError": "ईमेल क्लाइंट खोलने में विफल: ",
 "dialerLaunchError": "डायलर खोलने में विफल: ",
 "writeToUs": "हमें लिखें",
@@ -170,7 +170,7 @@
 "invalidOtp": "अमान्य ओटीपी",
 "enterOtp": "ओटीपी दर्ज करें",
 "otpVerification": "ओटीपी सत्यापन",
-"otpSentMessage": "अपने मोबाइल नंबर पर भेजा गया 4-अंकों का ओटीपी दर्ज करें",
+"otpSentMessage": "अपने मोबाइल नंबर पर भेजा गया 6-अंकों का ओटीपी दर्ज करें",
 "verifyOtp": "ओटीपी सत्यापित करें",
 "otpResent": "ओटीपी पुनः भेजा गया",
 "resendOtp": "ओटीपी पुनः भेजें",
@@ -249,7 +249,7 @@
   "validateBeneficiaryproceeding": "कृपया आगे बढ़ने से पहले लाभार्थी को पट्टे पर मान्य करें",
   "findnearbybranched": "आस-पास की शाखाएँ खोजें",
   "searchbranch": "शाखा खोजें",
-  "searchbranchby": "शाखा खोजें नाम / बैंक कोड / आईएफएससी द्वारा",
+  "searchbranchby": "शाखा नाम / बैंक कोड / आईएफएससी / पता",
   "branchsearchsoon": "शाखा खोज सुविधा जल्द ही आ रही है...",
   "loginFailed": "लॉगिन विफल",
 "invalidCredentials": "अवैध प्रत्यय पत्र",
@@ -290,5 +290,47 @@
 "beneficiarydetails": "लाभार्थी विवरण",
 "delete": "मिटाओ",
 "search": "खोजें",
-"viewCardDeatils": "कार्ड विवरण देखें"
+"viewCardDeatils": "कार्ड विवरण देखें",
+"logout": "लॉग आउट",
+"logoutCheck": "क्या आप लॉग आउट करना चाहते हैं?",
+"changeLoginPassword": "लॉगिन पासवर्ड बदलें",
+"currentpwdrqd": "वर्तमान पासवर्ड आवश्यक है",
+"newpwdrqd": "नया पासवर्ड आवश्यक है",
+"pwdFormat": "कम से कम 8 अक्षर (बड़े और छोटे अक्षर), अंक, विशेष अक्षर",
+"newoldpwddiff": "नया पासवर्ड वर्तमान पासवर्ड से भिन्न होना चाहिए",
+"confirmpwdrqd": "पुष्टि पासवर्ड आवश्यक है",
+"pwdmismatch": "सांकेतिक शब्द मेल नहीं खाते",
+"failedtosentOTP": "ओटीपी भेजने में विफल",
+"currentpwd": "वर्तमान पासवर्ड",
+"newpwd": "नया पासवर्ड",
+"confirmpwd": "नए पासवर्ड की पुष्टि करें",
+"pwdchangeSuccess": "पासवर्ड सफलतापूर्वक बदला गया!",
+"failedToValidate": "सत्यापित करने में विफल",
+"otpVerification": "ओटीपी सत्यापन",
+"otpSent": "आपके पंजीकृत मोबाइल नंबर पर एक ओटीपी भेजा गया है।",
+"enterOTP": "ओटीपी दर्ज करें",
+"validateOTP": "ओटीपी सत्यापित करें",
+ "selectThemeMode": "थीम मोड चुनें",
+ "themeModeSystem": "सिस्टम",
+ "themeModeLight": "लाईट",
+ "themeModeDark": "डार्क",
+"details": "विवरण",
+ "remarks": "विचार (अनिवार्य नहीं)",
+ "kccbMobile": "केसीसीबी मोबाइल",
+ "faq": "अक्सर पूछे जाने वाले प्रश्न",
+ "branches": "शाखाओं",
+ "atms": "एटीएम",
+ "dailylimit": "दैनिक लेनदेन सीमा",
+ "currentDailyLimit": "वर्तमान दैनिक सीमा",
+ "noLimitSet": "कोई सीमा निर्धारित नहीं",
+ "addLimit": "सीमा जोड़ें",
+ "editLimit": "सीमा संपादित करें",
+ "removeLimit": "सीमा हटाएँ",
+ "limitAmount": "सीमा राशि",
+ "save": "जमा करें",
+ "deregister": "अपंजीकृत",
+ "deregistercheck": "क्या आप वाकई पंजीकरण रद्द करना चाहते हैं??", 
+ "biometricsNotAvailable": "इस डिवाइस पर बायोमेट्रिक्स उपलब्ध नहीं है",
+ "disableFingerprintLogin": "फ़िंगरप्रिंट लॉगिन अक्षम करें",
+ "disableFingerprintMessage": "क्या आप फ़िंगरप्रिंट लॉगिन अक्षम करना चाहते हैं?"  
 }

lib/main.dart

@@ -1,3 +1,4 @@
+// ignore_for_file: unused_import
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:kmobile/features/security/security_error_screen.dart';
@@ -8,22 +9,19 @@ import 'app.dart';
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  // Set preferred orientations
   await SystemChrome.setPreferredOrientations([
     DeviceOrientation.portraitUp,
     DeviceOrientation.portraitDown,
   ]);
 
   // Check for device compromise
-  final compromisedMessage = await SecurityService.deviceCompromisedMessage;
+  // final compromisedMessage = await SecurityService.deviceCompromisedMessage;
   // if (compromisedMessage != null) {
   //   runApp(MaterialApp(
   //     home: SecurityErrorScreen(message: compromisedMessage),
   //   ));
   //   return;
   // }
-
-  // Initialize dependencies
   await setupDependencies();
   runApp(const KMobile());
 }

lib/widgets/bank_logos.dart

@@ -15,20 +15,27 @@ Widget getBankLogo(String? bankName, BuildContext context) {
       height: 40,
     );
   }
-  if (bankName != null && bankName.toLowerCase().contains('hdfc bank ltd')) {
+  if (bankName != null && bankName.toLowerCase().contains('hdfc')) {
     return Image.asset(
       'assets/images/hdfc_logo.png',
       width: 40,
       height: 40,
     );
   }
-  if (bankName != null && bankName.toLowerCase().contains('icici bank ltd')) {
+  if (bankName != null && bankName.toLowerCase().contains('icici')) {
     return Image.asset(
       'assets/images/icici_logo.png',
       width: 40,
       height: 40,
     );
   }
+  if (bankName != null && bankName.toLowerCase().contains('uco')) {
+    return Image.asset(
+      'assets/images/uco_logo.png',
+      width: 40,
+      height: 40,
+    );
+  }
   if (bankName != null &&
       bankName.toLowerCase().contains('punjab national bank')) {
     return Image.asset(
@@ -71,6 +78,21 @@ Widget getBankLogo(String? bankName, BuildContext context) {
       width: 40,
       height: 40,
     );
+  }
+  if (bankName != null && bankName.toLowerCase().contains('yes')) {
+    return Image.asset(
+      'assets/images/yes_bank_logo.png',
+      width: 40,
+      height: 40,
+    );
+  }
+  if (bankName != null && bankName.toLowerCase().contains('ipsbank') ||
+      bankName != null && bankName.toLowerCase().contains('india post')) {
+    return Image.asset(
+      'assets/images/ipos_logo.png',
+      width: 40,
+      height: 40,
+    );
   } else {
     return Icon(
       Icons.account_balance,

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