Formatting with Checkbook@2025

.gitignore

@@ -44,3 +44,8 @@ app.*.map.json
 lib/l10n/app_localizations.dart
 lib/l10n/app_localizations_en.dart
 lib/l10n/app_localizations_hi.dart
+
+# Keystore files
+android/key.properties
+android/*.jks
+android/*.keystore

android/app/build.gradle

@@ -22,12 +22,19 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace "com.example.kmobile"
     compileSdk flutter.compileSdkVersion
     ndkVersion "27.0.12077973"
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -51,15 +58,21 @@ android {
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-
         }
     }
 }
@@ -68,4 +81,6 @@ flutter {
     source '../..'
 }
 
-dependencies {}
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
+}

android/app/src/main/AndroidManifest.xml

@@ -40,6 +40,20 @@
          https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
 
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+  <intent>
+    <action android:name="android.intent.action.VIEW" />
+    <data android:scheme="https" />
+  </intent>
+  <intent>
+    <action android:name="android.intent.action.VIEW" />
+    <data android:scheme="http" />
+  </intent>
+  <intent>
+    <action android:name="android.intent.action.SENDTO" />
+    <data android:scheme="mailto" />
+  </intent>
+</queries>
     <queries>
         <intent>
             <action android:name="android.intent.action.PROCESS_TEXT"/>

lib/api/services/auth_service.dart

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

lib/api/services/branch_service.dart

@@ -0,0 +1,136 @@
+import 'package:dio/dio.dart';
+
+class Branch {
+  final String branch_code;
+  final String branch_name;
+  final String zone;
+  final String tehsil;
+  final String block;
+  final String block_code;
+  final String distt_name;
+  final String distt_code_slbc;
+  final String date_of_opening;
+  final String rbi_code_1;
+  final String rbi_code_2;
+  final String telephone_no;
+  final String type_of_branch;
+  final String rtgs_acct_no;
+  final String br_lattitude;
+  final String br_longitude;
+  final String pincode;
+  final String post_office;
+
+  Branch({
+    required this.branch_code,
+    required this.branch_name,
+    required this.zone,
+    required this.tehsil,
+    required this.block,
+    required this.block_code,
+    required this.distt_name,
+    required this.distt_code_slbc,
+    required this.date_of_opening,
+    required this.rbi_code_1,
+    required this.rbi_code_2,
+    required this.telephone_no,
+    required this.type_of_branch,
+    required this.rtgs_acct_no,
+    required this.br_lattitude,
+    required this.br_longitude,
+    required this.pincode,
+    required this.post_office,
+  });
+
+  factory Branch.fromJson(Map<String, dynamic> json) {
+    return Branch(
+      branch_code: json['branch_code'] ?? json['branch_code'] ?? '',
+      branch_name: json['branch_name'] ?? json['branch_name'] ?? '',
+      zone: json['zone'] ?? json['zone'] ?? '',
+      tehsil: json['tehsil'] ?? json['tehsil'] ?? '',
+      block: json['block'] ?? json['block'] ?? '',
+      block_code: json['block_code'] ?? json['block_code'] ?? '',
+      distt_name: json['distt_name'] ?? json['distt_name'] ?? '',
+      distt_code_slbc: json['distt_code_slbc'] ?? json['distt_code_slbc'] ?? '',
+      date_of_opening: json['date_of_opening'] ?? json['date_of_opening'] ?? '',
+      rbi_code_1: json['rbi_code_1'] ?? json['rbi_code_1'] ?? '',
+      rbi_code_2: json['rbi_code_2'] ?? json['rbi_code_2'] ?? '',
+      telephone_no: json['telephone_no'] ?? json['telephone_no'] ?? '',
+      type_of_branch: json['type_of_branch'] ?? json['type_of_branch'] ?? '',
+      rtgs_acct_no: json['rtgs_acct_no'] ?? json['rtgs_acct_no'] ?? '',
+      br_lattitude: json['br_lattitude'] ?? json['br_lattitude'] ?? '',
+      br_longitude: json['br_longitude'] ?? json['br_longitude'] ?? '',
+      pincode: json['pincode'] ?? json['pincode'] ?? '',
+      post_office: json['post_office'] ?? json['post_office'] ?? '',
+    );
+  }
+
+  static List<Branch> listFromJson(List<dynamic> jsonList) {
+    final beneficiaryList =
+        jsonList.map((beneficiary) => Branch.fromJson(beneficiary)).toList();
+    return beneficiaryList;
+  }
+}
+
+class Atm {
+  final String name;
+
+  Atm({required this.name});
+
+  factory Atm.fromJson(Map<String, dynamic> json) {
+    return Atm(
+      name: json['name'] ?? '', // Assuming the API returns a 'name' field
+    );
+  }
+
+  static List<Atm> listFromJson(List<dynamic> jsonList) {
+    return jsonList.map((atm) => Atm.fromJson(atm)).toList();
+  }
+}
+
+class BranchService {
+  final Dio _dio;
+  BranchService(this._dio);
+
+  Future<List<Branch>> fetchBranchList() async {
+    try {
+      final response = await _dio.get(
+        "/api/branch",
+        options: Options(
+          headers: {
+            "Content-Type": "application/json",
+          },
+        ),
+      );
+
+      if (response.statusCode == 200) {
+        return Branch.listFromJson(response.data);
+      } else {
+        throw Exception("Failed to fetch");
+      }
+    } catch (e) {
+      return [];
+    }
+  }
+
+  Future<List<Atm>> fetchAtmList() async {
+    try {
+      final response = await _dio.get(
+        "/api/atm",
+        options: Options(
+          headers: {
+            "Content-Type": "application/json",
+          },
+        ),
+      );
+      if (response.statusCode == 200) {
+        return Atm.listFromJson(response.data);
+      } else {
+        throw Exception("Failed to fetch ATM list: ${response.statusCode}");
+      }
+    } catch (e) {
+      // You might want to log the error here for debugging
+      print("Error fetching ATM list: $e");
+      return [];
+    }
+  }
+}

lib/api/services/change_password_service.dart

@@ -67,4 +67,21 @@ class ChangePasswordService {
     }
     return response.toString();
   }
+
+  Future validateChangeTpin({
+    required String oldTpin,
+    required String newTpin,
+  }) async {
+    final response = await _dio.post(
+      '/api/auth/change/tpin',
+      data: {
+        'oldTpin': oldTpin,
+        'newTpin': newTpin,
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Wrong OTP");
+    }
+    return response.toString();
+  }
 }

lib/api/services/cheque_service.dart

@@ -0,0 +1,138 @@
+import 'dart:convert';
+
+import 'package:dio/dio.dart';
+
+class Cheque {
+  final String? type;
+  final String? InstrType;
+  final String? Date;
+  final String? branchCode;
+  final String? fromCheque;
+  final String? toCheque;
+  final String? Chequescount;
+  final String? ChequeNumber;
+  final String? transactionCode;
+  final int? amount;
+  final String? status;
+  final String? stopIssueDate;
+  final String? StopExpiryDate;
+
+  Cheque({
+    this.type,
+    this.InstrType,
+    this.Date,
+    this.branchCode,
+    this.fromCheque,
+    this.toCheque,
+    this.Chequescount,
+    this.ChequeNumber,
+    this.transactionCode,
+    this.amount,
+    this.status,
+    this.stopIssueDate,
+    this.StopExpiryDate,
+  });
+
+  factory Cheque.fromJson(Map<String, dynamic> json) {
+    return Cheque(
+      type: json['type'] ?? '',
+      InstrType: json['InstrType'] ?? '',
+      Date: json['Date'] ?? '',
+      branchCode: json['branchCode'] ?? '',
+      fromCheque: json['fromCheque'] ?? '',
+      toCheque: json['toCheque'] ?? '',
+      Chequescount: json['Chequescount'] ?? '',
+      ChequeNumber: json['ChequeNumber'] ?? '',
+      transactionCode: json['transactionCode'] ?? '',
+      amount: json['amount'],
+      status: json['status'] ?? '',
+      stopIssueDate: json['stopIssueDate'] ?? '',
+      StopExpiryDate: json['StopExpiryDate'] ?? '',
+    );
+  }
+
+  static List<Cheque> listFromJson(List<dynamic> jsonList) {
+    final chequeList =
+        jsonList.map((cheque) => Cheque.fromJson(cheque)).toList();
+    return chequeList;
+  }
+}
+
+class ChequeService {
+  final Dio _dio;
+  ChequeService(this._dio);
+
+  Future<List<Cheque>> ChequeEnquiry({
+    required String accountNumber,
+    required String instrType,
+  }) async {
+    try {
+      final response = await _dio.get(
+        "/api/cheque/enquiry",
+        queryParameters: {
+          'accountNumber': accountNumber,
+          'instrumentType': instrType,
+        },
+        options: Options(
+          headers: {
+            "Content-Type": "application/json",
+          },
+        ),
+      );
+
+      if (response.statusCode == 200) {
+        if (response.data is Map<String, dynamic> &&
+            response.data.containsKey('records')) {
+          final records = response.data['records'];
+          if (records is List) {
+            return Cheque.listFromJson(records);
+          }
+        }
+        throw Exception(
+            "Unexpected API response format: 'records' list not found or malformed");
+      } else {
+        throw Exception("Failed to fetch");
+      }
+    } catch (e) {
+      print('Error in ChequeEnquiry: $e');
+      throw e;
+    }
+  }
+
+  Future stopCheque({
+    required String accountno,
+    required String stopFromChequeNo,
+    required String instrType,
+    String? stopToChequeNo,
+    String? stopIssueDate,
+    String? stopExpiryDate,
+    String? stopAmount,
+    String? stopComment,
+    String? chequeIssueDate,
+    required String tpin,
+  }) async {
+    final response = await _dio.post(
+      '/api/cheque/stop',
+      options: Options(
+        validateStatus: (int? status) => true,
+        receiveDataWhenStatusError: true,
+      ),
+      data: {
+        'accountNumber': accountno,
+        'stopFromChequeNo': stopFromChequeNo,
+        'instrumentType': instrType,
+        'stopToChequeNo': stopToChequeNo,
+        'stopIssueDate': stopIssueDate,
+        'stopExpiryDate': stopExpiryDate,
+        'stopAmount': stopAmount,
+        'stopComment': stopComment,
+        'chqIssueDate': chequeIssueDate,
+        'tpin': tpin,
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception(jsonEncode(response.data));
+    }
+    return response.toString();
+  }
+}

lib/api/services/limit_service.dart

@@ -13,8 +13,8 @@ class Limit {
 
   factory Limit.fromJson(Map<String, dynamic> json) {
     return Limit(
-      dailyLimit: json['dailyLimit']!,
-      usedLimit: json['usedLimit']!,
+      dailyLimit: (json['dailyLimit'] as num).toDouble(),
+      usedLimit: (json['usedLimit'] as num).toDouble(),
     );
   }
 }
@@ -39,7 +39,7 @@ class LimitService {
     }
   }
 
-  void editLimit( double newLimit) async {
+  void editLimit(double newLimit) async {
     try {
       final response = await _dio.post('/api/customer/daily-limit',
           data: '{"amount": $newLimit}');
@@ -54,4 +54,34 @@ class LimitService {
       throw Exception('Unexpected error: ${e.toString()}');
     }
   }
+
+  Future getOtpTLimit({
+    required String mobileNumber,
+  }) async {
+    final response = await _dio.post(
+      '/api/otp/send',
+      data: {'mobileNumber': mobileNumber, 'type': "TLIMIT"},
+    );
+    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();
+  }
 }

lib/app.dart

@@ -12,8 +12,8 @@ import 'package:kmobile/features/auth/controllers/theme_state.dart';
 import 'config/routes.dart';
 import 'di/injection.dart';
 import 'features/auth/controllers/auth_cubit.dart';
-import 'features/card/screens/card_management_screen.dart';
-import 'features/auth/screens/splash_screen.dart';
+import 'features/accounts/screens/account_statement_screen.dart';
+import 'package:kmobile/features/auth/controllers/auth_state.dart';
 import 'features/auth/screens/login_screen.dart';
 import 'features/service/screens/service_screen.dart';
 import 'features/dashboard/screens/dashboard_screen.dart';
@@ -37,7 +37,6 @@ class KMobile extends StatefulWidget {
 
 class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
   Timer? _backgroundTimer;
-  bool showSplash = true;
   Locale? _locale;
 
   @override
@@ -45,11 +44,6 @@ class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
     super.initState();
     WidgetsBinding.instance.addObserver(this);
     loadPreferences();
-    Future.delayed(const Duration(seconds: 3), () {
-      setState(() {
-        showSplash = false;
-      });
-    });
   }
 
   @override
@@ -131,9 +125,12 @@ class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
                 theme: themeState.getLightThemeData(),
                 darkTheme: themeState.getDarkThemeData(),
                 themeMode: context.watch<ThemeModeCubit>().state.mode,
+                navigatorObservers: [
+                  getIt<RouteObserver<ModalRoute<void>>>(),
+                ],
                 onGenerateRoute: AppRoutes.generateRoute,
                 initialRoute: AppRoutes.splash,
-                home: showSplash ? const SplashScreen() : const AuthGate(),
+                home: const AuthGate(),
               );
             },
           );
@@ -205,7 +202,7 @@ class _AuthGateState extends State<AuthGate> {
   @override
   Widget build(BuildContext context) {
     if (_checking) {
-      return const SplashScreen();
+      return const LoginScreen();
     }
     if (_isLoggedIn) {
       if (_hasMPin) {
@@ -214,7 +211,7 @@ class _AuthGateState extends State<AuthGate> {
             future: _tryBiometric(),
             builder: (context, snapshot) {
               if (snapshot.connectionState == ConnectionState.waiting) {
-                return const SplashScreen();
+                return const LoginScreen();
               }
               if (snapshot.data == true) {
                 return const NavigationScaffold();
@@ -316,7 +313,21 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
   int _selectedIndex = 0;
   final List<Widget> _pages = [
     const DashboardScreen(),
-    const CardManagementScreen(),
+    BlocBuilder<AuthCubit, AuthState>(
+      builder: (context, state) {
+        if (state is Authenticated) {
+          if (state.users.isNotEmpty) {
+            return AccountStatementScreen(
+              users: state.users,
+              selectedIndex: 0,
+            );
+          } else {
+            return const Center(child: Text("No accounts found."));
+          }
+        }
+        return const Center(child: CircularProgressIndicator());
+      },
+    ),
     const ServiceScreen(),
   ];
 
@@ -375,8 +386,8 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
               label: AppLocalizations.of(context).home,
             ),
             BottomNavigationBarItem(
-              icon: const Icon(Icons.credit_card),
-              label: AppLocalizations.of(context).card,
+              icon: const Icon(Icons.swap_vert_sharp),
+              label: AppLocalizations.of(context).transactions,
             ),
             BottomNavigationBarItem(
               icon: const Icon(Icons.miscellaneous_services),
@@ -422,7 +433,7 @@ class BiometricPromptScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     Future.microtask(() => _showDialog(context));
-    return const SplashScreen();
+    return const SizedBox.shrink();
   }
 
   Future<void> _showDialog(BuildContext context) async {

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,9 @@ 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/config/themes.dart

@@ -15,7 +15,17 @@ class AppThemes {
       colorScheme: colorScheme,
       useMaterial3: true,
       textTheme: GoogleFonts.rubikTextTheme(),
-    );
+    ).copyWith(
+        appBarTheme: AppBarTheme(
+      backgroundColor: const Color(0xFF01A04C),
+      titleTextStyle: TextStyle(
+        color: colorScheme.onPrimary,
+        fontWeight: FontWeight.w700,
+        fontSize: 20,
+      ),
+      iconTheme: IconThemeData(color: colorScheme.onPrimary),
+      actionsIconTheme: IconThemeData(color: colorScheme.onPrimary),
+    ));
   }
 
   static ThemeData getDarkTheme(ThemeType type) {
@@ -32,7 +42,17 @@ class AppThemes {
       textTheme: GoogleFonts.rubikTextTheme(
         ThemeData(brightness: Brightness.dark).textTheme,
       ),
-    );
+    ).copyWith(
+        appBarTheme: AppBarTheme(
+      backgroundColor: const Color(0xFF01A04C),
+      titleTextStyle: TextStyle(
+        color: colorScheme.onPrimary,
+        fontWeight: FontWeight.w700,
+        fontSize: 20,
+      ),
+      iconTheme: IconThemeData(color: colorScheme.onPrimary),
+      actionsIconTheme: IconThemeData(color: colorScheme.onPrimary),
+    ));
   }
 
   static Color _getSeedColor(ThemeType type) {

lib/data/models/beneficiary.dart

@@ -2,6 +2,7 @@ class Beneficiary {
   final String accountNo;
   final String accountType;
   final String name;
+  final DateTime? createdAt;
   final String ifscCode;
   final String? bankName;
   final String? branchName;
@@ -11,6 +12,7 @@ class Beneficiary {
     required this.accountNo,
     required this.accountType,
     required this.name,
+    this.createdAt,
     required this.ifscCode,
     this.bankName,
     this.branchName,
@@ -21,6 +23,9 @@ class Beneficiary {
     return Beneficiary(
       accountNo: json['account_no'] ?? json['accountNo'] ?? '',
       accountType: json['account_type'] ?? json['accountType'] ?? '',
+      createdAt: json['createdAt'] == null
+          ? null
+          : DateTime.tryParse(json['createdAt']),
       name: json['name'] ?? '',
       ifscCode: json['ifsc_code'] ?? json['ifscCode'] ?? '',
       bankName: json['bank_name'] ?? json['bankName'] ?? '',

lib/data/repositories/auth_repository.dart

@@ -13,10 +13,12 @@ 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 +29,7 @@ class AuthRepository {
 
     // Get and save user profile
     final users = await _userService.getUserDetails();
-    return users;
+    return (users, authToken);
   }
 
   Future<bool> isLoggedIn() async {
@@ -47,6 +49,7 @@ class AuthRepository {
     await _secureStorage.write(_accessTokenKey, token.accessToken);
     await _secureStorage.write(
         _tokenExpiryKey, token.expiresAt.toIso8601String());
+    await _secureStorage.write(_tncKey, token.tnc.toString());
   }
 
   Future<void> clearAuthTokens() async {
@@ -56,13 +59,28 @@ class AuthRepository {
   Future<AuthToken?> _getAuthToken() async {
     final accessToken = await _secureStorage.read(_accessTokenKey);
     final expiryString = await _secureStorage.read(_tokenExpiryKey);
+    final tncString = await _secureStorage.read(_tncKey);
 
     if (accessToken != null && expiryString != null) {
-      return AuthToken(
+      final authToken = AuthToken(
         accessToken: accessToken,
         expiresAt: DateTime.parse(expiryString),
+        tnc:
+            tncString == 'true', // Parse 'true' string to true, otherwise false
       );
+      return authToken;
     }
     return null;
   }
+
+  Future<void> acceptTnc() async {
+    // This method calls the setTncFlag function
+    try {
+      await _authService.setTncflag();
+    } catch (e) {
+      // Handle or rethrow the error as needed
+      print('Error setting TNC flag: $e');
+      rethrow;
+    }
+  }
 }

lib/di/injection.dart

@@ -1,3 +1,6 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/api/services/branch_service.dart';
+import 'package:kmobile/api/services/cheque_service.dart';
 import 'package:kmobile/api/services/limit_service.dart';
 import 'package:kmobile/api/services/rtgs_service.dart';
 import 'package:kmobile/api/services/neft_service.dart';
@@ -20,6 +23,8 @@ import '../security/secure_storage.dart';
 final getIt = GetIt.instance;
 
 Future<void> setupDependencies() async {
+  getIt.registerSingleton<RouteObserver<ModalRoute<void>>>(
+      RouteObserver<ModalRoute<void>>());
   //getIt.registerLazySingleton<ThemeController>(() => ThemeController());
   //getIt.registerLazySingleton<ThemeModeController>(() => ThemeModeController());
   getIt.registerSingleton<ThemeCubit>(ThemeCubit());
@@ -51,6 +56,8 @@ Future<void> setupDependencies() async {
   getIt.registerSingleton<NeftService>(NeftService(getIt<Dio>()));
   getIt.registerSingleton<RtgsService>(RtgsService(getIt<Dio>()));
   getIt.registerSingleton<ImpsService>(ImpsService(getIt<Dio>()));
+  getIt.registerSingleton<BranchService>(BranchService(getIt<Dio>()));
+  getIt.registerSingleton<ChequeService>(ChequeService(getIt<Dio>()));
   getIt.registerLazySingleton<ChangePasswordService>(
     () => ChangePasswordService(getIt<Dio>()),
   );
@@ -61,17 +68,17 @@ Future<void> setupDependencies() async {
       );
 
   // Register controllers/cubits
-  getIt.registerFactory<AuthCubit>(
-      () => AuthCubit(getIt<AuthRepository>(), getIt<UserService>()));
+  getIt.registerFactory<AuthCubit>(() => AuthCubit(
+      getIt<AuthRepository>(), getIt<UserService>(), getIt<SecureStorage>()));
 }
 
 Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-         // 'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
+          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com', //test
       //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
-      'https://kccbmbnk.net', //prod small
+      //'https://kccbmbnk.net', //prod small
       connectTimeout: const Duration(seconds: 60),
       receiveTimeout: const Duration(seconds: 60),
       headers: {

lib/features/accounts/screens/account_info_screen.dart

@@ -18,30 +18,70 @@ class AccountInfoScreen extends StatefulWidget {
 
 class _AccountInfoScreen extends State<AccountInfoScreen> {
   late User selectedUser;
+
   @override
   void initState() {
     super.initState();
+
     selectedUser = widget.users[widget.selectedIndex];
   }
 
+  String getFullAccountType(String? accountType) {
+    if (accountType == null || accountType.isEmpty) return 'N/A';
+    // 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;
+      case 'td':
+        return AppLocalizations.of(context).termDeposit;
+      case 'rd':
+        return AppLocalizations.of(context).recurringDeposit;
+      case 'ca':
+        return "Current Account";
+      case 'cc':
+        return "Cash Credit Account";
+      case 'od':
+        return "Overdraft Account";
+      default:
+        return AppLocalizations.of(context).unknownAccount;
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final users = widget.users;
+
     int selectedIndex = widget.selectedIndex;
+
     return Scaffold(
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)
             .accountInfo
             .replaceFirst(RegExp('\n'), '')),
       ),
-      body: ListView(
+      body: Stack(
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Column(
+              children: [
+                Card(
+                  elevation: 4,
+                  margin: const EdgeInsets.symmetric(vertical: 8.0),
+                  child: Padding(
                     padding: const EdgeInsets.all(16.0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Text(
                           AppLocalizations.of(context).accountNumber,
-            style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14),
+                          style: const TextStyle(
+                              fontWeight: FontWeight.bold, fontSize: 18),
                         ),
-
                         DropdownButton<User>(
                           value: selectedUser,
                           onChanged: (User? newUser) {
@@ -54,39 +94,83 @@ class _AccountInfoScreen extends State<AccountInfoScreen> {
                           items: widget.users.map((user) {
                             return DropdownMenuItem<User>(
                               value: user,
-                child: Text(user.accountNo.toString()),
+                              child: Text(
+                                user.accountNo.toString(),
+                                style: const TextStyle(
+                                    fontSize: 20, fontWeight: FontWeight.bold),
+                              ),
                             );
                           }).toList(),
+                          isExpanded: true,
                         ),
-
+                      ],
+                    ),
+                  ),
+                ),
+                Expanded(
+                  child: Card(
+                    elevation: 4,
+                    margin: const EdgeInsets.symmetric(vertical: 8.0),
+                    child: Padding(
+                      padding: const EdgeInsets.all(16.0),
+                      child: ListView(
+                        children: [
                           InfoRow(
                             title: AppLocalizations.of(context).customerNumber,
                             value: selectedUser.cifNumber ?? 'N/A',
                           ),
+                          InfoRow(
+                            title: AppLocalizations.of(context).accountType,
+                            value: getFullAccountType(selectedUser.accountType),
+                          ),
                           InfoRow(
                             title: AppLocalizations.of(context).productName,
                             value: selectedUser.productType ?? 'N/A',
                           ),
-          // InfoRow(title: 'Account Opening Date', value: users[selectedIndex].accountOpeningDate ?? 'N/A'),
                           InfoRow(
                             title: AppLocalizations.of(context).accountStatus,
                             value: 'OPEN',
                           ),
                           InfoRow(
-            title: AppLocalizations.of(context).availableBalance,
+                            title:
+                                AppLocalizations.of(context).availableBalance,
                             value: selectedUser.availableBalance ?? 'N/A',
                           ),
                           InfoRow(
                             title: AppLocalizations.of(context).currentBalance,
                             value: selectedUser.currentBalance ?? 'N/A',
                           ),
-
-          users[selectedIndex].approvedAmount != null
-              ? InfoRow(
-                  title: AppLocalizations.of(context).approvedAmount,
+                          if (users[selectedIndex].approvedAmount != null)
+                            InfoRow(
+                              title:
+                                  AppLocalizations.of(context).approvedAmount,
                               value: selectedUser.approvedAmount ?? 'N/A',
-                )
-              : const SizedBox.shrink(),
+                            ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+
+                    width: 200, // Adjust size as needed
+
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
         ],
       ),
     );
@@ -111,15 +195,18 @@ class InfoRow extends StatelessWidget {
           Text(
             title,
             style: TextStyle(
-              fontSize: 15,
-              fontWeight: FontWeight.w500,
+              fontSize: 18,
+              fontWeight: FontWeight.bold,
               color: theme.colorScheme.onSurfaceVariant,
             ),
           ),
           const SizedBox(height: 3),
           Text(
             value,
-            style: TextStyle(fontSize: 16, color: theme.colorScheme.onSurface),
+            style: TextStyle(
+                fontSize: 20,
+                fontWeight: FontWeight.bold,
+                color: theme.colorScheme.onSurface),
           ),
         ],
       ),

lib/features/accounts/screens/all_accounts_screen.dart

@@ -0,0 +1,155 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/data/models/user.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+
+import '../../../l10n/app_localizations.dart';
+
+class AllAccountsScreen extends StatefulWidget {
+  final List<User> users;
+  const AllAccountsScreen({super.key, required this.users});
+
+  @override
+  State<AllAccountsScreen> createState() => _AllAccountsScreenState();
+}
+
+class _AllAccountsScreenState extends State<AllAccountsScreen> {
+  final Map<String, bool> _visibilityMap = {};
+
+  String getFullAccountType(BuildContext context, String? accountType) {
+    // This is duplicated from dashboard_screen.dart.
+    // In a real app, this should be moved to a utility/helper class.
+    if (accountType == null || accountType.isEmpty) return 'N/A';
+    switch (accountType.toLowerCase()) {
+      case 'sa':
+        return AppLocalizations.of(context).savingsAccount;
+      case 'sb':
+        return AppLocalizations.of(context).savingsAccount;
+      case 'ln':
+        return AppLocalizations.of(context).loanAccount;
+      case 'td':
+        return AppLocalizations.of(context).termDeposit;
+      case 'rd':
+        return AppLocalizations.of(context).recurringDeposit;
+      case 'ca':
+        return "Current Account";
+      case 'cc':
+        return "Cash Credit Account";
+      case 'od':
+        return "Overdraft Account";
+      default:
+        return AppLocalizations.of(context).unknownAccount;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).viewall),
+      ),
+      body: Column(
+        children: [
+          const SizedBox(height: 16.0), // Added space below the app bar
+          Expanded(
+            child: ListView.builder(
+              itemCount: widget.users.length,
+              itemBuilder: (context, index) {
+                final user = widget.users[index];
+                return Padding(
+                  padding: const EdgeInsets.symmetric(
+                      horizontal: 16.0, vertical: 8.0),
+                  child: _buildAccountCard(user),
+                );
+              },
+            ),
+          ), // Closing Expanded
+        ], // Closing Column
+      ),
+    );
+  }
+
+  Widget _buildAccountCard(User user) {
+    final theme = Theme.of(context);
+    final accountNo = user.accountNo ?? '';
+    final isVisible = _visibilityMap[accountNo] ?? false;
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 12),
+      decoration: BoxDecoration(
+        color: const Color(0xFF01A04C),
+        borderRadius: BorderRadius.circular(16),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          // Top section: Account Type and Number
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                getFullAccountType(context, user.accountType),
+                style: TextStyle(
+                  color: theme.colorScheme.onPrimary,
+                  fontSize: 16,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              Text(
+                user.accountNo ?? 'N/A',
+                style: TextStyle(
+                  color: theme.colorScheme.onPrimary,
+                  fontSize: 14,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 16),
+          // Bottom section: Balance and Toggle
+          Row(
+            children: [
+              Text(
+                "₹ ",
+                style: TextStyle(
+                  color: theme.colorScheme.onPrimary,
+                  fontSize: 32,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              Expanded(
+                child: FittedBox(
+                  fit: BoxFit.scaleDown,
+                  alignment: Alignment.centerLeft,
+                  child: Text(
+                    isVisible ? user.currentBalance ?? '0.00' : '*****',
+                    style: TextStyle(
+                      color: theme.colorScheme.onPrimary,
+                      fontSize: 32,
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                ),
+              ),
+              const Spacer(),
+              InkWell(
+                onTap: () {
+                  setState(() {
+                    _visibilityMap[accountNo] = !isVisible;
+                  });
+                },
+                child: Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Icon(
+                    isVisible ? Symbols.visibility_lock : Symbols.visibility,
+                    color: theme.scaffoldBackgroundColor,
+                    weight: 800,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/features/accounts/screens/transaction_details_screen.dart

@@ -14,7 +14,9 @@ class TransactionDetailsScreen extends StatelessWidget {
     return Scaffold(
       appBar:
           AppBar(title: Text(AppLocalizations.of(context).transactionDetails)),
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(16.0),
             child: Column(
               children: [
@@ -37,8 +39,12 @@ class TransactionDetailsScreen extends StatelessWidget {
                             ),
                             const SizedBox(width: 8),
                             Icon(
-                          isCredit ? Symbols.call_received : Symbols.call_made,
-                          color: isCredit ? Colors.green : Colors.red,
+                              isCredit
+                                  ? Symbols.call_received
+                                  : Symbols.call_made,
+                              color: isCredit
+                                  ? const Color(0xFF10BB10)
+                                  : Theme.of(context).colorScheme.error,
                               size: 28,
                             ),
                           ],
@@ -47,9 +53,9 @@ class TransactionDetailsScreen extends StatelessWidget {
                         // Date centered
                         Text(
                           transaction.date ?? "",
-                      style: const TextStyle(
+                          style: TextStyle(
                             fontSize: 16,
-                        color: Colors.grey,
+                            color: Theme.of(context).textTheme.bodySmall?.color,
                           ),
                           textAlign: TextAlign.center,
                         ),
@@ -57,12 +63,13 @@ class TransactionDetailsScreen extends StatelessWidget {
                     ),
                   ),
                 ),
-            const Divider(),
+                Divider(color: Theme.of(context).dividerColor),
                 Expanded(
                   flex: 5,
                   child: ListView(
                     children: [
-                  _buildDetailRow(AppLocalizations.of(context).transactionType,
+                      _buildDetailRow(
+                          AppLocalizations.of(context).transactionType,
                           transaction.type ?? ""),
                       _buildDetailRow(AppLocalizations.of(context).transferType,
                           transaction.name.split("/").first ?? ""),
@@ -73,14 +80,30 @@ class TransactionDetailsScreen extends StatelessWidget {
                       //       AppLocalizations.of(context).beneficiaryAccountNo,
                       //       transaction.name.split("A/C ").last ?? "")
                       // ]
-                  _buildDetailRow(
-                      AppLocalizations.of(context).details, transaction.name),
+                      _buildDetailRow(AppLocalizations.of(context).details,
+                          transaction.name),
                     ],
                   ),
                 ),
               ],
             ),
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 

lib/features/auth/controllers/auth_cubit.dart

@@ -1,14 +1,19 @@
 import 'package:bloc/bloc.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 +34,62 @@ 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));
+      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/models/auth_token.dart

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

lib/features/auth/screens/login_screen.dart

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

lib/features/auth/screens/mpin_screen.dart

@@ -4,7 +4,6 @@ import 'dart:math';
 // import 'dart:developer';
 
 import 'package:flutter/material.dart';
-import 'package:kmobile/app.dart';
 import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:local_auth/local_auth.dart';
@@ -16,12 +15,18 @@ class MPinScreen extends StatefulWidget {
   final MPinMode mode;
   final String? initialPin;
   final void Function(String pin)? onCompleted;
+  final bool disableBiometric;
+  final String? customTitle;
+  final String? customConfirmTitle;
 
   const MPinScreen({
     super.key,
     required this.mode,
     this.initialPin,
     this.onCompleted,
+    this.disableBiometric = false,
+    this.customTitle,
+    this.customConfirmTitle,
   });
 
   @override
@@ -78,7 +83,7 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
       CurvedAnimation(parent: _waveController, curve: Curves.easeInOut),
     );
 
-    if (widget.mode == MPinMode.enter) {
+    if (widget.mode == MPinMode.enter && !widget.disableBiometric) {
       _tryBiometricBeforePin();
     }
   }
@@ -173,29 +178,36 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
         }
         break;
       case MPinMode.set:
-        // propagate parent onCompleted into confirm step
-        Navigator.push(
+        // Navigate to confirm and wait for result
+        final result = await Navigator.push(
           context,
           MaterialPageRoute(
             builder: (_) => MPinScreen(
               mode: MPinMode.confirm,
               initialPin: pin,
-              onCompleted: widget.onCompleted, // <-- use parent callback
+              onCompleted: (confirmedPin) {
+                // Just pop with the pin, don't call parent callback yet
+                Navigator.of(context).pop(confirmedPin);
+              },
+              disableBiometric: widget.disableBiometric,
+              customTitle: widget.customConfirmTitle,
             ),
           ),
         );
+
+        // If confirm succeeded, call parent callback
+        if (result != null && mounted) {
+          widget.onCompleted?.call(result);
+        }
         break;
       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
+          // 2) Call the onCompleted callback to let the parent handle navigation
           if (mounted) {
-            Navigator.of(context, rootNavigator: true).pushAndRemoveUntil(
-              MaterialPageRoute(builder: (_) => const NavigationScaffold()),
-              (route) => false,
-            );
+            widget.onCompleted?.call(pin);
           }
         } else {
           setState(() {
@@ -339,6 +351,9 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   String getTitle() {
+    if (widget.customTitle != null) {
+      return widget.customTitle!;
+    }
     switch (widget.mode) {
       case MPinMode.enter:
         return AppLocalizations.of(context).enterMPIN;

lib/features/auth/screens/tnc_required_screen.dart

@@ -0,0 +1,58 @@
+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: Stack(
+        children: [
+          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'),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/features/beneficiaries/screens/add_beneficiary_screen.dart

@@ -264,7 +264,9 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
         centerTitle: false,
       ),
       body: SafeArea(
-        child: Form(
+        child: Stack(
+          children: [
+            Form(
               key: _formKey,
               child: Column(
                 children: [
@@ -343,7 +345,8 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                                 LengthLimitingTextInputFormatter(11),
                               ],
                               decoration: InputDecoration(
-                            labelText: AppLocalizations.of(context).ifscCode,
+                                labelText:
+                                    AppLocalizations.of(context).ifscCode,
                                 border: const OutlineInputBorder(),
                                 isDense: true,
                               ),
@@ -360,7 +363,8 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                                 });
                               },
                               validator: (value) {
-                            final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
+                                final pattern =
+                                    RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
                                 if (value == null || value.trim().isEmpty) {
                                   return AppLocalizations.of(context).enterIfsc;
                                 } else if (!pattern.hasMatch(
@@ -377,9 +381,11 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             //  Bank Name (Disabled)
                             TextFormField(
                               controller: bankNameController,
-                          enabled: false, // changed from readOnly to disabled
+                              enabled:
+                                  false, // changed from readOnly to disabled
                               decoration: InputDecoration(
-                            labelText: AppLocalizations.of(context).bankName,
+                                labelText:
+                                    AppLocalizations.of(context).bankName,
                                 border: const OutlineInputBorder(),
                                 isDense: true,
                               ),
@@ -388,9 +394,11 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             // 🔹 Branch Name (Disabled)
                             TextFormField(
                               controller: branchNameController,
-                          enabled: false, // changed from readOnly to disabled
+                              enabled:
+                                  false, // changed from readOnly to disabled
                               decoration: InputDecoration(
-                            labelText: AppLocalizations.of(context).branchName,
+                                labelText:
+                                    AppLocalizations.of(context).branchName,
                                 border: const OutlineInputBorder(),
                                 isDense: true,
                               ),
@@ -418,9 +426,10 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                                       isDense: true,
                                     ),
                                     textInputAction: TextInputAction.next,
-                                validator: (value) => value == null ||
-                                        value.isEmpty
-                                    ? AppLocalizations.of(context).nameRequired
+                                    validator: (value) =>
+                                        value == null || value.isEmpty
+                                            ? AppLocalizations.of(context)
+                                                .nameRequired
                                             : null,
                                   ),
                                 ],
@@ -437,7 +446,8 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                                         ? null
                                         : () {
                                             final isAccountValid =
-                                            _accountNumberFieldKey.currentState!
+                                                _accountNumberFieldKey
+                                                    .currentState!
                                                     .validate();
                                             final isConfirmAccountValid =
                                                 _confirmAccountNumberFieldKey
@@ -470,7 +480,8 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             DropdownButtonFormField<String>(
                               value: accountType,
                               decoration: InputDecoration(
-                            labelText: AppLocalizations.of(context).accountType,
+                                labelText:
+                                    AppLocalizations.of(context).accountType,
                                 border: const OutlineInputBorder(),
                                 isDense: true,
                               ),
@@ -503,8 +514,8 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                                 isDense: true,
                               ),
                               textInputAction: TextInputAction.done,
-                          validator: (value) =>
-                              value == null || value.length != 10
+                              validator: (value) => value == null ||
+                                      value.length != 10
                                   ? AppLocalizations.of(context).enterValidPhone
                                   : null,
                             ),
@@ -525,8 +536,9 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             padding: const EdgeInsets.symmetric(vertical: 16),
                             backgroundColor:
                                 Theme.of(context).colorScheme.primaryContainer,
-                        foregroundColor:
-                            Theme.of(context).colorScheme.onPrimaryContainer),
+                            foregroundColor: Theme.of(context)
+                                .colorScheme
+                                .onPrimaryContainer),
                         child: Text(
                           AppLocalizations.of(context).validateAndAdd,
                           style: const TextStyle(fontSize: 16),
@@ -537,6 +549,22 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                 ],
               ),
             ),
+            IgnorePointer(
+              child: Center(
+                child: Opacity(
+                  opacity: 0.07, // Reduced opacity
+                  child: ClipOval(
+                    child: Image.asset(
+                      'assets/images/logo.png',
+                      width: 200, // Adjust size as needed
+                      height: 200, // Adjust size as needed
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }

lib/features/beneficiaries/screens/beneficiary_details_screen.dart

@@ -22,7 +22,9 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
       _showSuccessDialog(context);
     } catch (e) {
       ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('Failed to delete beneficiary: $e')),
+        SnackBar(
+            content: Text(
+                '${AppLocalizations.of(context).failedToDeleteBeneficiary} : $e')),
       );
     }
   }
@@ -32,11 +34,12 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
       context: context,
       builder: (BuildContext context) {
         return AlertDialog(
-          title: const Text('Success'),
-          content: const Text('Beneficiary deleted successfully.'),
+          title: Text(AppLocalizations.of(context).success),
+          content:
+              Text(AppLocalizations.of(context).beneficiaryDeletedSuccessfully),
           actions: <Widget>[
             TextButton(
-              child: const Text('OK'),
+              child: Text(AppLocalizations.of(context).ok),
               onPressed: () {
                 Navigator.of(context).popUntil((route) => route.isFirst);
               },
@@ -52,18 +55,18 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
       context: context,
       builder: (BuildContext context) {
         return AlertDialog(
-          title: const Text('Delete Beneficiary'),
-          content:
-              const Text('Are you sure you want to delete this beneficiary?'),
+          title: Text(AppLocalizations.of(context).deleteBeneficiary),
+          content: Text(AppLocalizations.of(context)
+              .areYouSureYouWantToDeleteThisBeneficiary),
           actions: <Widget>[
             TextButton(
-              child: const Text('Cancel'),
+              child: Text(AppLocalizations.of(context).cancel),
               onPressed: () {
                 Navigator.of(context).pop();
               },
             ),
             TextButton(
-              child: const Text('Delete'),
+              child: Text(AppLocalizations.of(context).delete),
               onPressed: () {
                 _deleteBeneficiary(context);
               },
@@ -81,7 +84,9 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
         title: Text(AppLocalizations.of(context).beneficiarydetails),
       ),
       body: SafeArea(
-        child: Padding(
+        child: Stack(
+          children: [
+            Padding(
               padding: const EdgeInsets.all(16.0),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -104,9 +109,11 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
                   const SizedBox(height: 24),
                   _buildDetailRow('${AppLocalizations.of(context).bankName} ',
                       beneficiary.bankName ?? 'N/A'),
-              _buildDetailRow('${AppLocalizations.of(context).accountNumber} ',
+                  _buildDetailRow(
+                      '${AppLocalizations.of(context).accountNumber} ',
                       beneficiary.accountNo),
-              _buildDetailRow('${AppLocalizations.of(context).accountType} ',
+                  _buildDetailRow(
+                      '${AppLocalizations.of(context).accountType} ',
                       beneficiary.accountType),
                   _buildDetailRow('${AppLocalizations.of(context).ifscCode} ',
                       beneficiary.ifscCode),
@@ -136,6 +143,22 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
                 ],
               ),
             ),
+            IgnorePointer(
+              child: Center(
+                child: Opacity(
+                  opacity: 0.07, // Reduced opacity
+                  child: ClipOval(
+                    child: Image.asset(
+                      'assets/images/logo.png',
+                      width: 200, // Adjust size as needed
+                      height: 200, // Adjust size as needed
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }

lib/features/beneficiaries/screens/manage_beneficiaries_screen.dart

@@ -21,21 +21,47 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
   var service = getIt<BeneficiaryService>();
   bool _isLoading = true;
   List<Beneficiary> _beneficiaries = [];
+  List<Beneficiary> _filteredBeneficiaries = [];
+  final TextEditingController _searchController = TextEditingController();
 
   @override
   void initState() {
     super.initState();
     _loadBeneficiaries();
+    _searchController.addListener(() {
+      _filterBeneficiaries(_searchController.text);
+    });
+  }
+
+  @override
+  void dispose() {
+    _searchController.dispose();
+    super.dispose();
   }
 
   Future<void> _loadBeneficiaries() async {
     final data = await service.fetchBeneficiaryList();
     setState(() {
       _beneficiaries = data;
+      _filteredBeneficiaries = data;
       _isLoading = false;
     });
   }
 
+  void _filterBeneficiaries(String query) {
+    setState(() {
+      if (query.isEmpty) {
+        _filteredBeneficiaries = _beneficiaries;
+      } else {
+        _filteredBeneficiaries = _beneficiaries.where((beneficiary) {
+          final lowerQuery = query.toLowerCase();
+          return beneficiary.name.toLowerCase().contains(lowerQuery) ||
+              beneficiary.accountNo.toLowerCase().contains(lowerQuery);
+        }).toList();
+      }
+    });
+  }
+
   Widget _buildShimmerList() {
     return ListView.builder(
       itemCount: 6,
@@ -63,15 +89,17 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
   }
 
   Widget _buildBeneficiaryList() {
-    if (_beneficiaries.isEmpty) {
+    if (_filteredBeneficiaries.isEmpty) {
       return Center(
           child: Text(AppLocalizations.of(context).noBeneficiaryFound));
     }
     return ListView.builder(
-      itemCount: _beneficiaries.length,
+      itemCount: _filteredBeneficiaries.length,
       itemBuilder: (context, index) {
-        final item = _beneficiaries[index];
-        return ListTile(
+        final item = _filteredBeneficiaries[index];
+        return Card(
+          margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+          child: ListTile(
             leading: CircleAvatar(
               radius: 24,
               backgroundColor: Colors.transparent,
@@ -97,6 +125,7 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
                 ),
               );
             },
+          ),
         );
       },
     );
@@ -109,7 +138,47 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
       appBar: AppBar(
         title: Text(AppLocalizations.of(context).beneficiaries),
       ),
-      body: _isLoading ? _buildShimmerList() : _buildBeneficiaryList(),
+      body: Stack(
+        children: [
+          Column(
+            children: [
+              Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: TextField(
+                  controller: _searchController,
+                  decoration: InputDecoration(
+                    hintText:
+                        AppLocalizations.of(context).searchByNameOrAccountHint,
+                        
+                    prefixIcon: const Icon(Icons.search),
+                    border: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(12),
+                    ),
+                  ),
+                ),
+              ),
+              Expanded(
+                child:
+                    _isLoading ? _buildShimmerList() : _buildBeneficiaryList(),
+              ),
+            ],
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
       floatingActionButton: Padding(
         padding: const EdgeInsets.only(bottom: 8.0),
         child: FloatingActionButton(

lib/features/card/screens/block_card_screen.dart

@@ -56,12 +56,12 @@ class _BlockCardScreen extends State<BlockCardScreen> {
       appBar: AppBar(
         title: Text(
           AppLocalizations.of(context).blockCard,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
       ),
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(10.0),
             child: Form(
               key: _formKey,
@@ -100,18 +100,21 @@ class _BlockCardScreen extends State<BlockCardScreen> {
                             border: const OutlineInputBorder(),
                             isDense: true,
                             filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
                             enabledBorder: const OutlineInputBorder(
                               borderSide: BorderSide(color: Colors.black),
                             ),
                             focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black, width: 2),
+                              borderSide:
+                                  BorderSide(color: Colors.black, width: 2),
                             ),
                           ),
                           keyboardType: TextInputType.number,
                           textInputAction: TextInputAction.next,
                           obscureText: true,
-                      validator: (value) => value != null && value.length == 3
+                          validator: (value) =>
+                              value != null && value.length == 3
                                   ? null
                                   : AppLocalizations.of(context).cvv3Digits,
                         ),
@@ -128,15 +131,18 @@ class _BlockCardScreen extends State<BlockCardScreen> {
                             border: const OutlineInputBorder(),
                             isDense: true,
                             filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
                             enabledBorder: const OutlineInputBorder(
                               borderSide: BorderSide(color: Colors.black),
                             ),
                             focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black, width: 2),
+                              borderSide:
+                                  BorderSide(color: Colors.black, width: 2),
                             ),
                           ),
-                      validator: (value) => value != null && value.isNotEmpty
+                          validator: (value) => value != null &&
+                                  value.isNotEmpty
                               ? null
                               : AppLocalizations.of(context).selectExpiryDate,
                         ),
@@ -188,6 +194,22 @@ class _BlockCardScreen extends State<BlockCardScreen> {
               ),
             ),
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }

lib/features/card/screens/card_details_screen.dart

@@ -9,7 +9,9 @@ class CardDetailsScreen extends StatelessWidget {
       appBar: AppBar(
         title: const Text("My Cards"),
       ),
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(16.0),
             child: ListView(
               children: const [
@@ -31,6 +33,8 @@ class CardDetailsScreen extends StatelessWidget {
               ],
             ),
           ),
+        ],
+      ),
     );
   }
 }
@@ -87,7 +91,7 @@ class CardTile extends StatelessWidget {
                 "Kangra Central Co-operative Bank",
                 style: TextStyle(
                   color: Colors.white,
-                  fontSize: 18,
+                  fontSize: 15.5,
                   fontWeight: FontWeight.bold,
                 ),
                 overflow: TextOverflow.ellipsis,

lib/features/card/screens/card_management_screen.dart

@@ -25,7 +25,9 @@ class _CardManagementScreen extends State<CardManagementScreen> {
         ),
         centerTitle: false,
       ),
-      body: ListView(
+      body: Stack(
+        children: [
+          ListView(
             children: [
               CardManagementTile(
                 icon: Symbols.add,
@@ -33,7 +35,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 onTap: () {},
                 disabled: true, // Add this
               ),
-          const Divider(height: 1),
+              Divider(height: 1, color: Theme.of(context).dividerColor),
               CardManagementTile(
                 icon: Symbols.remove_moderator,
                 label: AppLocalizations.of(context).blockUnblockCard,
@@ -47,7 +49,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 },
                 disabled: true,
               ),
-          const Divider(height: 1),
+              Divider(height: 1, color: Theme.of(context).dividerColor),
               CardManagementTile(
                 icon: Symbols.password_2,
                 label: AppLocalizations.of(context).changeCardPin,
@@ -61,7 +63,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 },
                 disabled: true,
               ),
-          const Divider(height: 1),
+              Divider(height: 1, color: Theme.of(context).dividerColor),
               CardManagementTile(
                 icon: Symbols.payment_card,
                 label: AppLocalizations.of(context).viewCardDeatils,
@@ -73,9 +75,25 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                     ),
                   );
                 },
-            disabled: true,
+                disabled: false,
+              ),
+              Divider(height: 1, color: Theme.of(context).dividerColor),
+            ],
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
           ),
-          const Divider(height: 1),
         ],
       ),
     );

lib/features/card/screens/card_pin_change_details_screen.dart

@@ -46,12 +46,12 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen> {
       appBar: AppBar(
         title: Text(
           AppLocalizations.of(context).cardDetails,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
       ),
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(10.0),
             child: Form(
               key: _formKey,
@@ -90,18 +90,21 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen> {
                             border: const OutlineInputBorder(),
                             isDense: true,
                             filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
                             enabledBorder: const OutlineInputBorder(
                               borderSide: BorderSide(color: Colors.black),
                             ),
                             focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black, width: 2),
+                              borderSide:
+                                  BorderSide(color: Colors.black, width: 2),
                             ),
                           ),
                           keyboardType: TextInputType.number,
                           textInputAction: TextInputAction.next,
                           obscureText: true,
-                      validator: (value) => value != null && value.length == 3
+                          validator: (value) =>
+                              value != null && value.length == 3
                                   ? null
                                   : AppLocalizations.of(context).cvv3Digits,
                         ),
@@ -118,15 +121,18 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen> {
                             border: const OutlineInputBorder(),
                             isDense: true,
                             filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
                             enabledBorder: const OutlineInputBorder(
                               borderSide: BorderSide(color: Colors.black),
                             ),
                             focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black, width: 2),
+                              borderSide:
+                                  BorderSide(color: Colors.black, width: 2),
                             ),
                           ),
-                      validator: (value) => value != null && value.isNotEmpty
+                          validator: (value) => value != null &&
+                                  value.isNotEmpty
                               ? null
                               : AppLocalizations.of(context).selectExpiryDate,
                         ),
@@ -178,6 +184,22 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen> {
               ),
             ),
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }

lib/features/card/screens/card_pin_set_screen.dart

@@ -46,12 +46,12 @@ class _CardPinSetScreen extends State<CardPinSetScreen> {
       appBar: AppBar(
         title: Text(
           AppLocalizations.of(context).cardPin,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
       ),
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(16.0),
             child: Form(
               key: _formKey,
@@ -133,6 +133,22 @@ class _CardPinSetScreen extends State<CardPinSetScreen> {
               ),
             ),
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }

lib/features/cheque/screens/cheque_enquiry_screen.dart

@@ -0,0 +1,361 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/api/services/cheque_service.dart';
+import 'package:kmobile/data/models/user.dart';
+import 'package:kmobile/di/injection.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
+
+class ChequeEnquiryScreen extends StatefulWidget {
+  final List<User> users;
+  final int selectedIndex;
+  const ChequeEnquiryScreen({
+    super.key,
+    required this.users,
+    required this.selectedIndex,
+  });
+
+  @override
+  State<ChequeEnquiryScreen> createState() => _ChequeEnquiryScreenState();
+}
+
+class _ChequeEnquiryScreenState extends State<ChequeEnquiryScreen> {
+  User? _selectedAccount;
+  final TextEditingController _searchController = TextEditingController();
+  var service = getIt<ChequeService>();
+  bool _isLoading = true;
+  List<Cheque> _allCheques = [];
+  Map<String, List<Cheque>> _groupedCheques = {};
+  List<User> _filteredUsers = [];
+
+  @override
+  void initState() {
+    super.initState();
+    _filteredUsers = widget.users
+        .where((user) => ['SA', 'SB', 'CA', 'CC'].contains(user.accountType))
+        .toList();
+
+    if (widget.users.isNotEmpty && widget.selectedIndex < widget.users.length) {
+      if (_filteredUsers.isNotEmpty) {
+        if (_filteredUsers.contains(widget.users[widget.selectedIndex])) {
+          _selectedAccount = widget.users[widget.selectedIndex];
+        } else {
+          _selectedAccount = _filteredUsers.first;
+        }
+      } else {
+        _selectedAccount = widget.users[widget.selectedIndex];
+      }
+    } else {
+      if (_filteredUsers.isNotEmpty) {
+        _selectedAccount = _filteredUsers.first;
+      }
+    }
+
+    _loadCheques();
+    _searchController.addListener(() {
+      _filterCheques(_searchController.text);
+    });
+  }
+
+  Future<void> _loadCheques() async {
+    if (_selectedAccount == null) {
+      setState(() {
+        _isLoading = false;
+        _groupedCheques = {};
+      });
+      return;
+    }
+    setState(() {
+      _isLoading = true;
+    });
+
+    String instrType;
+    switch (_selectedAccount!.accountType) {
+      case 'SA':
+      case 'SB':
+        instrType = '10';
+        break;
+      case 'CA':
+        instrType = '11';
+        break;
+      case 'CC':
+        instrType = '13';
+        break;
+      default:
+        instrType = '10';
+    }
+
+    try {
+      final data = await service.ChequeEnquiry(
+          accountNumber: _selectedAccount!.accountNo!, instrType: instrType);
+      _allCheques = data;
+      _groupedCheques.clear();
+      for (var cheque in _allCheques) {
+        if (cheque.type != null) {
+          if (!_groupedCheques.containsKey(cheque.type)) {
+            _groupedCheques[cheque.type!] = [];
+          }
+          _groupedCheques[cheque.type!]!.add(cheque);
+        }
+      }
+      setState(() {
+        _isLoading = false;
+      });
+    } catch (e) {
+      setState(() {
+        _isLoading = false;
+        _groupedCheques = {};
+      });
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text('Failed to fetch cheque status: ${e.toString()}'),
+        ),
+      );
+    }
+  }
+
+  void _filterCheques(String query) {
+    _groupedCheques.clear();
+    List<Cheque> filteredCheques;
+    if (query.isEmpty) {
+      filteredCheques = _allCheques;
+    } else {
+      filteredCheques = _allCheques.where((cheque) {
+        final lowerQuery = query.toLowerCase();
+        return (cheque.ChequeNumber?.toLowerCase().contains(lowerQuery) ??
+                false) ||
+            (cheque.status?.toLowerCase().contains(lowerQuery) ?? false) ||
+            (cheque.fromCheque?.toLowerCase().contains(lowerQuery) ?? false) ||
+            (cheque.toCheque?.toLowerCase().contains(lowerQuery) ?? false);
+      }).toList();
+    }
+
+    for (var cheque in filteredCheques) {
+      if (cheque.type != null) {
+        if (!_groupedCheques.containsKey(cheque.type)) {
+          _groupedCheques[cheque.type!] = [];
+        }
+        _groupedCheques[cheque.type!]!.add(cheque);
+      }
+    }
+
+    setState(() {});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).chequeEnquiryTitle),
+        centerTitle: false,
+      ),
+      body: Stack(
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: Column(
+              children: [
+                Card(
+                  elevation: 4,
+                  margin: const EdgeInsets.symmetric(vertical: 8.0),
+                  child: Padding(
+                    padding: const EdgeInsets.all(16.0),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Text(
+                          AppLocalizations.of(context).accountNumber,
+                          style: const TextStyle(
+                              fontWeight: FontWeight.bold, fontSize: 18),
+                        ),
+                        const SizedBox(width: 16),
+                        if (_selectedAccount != null)
+                          Expanded(
+                            child: DropdownButton<User>(
+                              value: _selectedAccount,
+                              onChanged: (User? newUser) {
+                                if (newUser != null) {
+                                  setState(() {
+                                    _selectedAccount = newUser;
+                                    _loadCheques();
+                                  });
+                                }
+                              },
+                              items: _filteredUsers.map((user) {
+                                return DropdownMenuItem<User>(
+                                  value: user,
+                                  child: Text(user.accountNo.toString()),
+                                );
+                              }).toList(),
+                            ),
+                          )
+                        else
+                          const Text('No accounts found'),
+                      ],
+                    ),
+                  ),
+                ),
+                const SizedBox(height: 20),
+                Card(
+                  elevation: 4,
+                  margin: const EdgeInsets.symmetric(vertical: 8.0),
+                  child: Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: TextField(
+                      controller: _searchController,
+                      decoration: InputDecoration(
+                        labelText: AppLocalizations.of(context)
+                            .searchByChequeDetailsHint,
+                        prefixIcon: const Icon(Icons.search),
+                        border: InputBorder
+                            .none, // Remove border to make it look like it's inside the card
+                      ),
+                    ),
+                  ),
+                ),
+                const SizedBox(height: 20),
+                Expanded(
+                  child: _isLoading
+                      ? const Center(child: CircularProgressIndicator())
+                      : _groupedCheques.isEmpty
+                          ? Center(
+                              child: Text(AppLocalizations.of(context)
+                                  .noChequeStatusFound))
+                          : ListView(
+                              children: _groupedCheques.entries.map((entry) {
+                                return Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    ...entry.value.map((cheque) =>
+                                        ChequeStatusTile(cheque: cheque)),
+                                  ],
+                                );
+                              }).toList(),
+                            ),
+                ),
+              ],
+            ),
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class ChequeStatusTile extends StatelessWidget {
+  final Cheque cheque;
+
+  const ChequeStatusTile({
+    super.key,
+    required this.cheque,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    switch (cheque.type) {
+      case 'CI':
+        return _buildCiTile(context);
+      case 'PR':
+        return _buildPrTile(context);
+      case 'ST':
+        return _buildStTile(context);
+      default:
+        return const SizedBox.shrink();
+    }
+  }
+
+  Widget _buildCiTile(BuildContext context) {
+    return Card(
+      margin: const EdgeInsets.symmetric(
+        vertical: 8.0,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(AppLocalizations.of(context).chequebookIssuedLabel,
+                style: Theme.of(context).textTheme.titleLarge),
+            const SizedBox(height: 8),
+            _buildInfoRow('Branch Code:', cheque.branchCode),
+            _buildInfoRow('From Cheque:', cheque.fromCheque),
+            _buildInfoRow('To Cheque:', cheque.toCheque),
+            _buildInfoRow('Date:', cheque.Date),
+            _buildInfoRow('Cheques Count:', cheque.Chequescount),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildPrTile(BuildContext context) {
+    return Card(
+      margin: const EdgeInsets.symmetric(vertical: 8.0),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(AppLocalizations.of(context).presentedChequeLabel,
+                style: Theme.of(context).textTheme.titleLarge),
+            const SizedBox(height: 8),
+            _buildInfoRow('Branch Code:', cheque.branchCode),
+            _buildInfoRow('Cheque Number:', cheque.ChequeNumber),
+            _buildInfoRow('Date:', cheque.Date),
+            _buildInfoRow('Transaction Code:', cheque.transactionCode),
+            _buildInfoRow('Amount:', '₹ ${cheque.amount.toString()}'),
+            _buildInfoRow('Status:', cheque.status),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStTile(BuildContext context) {
+    return Card(
+      margin: const EdgeInsets.symmetric(vertical: 8.0),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(AppLocalizations.of(context).stopChequeLabel,
+                style: Theme.of(context).textTheme.titleLarge),
+            const SizedBox(height: 8),
+            _buildInfoRow('Branch Code:', cheque.branchCode),
+            _buildInfoRow('From Cheque:', cheque.fromCheque),
+            _buildInfoRow('To Cheque:', cheque.toCheque),
+            _buildInfoRow('Stop Issue Date:', cheque.stopIssueDate),
+            _buildInfoRow('Stop Expiry Date:', cheque.StopExpiryDate),
+            _buildInfoRow('Cheques Count:', cheque.Chequescount),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(String label, String? value) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(label, style: const TextStyle(fontWeight: FontWeight.bold)),
+          Text(value ?? ''),
+        ],
+      ),
+    );
+  }
+}

lib/features/cheque/screens/cheque_management_screen.dart

@@ -1,96 +1,176 @@
 import 'package:flutter/material.dart';
-import 'package:kmobile/features/enquiry/screens/enquiry_screen.dart';
+import 'package:kmobile/data/models/user.dart';
+import 'package:kmobile/features/cheque/screens/cheque_enquiry_screen.dart';
+import 'package:kmobile/features/cheque/screens/stop_cheque_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class ChequeManagementScreen extends StatefulWidget {
-  const ChequeManagementScreen({super.key});
+  final List<User> users;
+  final int selectedIndex;
+  const ChequeManagementScreen({
+    super.key,
+    required this.users,
+    required this.selectedIndex,
+  });
 
   @override
   State<ChequeManagementScreen> createState() => _ChequeManagementScreen();
 }
 
 class _ChequeManagementScreen extends State<ChequeManagementScreen> {
+  List<User> get users => widget.users;
+  int get selectedAccountIndex => widget.selectedIndex;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         title: Text(
           AppLocalizations.of(context).chequeManagement,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
       ),
-      body: ListView(
+      body: Stack(
         children: [
-          const SizedBox(height: 15),
-          ChequeManagementTile(
-            icon: Symbols.add,
-            label: AppLocalizations.of(context).requestChequeBook,
-            onTap: () {},
-          ),
-          const Divider(height: 1),
-          ChequeManagementTile(
-            icon: Symbols.data_alert,
-            label: AppLocalizations.of(context).enquiry,
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                Expanded(
+                  child: ChequeManagementCardTile(
+                    icon: Symbols.payments,
+                    label: AppLocalizations.of(context).chequeEnquiryTitle,
+                    subtitle:
+                        AppLocalizations.of(context).chequeEnquirySubtitle,
                     onTap: () {
                       Navigator.push(
                         context,
-                MaterialPageRoute(builder: (context) => const EnquiryScreen()),
+                        MaterialPageRoute(
+                          builder: (context) => ChequeEnquiryScreen(
+                            users: users,
+                            selectedIndex: selectedAccountIndex,
+                          ),
+                        ),
                       );
                     },
                   ),
-          const Divider(height: 1),
-          ChequeManagementTile(
-            icon: Symbols.approval_delegation,
-            label: AppLocalizations.of(context).chequeDeposit,
-            onTap: () {},
                 ),
-          const Divider(height: 1),
-          ChequeManagementTile(
-            icon: Symbols.front_hand,
+                Expanded(
+                  child: ChequeManagementCardTile(
+                    icon: Symbols.block_sharp,
                     label: AppLocalizations.of(context).stopCheque,
-            onTap: () {},
+                    subtitle: AppLocalizations.of(context).stopChequeSubtitle,
+                    onTap: () {
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (context) => StopChequeScreen(
+                            users: users,
+                            selectedIndex: selectedAccountIndex,
+                          ),
+                        ),
+                      );
+                    },
+                  ),
+                ),
+              ],
+            ),
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
               ),
-          const Divider(height: 1),
-          ChequeManagementTile(
-            icon: Symbols.cancel_presentation,
-            label: AppLocalizations.of(context).revokeStop,
-            onTap: () {},
             ),
-          const Divider(height: 1),
-          ChequeManagementTile(
-            icon: Symbols.payments,
-            label: AppLocalizations.of(context).positivePay,
-            onTap: () {},
           ),
-          const Divider(height: 1),
         ],
       ),
     );
   }
 }
 
-class ChequeManagementTile extends StatelessWidget {
+class ChequeManagementCardTile extends StatelessWidget {
   final IconData icon;
   final String label;
+  final String? subtitle;
   final VoidCallback onTap;
+  final bool disable;
 
-  const ChequeManagementTile({
+  const ChequeManagementCardTile({
     super.key,
     required this.icon,
     required this.label,
+    this.subtitle,
     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,
+    final theme = Theme.of(context);
+    return Card(
+      margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(12.0),
+      ),
+      elevation: 4, // Add some elevation for better visual separation
+      child: InkWell(
+        onTap:
+            disable ? null : onTap, // Disable InkWell if the tile is disabled
+        borderRadius: BorderRadius.circular(12.0),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 24.0, horizontal: 16.0),
+          child: Center(
+            child: SingleChildScrollView(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Icon(
+                    icon,
+                    size: 48, // Make icon larger
+                    color: disable
+                        ? theme.disabledColor
+                        : theme.colorScheme.primary,
+                  ),
+                  const SizedBox(height: 12),
+                  Text(
+                    label,
+                    textAlign: TextAlign.center,
+                    style: theme.textTheme.titleLarge?.copyWith(
+                      fontWeight: FontWeight.bold,
+                      color: disable
+                          ? theme.disabledColor
+                          : theme.colorScheme.onSurface,
+                    ),
+                  ),
+                  if (subtitle != null)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 8.0),
+                      child: Text(
+                        subtitle!,
+                        textAlign: TextAlign.center,
+                        style: theme.textTheme.bodyMedium?.copyWith(
+                          color: disable
+                              ? theme.disabledColor
+                              : theme.colorScheme.onSurfaceVariant,
+                        ),
+                      ),
+                    ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
     );
   }
 }

lib/features/cheque/screens/stop_cheque_screen.dart

@@ -0,0 +1,349 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/features/cheque/screens/stop_multiple_cheques_screen.dart';
+import 'package:kmobile/features/cheque/screens/stop_single_cheque_screen.dart';
+import 'package:kmobile/api/services/cheque_service.dart';
+import 'package:kmobile/data/models/user.dart';
+import 'package:kmobile/di/injection.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
+
+class StopChequeScreen extends StatefulWidget {
+  final List<User> users;
+  final int selectedIndex;
+  const StopChequeScreen({
+    super.key,
+    required this.users,
+    required this.selectedIndex,
+  });
+
+  @override
+  State<StopChequeScreen> createState() => _StopChequeScreenState();
+}
+
+class _StopChequeScreenState extends State<StopChequeScreen> {
+  User? _selectedAccount;
+  var service = getIt<ChequeService>();
+  bool _isLoading = true;
+  Cheque? _ciCheque;
+  List<User> _filteredUsers = [];
+
+  @override
+  void initState() {
+    super.initState();
+    _filteredUsers = widget.users
+        .where((user) => ['SA', 'SB', 'CA', 'CC'].contains(user.accountType))
+        .toList();
+
+    if (widget.users.isNotEmpty && widget.selectedIndex < widget.users.length) {
+      if (_filteredUsers.isNotEmpty) {
+        if (_filteredUsers.contains(widget.users[widget.selectedIndex])) {
+          _selectedAccount = widget.users[widget.selectedIndex];
+        } else {
+          _selectedAccount = _filteredUsers.first;
+        }
+      } else {
+        _selectedAccount = widget.users[widget.selectedIndex];
+      }
+    } else {
+      if (_filteredUsers.isNotEmpty) {
+        _selectedAccount = _filteredUsers.first;
+      }
+    }
+
+    _loadCheques();
+  }
+
+  Future<void> _loadCheques() async {
+    if (_selectedAccount == null) {
+      setState(() {
+        _isLoading = false;
+        _ciCheque = null;
+      });
+      return;
+    }
+    setState(() {
+      _isLoading = true;
+    });
+
+    String instrType;
+    switch (_selectedAccount!.accountType) {
+      case 'SA':
+      case 'SB':
+        instrType = '10';
+        break;
+      case 'CA':
+        instrType = '11';
+        break;
+      case 'CC':
+        instrType = '13';
+        break;
+      default:
+        instrType = '10';
+    }
+
+    try {
+      final data = await service.ChequeEnquiry(
+          accountNumber: _selectedAccount!.accountNo!, instrType: instrType);
+      final ciCheques = data.where((cheque) => cheque.type == 'CI').toList();
+      setState(() {
+        _ciCheque = ciCheques.isNotEmpty ? ciCheques.first : null;
+        _isLoading = false;
+      });
+    } catch (e) {
+      setState(() {
+        _isLoading = false;
+        _ciCheque = null;
+      });
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text('Failed to fetch cheque status: ${e.toString()}'),
+        ),
+      );
+    }
+  }
+
+  String _getAccountTypeDisplayName(String accountType) {
+    switch (accountType.toLowerCase()) {
+      case 'sa':
+        return AppLocalizations.of(context).savingsAccount;
+      case 'sb':
+        return AppLocalizations.of(context).savingsAccount;
+      case 'ca':
+        return "Current Account";
+      case 'cc':
+        return "Cash Credit Account";
+      default:
+        return accountType;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).stopChequeTitle),
+        centerTitle: false,
+      ),
+      body: Stack(
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(16.0),
+            child: Column(
+              children: [
+                Card(
+                  elevation: 4,
+                  margin: const EdgeInsets.symmetric(vertical: 8.0),
+                  child: Padding(
+                    padding: const EdgeInsets.all(16.0),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Text(
+                          AppLocalizations.of(context).accountNumber,
+                          style: const TextStyle(
+                              fontWeight: FontWeight.bold, fontSize: 18),
+                        ),
+                        const SizedBox(width: 16),
+                        if (_selectedAccount != null)
+                          Expanded(
+                            child: DropdownButton<User>(
+                              value: _selectedAccount,
+                              onChanged: (User? newUser) {
+                                if (newUser != null) {
+                                  setState(() {
+                                    _selectedAccount = newUser;
+                                    _loadCheques();
+                                  });
+                                }
+                              },
+                              items: _filteredUsers.map((user) {
+                                return DropdownMenuItem<User>(
+                                  value: user,
+                                  child: Text(user.accountNo.toString()),
+                                );
+                              }).toList(),
+                            ),
+                          )
+                        else
+                          Text(AppLocalizations.of(context).noAccountsFound),
+                      ],
+                    ),
+                  ),
+                ),
+                const SizedBox(height: 20),
+                Row(
+                  children: [
+                    Expanded(
+                      child: Card(
+                        color: Theme.of(context).colorScheme.primaryContainer,
+                        elevation: 4,
+                        child: InkWell(
+                          onTap: () {
+                            if (_selectedAccount != null && _ciCheque != null) {
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder: (context) => StopSingleChequeScreen(
+                                    selectedAccount: _selectedAccount!,
+                                    date: _ciCheque!.Date!,
+                                    instrType: _ciCheque!.InstrType!,
+                                    fromCheque: _ciCheque!.fromCheque!,
+                                    toCheque: _ciCheque!.toCheque!,
+                                  ),
+                                ),
+                              );
+                            } else {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(
+                                  content: Text(AppLocalizations.of(context)
+                                      .noChequebookToStop),
+                                ),
+                              );
+                            }
+                          },
+                          child: Padding(
+                            padding: const EdgeInsets.all(16.0),
+                            child: Center(
+                              child: Text(
+                                AppLocalizations.of(context)
+                                    .stopSingleChequeTitle,
+                                textAlign: TextAlign.center,
+                                style: TextStyle(
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold,
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onPrimaryContainer,
+                                ),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                    const SizedBox(width: 10),
+                    Expanded(
+                      child: Card(
+                        color: Theme.of(context).colorScheme.primaryContainer,
+                        elevation: 4,
+                        child: InkWell(
+                          onTap: () {
+                            if (_selectedAccount != null) {
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder: (context) =>
+                                      StopMultipleChequesScreen(
+                                    selectedAccount: _selectedAccount!,
+                                    date: _ciCheque!.Date!,
+                                    instrType: _ciCheque!.InstrType!,
+                                    fromCheque: _ciCheque!.fromCheque!,
+                                    toCheque: _ciCheque!.toCheque!,
+                                  ),
+                                ),
+                              );
+                            } else {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(
+                                  content: Text(AppLocalizations.of(context)
+                                      .pleaseSelectAccountFirst),
+                                ),
+                              );
+                            }
+                          },
+                          child: Padding(
+                            padding: const EdgeInsets.all(16.0),
+                            child: Center(
+                              child: Text(
+                                AppLocalizations.of(context)
+                                    .stopMultipleChequesButton,
+                                textAlign: TextAlign.center,
+                                style: TextStyle(
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.bold,
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onSecondaryContainer,
+                                ),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 20),
+                Expanded(
+                  child: _isLoading
+                      ? const Center(child: CircularProgressIndicator())
+                      : _ciCheque == null
+                          ? Center(
+                              child: Text(AppLocalizations.of(context)
+                                  .noChequeIssuedStatus))
+                          : _buildCiTile(context, _ciCheque!),
+                ),
+              ],
+            ),
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCiTile(BuildContext context, Cheque cheque) {
+    return Card(
+      margin: const EdgeInsets.symmetric(
+        vertical: 8.0,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(AppLocalizations.of(context).chequebookDetailsTitle,
+                style: Theme.of(context).textTheme.titleLarge),
+            const SizedBox(height: 8),
+            _buildInfoRow('Account Number:', _selectedAccount!.accountNo!),
+            _buildInfoRow('Customer Name:', _selectedAccount!.name!),
+            _buildInfoRow('CIF Number:', _selectedAccount!.cifNumber!),
+            _buildInfoRow('Account Type:',
+                _getAccountTypeDisplayName(_selectedAccount!.accountType!)),
+            _buildInfoRow('Branch Code:', cheque.branchCode),
+            _buildInfoRow('Starting Cheque Number:', cheque.fromCheque),
+            _buildInfoRow('Ending Cheque Number:', cheque.toCheque),
+            _buildInfoRow('Issue Date:', cheque.Date),
+            _buildInfoRow('Number of Cheques:', cheque.Chequescount),
+            _buildInfoRow('Instrument Type:', cheque.InstrType),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildInfoRow(String label, String? value) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(label, style: const TextStyle(fontWeight: FontWeight.bold)),
+          Text(value ?? ''),
+        ],
+      ),
+    );
+  }
+}

lib/features/cheque/screens/stop_multiple_cheques_screen.dart

@@ -0,0 +1,287 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:kmobile/api/services/cheque_service.dart';
+import 'package:kmobile/data/models/user.dart';
+import 'package:kmobile/di/injection.dart';
+import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
+
+class StopMultipleChequesScreen extends StatefulWidget {
+  final User selectedAccount;
+  final String date;
+  final String instrType;
+  final String fromCheque;
+  final String toCheque;
+
+  const StopMultipleChequesScreen(
+      {super.key,
+      required this.selectedAccount,
+      required this.date,
+      required this.instrType,
+      required this.fromCheque,
+      required this.toCheque});
+
+  @override
+  State<StopMultipleChequesScreen> createState() =>
+      _StopMultipleChequesScreenState();
+}
+
+class _StopMultipleChequesScreenState extends State<StopMultipleChequesScreen> {
+  final _formKey = GlobalKey<FormState>();
+  final _stopFromChequeNoController = TextEditingController();
+  final _stopToChequeNoController = TextEditingController();
+  final _stopIssueDateController = TextEditingController();
+  final _stopExpiryDateController = TextEditingController();
+  final _stopAmountController = TextEditingController();
+  final _stopCommentController = TextEditingController();
+  final _chequeService = getIt<ChequeService>();
+
+  String _formatDate(String dateString) {
+    if (dateString.length != 8) {
+      return dateString; // Return as is if not in expected ddmmyyyy format
+    }
+    try {
+      final day = dateString.substring(0, 2);
+      final month = dateString.substring(2, 4);
+      final year = dateString.substring(4, 8);
+      return '$day/$month/$year';
+    } catch (e) {
+      return dateString; // Return original string on error
+    }
+  }
+
+  Future<void> _showResponseDialog(String title, String message) async {
+    return showDialog<void>(
+      context: context,
+      barrierDismissible: false, // user must tap button!
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text(title),
+          content: SingleChildScrollView(
+            child: ListBody(
+              children: <Widget>[
+                Text(message),
+              ],
+            ),
+          ),
+          actions: <Widget>[
+            TextButton(
+              child: const Text('Close'),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).stopMultipleChequesTitle),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Form(
+          key: _formKey,
+          child: ListView(
+            children: [
+              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.selectedAccount.accountNo!),
+                  subtitle:
+                      Text(AppLocalizations.of(context).accountNumberTitle),
+                ),
+              ),
+              const SizedBox(height: 24),
+              TextFormField(
+                controller: _stopFromChequeNoController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).fromChequeNumberHint,
+                  border: const OutlineInputBorder(),
+                ),
+                keyboardType: TextInputType.number,
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return AppLocalizations.of(context)
+                        .pleaseEnterChequeNumberError;
+                  }
+                  final chequeNumber = int.tryParse(value);
+                  final fromCheque = int.tryParse(widget.fromCheque);
+                  final toCheque = int.tryParse(widget.toCheque);
+                  if (chequeNumber == null ||
+                      fromCheque == null ||
+                      toCheque == null) {
+                    return AppLocalizations.of(context)
+                        .invalidChequeNumberFormatError;
+                  }
+                  if (chequeNumber < fromCheque || chequeNumber > toCheque) {
+                    return AppLocalizations.of(context).chequeNumberRangeError(
+                        widget.fromCheque, widget.toCheque);
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _stopToChequeNoController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).toChequeNumberHint,
+                  border: const OutlineInputBorder(),
+                ),
+                keyboardType: TextInputType.number,
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return AppLocalizations.of(context)
+                        .pleaseEnterChequeNumberError;
+                  }
+                  final chequeNumber = int.tryParse(value);
+                  final fromCheque = int.tryParse(widget.fromCheque);
+                  final toCheque = int.tryParse(widget.toCheque);
+                  if (chequeNumber == null ||
+                      fromCheque == null ||
+                      toCheque == null) {
+                    return AppLocalizations.of(context)
+                        .invalidChequeNumberFormatError;
+                  }
+                  if (chequeNumber < fromCheque || chequeNumber > toCheque) {
+                    return AppLocalizations.of(context).chequeNumberRangeError(
+                        widget.fromCheque, widget.toCheque);
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                initialValue: widget.instrType,
+                readOnly: true,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).instrumentTypeLabel,
+                  border: const OutlineInputBorder(),
+                ),
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _stopIssueDateController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).stopIssueDateHint,
+                  border: const OutlineInputBorder(),
+                ),
+                keyboardType: TextInputType.datetime,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _stopExpiryDateController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).stopExpiryDateHint,
+                  border: const OutlineInputBorder(),
+                ),
+                keyboardType: TextInputType.datetime,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _stopAmountController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).stopAmountHint,
+                  border: const OutlineInputBorder(),
+                ),
+                keyboardType: TextInputType.number,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _stopCommentController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).stopCommentHint,
+                  border: const OutlineInputBorder(),
+                ),
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                initialValue: _formatDate(widget.date),
+                readOnly: true,
+                decoration: InputDecoration(
+                  labelText:
+                      AppLocalizations.of(context).chequebookIssueDateHint,
+                  border: const OutlineInputBorder(),
+                ),
+              ),
+              const SizedBox(height: 32),
+              ElevatedButton(
+                onPressed: () {
+                  if (_formKey.currentState!.validate()) {
+                    Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) => TransactionPinScreen(
+                          onPinCompleted: (ctx, pin) async {
+                            Navigator.pop(context);
+                            try {
+                              final response = await _chequeService.stopCheque(
+                                accountno: widget.selectedAccount.accountNo!,
+                                stopFromChequeNo:
+                                    _stopFromChequeNoController.text,
+                                instrType: widget.instrType,
+                                stopToChequeNo: _stopToChequeNoController.text,
+                                stopIssueDate: _stopIssueDateController.text,
+                                stopExpiryDate: _stopExpiryDateController.text,
+                                stopAmount: _stopAmountController.text,
+                                stopComment: _stopCommentController.text,
+                                chequeIssueDate: widget.date,
+                                tpin: pin,
+                              );
+                              if (!mounted) return;
+                              final decodedResponse = jsonDecode(response);
+                              final status = decodedResponse['status'];
+                              final message = decodedResponse['message'];
+                              if (status == 'SUCCESS') {
+                                _showResponseDialog('Success', message);
+                              } else {
+                                _showResponseDialog('Error', message);
+                              }
+                            } on Exception catch (e) {
+                              print('inside catch block');
+                              print(e.toString());
+
+                              try {
+                                final errorBodyString =
+                                    e.toString().split('Exception: ')[1];
+                                final errorBody = jsonDecode(errorBodyString);
+                                if (errorBody.containsKey('error') &&
+                                    errorBody['error'] == 'INCORRECT_TPIN') {
+                                  _showResponseDialog('Invalid TPIN',
+                                      'The TPIN you entered is incorrect. Please try again.');
+                                } else {
+                                  _showResponseDialog(
+                                      'Error', 'Internal Server Error');
+                                }
+                              } catch (_) {
+                                _showResponseDialog(
+                                    'Error', 'Internal Server Error');
+                              }
+                            }
+                          },
+                        ),
+                      ),
+                    );
+                  }
+                },
+                child: Text(AppLocalizations.of(context).stopChequeButton),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/cheque/screens/stop_single_cheque_screen.dart

@@ -0,0 +1,256 @@
+import 'dart:convert';
+import 'package:kmobile/data/models/user.dart';
+import 'package:kmobile/di/injection.dart';
+import 'package:flutter/material.dart';
+import 'package:kmobile/api/services/cheque_service.dart';
+import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
+
+class StopSingleChequeScreen extends StatefulWidget {
+  final User selectedAccount;
+  final String date;
+  final String instrType;
+  final String fromCheque;
+  final String toCheque;
+
+  const StopSingleChequeScreen(
+      {super.key,
+      required this.selectedAccount,
+      required this.date,
+      required this.instrType,
+      required this.fromCheque,
+      required this.toCheque});
+
+  @override
+  State<StopSingleChequeScreen> createState() => _StopSingleChequeScreenState();
+}
+
+class _StopSingleChequeScreenState extends State<StopSingleChequeScreen> {
+  final _formKey = GlobalKey<FormState>();
+  final _stopFromChequeNoController = TextEditingController();
+  final _stopIssueDateController = TextEditingController();
+  final _stopExpiryDateController = TextEditingController();
+  final _stopAmountController = TextEditingController();
+  final _stopCommentController = TextEditingController();
+  final _chequeService = getIt<ChequeService>();
+
+  String _formatDate(String dateString) {
+    if (dateString.length != 8) {
+      return dateString; // Return as is if not in expected ddmmyyyy format
+    }
+    try {
+      final day = dateString.substring(0, 2);
+      final month = dateString.substring(2, 4);
+      final year = dateString.substring(4, 8);
+      return '$day/$month/$year';
+    } catch (e) {
+      return dateString; // Return original string on error
+    }
+  }
+
+  Future<void> _showResponseDialog(String title, String message) async {
+    return showDialog<void>(
+      context: context,
+      barrierDismissible: false, // user must tap button!
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text(title),
+          content: SingleChildScrollView(
+            child: ListBody(
+              children: <Widget>[
+                Text(message),
+              ],
+            ),
+          ),
+          actions: <Widget>[
+            TextButton(
+              child: Text(AppLocalizations.of(context).closeButton),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).stopSingleChequeTitle),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Form(
+          key: _formKey,
+          child: ListView(
+            children: [
+              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.selectedAccount.accountNo!),
+                  subtitle:
+                      Text(AppLocalizations.of(context).accountNumberLabel),
+                ),
+              ),
+              const SizedBox(height: 24),
+              TextFormField(
+                controller: _stopFromChequeNoController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).chequeNumberLabel,
+                  border: OutlineInputBorder(),
+                ),
+                keyboardType: TextInputType.number,
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return AppLocalizations.of(context)
+                        .pleaseEnterChequeNumberError;
+                  }
+                  final chequeNumber = int.tryParse(value);
+                  final fromCheque = int.tryParse(widget.fromCheque);
+                  final toCheque = int.tryParse(widget.toCheque);
+                  if (chequeNumber == null ||
+                      fromCheque == null ||
+                      toCheque == null) {
+                    return AppLocalizations.of(context)
+                        .invalidChequeNumberFormatError;
+                  }
+                  if (chequeNumber < fromCheque || chequeNumber > toCheque) {
+                    return AppLocalizations.of(context).chequeNumberRangeError(
+                        widget.fromCheque, widget.toCheque);
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                initialValue: widget.instrType,
+                readOnly: true,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).instrumentTypeLabel,
+                  border: const OutlineInputBorder(),
+                ),
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _stopIssueDateController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).stopIssueDateLabel,
+                  border: const OutlineInputBorder(),
+                ),
+                keyboardType: TextInputType.datetime,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _stopExpiryDateController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).stopExpiryDateLabel,
+                  border: const OutlineInputBorder(),
+                ),
+                keyboardType: TextInputType.datetime,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _stopAmountController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).stopAmountHint,
+                  border: const OutlineInputBorder(),
+                ),
+                keyboardType: TextInputType.number,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: _stopCommentController,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).stopCommentHint,
+                  border: const OutlineInputBorder(),
+                ),
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                initialValue: _formatDate(widget.date),
+                readOnly: true,
+                decoration: InputDecoration(
+                  labelText:
+                      AppLocalizations.of(context).chequebookIssueDateHint,
+                  border: const OutlineInputBorder(),
+                ),
+              ),
+              const SizedBox(height: 32),
+              ElevatedButton(
+                onPressed: () {
+                  if (_formKey.currentState!.validate()) {
+                    Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) => TransactionPinScreen(
+                          onPinCompleted: (ctx, pin) async {
+                            Navigator.pop(context);
+                            try {
+                              final response = await _chequeService.stopCheque(
+                                accountno: widget.selectedAccount.accountNo!,
+                                stopFromChequeNo:
+                                    _stopFromChequeNoController.text,
+                                instrType: widget.instrType,
+                                stopToChequeNo:
+                                    _stopFromChequeNoController.text,
+                                stopIssueDate: _stopIssueDateController.text,
+                                stopExpiryDate: _stopExpiryDateController.text,
+                                stopAmount: _stopAmountController.text,
+                                stopComment: _stopCommentController.text,
+                                chequeIssueDate: widget.date,
+                                tpin: pin,
+                              );
+                              if (!mounted) return;
+                              final decodedResponse = jsonDecode(response);
+                              final status = decodedResponse['status'];
+                              final message = decodedResponse['message'];
+                              if (status == 'SUCCESS') {
+                                _showResponseDialog('Success', message);
+                              } else {
+                                _showResponseDialog('Error', message);
+                              }
+                            } on Exception catch (e) {
+                              print('inside catch block');
+                              print(e.toString());
+
+                              try {
+                                final errorBodyString =
+                                    e.toString().split('Exception: ')[1];
+                                final errorBody = jsonDecode(errorBodyString);
+                                if (errorBody.containsKey('error') &&
+                                    errorBody['error'] == 'INCORRECT_TPIN') {
+                                  _showResponseDialog('Invalid TPIN',
+                                      'The TPIN you entered is incorrect. Please try again.');
+                                } else {
+                                  _showResponseDialog(
+                                      'Error', 'Internal Server Error');
+                                }
+                              } catch (_) {
+                                _showResponseDialog(
+                                    'Error', 'Internal Server Error');
+                              }
+                            }
+                          },
+                        ),
+                      ),
+                    );
+                  }
+                },
+                child: Text(AppLocalizations.of(context).stopChequeButton),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/customer_info/screens/customer_info_screen.dart

@@ -1,6 +1,7 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/data/models/user.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class CustomerInfoScreen extends StatefulWidget {
@@ -13,6 +14,7 @@ class CustomerInfoScreen extends StatefulWidget {
 
 class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
   late final User user = widget.user;
+  int _selectedCard = 0; // 0 for Personal Info, 1 for KYC
 
   String _maskPrimaryId(String? primaryId) {
     if (primaryId == null || primaryId.length <= 4) {
@@ -33,45 +35,160 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                 .replaceFirst(RegExp('\n'), ''),
           ),
         ),
-      body: SingleChildScrollView(
+        body: SafeArea(
+          child: Stack(
+            children: [
+              SingleChildScrollView(
                 physics: const AlwaysScrollableScrollPhysics(),
                 child: Padding(
                   padding: const EdgeInsets.all(16.0),
-          child: SafeArea(
-            child: Center(
                   child: Column(
                     children: [
-                  const SizedBox(height: 30),
-                  CircleAvatar(
+                      Card(
+                        elevation: 0,
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(12),
+                          side: BorderSide(
+                            color: theme.colorScheme.outline.withOpacity(0.2),
+                            width: 1,
+                          ),
+                        ),
+                        child: Padding(
+                          padding: const EdgeInsets.all(16.0),
+                          child: Row(
+                            children: [
+                              const SizedBox(
+                                width: 56,
+                                height: 56,
+                                child: CircleAvatar(
                                   radius: 50,
-                    child: SvgPicture.asset(
-                      'assets/images/avatar_male.svg',
-                      width: 150,
-                      height: 150,
-                      fit: BoxFit.cover,
-                    ),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(top: 10.0),
-                    child: Text(
-                      user.name ?? '',
-                      style: TextStyle(
-                        fontSize: 20,
-                        color: theme.colorScheme.onSurface,
-                        fontWeight: FontWeight.w500,
+                                  child: Icon(
+                                    Symbols.person,
+                                    size: 56,
                                   ),
                                 ),
                               ),
+                              const SizedBox(width: 12),
+                              // Name + mobile
+                              Expanded(
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
                                     Text(
-                    '${AppLocalizations.of(context).cif}: ${user.cifNumber ?? 'N/A'}',
-                    style: TextStyle(
-                        fontSize: 16,
-                        color: theme.colorScheme.onSurfaceVariant),
+                                      // If you want to show the user's name instead, replace below.
+                                      user.name ?? '',
+                                      style:
+                                          theme.textTheme.titleLarge?.copyWith(
+                                        fontWeight: FontWeight.w600,
                                       ),
-                  const SizedBox(height: 30),
+                                    ),
+                                    const SizedBox(height: 4),
+                                    Text(
+                                      user.cifNumber ?? '',
+                                      style:
+                                          theme.textTheme.bodyMedium?.copyWith(
+                                        color: theme.colorScheme.onSurface
+                                            .withOpacity(0.7),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 16),
+                      // Toggle Buttons for Personal Info and KYC
+                      SizedBox(
+                        width: double.infinity,
+                        child: CupertinoSlidingSegmentedControl<int>(
+                          groupValue: _selectedCard,
+                          thumbColor: Theme.of(context)
+                              .colorScheme
+                              .onPrimary, // Set selected switch color to theme primary color
+                          onValueChanged: (int? newValue) {
+                            if (newValue != null) {
+                              setState(() {
+                                _selectedCard = newValue;
+                              });
+                            }
+                          },
+                          children: {
+                            0: Padding(
+                              padding: const EdgeInsets.symmetric(
+                                  horizontal: 20, vertical: 10),
+                              child: Text(
+                                  AppLocalizations.of(context).personaldetails),
+                            ),
+                            1: Padding(
+                              padding: const EdgeInsets.symmetric(
+                                  horizontal: 20, vertical: 10),
+                              child:
+                                  Text(AppLocalizations.of(context).kycdetails),
+                            ),
+                          },
+                        ),
+                      ),
+                      const SizedBox(height: 16),
+                      // Card that shows content based on the toggle
+                      Card(
+                        elevation: 0,
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(12),
+                          side: BorderSide(
+                            color: theme.colorScheme.outline.withOpacity(0.2),
+                            width: 1,
+                          ),
+                        ),
+                        child: Padding(
+                          padding: const EdgeInsets.all(16.0),
+                          child: AnimatedSwitcher(
+                            duration: const Duration(milliseconds: 300),
+                            child: _selectedCard == 0
+                                ? _buildPersonalInfo(theme)
+                                : _buildKycDetails(theme),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+              IgnorePointer(
+                child: Center(
+                  child: Opacity(
+                    opacity: 0.07, // Reduced opacity
+                    child: ClipOval(
+                      child: Image.asset(
+                        'assets/images/logo.png',
+                        width: 200, // Adjust size as needed
+                        height: 200, // Adjust size as needed
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ));
+  }
+
+  Widget _buildPersonalInfo(ThemeData theme) {
+    return Column(
+      key: const ValueKey('personal_info'),
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          AppLocalizations.of(context).personaldetails,
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+        const SizedBox(height: 16),
         InfoField(
           label: AppLocalizations.of(context).activeAccounts,
-                    value: user.activeAccounts?.toString() ?? '6',
+          value: user.activeAccounts?.toString() ?? 'N/A',
         ),
         InfoField(
           label: AppLocalizations.of(context).mobileNumber,
@@ -79,29 +196,39 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
         ),
         InfoField(
           label: AppLocalizations.of(context).dateOfBirth,
-                    value: (user.dateOfBirth != null &&
-                            user.dateOfBirth!.length == 8)
+          value: (user.dateOfBirth != null && user.dateOfBirth!.length == 8)
               ? '${user.dateOfBirth!.substring(0, 2)}-${user.dateOfBirth!.substring(2, 4)}-${user.dateOfBirth!.substring(4, 8)}'
               : 'N/A',
-                  ), // Replace with DOB if available
+        ),
         InfoField(
           label: AppLocalizations.of(context).branchCode,
           value: user.branchId ?? 'N/A',
         ),
         InfoField(
-                    label: AppLocalizations.of(context).branchAddress,
+          label: AppLocalizations.of(context).address,
           value: user.address ?? 'N/A',
-                  ), // Replace with Aadhar if available
+        ),
+      ],
+    );
+  }
+
+  Widget _buildKycDetails(ThemeData theme) {
+    return Column(
+      key: const ValueKey('kyc_details'),
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          AppLocalizations.of(context).kycdetails,
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+        const SizedBox(height: 16),
         InfoField(
           label: AppLocalizations.of(context).primaryId,
           value: _maskPrimaryId(user.primaryId),
-                  ), // Replace with PAN if available
+        ),
       ],
-              ),
-            ),
-          ),
-        ),
-      ),
     );
   }
 }
@@ -123,16 +250,16 @@ class InfoField extends StatelessWidget {
         children: [
           Text(
             label,
-            style: TextStyle(
-              fontSize: 15,
-              fontWeight: FontWeight.w500,
-              color: theme.colorScheme.onSurfaceVariant,
+            style: theme.textTheme.bodySmall?.copyWith(
+              color: theme.colorScheme.onSurface.withOpacity(0.6),
             ),
           ),
-          const SizedBox(height: 3),
+          const SizedBox(height: 4),
           Text(
-            value,
-            style: TextStyle(fontSize: 16, color: theme.colorScheme.onSurface),
+            value.isEmpty ? 'N/A' : value,
+            style: theme.textTheme.titleMedium?.copyWith(
+              fontWeight: FontWeight.w600,
+            ),
           ),
         ],
       ),

lib/features/dashboard/screens/dashboard_screen.dart

@@ -1,26 +1,26 @@
-import 'dart:developer';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:kmobile/data/repositories/transaction_repository.dart';
+
+import 'package:kmobile/data/models/user.dart';
 import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/features/accounts/screens/account_info_screen.dart';
 import 'package:kmobile/features/accounts/screens/account_statement_screen.dart';
-import 'package:kmobile/features/accounts/screens/transaction_details_screen.dart';
+import 'package:kmobile/features/accounts/screens/all_accounts_screen.dart';
 import 'package:kmobile/features/auth/controllers/auth_cubit.dart';
 import 'package:kmobile/features/auth/controllers/auth_state.dart';
+import 'package:kmobile/features/cheque/screens/cheque_management_screen.dart';
 import 'package:kmobile/features/customer_info/screens/customer_info_screen.dart';
 import 'package:kmobile/features/beneficiaries/screens/manage_beneficiaries_screen.dart';
 import 'package:kmobile/features/enquiry/screens/enquiry_screen.dart';
 import 'package:kmobile/features/fund_transfer/screens/fund_transfer_screen.dart';
 import 'package:kmobile/features/profile/profile_screen.dart';
 import 'package:kmobile/features/quick_pay/screens/quick_pay_screen.dart';
+import 'package:kmobile/features/service/screens/branch_locator_screen.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:shimmer/shimmer.dart';
-import 'package:kmobile/data/models/transaction.dart';
 import '../../../l10n/app_localizations.dart';
 
 class DashboardScreen extends StatefulWidget {
@@ -31,47 +31,189 @@ class DashboardScreen extends StatefulWidget {
 }
 
 class _DashboardScreenState extends State<DashboardScreen>
-    with SingleTickerProviderStateMixin {
+    with SingleTickerProviderStateMixin, RouteAware {
   int selectedAccountIndex = 0;
-  bool isVisible = false;
+  Map<String, bool> _visibilityMap = {};
   bool isRefreshing = false;
-  bool isBalanceLoading = false;
-  bool _biometricPromptShown = false;
-  bool _txLoading = false;
-  List<Transaction> _transactions = [];
-  bool _txInitialized = false;
 
-  Future<void> _loadTransactions(String accountNo) async {
-    setState(() {
-      _txLoading = true;
-      _transactions = [];
-    });
-    try {
-      final repo = getIt<TransactionRepository>();
-      final txs = await repo.fetchTransactions(accountNo);
-      var fiveTxns = <Transaction>[];
-      //only take the first 5 transactions
-      if (txs.length > 5) {
-        fiveTxns = txs.sublist(0, 5);
-      } else {
-        fiveTxns = txs;
+  bool _biometricPromptShown = false;
+  bool _txInitialized = false;
+  PageController? _pageController;
+  final routeObserver = getIt<RouteObserver<ModalRoute<void>>>();
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    routeObserver.subscribe(this, ModalRoute.of(context)!);
   }
-      setState(() => _transactions = fiveTxns);
-    } catch (e) {
-      log(accountNo, error: e);
-      if (!mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(
-            AppLocalizations.of(context).failedToLoad(e.toString()),
+
+  @override
+  void dispose() {
+    routeObserver.unsubscribe(this);
+    _pageController?.dispose();
+    _visibilityMap.clear();
+    super.dispose();
+  }
+
+  @override
+  void didPushNext() {
+    // This method is called when another route is pushed on top of this one.
+    // We clear the map and call setState to ensure the UI is updated
+    // if the user navigates back.
+    setState(() {
+      _visibilityMap.clear();
+    });
+  }
+
+  Widget _buildAccountCard(User user, bool isSelected) {
+    final theme = Theme.of(context);
+    final bool isCardVisible = _visibilityMap[user.accountNo] ?? false;
+    // Animated scale for the selected card
+    final scale = isSelected ? 1.02 : 0.9;
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 3.0),
+      child: AnimatedScale(
+        duration: const Duration(milliseconds: 200),
+        scale: scale,
+        child: Container(
+          padding: const EdgeInsets.symmetric(
+            horizontal: 18,
+            vertical: 10,
+          ),
+          decoration: BoxDecoration(
+            color: const Color(0xFF01A04C),
+            borderRadius: BorderRadius.circular(20),
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // Top section with account type and number (no refresh button here)
+              Row(
+                children: [
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          getFullAccountType(user.accountType),
+                          style: TextStyle(
+                            color: theme.colorScheme.onPrimary,
+                            fontSize: 16,
+                            fontWeight: FontWeight.w700,
+                          ),
+                        ),
+                        Text(
+                          user.accountNo ?? 'N/A',
+                          style: TextStyle(
+                            color: theme.colorScheme.onPrimary,
+                            fontSize: 14,
+                            fontWeight: FontWeight.w700,
+                          ),
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                      ],
+                    ),
+                  ),
+                  if (isSelected) // Show logo only if card is selected
+                    CircleAvatar(
+                      radius: 20,
+                      backgroundColor: Colors.white,
+                      child: Padding(
+                        padding: const EdgeInsets.all(2.0),
+                        child: ClipOval(
+                          child: Image.asset(
+                            'assets/images/logo.png',
+                            width: 30,
+                            height: 30,
+                            fit: BoxFit.cover,
+                          ),
+                        ),
+                      ),
+                    ),
+                ],
+              ),
+              const Spacer(),
+              // Bottom section with balance and combined toggle/refresh
+              Row(
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: [
+                  if (isRefreshing && isSelected)
+                    Expanded(child: _buildBalanceShimmer())
+                  else
+                    Expanded(
+                      child: FittedBox(
+                        fit: BoxFit.scaleDown,
+                        alignment: Alignment.centerLeft,
+                        child: Row(
+                          children: [
+                            Text(
+                              "₹ ",
+                              style: TextStyle(
+                                color: theme.colorScheme.onPrimary,
+                                fontSize: 40,
+                                fontWeight: FontWeight.w700,
+                              ),
+                            ),
+                            Text(
+                              isCardVisible
+                                  ? user.currentBalance ?? '0.00'
+                                  : '*****',
+                              style: TextStyle(
+                                color: theme.colorScheme.onPrimary,
+                                fontSize: 40,
+                                fontWeight: FontWeight.w700,
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  const SizedBox(width: 10), // A steady space
+                  if (isSelected) // Only show toggle for selected card
+                    InkWell(
+                      onTap: () async {
+                        if (isRefreshing)
+                          return; // Prevent taps while refreshing
+                        final accountNo = user.accountNo;
+                        if (accountNo == null) return;
+
+                        final bool currentVisibility =
+                            _visibilityMap[accountNo] ?? false;
+
+                        if (!currentVisibility) {
+                          // If hidden, refresh data and then show the balance
+                          await _refreshAccountData(context);
+                          if (mounted) {
+                            setState(() {
+                              _visibilityMap[accountNo] = true;
+                            });
+                          }
+                        } else {
+                          // If visible, just hide it
+                          setState(() {
+                            _visibilityMap[accountNo] = false;
+                          });
+                        }
+                      },
+                      child: Padding(
+                        padding: const EdgeInsets.all(8.0),
+                        child: Icon(
+                          isCardVisible
+                              ? Symbols.visibility_lock
+                              : Symbols.visibility,
+                          color: theme.scaffoldBackgroundColor,
+                          weight: 800,
+                        ),
+                      ),
+                    ),
+                ],
+              ),
+              const Spacer(),
+            ],
+          ),
         ),
       ),
     );
-    } finally {
-      if (mounted) {
-        setState(() => _txLoading = false);
-      }
-    }
   }
 
   Future<void> _refreshAccountData(BuildContext context) async {
@@ -101,8 +243,7 @@ class _DashboardScreenState extends State<DashboardScreen>
     return Shimmer.fromColors(
       baseColor: theme.colorScheme.primary,
       highlightColor: theme.colorScheme.onPrimary,
-      child: Container(
-          width: 200, height: 42, color: theme.scaffoldBackgroundColor),
+      child: Container(height: 36, color: theme.scaffoldBackgroundColor),
     );
   }
 
@@ -147,6 +288,12 @@ class _DashboardScreenState extends State<DashboardScreen>
         return AppLocalizations.of(context).termDeposit;
       case 'rd':
         return AppLocalizations.of(context).recurringDeposit;
+      case 'ca':
+        return "Current Account";
+      case 'cc':
+        return "Cash Credit Account";
+      case 'od':
+        return "Overdraft Account";
       default:
         return AppLocalizations.of(context).unknownAccount;
     }
@@ -197,6 +344,19 @@ class _DashboardScreenState extends State<DashboardScreen>
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
+    final authState = context.read<AuthCubit>().state;
+    String mobileNumberToPass = '';
+    String customerNo = '';
+    String customerName = '';
+    if (authState is Authenticated) {
+      if (selectedAccountIndex >= 0 &&
+          selectedAccountIndex < authState.users.length) {
+        mobileNumberToPass =
+            authState.users[selectedAccountIndex].mobileNo ?? '';
+        customerNo = authState.users[selectedAccountIndex].cifNumber ?? '';
+        customerName = authState.users[selectedAccountIndex].name ?? '';
+      }
+    }
     return BlocListener<AuthCubit, AuthState>(
       listener: (context, state) async {
         if (state is Authenticated && !_biometricPromptShown) {
@@ -211,52 +371,67 @@ class _DashboardScreenState extends State<DashboardScreen>
       child: Scaffold(
         backgroundColor: theme.scaffoldBackgroundColor,
         appBar: AppBar(
-          backgroundColor: theme.scaffoldBackgroundColor,
           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: Material(
+              elevation: 4.0,
+              clipBehavior: Clip.antiAlias,
+              shape: RoundedRectangleBorder(
+                side: const BorderSide(color: Colors.white, width: 1.5),
+                borderRadius: BorderRadius.circular(12.0),
               ),
-                );
-              },
-              child: CircleAvatar(
-                backgroundColor: Colors.grey[200],
-                radius: 20,
-                child: SvgPicture.asset(
-                  'assets/images/avatar_male.svg',
+              child: Container(
                 width: 40,
                 height: 40,
-                  fit: BoxFit.cover,
+                decoration: const BoxDecoration(
+                  color: Colors.white,
+                ),
+                child: Image.asset(
+                  'assets/images/logo.png',
+                  fit: BoxFit.fill,
                 ),
               ),
             ),
           ),
           title: Text(
-            AppLocalizations.of(context).kccbMobile,
-            textAlign: TextAlign.left,
+            AppLocalizations.of(context).kccBankFull.replaceAll('-', '\u2011'),
+            textAlign: TextAlign.center,
+            softWrap: true, // Explicitly allow wrapping
+            maxLines: 2, // Allow text to wrap to a maximum of 2 lines
             style: TextStyle(
-              color: theme.colorScheme.primary,
+              color: theme.colorScheme.onPrimary,
               fontWeight: FontWeight.w700,
+              fontSize: 20,
             ),
           ),
-          centerTitle: true,
+          // Removed centerTitle: true to give more space for text wrapping
+
+          actions: [
+            Padding(
+              padding: const EdgeInsets.only(right: 10.0),
+              child: InkWell(
+                borderRadius: BorderRadius.circular(20),
+                onTap: () {
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => ProfileScreen(
+                          mobileNumber: mobileNumberToPass,
+                          customerNo: customerNo,
+                          customerName: customerName),
+                    ),
+                  );
+                },
+                child: const CircleAvatar(
+                  radius: 21,
+                  child: Icon(
+                    Symbols.person,
+                    size: 30,
+                  ),
+                ),
+              ),
+            ),
+          ],
         ),
         body: BlocBuilder<AuthCubit, AuthState>(
           builder: (context, state) {
@@ -266,24 +441,31 @@ 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' &&
+                  accountType != 'cc';
               // first‐time load
               if (!_txInitialized) {
                 _txInitialized = true;
-                WidgetsBinding.instance.addPostFrameCallback((_) {
-                  _loadTransactions(currAccount.accountNo!);
-                });
+                WidgetsBinding.instance.addPostFrameCallback((_) {});
               }
+              _pageController ??= PageController(
+                initialPage: selectedAccountIndex,
+                viewportFraction: 0.75,
+              );
               final firstName = getProcessedFirstName(currAccount.name);
 
               return SingleChildScrollView(
-                physics: const AlwaysScrollableScrollPhysics(),
                 child: Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16.0),
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
+                      const SizedBox(height: 16), // Added spacing
                       Padding(
-                        padding: const EdgeInsets.only(left: 8.0),
+                        padding: const EdgeInsets.only(left: 4.0),
                         child: Text(
                           "${AppLocalizations.of(context).hi} $firstName!",
                           style: GoogleFonts.baumans().copyWith(
@@ -295,176 +477,76 @@ class _DashboardScreenState extends State<DashboardScreen>
                       ),
                       const SizedBox(height: 16),
 
-                      // Account Info Card
-                      Container(
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 18,
-                          vertical: 10,
+                      // Account Info Cards
+                      SizedBox(
+                        height: 160,
+                        child: PageView.builder(
+                          clipBehavior: Clip.none,
+                          controller: _pageController,
+                          itemCount:
+                              users.length, // Keep this to show adjacent cards
+
+                          onPageChanged: (int newIndex) async {
+                            if (newIndex == selectedAccountIndex) return;
+
+                            // Hide the balance of the old card when scrolling away
+                            final oldAccountNo =
+                                users[selectedAccountIndex].accountNo;
+                            if (oldAccountNo != null) {
+                              _visibilityMap[oldAccountNo] = false;
+                            }
+
+                            setState(() {
+                              selectedAccountIndex = newIndex;
+                            });
+                          },
+                          itemBuilder: (context, index) {
+                            final user = users[index];
+                            final isSelected = index == selectedAccountIndex;
+                            return _buildAccountCard(user, isSelected);
+                          },
                         ),
-                        decoration: BoxDecoration(
-                          color: Color(0xFF01A04C),
-                          borderRadius: BorderRadius.circular(16),
                       ),
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
+                      const SizedBox(height: 8),
                       Row(
+                        mainAxisAlignment: MainAxisAlignment.end,
                         children: [
-                                Text(
-                                  "${getFullAccountType(currAccount.accountType)}: ",
-                                  style: TextStyle(
-                                    color: theme.colorScheme.onPrimary,
-                                    fontSize: 18,
-                                    fontWeight: FontWeight.w700,
+                          GestureDetector(
+                            onTap: () {
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder: (context) =>
+                                      AllAccountsScreen(users: users),
                                 ),
-                                ),
-                                DropdownButton<int>(
-                                  value: selectedAccountIndex,
-                                  dropdownColor: theme.colorScheme.primary,
-                                  underline: const SizedBox(),
-                                  icon: const Icon(Icons.keyboard_arrow_down),
-                                  iconEnabledColor: theme.colorScheme.onPrimary,
-                                  style: TextStyle(
-                                    color: theme.colorScheme.onPrimary,
-                                    fontSize: 18,
-                                  ),
-                                  items: List.generate(users.length, (index) {
-                                    return DropdownMenuItem<int>(
-                                      value: index,
+                              );
+                            },
                             child: Text(
-                                        users[index].accountNo ?? 'N/A',
+                              AppLocalizations.of(context).viewall,
                               style: TextStyle(
-                                          color: theme.colorScheme.onPrimary,
-                                          fontSize: 18,
-                                          fontWeight: FontWeight.w700,
-                                        ),
-                                      ),
-                                    );
-                                  }),
-                                  onChanged: (int? newIndex) async {
-                                    if (newIndex == null ||
-                                        newIndex == selectedAccountIndex) {
-                                      return;
-                                    }
-                                    if (isBalanceLoading) return;
-                                    if (isVisible) {
-                                      setState(() {
-                                        isBalanceLoading = true;
-                                        selectedAccountIndex = newIndex;
-                                      });
-                                      await Future.delayed(
-                                        const Duration(milliseconds: 200),
-                                      );
-                                      setState(() {
-                                        isBalanceLoading = false;
-                                      });
-                                    } else {
-                                      setState(() {
-                                        selectedAccountIndex = newIndex;
-                                      });
-                                    }
-                                    await _loadTransactions(
-                                      users[newIndex].accountNo!,
-                                    );
-                                  },
-                                ),
-                                const Spacer(),
-                                IconButton(
-                                  icon: isRefreshing
-                                      ? SizedBox(
-                                          width: 20,
-                                          height: 20,
-                                          child: CircularProgressIndicator(
-                                            color: theme.colorScheme.onPrimary,
-                                            strokeWidth: 2,
-                                          ),
-                                        )
-                                      : Icon(
-                                          Symbols.refresh,
-                                          color: theme.colorScheme.onPrimary,
-                                        ),
-                                  onPressed: isRefreshing
-                                      ? null
-                                      : () => _refreshAccountData(context),
-                                  tooltip: 'Refresh',
-                                ),
-                              ],
-                            ),
-                            const SizedBox(height: 15),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.start,
-                              children: [
-                                Text(
-                                  "₹ ",
-                                  style: TextStyle(
-                                    color: theme.colorScheme.onPrimary,
-                                    fontSize: 40,
-                                    fontWeight: FontWeight.w700,
-                                  ),
-                                ),
-                                isRefreshing || isBalanceLoading
-                                    ? _buildBalanceShimmer()
-                                    : Text(
-                                        isVisible
-                                            ? currAccount.currentBalance ??
-                                                '0.00'
-                                            : '*****',
-                                        style: TextStyle(
-                                          color: theme.colorScheme.onPrimary,
-                                          fontSize: 40,
-                                          fontWeight: FontWeight.w700,
-                                        ),
-                                      ),
-                                const Spacer(),
-                                InkWell(
-                                  onTap: () async {
-                                    if (isBalanceLoading) return;
-                                    if (!isVisible) {
-                                      setState(() {
-                                        isBalanceLoading = true;
-                                      });
-                                      await Future.delayed(
-                                        const Duration(seconds: 1),
-                                      );
-                                      setState(() {
-                                        isVisible = true;
-                                        isBalanceLoading = false;
-                                      });
-                                    } else {
-                                      setState(() {
-                                        isVisible = false;
-                                      });
-                                    }
-                                  },
-                                  child: Padding(
-                                    padding: const EdgeInsets.all(8.0),
-                                    child: Icon(
-                                      isVisible
-                                          ? Symbols.visibility_lock
-                                          : Symbols.visibility,
-                                      color: theme.scaffoldBackgroundColor,
-                                      weight: 800,
+                                fontSize: 14,
+                                fontWeight: FontWeight.bold,
+                                color: theme.colorScheme.primary,
                               ),
                             ),
                           ),
                         ],
                       ),
-                            const SizedBox(height: 15),
-                          ],
-                        ),
-                      ),
                       const SizedBox(height: 18),
                       Text(
                         AppLocalizations.of(context).quickLinks,
                         style: const TextStyle(fontSize: 17),
                       ),
-                      const SizedBox(height: 16),
+                      const SizedBox(height: 24),
 
                       // Quick Links
                       GridView.count(
-                        crossAxisCount: 4,
+                        crossAxisCount: 3,
                         shrinkWrap: true,
                         physics: const NeverScrollableScrollPhysics(),
+                        crossAxisSpacing: 10,
+                        mainAxisSpacing: 10,
+                        childAspectRatio: 1,
                         children: [
                           _buildQuickLink(
                             Symbols.id_card,
@@ -493,6 +575,7 @@ class _DashboardScreenState extends State<DashboardScreen>
                                 ),
                               );
                             },
+                            disable: isPaymentDisabled,
                           ),
                           _buildQuickLink(Symbols.send_money,
                               AppLocalizations.of(context).fundTransfer, () {
@@ -504,9 +587,10 @@ class _DashboardScreenState extends State<DashboardScreen>
                                             users[selectedAccountIndex]
                                                 .accountNo!,
                                         remitterName:
-                                            users[selectedAccountIndex]
-                                                .name!)));
-                          }, disable: false),
+                                            users[selectedAccountIndex].name!,
+                                        // Pass the full list of accounts
+                                        accounts: users)));
+                          }, disable: isPaymentDisabled),
                           _buildQuickLink(
                             Symbols.server_person,
                             AppLocalizations.of(context).accountInfo,
@@ -530,18 +614,18 @@ class _DashboardScreenState extends State<DashboardScreen>
                                 MaterialPageRoute(
                                     builder: (context) =>
                                         AccountStatementScreen(
-                                          accountNo: users[selectedAccountIndex]
-                                              .accountNo!,
-                                          balance: users[selectedAccountIndex]
-                                              .availableBalance!,
-                                          accountType:
-                                              users[selectedAccountIndex]
-                                                  .accountType!,
+                                          users: users,
+                                          selectedIndex: selectedAccountIndex,
                                         )));
                           }),
-                          _buildQuickLink(Symbols.checkbook,
-                              AppLocalizations.of(context).handleCheque, () {},
-                              disable: true),
+                          _buildQuickLink(Icons.location_pin,
+                              AppLocalizations.of(context).branchlocator, () {
+                            Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                    builder: (context) =>
+                                        const BranchLocatorScreen()));
+                          }, disable: false),
                           _buildQuickLink(Icons.group,
                               AppLocalizations.of(context).manageBeneficiary,
                               () {
@@ -560,68 +644,22 @@ class _DashboardScreenState extends State<DashboardScreen>
                                     builder: (context) =>
                                         const EnquiryScreen()));
                           }),
-                        ],
-                      ),
-                      const SizedBox(height: 5),
-
-                      // Recent Transactions
-                      Text(
-                        AppLocalizations.of(context).recentTransactions,
-                        style: const TextStyle(fontSize: 17),
-                      ),
-                      const SizedBox(height: 16),
-                      if (_txLoading)
-                        ..._buildTransactionShimmer()
-                      else if (_transactions.isNotEmpty)
-                        ..._transactions.map(
-                          (tx) => ListTile(
-                            leading: Icon(
-                              tx.type == 'CR'
-                                  ? Symbols.call_received
-                                  : Symbols.call_made,
-                              color: tx.type == 'CR'
-                                  ? const Color(0xFF10BB10)
-                                  : theme.colorScheme.error,
-                            ),
-                            title: Text(
-                              tx.date ?? '',
-                              style: const TextStyle(fontSize: 15),
-                            ),
-                            subtitle: Text(
-                              tx.name != null
-                                  ? (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),
-                            ),
-                            onTap: () {
+                          _buildQuickLink(
+                            Symbols.checkbook,
+                            AppLocalizations.of(context).chequeManagement,
+                            () {
                               Navigator.push(
                                 context,
                                 MaterialPageRoute(
-                                  builder: (_) =>
-                                      TransactionDetailsScreen(transaction: tx),
+                                  builder: (context) => ChequeManagementScreen(
+                                      users: users,
+                                      selectedIndex: selectedAccountIndex),
                                 ),
                               );
                             },
+                            disable: isPaymentDisabled,
                           ),
-                        )
-                      else
-                        Padding(
-                          padding: const EdgeInsets.symmetric(vertical: 24.0),
-                          child: Center(
-                            child: Text(
-                              AppLocalizations.of(context).noTransactions,
-                              style: TextStyle(
-                                fontSize: 16,
-                                color: Theme.of(context).colorScheme.outline,
-                              ),
-                            ),
-                          ),
+                        ],
                       ),
                     ],
                   ),
@@ -637,32 +675,6 @@ class _DashboardScreenState extends State<DashboardScreen>
     );
   }
 
-  List<Widget> _buildTransactionShimmer() {
-    final theme = Theme.of(context);
-    return List.generate(3, (i) {
-      return ListTile(
-        leading: Shimmer.fromColors(
-          baseColor: Colors.grey[300]!,
-          highlightColor: Colors.grey[100]!,
-          child: CircleAvatar(
-              radius: 12, backgroundColor: theme.scaffoldBackgroundColor),
-        ),
-        title: Shimmer.fromColors(
-          baseColor: Colors.grey[300]!,
-          highlightColor: Colors.grey[100]!,
-          child: Container(
-              height: 10, width: 100, color: theme.scaffoldBackgroundColor),
-        ),
-        subtitle: Shimmer.fromColors(
-          baseColor: Colors.grey[300]!,
-          highlightColor: Colors.grey[100]!,
-          child: Container(
-              height: 8, width: 60, color: theme.scaffoldBackgroundColor),
-        ),
-      );
-    });
-  }
-
   Widget _buildQuickLink(
     IconData icon,
     String label,
@@ -670,28 +682,36 @@ class _DashboardScreenState extends State<DashboardScreen>
     bool disable = false,
   }) {
     final theme = Theme.of(context);
-    return InkWell(
+    return Card(
+      elevation: 2,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(12.0),
+      ),
+      child: InkWell(
         onTap: disable ? null : onTap,
+        borderRadius: BorderRadius.circular(12.0),
         child: Column(
-        mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
           children: [
             Icon(
               icon,
               size: 30,
-            color: disable
-                ? theme.colorScheme.onSurface.withOpacity(0.3)
-                : theme.colorScheme.primary,
-            grade: 200,
-            weight: 700,
+              color: disable ? theme.disabledColor : theme.colorScheme.primary,
             ),
             const SizedBox(height: 4),
             Text(
               label,
               textAlign: TextAlign.center,
-            style: const TextStyle(fontSize: 13),
+              style: theme.textTheme.titleMedium?.copyWith(
+                fontWeight: FontWeight.bold,
+                fontSize: 12,
+                color:
+                    disable ? theme.disabledColor : theme.colorScheme.onSurface,
+              ),
             ),
           ],
         ),
+      ),
     );
   }
 }

lib/features/enquiry/screens/enquiry_screen.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: use_build_context_synchronously
-
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 import '../../../l10n/app_localizations.dart';
@@ -12,54 +10,97 @@ class EnquiryScreen extends StatefulWidget {
 }
 
 class _EnquiryScreen extends State<EnquiryScreen> {
+  // Updated to launch externally and pre-fill the subject
   Future<void> _launchEmailAddress(String email) async {
-    final Uri emailUri = Uri(scheme: 'mailto', path: email);
+    final Uri emailUri = Uri(
+      scheme: 'mailto',
+      path: email,
+      query: 'subject=Enquiry', // Pre-fills the subject line
+    );
     if (await canLaunchUrl(emailUri)) {
-      await launchUrl(emailUri);
+      // Use external application mode
+      await launchUrl(emailUri, mode: LaunchMode.externalApplication);
     } else {
-      debugPrint('${AppLocalizations.of(context).emailLaunchError} $email');
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Could not open email app for $email')),
+      );
     }
   }
 
+  // Updated with better error handling
   Future<void> _launchPhoneNumber(String phone) async {
     final Uri phoneUri = Uri(scheme: 'tel', path: phone);
     if (await canLaunchUrl(phoneUri)) {
       await launchUrl(phoneUri);
     } else {
-      debugPrint('${AppLocalizations.of(context).dialerLaunchError} $phone');
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Could not open dialer for $phone')),
+      );
     }
   }
 
+  // Updated to launch externally
   Future<void> _launchUrl(String url) async {
     final Uri uri = Uri.parse(url);
     if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
+      // Use external application mode
+      await launchUrl(uri, mode: LaunchMode.externalApplication);
     } else {
-      // Consider adding a 'urlLaunchError' key to your AppLocalizations
-      debugPrint('Could not launch $url');
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Could not launch $url')),
+      );
     }
   }
 
   Widget _buildContactItem(String role, String email, String phone) {
-    return Column(
+    return Card(
+      elevation: 4,
+      margin: const EdgeInsets.symmetric(vertical: 8),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Text(role,
-            style: TextStyle(color: Theme.of(context).colorScheme.onSurface)),
-        const SizedBox(height: 4),
+                style: TextStyle(
+                    color: Theme.of(context).colorScheme.onSurface,
+                    fontSize: 15,
+                    fontWeight: FontWeight.bold)),
+            const SizedBox(height: 8),
             GestureDetector(
               onTap: () => _launchEmailAddress(email),
+              child: Row(
+                children: [
+                  const Icon(Icons.email),
+                  const SizedBox(width: 8),
+                  Expanded(
                     child: Text(email,
-              style: TextStyle(color: Theme.of(context).colorScheme.primary)),
-        ),
-        const SizedBox(height: 4),
-        GestureDetector(
-          onTap: () => _launchPhoneNumber(phone),
-          child: Text(phone,
-              style:
-                  TextStyle(color: Theme.of(context).scaffoldBackgroundColor)),
+                        style: TextStyle(
+                            color: Theme.of(context).colorScheme.primary,
+                            fontSize: 14)),
                   ),
                 ],
+              ),
+            ),
+            const SizedBox(height: 8),
+            GestureDetector(
+              onTap: () => _launchPhoneNumber(phone),
+              child: Row(
+                children: [
+                  const Icon(Icons.phone),
+                  const SizedBox(width: 8),
+                  Expanded(
+                    child: Text(phone,
+                        style: TextStyle(
+                            color: Theme.of(context).colorScheme.primary,
+                            fontSize: 14)),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
     );
   }
 
@@ -70,59 +111,67 @@ class _EnquiryScreen extends State<EnquiryScreen> {
         title: Text(AppLocalizations.of(context).enquiry),
         centerTitle: false,
       ),
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(16.0),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-            const SizedBox(height: 20),
-            GestureDetector(
-                onTap: () => _launchUrl("https://kccb.in/complaint-form"),
-                child: Row(mainAxisSize: MainAxisSize.min, children: [
+                Card(
+                  elevation: 4,
+                  child: InkWell(
+                    onTap: () =>
+                        _launchUrl("https://kccbhp.bank.in/complaint-form/"),
+                    child: Padding(
+                      padding: const EdgeInsets.all(16.0),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
                           Text(
-                    "Complaint Form",
+                            AppLocalizations.of(context).complaintFormTitle,
                             style: TextStyle(
-                      fontSize: 17,
+                              fontSize: 15,
                               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),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+                const Divider(height: 32),
                 Text(
                   AppLocalizations.of(context).keyContacts,
-              style: TextStyle(
-                fontSize: 17,
-                color: Theme.of(context).colorScheme.primary,
+                  style: const TextStyle(
+                    fontSize: 15,
+                    fontWeight: FontWeight.bold,
                   ),
-              // horizontal line
                 ),
-            Divider(color: Theme.of(context).colorScheme.outline),
                 const SizedBox(height: 16),
+                Expanded(
+                  child: ListView(
+                    children: [
                       _buildContactItem(
                         AppLocalizations.of(context).chairman,
                         "chairman@kccb.in",
                         "01892-222677",
                       ),
-            const SizedBox(height: 16),
                       _buildContactItem(
                         AppLocalizations.of(context).managingDirector,
                         "md@kccb.in",
                         "01892-224969",
                       ),
-            const SizedBox(height: 16),
                       _buildContactItem(
                         AppLocalizations.of(context).gmWest,
                         "gmw@kccb.in",
                         "01892-223280",
                       ),
-            const SizedBox(height: 16),
                       _buildContactItem(
                         AppLocalizations.of(context).gmNorth,
                         "gmn@kccb.in",
@@ -131,6 +180,25 @@ class _EnquiryScreen extends State<EnquiryScreen> {
                     ],
                   ),
                 ),
+              ],
+            ),
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }

lib/features/fund_transfer/screens/cooldown.dart

@@ -0,0 +1,92 @@
+import 'dart:async';
+import 'dart:ui';
+import 'package:flutter/material.dart';
+
+class CooldownTimer extends StatefulWidget {
+  final DateTime createdAt;
+  final VoidCallback onTimerFinish;
+
+  const CooldownTimer({
+    Key? key,
+    required this.createdAt,
+    required this.onTimerFinish,
+  }) : super(key: key);
+
+  @override
+  _CooldownTimerState createState() => _CooldownTimerState();
+}
+
+class _CooldownTimerState extends State<CooldownTimer> {
+  late Timer _timer;
+  late Duration _timeRemaining;
+
+  @override
+  void initState() {
+    super.initState();
+    _updateRemainingTime();
+    // Update the timer every second
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      _updateRemainingTime();
+    });
+  }
+
+  void _updateRemainingTime() {
+    final cooldownEnd = widget.createdAt.add(const Duration(minutes: 60));
+    final now = DateTime.now();
+
+    if (now.isAfter(cooldownEnd)) {
+      _timeRemaining = Duration.zero;
+      _timer.cancel();
+      // Notify the parent widget that the timer is done
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        widget.onTimerFinish();
+      });
+    } else {
+      _timeRemaining = cooldownEnd.difference(now);
+    }
+    // Trigger a rebuild
+    setState(() {});
+  }
+
+  @override
+  void dispose() {
+    _timer.cancel();
+    super.dispose();
+  }
+
+  String _formatDuration(Duration duration) {
+    final minutes = duration.inMinutes.remainder(60).toString().padLeft(2, '0');
+    final seconds = duration.inSeconds.remainder(60).toString().padLeft(2, '0');
+    return '$minutes:$seconds';
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (_timeRemaining == Duration.zero) {
+      return const SizedBox
+          .shrink(); // Or some other widget indicating it's enabled
+    }
+
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Icon(
+          Icons.timer,
+          color: Colors.orange.shade700,
+          size: 18,
+        ),
+        const SizedBox(width: 6),
+        Text(
+          _formatDuration(_timeRemaining),
+          style: TextStyle(
+            color: Colors.orange.shade700,
+            fontSize: 14,
+            fontWeight: FontWeight.bold,
+            fontFamily: 'monospace',
+            fontFeatures: const [FontFeature.tabularFigures()],
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart

@@ -43,21 +43,22 @@ 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: '₹');
+  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() {
+  @override
+  void initState() {
     super.initState();
     _loadLimit(); // Call the new method
     _amountController.addListener(_checkAmountLimit);
-}
+  }
+
   Future<void> _loadLimit() async {
     setState(() {
       _isLoadingLimit = true;
@@ -77,7 +78,7 @@ void initState() {
   }
 
   // Add this method to check the amount against the limit
-void _checkAmountLimit() {
+  void _checkAmountLimit() {
     if (_limit == null) return;
 
     final amount = double.tryParse(_amountController.text) ?? 0;
@@ -87,7 +88,8 @@ void _checkAmountLimit() {
     if (isOverLimit) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-        content: Text('Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
+          content: Text(
+              'Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
           backgroundColor: Colors.red,
         ),
       );
@@ -98,7 +100,7 @@ void _checkAmountLimit() {
         _isAmountOverLimit = isOverLimit;
       });
     }
-}
+  }
 
   @override
   void dispose() {
@@ -360,7 +362,9 @@ void _checkAmountLimit() {
         title: Text(loc.fundTransfer.replaceFirst(RegExp('\n'), '')),
       ),
       body: SafeArea(
-        child: Padding(
+        child: Stack(
+          children: [
+            Padding(
               padding: const EdgeInsets.all(16.0),
               child: Form(
                 key: _formKey,
@@ -396,8 +400,8 @@ void _checkAmountLimit() {
                       elevation: 0,
                       margin: const EdgeInsets.symmetric(vertical: 8.0),
                       child: ListTile(
-                    leading:
-                        getBankLogo(widget.creditBeneficiary.bankName, context),
+                        leading: getBankLogo(
+                            widget.creditBeneficiary.bankName, context),
                         title: Text(widget.creditBeneficiary.name),
                         subtitle: Text(widget.creditBeneficiary.accountNo),
                       ),
@@ -429,7 +433,8 @@ void _checkAmountLimit() {
                             });
                           },
                           borderRadius: BorderRadius.circular(10),
-                      selectedColor: Theme.of(context).colorScheme.onPrimary,
+                          selectedColor:
+                              Theme.of(context).colorScheme.onPrimary,
                           fillColor: Theme.of(context).colorScheme.primary,
                           color: Theme.of(context).colorScheme.onSurface,
                           borderColor: Colors.transparent,
@@ -488,10 +493,10 @@ void _checkAmountLimit() {
                     ),
                     const SizedBox(height: 8),
                     if (_isLoadingLimit)
-   const Text('Fetching daily limit...'),
+                      Text(AppLocalizations.of(context).fetchingDailyLimit),
                     if (!_isLoadingLimit && _limit != null)
                       Text(
-     'Remaining Daily Limit: ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}',
+                        '${AppLocalizations.of(context).remainingDailyLimit} ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}',
                         style: Theme.of(context).textTheme.bodySmall,
                       ),
                     const Spacer(),
@@ -506,12 +511,28 @@ void _checkAmountLimit() {
                         ),
                         child: Text(AppLocalizations.of(context).proceed),
                       ),
-),
+                    ),
                     const SizedBox(height: 10),
                   ],
                 ),
               ),
             ),
+            IgnorePointer(
+              child: Center(
+                child: Opacity(
+                  opacity: 0.07, // Reduced opacity
+                  child: ClipOval(
+                    child: Image.asset(
+                      'assets/images/logo.png',
+                      width: 200, // Adjust size as needed
+                      height: 200, // Adjust size as needed
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }

lib/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:kmobile/features/fund_transfer/screens/cooldown.dart';
 import 'package:kmobile/widgets/bank_logos.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
 import 'package:kmobile/features/fund_transfer/screens/fund_transfer_amount_screen.dart';
@@ -27,11 +28,22 @@ class _FundTransferBeneficiaryScreenState
   var service = getIt<BeneficiaryService>();
   bool _isLoading = true;
   List<Beneficiary> _beneficiaries = [];
+  List<Beneficiary> _filteredBeneficiaries = [];
+  final TextEditingController _searchController = TextEditingController();
 
   @override
   void initState() {
     super.initState();
     _loadBeneficiaries();
+    _searchController.addListener(() {
+      _filterBeneficiaries(_searchController.text);
+    });
+  }
+
+  @override
+  void dispose() {
+    _searchController.dispose();
+    super.dispose();
   }
 
   Future<void> _loadBeneficiaries() async {
@@ -42,10 +54,25 @@ class _FundTransferBeneficiaryScreenState
               ? b.bankName!.toLowerCase().contains('kangra central')
               : !b.bankName!.toLowerCase().contains('kangra central'))
           .toList();
+      _filteredBeneficiaries = _beneficiaries;
       _isLoading = false;
     });
   }
 
+  void _filterBeneficiaries(String query) {
+    setState(() {
+      if (query.isEmpty) {
+        _filteredBeneficiaries = _beneficiaries;
+      } else {
+        _filteredBeneficiaries = _beneficiaries.where((beneficiary) {
+          final lowerQuery = query.toLowerCase();
+          return beneficiary.name.toLowerCase().contains(lowerQuery) ||
+              beneficiary.accountNo.toLowerCase().contains(lowerQuery);
+        }).toList();
+      }
+    });
+  }
+
   Widget _buildShimmerList() {
     return ListView.builder(
       itemCount: 6,
@@ -73,15 +100,32 @@ class _FundTransferBeneficiaryScreenState
   }
 
   Widget _buildBeneficiaryList() {
-    if (_beneficiaries.isEmpty) {
+    if (_filteredBeneficiaries.isEmpty) {
       return Center(
           child: Text(AppLocalizations.of(context).noBeneficiaryFound));
     }
     return ListView.builder(
-      itemCount: _beneficiaries.length,
+      itemCount: _filteredBeneficiaries.length,
       itemBuilder: (context, index) {
-        final beneficiary = _beneficiaries[index];
-        return ListTile(
+        final beneficiary = _filteredBeneficiaries[index];
+
+        // --- Cooldown Logic ---
+        bool isCoolingDown = false;
+        if (beneficiary.createdAt != null) {
+          final sixtyMinutesAgo =
+              DateTime.now().subtract(const Duration(minutes: 60));
+          isCoolingDown = beneficiary.createdAt!.isAfter(sixtyMinutesAgo);
+        }
+        // --- End of Cooldown Logic ---
+
+        // By wrapping the ListTile in an Opacity widget, we can make it look
+        // disabled while ensuring the onTap callback still works.
+        return Card(
+          margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+          child: Opacity(
+            opacity: isCoolingDown ? 0.5 : 1.0,
+            child: ListTile(
+              // REMOVED the 'enabled' property from here.
               leading: CircleAvatar(
                 radius: 24,
                 backgroundColor: Colors.transparent,
@@ -100,7 +144,25 @@ class _FundTransferBeneficiaryScreenState
                     ),
                 ],
               ),
+              trailing: isCoolingDown
+                  ? CooldownTimer(
+                      createdAt: beneficiary.createdAt!,
+                      onTimerFinish: () {
+                        setState(() {});
+                      },
+                    )
+                  : null,
               onTap: () {
+                if (isCoolingDown) {
+                  // This will now execute correctly on tap
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    const SnackBar(
+                      content: Text(
+                          'Beneficiary will be enabled after the cooldown period.'),
+                      behavior: SnackBarBehavior.floating,
+                    ),
+                  );
+                } else {
                   Navigator.push(
                     context,
                     MaterialPageRoute(
@@ -112,7 +174,10 @@ class _FundTransferBeneficiaryScreenState
                       ),
                     ),
                   );
+                }
               },
+            ),
+          ),
         );
       },
     );
@@ -124,7 +189,46 @@ class _FundTransferBeneficiaryScreenState
       appBar: AppBar(
         title: Text(AppLocalizations.of(context).beneficiaries),
       ),
-      body: _isLoading ? _buildShimmerList() : _buildBeneficiaryList(),
+      body: Stack(
+        children: [
+          Column(
+            children: [
+              Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: TextField(
+                  controller: _searchController,
+                  decoration: InputDecoration(
+                    hintText:
+                        AppLocalizations.of(context).searchByNameOrAccountHint,
+                    prefixIcon: const Icon(Icons.search),
+                    border: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(12),
+                    ),
+                  ),
+                ),
+              ),
+              Expanded(
+                child:
+                    _isLoading ? _buildShimmerList() : _buildBeneficiaryList(),
+              ),
+            ],
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }

lib/features/fund_transfer/screens/fund_transfer_screen.dart

@@ -1,36 +1,78 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:kmobile/data/models/user.dart';
+import 'package:kmobile/features/auth/controllers/auth_cubit.dart';
+import 'package:kmobile/features/auth/controllers/auth_state.dart';
 import 'package:kmobile/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart';
+import 'package:kmobile/features/fund_transfer/screens/fund_transfer_self_accounts_screen.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import '../../../l10n/app_localizations.dart';
+import '../../../l10n/app_localizations.dart'; // Keep localizations
 
 class FundTransferScreen extends StatelessWidget {
   final String creditAccountNo;
   final String remitterName;
+  final List<User> accounts; // Continue to accept the list of accounts
 
   const FundTransferScreen({
     super.key,
     required this.creditAccountNo,
     required this.remitterName,
+    required this.accounts, // It is passed from the dashboard
   });
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        // Restore localization for the title
         title: Text(AppLocalizations.of(context)
             .fundTransfer
             .replaceFirst(RegExp('\n'), '')),
       ),
-      body: ListView(
+      // Wrap with BlocBuilder to check the authentication state
+      body: BlocBuilder<AuthCubit, AuthState>(
+        builder: (context, state) {
+          return Stack(
             children: [
-          FundTransferManagementTile(
-            icon: Symbols.input_circle,
-            label: AppLocalizations.of(context).ownBank,
+              Padding(
+                padding: const EdgeInsets.symmetric(vertical: 16.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    Expanded(
+                      child: FundTransferManagementTile(
+                        icon: Symbols.person,
+                        label: AppLocalizations.of(context).selfPay,
+                        subtitle:
+                            AppLocalizations.of(context).ftselfpaysubtitle,
                         onTap: () {
                           Navigator.push(
                             context,
                             MaterialPageRoute(
-                  builder: (context) => FundTransferBeneficiaryScreen(
+                              builder: (context) =>
+                                  FundTransferSelfAccountsScreen(
+                                debitAccountNo: creditAccountNo,
+                                remitterName: remitterName,
+                                accounts: accounts,
+                              ),
+                            ),
+                          );
+                        },
+                        disable: state is! Authenticated,
+                      ),
+                    ),
+                    const SizedBox(height: 16),
+                    Expanded(
+                      child: FundTransferManagementTile(
+                        icon: Symbols.input_circle,
+                        label: AppLocalizations.of(context).ownBank,
+                        subtitle: AppLocalizations.of(context).ftownsubtitle,
+                        onTap: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (context) =>
+                                  FundTransferBeneficiaryScreen(
                                 creditAccountNo: creditAccountNo,
                                 remitterName: remitterName,
                                 isOwnBank: true,
@@ -39,15 +81,20 @@ class FundTransferScreen extends StatelessWidget {
                           );
                         },
                       ),
-          const Divider(height: 1),
-          FundTransferManagementTile(
+                    ),
+                    const SizedBox(height: 16),
+                    Expanded(
+                      child: FundTransferManagementTile(
                         icon: Symbols.output_circle,
                         label: AppLocalizations.of(context).outsideBank,
+                        subtitle:
+                            AppLocalizations.of(context).ftoutsidesubtitle,
                         onTap: () {
                           Navigator.push(
                             context,
                             MaterialPageRoute(
-                  builder: (context) => FundTransferBeneficiaryScreen(
+                              builder: (context) =>
+                                  FundTransferBeneficiaryScreen(
                                 creditAccountNo: creditAccountNo,
                                 remitterName: remitterName,
                                 isOwnBank: false,
@@ -56,9 +103,28 @@ class FundTransferScreen extends StatelessWidget {
                           );
                         },
                       ),
-          const Divider(height: 1),
+                    ),
                   ],
                 ),
+              ),
+              IgnorePointer(
+                child: Center(
+                  child: Opacity(
+                    opacity: 0.07, // Reduced opacity
+                    child: ClipOval(
+                      child: Image.asset(
+                        'assets/images/logo.png',
+                        width: 200, // Adjust size as needed
+                        height: 200, // Adjust size as needed
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          );
+        },
+      ),
     );
   }
 }
@@ -66,6 +132,7 @@ class FundTransferScreen extends StatelessWidget {
 class FundTransferManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
+  final String? subtitle;
   final VoidCallback onTap;
   final bool disable;
 
@@ -73,18 +140,65 @@ class FundTransferManagementTile extends StatelessWidget {
     super.key,
     required this.icon,
     required this.label,
+    this.subtitle,
     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,
+    final theme = Theme.of(context);
+    return Card(
+      margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(12.0),
+      ),
+      elevation: 4, // Add some elevation for better visual separation
+      child: InkWell(
+        onTap:
+            disable ? null : onTap, // Disable InkWell if the tile is disabled
+        borderRadius: BorderRadius.circular(12.0),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 24.0, horizontal: 16.0),
+          child: Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Icon(
+                  icon,
+                  size: 48, // Make icon larger
+                  color:
+                      disable ? theme.disabledColor : theme.colorScheme.primary,
+                ),
+                const SizedBox(height: 12),
+                Text(
+                  label,
+                  textAlign: TextAlign.center,
+                  style: theme.textTheme.titleLarge?.copyWith(
+                    fontWeight: FontWeight.bold,
+                    color: disable
+                        ? theme.disabledColor
+                        : theme.colorScheme.onSurface,
+                  ),
+                ),
+                if (subtitle != null)
+                  Padding(
+                    padding: const EdgeInsets.only(top: 8.0),
+                    child: Text(
+                      subtitle!,
+                      textAlign: TextAlign.center,
+                      style: theme.textTheme.bodyMedium?.copyWith(
+                        color: disable
+                            ? theme.disabledColor
+                            : theme.colorScheme.onSurfaceVariant,
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        ),
+      ),
     );
   }
 }

lib/features/fund_transfer/screens/fund_transfer_self_accounts_screen.dart

@@ -0,0 +1,118 @@
+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/l10n/app_localizations.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: Text(AppLocalizations.of(context).selectAccount),
+      ),
+      body: Stack(
+        children: [
+          filteredAccounts.isEmpty
+              ? const Center(
+                  child: Text("No other accounts found"),
+                )
+              : ListView.builder(
+                  itemCount: filteredAccounts.length,
+                  itemBuilder: (context, index) {
+                    final account = filteredAccounts[index];
+                    return Card(
+                      margin: const EdgeInsets.symmetric(
+                          horizontal: 12, vertical: 6),
+                      child: 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,
+                              ),
+                            ),
+                          );
+                        },
+                      ),
+                    );
+                  },
+                ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/features/fund_transfer/screens/fund_transfer_self_amount_screen.dart

@@ -0,0 +1,266 @@
+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/l10n/app_localizations.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: Text(AppLocalizations.of(context).fundTransferTitle),
+      ),
+      body: SafeArea(
+        child: Stack(
+          children: [
+            Padding(
+              padding: const EdgeInsets.all(16.0),
+              child: Form(
+                key: _formKey,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    // Debit Account (User)
+                    Text(
+                      AppLocalizations.of(context).debitFromLabel,
+                      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(
+                      AppLocalizations.of(context).creditedTo,
+                      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: InputDecoration(
+                        labelText:
+                            AppLocalizations.of(context).remarksOptionalHint,
+                        border: const OutlineInputBorder(),
+                      ),
+                    ),
+                    const SizedBox(height: 24),
+
+                    // Amount
+                    TextFormField(
+                      controller: _amountController,
+                      keyboardType: TextInputType.number,
+                      decoration: InputDecoration(
+                        labelText: AppLocalizations.of(context).amountLabel,
+                        border: const OutlineInputBorder(),
+                        prefixIcon: const Icon(Icons.currency_rupee),
+                      ),
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return AppLocalizations.of(context).amountRequired;
+                        }
+                        if (double.tryParse(value) == null ||
+                            double.parse(value) <= 0) {
+                          return AppLocalizations.of(context).validAmountError;
+                        }
+                        return null;
+                      },
+                    ),
+                    const SizedBox(height: 8),
+
+                    // Daily Limit Display
+                    if (_isLoadingLimit)
+                      Text(AppLocalizations.of(context)
+                          .fetchingDailyLimitLoader),
+                    if (!_isLoadingLimit && _limit != null)
+                      Text(
+                        '${AppLocalizations.of(context).remainingDailyLimit} ${_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: Text(AppLocalizations.of(context).proceedButton),
+                      ),
+                    ),
+                    const SizedBox(height: 10),
+                  ],
+                ),
+              ),
+            ),
+            IgnorePointer(
+              child: Center(
+                child: Opacity(
+                  opacity: 0.07, // Reduced opacity
+                  child: ClipOval(
+                    child: Image.asset(
+                      'assets/images/logo.png',
+                      width: 200, // Adjust size as needed
+                      height: 200, // Adjust size as needed
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/features/fund_transfer/screens/tpin_otp_screen.dart

@@ -116,24 +116,39 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: List.generate(6, (i) {
                   return Container(
-                    width: 32,
-                    margin: const EdgeInsets.symmetric(horizontal: 8),
-                    child: TextField(
+                    width: 50,
+                    height: 60,
+                    margin: const EdgeInsets.symmetric(horizontal: 6),
+                    child: Stack(
+                      alignment: Alignment.center,
+                      children: [
+                        TextField(
                           controller: _controllers[i],
                           focusNode: _focusNodes[i],
                           keyboardType: TextInputType.number,
                           textAlign: TextAlign.center,
                           maxLength: 1,
-                      obscureText: true,
-                      obscuringCharacter: '*',
+                          style: const TextStyle(
+                            color: Colors.transparent,
+                            fontSize: 24,
+                          ),
                           decoration: InputDecoration(
                             counterText: '',
                             filled: true,
-                        fillColor: Theme.of(context).primaryColorLight,
+                            fillColor: Colors.grey[200],
+                            contentPadding:
+                                const EdgeInsets.symmetric(vertical: 16),
                             border: OutlineInputBorder(
                               borderRadius: BorderRadius.circular(12),
                               borderSide: BorderSide(
-                            color: theme.colorScheme.primary,
+                                color: Colors.grey[400]!,
+                                width: 2,
+                              ),
+                            ),
+                            enabledBorder: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(12),
+                              borderSide: BorderSide(
+                                color: Colors.grey[400]!,
                                 width: 2,
                               ),
                             ),
@@ -147,6 +162,17 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
                           ),
                           onChanged: (val) => _onOtpChanged(i, val),
                         ),
+                        if (_controllers[i].text.isNotEmpty)
+                          Container(
+                            width: 16,
+                            height: 16,
+                            decoration: BoxDecoration(
+                              color: Colors.black87,
+                              shape: BoxShape.circle,
+                            ),
+                          ),
+                      ],
+                    ),
                   );
                 }),
               ),

lib/features/fund_transfer/screens/transaction_success_screen.dart

@@ -143,6 +143,20 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
                 ),
               ),
             ),
+            IgnorePointer(
+              child: Center(
+                child: Opacity(
+                  opacity: 0.07, // Reduced opacity
+                  child: ClipOval(
+                    child: Image.asset(
+                      'assets/images/logo.png',
+                      width: 200, // Adjust size as needed
+                      height: 200, // Adjust size as needed
+                    ),
+                  ),
+                ),
+              ),
+            ),
           ],
         ),
       ),

lib/features/profile/change_limit_otp_screen.dart

@@ -0,0 +1,120 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/api/services/limit_service.dart';
+import '../../../di/injection.dart';
+import '../../../l10n/app_localizations.dart';
+
+class ChangeLimitOTPScreen extends StatefulWidget {
+  final String newLimit;
+  final String mobileNumber;
+
+  // ignore: use_key_in_widget_constructors
+  const ChangeLimitOTPScreen({
+    required this.newLimit,
+    required this.mobileNumber,
+  });
+
+  @override
+  State<ChangeLimitOTPScreen> createState() => _ChangeLimitOTPScreenState();
+}
+
+class _ChangeLimitOTPScreenState extends State<ChangeLimitOTPScreen> {
+  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 limitService = getIt<LimitService>();
+  Future<void> _validateOTP() async {
+    try {
+      await limitService.validateOtp(
+        otp: otpController.text,
+        mobileNumber: widget.mobileNumber,
+      );
+
+      // If OTP is valid, then change the limit
+      limitService.editLimit(
+        double.parse(widget.newLimit),
+      );
+
+      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
+        content: Text("Limit has been Changed"),
+      ));
+
+      // 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: Stack(
+        children: [
+          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),
+                        ),
+                      ),
+                    ],
+                  ),
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/features/profile/change_mpin_screen.dart

@@ -0,0 +1,96 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/features/auth/screens/mpin_screen.dart';
+import 'package:kmobile/security/secure_storage.dart';
+import 'package:kmobile/di/injection.dart';
+import '../../l10n/app_localizations.dart';
+
+class ChangeMpinScreen extends StatefulWidget {
+  const ChangeMpinScreen({super.key});
+
+  @override
+  State<ChangeMpinScreen> createState() => _ChangeMpinScreenState();
+}
+
+class _ChangeMpinScreenState extends State<ChangeMpinScreen> {
+  @override
+  void initState() {
+    super.initState();
+    // Start the flow after the widget is built
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _startChangeMpin();
+    });
+  }
+
+  void _startChangeMpin() async {
+    final loc = AppLocalizations.of(context);
+
+    // Step 1: Verify old PIN
+    final oldPinVerified = await Navigator.of(context).push<bool>(
+      MaterialPageRoute(
+        builder: (_) => MPinScreen(
+          mode: MPinMode.enter,
+          disableBiometric: true,
+          customTitle: loc.enterOldMpin,
+          onCompleted: (oldPin) => _verifyOldPin(oldPin),
+        ),
+      ),
+    );
+
+    if (oldPinVerified != true) {
+      if (mounted) Navigator.of(context).pop(false);
+      return;
+    }
+
+    // Step 2 & 3: Set new PIN (which will internally navigate to confirm)
+    // The onCompleted will be called after both set and confirm succeed
+    final success = await Navigator.of(context).push<bool>(
+      MaterialPageRoute(
+        builder: (_) => MPinScreen(
+          mode: MPinMode.set,
+          customTitle: loc.enterNewMpin,
+          customConfirmTitle: loc.confirmNewMpin,
+          onCompleted: (newPin) async {
+            // This is called after confirm succeeds and PIN is saved
+            if (context.mounted) {
+              Navigator.of(context).pop(true);
+            }
+          },
+        ),
+      ),
+    );
+
+    if (mounted) {
+      Navigator.of(context).pop(success == true);
+    }
+  }
+
+  Future<void> _verifyOldPin(String oldPin) async {
+    final storage = getIt<SecureStorage>();
+    final storedPin = await storage.read('mpin');
+
+    if (storedPin == int.tryParse(oldPin)) {
+      // Old PIN is correct
+      if (mounted) {
+        Navigator.of(context).pop(true);
+      }
+    } else {
+      // This shouldn't happen as MPinScreen handles validation
+      if (mounted) {
+        Navigator.of(context).pop(false);
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).changeMpin),
+        centerTitle: true,
+      ),
+      body: const Center(
+        child: CircularProgressIndicator(),
+      ),
+    );
+  }
+}

lib/features/profile/change_password/change_password_otp_screen.dart

@@ -70,7 +70,9 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(title: Text(AppLocalizations.of(context).otpVerification)),
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(16.0),
             child: _isLoading
                 ? const Center(child: CircularProgressIndicator())
@@ -105,6 +107,22 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
                     ],
                   ),
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }

lib/features/profile/change_password/change_password_screen.dart

@@ -90,7 +90,9 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
     return Scaffold(
       appBar:
           AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(16),
             child: Form(
               key: _formKey,
@@ -121,8 +123,8 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
                         icon: Icon(_showNewPassword
                             ? Icons.visibility
                             : Icons.visibility_off),
-                    onPressed: () =>
-                        setState(() => _showNewPassword = !_showNewPassword),
+                        onPressed: () => setState(
+                            () => _showNewPassword = !_showNewPassword),
                       ),
                     ),
                     validator: validateNewPassword,
@@ -152,6 +154,22 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
               ),
             ),
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }

lib/features/profile/daily_transaction_limit.dart

@@ -2,11 +2,13 @@ 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/features/profile/change_limit_otp_screen.dart';
 import 'package:kmobile/l10n/app_localizations.dart';
 import 'package:intl/intl.dart';
 
 class DailyLimitScreen extends StatefulWidget {
-  const DailyLimitScreen({super.key});
+  final String mobileNumber;
+  const DailyLimitScreen({super.key, required this.mobileNumber});
   @override
   State<DailyLimitScreen> createState() => _DailyLimitScreenState();
 }
@@ -42,7 +44,7 @@ class _DailyLimitScreenState extends State<DailyLimitScreen> {
     super.dispose();
   }
 
-Future<void> _showAddOrEditLimitDialog() async {
+  Future<void> _showAddOrEditLimitDialog() async {
     _limitController.text = _currentLimit?.toStringAsFixed(0) ?? '';
     final newLimit = await showDialog<double>(
       context: context,
@@ -74,21 +76,40 @@ Future<void> _showAddOrEditLimitDialog() async {
               child: Text(localizations.cancel),
             ),
             ElevatedButton(
-            onPressed: () {
+              onPressed: () async {
                 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"),
+                      content:
+                          Text(localizations.limitToBeSetMustBeLessThan200000),
                       behavior: SnackBarBehavior.floating,
                       backgroundColor: theme.colorScheme.error,
                     ),
                   );
                 } else {
-                service.editLimit(value);
-                Navigator.of(dialogContext).pop(value);
+                  try {
+                    await service.getOtpTLimit(
+                        mobileNumber: widget.mobileNumber);
+                    Navigator.of(context).push(
+                      MaterialPageRoute(
+                        builder: (context) => ChangeLimitOTPScreen(
+                          newLimit: value.toString(),
+                          mobileNumber: widget.mobileNumber,
+                        ),
+                      ),
+                    );
+                  } catch (e) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      SnackBar(
+                        content: Text("Error: $e"),
+                        behavior: SnackBarBehavior.floating,
+                        backgroundColor: theme.colorScheme.error,
+                      ),
+                    );
+                  }
                 }
               },
               child: Text(localizations.save),
@@ -108,13 +129,6 @@ Future<void> _showAddOrEditLimitDialog() async {
         ),
       );
     }
-}
-
-
-  void _removeLimit() {
-    setState(() {
-      _currentLimit = null;
-    });
   }
 
   @override
@@ -129,13 +143,14 @@ Future<void> _showAddOrEditLimitDialog() async {
           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;
+    final remainingLimit =
+        _currentLimit != null ? _currentLimit! - _spentAmount! : 0.0;
 
     return Scaffold(
       appBar: AppBar(
@@ -169,7 +184,7 @@ Future<void> _showAddOrEditLimitDialog() async {
               if (_currentLimit != null) ...[
                 const SizedBox(height: 24),
                 Text(
-                 "Remaining Limit Today", // This should be localized
+                  localizations.remainingLimitToday, // This should be localized
                   style: theme.textTheme.titleMedium,
                 ),
                 const SizedBox(height: 4),
@@ -209,14 +224,6 @@ Future<void> _showAddOrEditLimitDialog() async {
                       ),
                     ),
                     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/preferences/preference_screen.dart

@@ -20,18 +20,19 @@ class PreferenceScreen extends StatelessWidget {
       ),
       body: BlocBuilder<ThemeCubit, ThemeState>(
         builder: (context, state) {
-          return ListView(
+          return Stack(
+            children: [
+              ListView(
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
                 children: [
-              //Set Prefered Username
-              //  ListTile(
-              //     leading: const Icon(Icons.person),
-              //     title: const Text("Set Prefered Username"),
-              //     onTap: () {
-              //     }),
                   // Language Selection
-              ListTile(
+                  Card(
+                    margin: const EdgeInsets.only(bottom: 10),
+                    child: ListTile(
                       leading: const Icon(Icons.language),
                       title: Text(loc.language),
+                      trailing: const Icon(Icons.chevron_right),
                       onTap: () {
                         showDialog(
                           context: context,
@@ -39,24 +40,49 @@ class PreferenceScreen extends StatelessWidget {
                         );
                       },
                     ),
+                  ),
                   //Theme Mode Switch (Light/Dark)
-              ListTile(
+                  Card(
+                    margin: const EdgeInsets.only(bottom: 10),
+                    child: ListTile(
                       leading: const Icon(Icons.brightness_6),
                       title: Text(AppLocalizations.of(context).themeMode),
+                      trailing: const Icon(Icons.chevron_right),
                       onTap: () {
                         showThemeModeDialog(context);
                       },
                     ),
+                  ),
                   //Color_Theme_Selection
-              ListTile(
+                  Card(
+                    margin: const EdgeInsets.only(bottom: 10),
+                    child: ListTile(
                         leading: const Icon(Icons.color_lens),
                         title: Text(AppLocalizations.of(context).themeColor),
+                        trailing: const Icon(Icons.chevron_right),
                         onTap: () {
                           showDialog(
                             context: context,
                             builder: (_) => const ColorThemeDialog(),
                           );
                         }),
+                  ),
+                ],
+              ),
+              IgnorePointer(
+                child: Center(
+                  child: Opacity(
+                    opacity: 0.07, // Reduced opacity
+                    child: ClipOval(
+                      child: Image.asset(
+                        'assets/images/logo.png',
+                        width: 200, // Adjust size as needed
+                        height: 200, // Adjust size as needed
+                      ),
+                    ),
+                  ),
+                ),
+              ),
             ],
           );
         },

lib/features/profile/profile_screen.dart

@@ -2,20 +2,26 @@ 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/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/security_settings_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 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../di/injection.dart';
 import '../../l10n/app_localizations.dart';
 import 'package:kmobile/features/profile/preferences/preference_screen.dart';
 
 class ProfileScreen extends StatefulWidget {
   final String mobileNumber;
-  const ProfileScreen({super.key, required this.mobileNumber});
+  final String customerNo;
+  final String customerName;
+  const ProfileScreen(
+      {super.key,
+      required this.mobileNumber,
+      required this.customerNo,
+      required this.customerName});
 
   @override
   State<ProfileScreen> createState() => _ProfileScreenState();
@@ -30,15 +36,14 @@ class _ProfileScreenState extends State<ProfileScreen> {
   }
 
   Future<String> _getAppVersion() async {
-    final PackageInfo info = await PackageInfo.fromPlatform();
-    return 'Version ${info.version} (${info.buildNumber})';
+    return 'Version 1.0.1 (1))';
   }
 
   Future<void> _loadBiometricStatus() async {
     final storage = getIt<SecureStorage>();
-    final isEnabled = await storage.read('biometric_enabled');
+    final enabled = await storage.read('biometric_enabled');
     setState(() {
-      _isBiometricEnabled = isEnabled == 'true';
+      _isBiometricEnabled = enabled ?? false;
     });
   }
 
@@ -57,16 +62,17 @@ class _ProfileScreenState extends State<ProfileScreen> {
     final canCheck = await localAuth.canCheckBiometrics;
 
     if (!canCheck) {
-      // Optional: Show a snackbar or dialog if biometrics are not available
+      if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text(AppLocalizations.of(context).biometricsNotAvailable)),
+              content:
+                  Text(AppLocalizations.of(context).biometricsNotAvailable)),
         );
+      }
       return;
     }
 
     if (enable) {
-      // Show "Enable" dialog
       final optIn = await showDialog<bool>(
         context: context,
         barrierDismissible: false,
@@ -96,17 +102,31 @@ class _ProfileScreenState extends State<ProfileScreen> {
             ),
           );
           if (didAuth) {
-            await storage.write('biometric_enabled', 'true');
+            await storage.write('biometric_enabled', true);
+            if (mounted) {
               setState(() {
                 _isBiometricEnabled = true;
               });
             }
+          } else {
+            // Authentication failed, reload state to refresh UI
+            if (mounted) {
+              await _loadBiometricStatus();
+            }
+          }
         } catch (e) {
-          // Handle authentication errors
+          // Handle exceptions, reload state to ensure consistency
+          if (mounted) {
+            await _loadBiometricStatus();
+          }
+        }
+      } else {
+        // User cancelled, reload state to refresh UI
+        if (mounted) {
+          await _loadBiometricStatus();
         }
       }
     } else {
-      // Show "Disable" dialog
       final optOut = await showDialog<bool>(
         context: context,
         barrierDismissible: false,
@@ -127,117 +147,232 @@ class _ProfileScreenState extends State<ProfileScreen> {
       );
 
       if (optOut == true) {
-        await storage.write('biometric_enabled', 'false');
+        await storage.write('biometric_enabled', false);
+        if (mounted) {
           setState(() {
             _isBiometricEnabled = false;
           });
         }
+      } else {
+        // User cancelled, reload state to refresh UI
+        if (mounted) {
+          await _loadBiometricStatus();
+        }
+      }
     }
   }
 
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
+    final theme = Theme.of(context);
 
     return Scaffold(
       appBar: AppBar(
-        title: Text(loc.profile), // Localized "Profile"
+        title: Text(loc.profile),
+        elevation: 0,
       ),
-      body: ListView(
+      body: Stack(
         children: [
-          ListTile(
-            leading: const Icon(Icons.settings),
-            title: Text(loc.preferences),
+          ListView(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+            children: [
+              // ===== Profile Header =====
+              Card(
+                child: Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Row(
+                    children: [
+                      // Avatar
+                      Container(
+                        width: 56,
+                        height: 56,
+                        child: const CircleAvatar(
+                          radius: 50,
+                          child: Icon(
+                            Symbols.person,
+                            size: 56,
+                          ),
+                        ),
+                      ),
+                      const SizedBox(width: 12),
+                      // Name + mobile
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              // If you want to show the user's name instead, replace below.
+                              widget.customerName,
+                              style: theme.textTheme.titleLarge?.copyWith(
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                            const SizedBox(height: 4),
+                            Text(
+                              widget.customerNo,
+                              style: theme.textTheme.bodyMedium?.copyWith(
+                                color: theme.colorScheme.onSurface
+                                    .withOpacity(0.7),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+
+              const SizedBox(height: 16),
+
+              // ===== Section: Settings =====
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                child: Text(
+                  "Settings",
+                  style: theme.textTheme.labelLarge?.copyWith(
+                    fontWeight: FontWeight.w600,
+                    letterSpacing: 0.2,
+                  ),
+                ),
+              ),
+              const SizedBox(height: 8),
+
+              _SectionTile(
+                leadingIcon: Icons.settings,
+                title: loc.preferences,
                 onTap: () {
                   Navigator.push(
                     context,
                     MaterialPageRoute(
-                    builder: (context) => const PreferenceScreen()),
+                      builder: (context) => const PreferenceScreen(),
+                    ),
                   );
                 },
               ),
-          ListTile(
-            leading: const Icon(Icons.currency_rupee),
-            title: Text(AppLocalizations.of(context).dailylimit),
+              _SectionTile(
+                leadingIcon: Icons.security,
+                title: loc.securitySettings,
                 onTap: () {
                   Navigator.push(
                     context,
                     MaterialPageRoute(
-                    builder: (context) => const DailyLimitScreen()),
+                      builder: (context) => SecuritySettingsScreen(
+                        mobileNumber: widget.mobileNumber,
+                      ),
+                    ),
                   );
                 },
               ),
-          SwitchListTile(
-            title: Text(AppLocalizations.of(context).enableFingerprintLogin),
+              _SectionTile(
+                leadingIcon: Icons.currency_rupee,
+                title: loc.dailylimit,
+                onTap: () {
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) =>
+                          DailyLimitScreen(mobileNumber: widget.mobileNumber),
+                    ),
+                  );
+                },
+              ),
+              Card(
+                child: SwitchListTile(
+                  title: Text(loc.enableFingerprintLogin),
                   value: _isBiometricEnabled,
                   onChanged: (bool value) {
                     _handleBiometricToggle(value);
                   },
                   secondary: const Icon(Icons.fingerprint),
+                  contentPadding:
+                      const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
                 ),
-          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: const Text("Manage TPIN"),
-          //   onTap: () async {
-          //   },
-          // ),
-          //           ListTile(
-          //   leading: const Icon(Icons.password),
-          //   title: const Text("Change Login MPIN"),
-          //   onTap: () async {
-          //   },
-          // ),
-          ListTile(
+
+              const SizedBox(height: 16),
+              const Divider(height: 24),
+
+              // ===== Section: Security & App =====
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                child: Text(
+                  loc.appVersion,
+                  style: theme.textTheme.labelLarge?.copyWith(
+                    fontWeight: FontWeight.w600,
+                    letterSpacing: 0.2,
+                  ),
+                ),
+              ),
+              const SizedBox(height: 8),
+
+              // Fingerprint toggle inside a styled container
+              Card(
+                child: ListTile(
                   leading: const Icon(Icons.smartphone),
-            title: const Text("App Version"),
+                  title: Text(loc.appVersion),
                   trailing: FutureBuilder<String>(
                     future: _getAppVersion(),
-              builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
+                    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();
+                        return const SizedBox(
+                          width: 18,
+                          height: 18,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        );
                       } else if (snapshot.hasError) {
-                  return const Text("Error");
+                        return Text(loc.error);
                       } else {
-                  // Display the version number once the future is complete
                         return Text(
                           snapshot.data ?? "N/A",
-                    selectionColor: const Color(0xFFFFFFFF),
                         );
                       }
                     },
                   ),
+                  contentPadding:
+                      const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(16),
                   ),
-          ListTile(
-            leading: const Icon(Icons.exit_to_app),
-            title: Text(AppLocalizations.of(context).logout),
+                ),
+              ),
+
+              const SizedBox(height: 16),
+              const Divider(height: 24),
+
+              // ===== Section: Actions =====
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                child: Text(
+                  "Exit",
+                  style: theme.textTheme.labelLarge?.copyWith(
+                    fontWeight: FontWeight.w600,
+                    letterSpacing: 0.2,
+                  ),
+                ),
+              ),
+              const SizedBox(height: 8),
+
+              _SectionTile(
+                leadingIcon: Icons.exit_to_app,
+                title: loc.logout,
+                trailChevron: false, // action tile, no chevron
                 onTap: () async {
                   final shouldExit = await showDialog<bool>(
                     context: context,
                     builder: (context) => AlertDialog(
-                  title: Text(AppLocalizations.of(context).logout),
-                  content: Text(AppLocalizations.of(context).logoutCheck),
+                      title: Text(loc.logout),
+                      content: Text(loc.logoutCheck),
                       actions: [
                         TextButton(
                           onPressed: () => Navigator.of(context).pop(false),
-                      child: Text(AppLocalizations.of(context).no),
+                          child: Text(loc.no),
                         ),
                         TextButton(
                           onPressed: () => Navigator.of(context).pop(true),
-                      child: Text(AppLocalizations.of(context).yes),
+                          child: Text(loc.yes),
                         ),
                       ],
                     ),
@@ -251,9 +386,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   }
                 },
               ),
-          ListTile(
-            leading: const Icon(Icons.logout),
-            title: Text(AppLocalizations.of(context).deregister),
+              _SectionTile(
+                leadingIcon: Icons.logout,
+                title: loc.deregister,
+                trailChevron: false,
                 onTap: () async {
                   final shouldLogout = await showDialog<bool>(
                     context: context,
@@ -265,8 +401,47 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   }
                 },
               ),
+
+              const SizedBox(height: 24),
+            ],
+          ),
         ],
       ),
     );
   }
 }
+
+class _SectionTile extends StatelessWidget {
+  const _SectionTile({
+    required this.leadingIcon,
+    required this.title,
+    this.onTap,
+    this.trailChevron = true,
+  });
+
+  final IconData leadingIcon;
+  final String title;
+  final VoidCallback? onTap;
+  final bool trailChevron;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return Card(
+      margin: const EdgeInsets.only(bottom: 10),
+      child: ListTile(
+        leading: Icon(leadingIcon, color: theme.colorScheme.onSurface),
+        title: Text(title, style: theme.textTheme.bodyLarge),
+        trailing: trailChevron
+            ? Icon(Icons.chevron_right, color: theme.colorScheme.onSurface)
+            : null,
+        onTap: onTap,
+        contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(16),
+        ),
+      ),
+    );
+  }
+}

lib/features/profile/security_settings_screen.dart

@@ -0,0 +1,149 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/features/profile/change_password/change_password_screen.dart';
+import 'package:kmobile/features/profile/tpin/change_tpin_screen.dart';
+import 'package:kmobile/features/profile/change_mpin_screen.dart';
+import 'package:kmobile/api/services/auth_service.dart';
+import 'package:kmobile/features/fund_transfer/screens/tpin_set_screen.dart';
+import 'package:kmobile/di/injection.dart';
+import '../../l10n/app_localizations.dart';
+
+class SecuritySettingsScreen extends StatelessWidget {
+  final String mobileNumber;
+
+  const SecuritySettingsScreen({super.key, required this.mobileNumber});
+
+  @override
+  Widget build(BuildContext context) {
+    final loc = AppLocalizations.of(context);
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(loc.securitySettings),
+        centerTitle: true,
+      ),
+      body: Stack(
+        children: [
+          ListView(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+            children: [
+              Card(
+                margin: const EdgeInsets.only(bottom: 10),
+                child: ListTile(
+                  leading: const Icon(Icons.lock_outline),
+                  title: Text(loc.changeLoginPassword),
+                  trailing: const Icon(Icons.chevron_right),
+                  onTap: () {
+                    Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) => ChangePasswordScreen(
+                          mobileNumber: mobileNumber,
+                        ),
+                      ),
+                    );
+                  },
+                ),
+              ),
+              Card(
+                margin: const EdgeInsets.only(bottom: 10),
+                child: ListTile(
+                  leading: const Icon(Icons.pin),
+                  title: Text(loc.changeMpin),
+                  trailing: const Icon(Icons.chevron_right),
+                  onTap: () async {
+                    final result = await Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) => const ChangeMpinScreen(),
+                      ),
+                    );
+
+                    if (result == true && context.mounted) {
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        SnackBar(
+                          content: Text(loc.mpinChangedSuccessfully),
+                          backgroundColor:
+                              Theme.of(context).colorScheme.secondary,
+                        ),
+                      );
+                    }
+                  },
+                ),
+              ),
+              Card(
+                margin: const EdgeInsets.only(bottom: 10),
+                child: ListTile(
+                  leading: const Icon(Icons.password),
+                  title: const Text('Change TPIN'),
+                  trailing: const Icon(Icons.chevron_right),
+                  onTap: () async {
+                    final authService = getIt<AuthService>();
+                    final isTpinSet = await authService.checkTpin();
+
+                    if (!isTpinSet) {
+                      if (context.mounted) {
+                        showDialog(
+                          context: context,
+                          builder: (BuildContext context) {
+                            return AlertDialog(
+                              title: const Text('TPIN Not Set'),
+                              content: const Text(
+                                  'You have not set a TPIN yet. Please set a TPIN to proceed.'),
+                              actions: <Widget>[
+                                TextButton(
+                                  child: const Text('Back'),
+                                  onPressed: () {
+                                    Navigator.of(context).pop();
+                                  },
+                                ),
+                                TextButton(
+                                  child: const Text('Proceed'),
+                                  onPressed: () {
+                                    Navigator.of(context).pop();
+                                    Navigator.of(context).push(
+                                      MaterialPageRoute(
+                                        builder: (context) =>
+                                            const TpinSetScreen(),
+                                      ),
+                                    );
+                                  },
+                                ),
+                              ],
+                            );
+                          },
+                        );
+                      }
+                    } else {
+                      if (context.mounted) {
+                        Navigator.of(context).push(
+                          MaterialPageRoute(
+                            builder: (context) =>
+                                ChangeTpinScreen(mobileNumber: mobileNumber),
+                          ),
+                        );
+                      }
+                    }
+                  },
+                ),
+              ),
+            ],
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

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,147 @@
+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

@@ -31,9 +31,9 @@ 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: '₹');
+  Limit? _limit;
+  bool _isLoadingLimit = true;
+  final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
   // Controllers
   final accountNumberController = TextEditingController();
   final confirmAccountNumberController = TextEditingController();
@@ -70,7 +70,7 @@ final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
     amountController.addListener(_checkAmountLimit);
   }
 
-Future<void> _loadLimit() async {
+  Future<void> _loadLimit() async {
     setState(() {
       _isLoadingLimit = true;
     });
@@ -86,7 +86,7 @@ Future<void> _loadLimit() async {
         _isLoadingLimit = false;
       });
     }
-}
+  }
 
 // Add this method to check the amount against the limit
   void _checkAmountLimit() {
@@ -99,7 +99,8 @@ Future<void> _loadLimit() async {
     if (isOverLimit) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-         content: Text('Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
+          content: Text(
+              'Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
           backgroundColor: Colors.red,
         ),
       );
@@ -457,7 +458,9 @@ Future<void> _loadLimit() async {
         ),
         centerTitle: false,
       ),
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(12),
             child: Form(
               key: _formKey,
@@ -495,7 +498,8 @@ Future<void> _loadLimit() async {
                       ),
                       focusedBorder: OutlineInputBorder(
                         borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                            color: Theme.of(context).colorScheme.primary,
+                            width: 2),
                       ),
                     ),
                     controller: accountNumberController,
@@ -510,7 +514,8 @@ Future<void> _loadLimit() async {
                     },
                     validator: (value) {
                       if (value == null || value.isEmpty) {
-                    return AppLocalizations.of(context).accountNumberRequired;
+                        return AppLocalizations.of(context)
+                            .accountNumberRequired;
                       } else if (value.length < 7 || value.length > 20) {
                         return AppLocalizations.of(context).accno7to20;
                       }
@@ -521,7 +526,8 @@ Future<void> _loadLimit() async {
                   TextFormField(
                     controller: confirmAccountNumberController,
                     decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).confirmAccountNumber,
+                      labelText:
+                          AppLocalizations.of(context).confirmAccountNumber,
                       // prefixIcon: Icon(Icons.person),
                       border: const OutlineInputBorder(),
                       isDense: true,
@@ -533,14 +539,16 @@ Future<void> _loadLimit() async {
                       ),
                       focusedBorder: OutlineInputBorder(
                         borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                            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).reenterAccountNumber;
+                        return AppLocalizations.of(context)
+                            .reenterAccountNumber;
                       }
                       if (value != accountNumberController.text) {
                         return AppLocalizations.of(context).accountMismatch;
@@ -564,7 +572,8 @@ Future<void> _loadLimit() async {
                             border: const OutlineInputBorder(),
                             isDense: true,
                             filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
                             enabledBorder: OutlineInputBorder(
                               borderSide: BorderSide(
                                   color: Theme.of(context).colorScheme.outline),
@@ -613,7 +622,8 @@ Future<void> _loadLimit() async {
                             border: const OutlineInputBorder(),
                             isDense: true,
                             filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
                             enabledBorder: OutlineInputBorder(
                               borderSide: BorderSide(
                                   color: Theme.of(context).colorScheme.outline),
@@ -629,7 +639,8 @@ Future<void> _loadLimit() async {
                             'Current',
                           ]
                               .map(
-                            (e) => DropdownMenuItem(value: e, child: Text(e)),
+                                (e) =>
+                                    DropdownMenuItem(value: e, child: Text(e)),
                               )
                               .toList(),
                           onChanged: (value) => setState(() {
@@ -655,7 +666,8 @@ Future<void> _loadLimit() async {
                       ),
                       focusedBorder: OutlineInputBorder(
                         borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                            color: Theme.of(context).colorScheme.primary,
+                            width: 2),
                       ),
                     ),
                   ),
@@ -707,10 +719,11 @@ Future<void> _loadLimit() async {
                               ? const SizedBox(
                                   width: 20,
                                   height: 20,
-                              child: CircularProgressIndicator(strokeWidth: 2),
+                                  child:
+                                      CircularProgressIndicator(strokeWidth: 2),
                                 )
-                          : Text(
-                              AppLocalizations.of(context).validateBeneficiary),
+                              : Text(AppLocalizations.of(context)
+                                  .validateBeneficiary),
                         ),
                       ),
                     ),
@@ -719,8 +732,8 @@ Future<void> _loadLimit() async {
                       padding: const EdgeInsets.only(bottom: 24.0),
                       child: Text(
                         _validationError!,
-                    style:
-                        TextStyle(color: Theme.of(context).colorScheme.error),
+                        style: TextStyle(
+                            color: Theme.of(context).colorScheme.error),
                       ),
                     ),
                   TextFormField(
@@ -738,7 +751,8 @@ Future<void> _loadLimit() async {
                       ),
                       focusedBorder: OutlineInputBorder(
                         borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                            color: Theme.of(context).colorScheme.primary,
+                            width: 2),
                       ),
                     ),
                     validator: (value) {
@@ -763,7 +777,8 @@ Future<void> _loadLimit() async {
                       ),
                       focusedBorder: OutlineInputBorder(
                         borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                            color: Theme.of(context).colorScheme.primary,
+                            width: 2),
                       ),
                     ),
                   ),
@@ -783,19 +798,24 @@ Future<void> _loadLimit() async {
                                 border: const OutlineInputBorder(),
                                 isDense: true,
                                 filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
+                                fillColor:
+                                    Theme.of(context).scaffoldBackgroundColor,
                                 enabledBorder: OutlineInputBorder(
                                   borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.outline),
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .outline),
                                 ),
                                 focusedBorder: OutlineInputBorder(
                                   borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.primary,
+                                      color:
+                                          Theme.of(context).colorScheme.primary,
                                       width: 2),
                                 ),
                               ),
                               textInputAction: TextInputAction.next,
-                      validator: (value) => value == null || value.isEmpty
+                              validator: (value) => value == null ||
+                                      value.isEmpty
                                   ? AppLocalizations.of(context).phoneRequired
                                   : null,
                             ),
@@ -808,14 +828,18 @@ Future<void> _loadLimit() async {
                                 border: const OutlineInputBorder(),
                                 isDense: true,
                                 filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
+                                fillColor:
+                                    Theme.of(context).scaffoldBackgroundColor,
                                 enabledBorder: OutlineInputBorder(
                                   borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.outline),
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .outline),
                                 ),
                                 focusedBorder: OutlineInputBorder(
                                   borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.primary,
+                                      color:
+                                          Theme.of(context).colorScheme.primary,
                                       width: 2),
                                 ),
                               ),
@@ -824,11 +848,13 @@ Future<void> _loadLimit() async {
                               textInputAction: TextInputAction.next,
                               validator: (value) {
                                 if (value == null || value.isEmpty) {
-                          return AppLocalizations.of(context).amountRequired;
+                                  return AppLocalizations.of(context)
+                                      .amountRequired;
                                 }
                                 final amount = double.tryParse(value);
                                 if (amount == null || amount <= 0) {
-                          return AppLocalizations.of(context).validAmount;
+                                  return AppLocalizations.of(context)
+                                      .validAmount;
                                 }
                                 return null;
                               },
@@ -839,12 +865,12 @@ Future<void> _loadLimit() async {
                     ],
                   ),
                   const SizedBox(height: 8),
-if (_isLoadingLimit)
+                  if (_isLoadingLimit)
                     const Padding(
                       padding: EdgeInsets.only(left: 8.0),
                       child: Text('Fetching daily limit...'),
                     ),
-if (!_isLoadingLimit && _limit != null)
+                  if (!_isLoadingLimit && _limit != null)
                     Padding(
                       padding: const EdgeInsets.only(left: 8.0),
                       child: Text(
@@ -868,12 +894,18 @@ if (!_isLoadingLimit && _limit != null)
                     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,
+                          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),
+                          : Theme.of(context)
+                              .colorScheme
+                              .secondary
+                              .withAlpha(100),
                       borderRadius: BorderRadius.circular(30),
                       height: 56,
                       onSwipe: () {
@@ -893,6 +925,22 @@ if (!_isLoadingLimit && _limit != null)
               ),
             ),
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 

lib/features/quick_pay/screens/quick_pay_screen.dart

@@ -21,11 +21,18 @@ class _QuickPayScreen extends State<QuickPayScreen> {
           AppLocalizations.of(context).quickPay.replaceAll('\n', ''),
         ),
       ),
-      body: ListView(
+      body: Stack(
         children: [
-          QuickPayManagementTile(
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                Expanded(
+                  child: QuickPayManagementTile(
                     icon: Symbols.input_circle,
                     label: AppLocalizations.of(context).ownBank,
+                    subtitle: AppLocalizations.of(context).quickownsubtitle,
                     onTap: () {
                       Navigator.push(
                         context,
@@ -37,10 +44,13 @@ class _QuickPayScreen extends State<QuickPayScreen> {
                       );
                     },
                   ),
-          const Divider(height: 1),
-          QuickPayManagementTile(
+                ),
+                const SizedBox(height: 16),
+                Expanded(
+                  child: QuickPayManagementTile(
                     icon: Symbols.output_circle,
                     label: AppLocalizations.of(context).outsideBank,
+                    subtitle: AppLocalizations.of(context).quickoutsidesubtitle,
                     onTap: () {
                       Navigator.push(
                         context,
@@ -52,7 +62,24 @@ class _QuickPayScreen extends State<QuickPayScreen> {
                       );
                     },
                   ),
-          const Divider(height: 1),
+                ),
+              ],
+            ),
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
         ],
       ),
     );
@@ -62,6 +89,7 @@ class _QuickPayScreen extends State<QuickPayScreen> {
 class QuickPayManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
+  final String? subtitle;
   final VoidCallback onTap;
   final bool disable;
 
@@ -69,18 +97,63 @@ class QuickPayManagementTile extends StatelessWidget {
     super.key,
     required this.icon,
     required this.label,
+    this.subtitle,
     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,
+    final theme = Theme.of(context);
+    return Card(
+      margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(12.0),
+      ),
+      elevation: 4, // Add some elevation for better visual separation
+      child: InkWell(
+        onTap:
+            disable ? null : onTap, // Disable InkWell if the tile is disabled
+        borderRadius: BorderRadius.circular(12.0),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 36.0, horizontal: 16.0),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Icon(
+                icon,
+                size: 64, // Make icon larger for two cards
+                color:
+                    disable ? theme.disabledColor : theme.colorScheme.primary,
+              ),
+              const SizedBox(height: 16),
+              Text(
+                label,
+                textAlign: TextAlign.center,
+                style: theme.textTheme.headlineSmall?.copyWith(
+                  fontWeight: FontWeight.bold,
+                  color: disable
+                      ? theme.disabledColor
+                      : theme.colorScheme.onSurface,
+                ),
+              ),
+              if (subtitle != null) // Conditionally display subtitle
+                Padding(
+                  padding: const EdgeInsets.only(top: 8.0),
+                  child: Text(
+                    subtitle!,
+                    textAlign: TextAlign.center,
+                    style: theme.textTheme.bodyMedium?.copyWith(
+                      color: disable
+                          ? theme.disabledColor
+                          : theme.colorScheme.onSurfaceVariant,
+                    ),
+                  ),
+                ),
+            ],
+          ),
+        ),
+      ),
     );
   }
 }

lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart

@@ -22,9 +22,9 @@ 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: '₹');
+  Limit? _limit;
+  bool _isLoadingLimit = true;
+  final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
@@ -46,7 +46,7 @@ final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
     amountController.addListener(_checkAmountLimit);
   }
 
-Future<void> _loadLimit() async {
+  Future<void> _loadLimit() async {
     setState(() {
       _isLoadingLimit = true;
     });
@@ -62,9 +62,9 @@ Future<void> _loadLimit() async {
         _isLoadingLimit = false;
       });
     }
-}
+  }
 
-void _checkAmountLimit() {
+  void _checkAmountLimit() {
     if (_limit == null) return;
 
     final amount = double.tryParse(amountController.text) ?? 0;
@@ -74,7 +74,8 @@ void _checkAmountLimit() {
     if (isOverLimit) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-        content: Text('Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
+          content: Text(
+              'Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
           backgroundColor: Colors.red,
         ),
       );
@@ -86,7 +87,7 @@ void _checkAmountLimit() {
         _isAmountOverLimit = isOverLimit;
       });
     }
-}
+  }
 
   void _resetBeneficiaryValidation() {
     if (_isBeneficiaryValidated ||
@@ -142,13 +143,12 @@ void _checkAmountLimit() {
       appBar: AppBar(
         title: Text(
           AppLocalizations.of(context).quickPayOwnBank,
-          style: TextStyle(
-              color: Theme.of(context).colorScheme.onSurface,
-              fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
       ),
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(16.0),
             child: Form(
               key: _formKey,
@@ -158,14 +158,16 @@ void _checkAmountLimit() {
                     const SizedBox(height: 10),
                     TextFormField(
                       decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).debitAccountNumber,
+                        labelText:
+                            AppLocalizations.of(context).debitAccountNumber,
                         border: const OutlineInputBorder(),
                         isDense: true,
                         filled: true,
                         fillColor: Theme.of(context).scaffoldBackgroundColor,
                       ),
                       readOnly: true,
-                controller: TextEditingController(text: widget.debitAccount),
+                      controller:
+                          TextEditingController(text: widget.debitAccount),
                       keyboardType: TextInputType.number,
                       textInputAction: TextInputAction.next,
                       enabled: false,
@@ -184,7 +186,8 @@ void _checkAmountLimit() {
                         ),
                         focusedBorder: OutlineInputBorder(
                           borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                              color: Theme.of(context).colorScheme.primary,
+                              width: 2),
                         ),
                       ),
                       controller: accountNumberController,
@@ -193,9 +196,11 @@ void _checkAmountLimit() {
                       textInputAction: TextInputAction.next,
                       validator: (value) {
                         if (value == null || value.isEmpty) {
-                    return AppLocalizations.of(context).accountNumberRequired;
+                          return AppLocalizations.of(context)
+                              .accountNumberRequired;
                         } else if (value.length != 11) {
-                    return AppLocalizations.of(context).validAccountNumber;
+                          return AppLocalizations.of(context)
+                              .validAccountNumber;
                         }
                         return null;
                       },
@@ -204,7 +209,8 @@ void _checkAmountLimit() {
                     TextFormField(
                       controller: confirmAccountNumberController,
                       decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).confirmAccountNumber,
+                        labelText:
+                            AppLocalizations.of(context).confirmAccountNumber,
                         // prefixIcon: Icon(Icons.person),
                         border: const OutlineInputBorder(),
                         isDense: true,
@@ -216,14 +222,16 @@ void _checkAmountLimit() {
                         ),
                         focusedBorder: OutlineInputBorder(
                           borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                              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).reenterAccountNumber;
+                          return AppLocalizations.of(context)
+                              .reenterAccountNumber;
                         }
                         if (value != accountNumberController.text) {
                           return AppLocalizations.of(context).accountMismatch;
@@ -240,7 +248,8 @@ void _checkAmountLimit() {
                             onPressed: _isValidating
                                 ? null
                                 : () {
-                              if (accountNumberController.text.length == 11 &&
+                                    if (accountNumberController.text.length ==
+                                            11 &&
                                         confirmAccountNumberController.text ==
                                             accountNumberController.text) {
                                       _validateBeneficiary();
@@ -256,10 +265,11 @@ void _checkAmountLimit() {
                                 ? const SizedBox(
                                     width: 20,
                                     height: 20,
-                              child: CircularProgressIndicator(strokeWidth: 2),
+                                    child: CircularProgressIndicator(
+                                        strokeWidth: 2),
                                   )
-                          : Text(
-                              AppLocalizations.of(context).validateBeneficiary),
+                                : Text(AppLocalizations.of(context)
+                                    .validateBeneficiary),
                           ),
                         ),
                       ),
@@ -273,7 +283,8 @@ void _checkAmountLimit() {
                             Text(
                               '${AppLocalizations.of(context).beneficiaryName}: $_beneficiaryName',
                               style: const TextStyle(
-                            color: Colors.green, fontWeight: FontWeight.bold),
+                                  color: Colors.green,
+                                  fontWeight: FontWeight.bold),
                             ),
                           ],
                         ),
@@ -302,7 +313,8 @@ void _checkAmountLimit() {
                         ),
                         focusedBorder: OutlineInputBorder(
                           borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                              color: Theme.of(context).colorScheme.primary,
+                              width: 2),
                         ),
                       ),
                       value: _selectedAccountType,
@@ -343,12 +355,12 @@ void _checkAmountLimit() {
                         ),
                         focusedBorder: OutlineInputBorder(
                           borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                              color: Theme.of(context).colorScheme.primary,
+                              width: 2),
                         ),
                       ),
                     ),
                     const SizedBox(height: 25),
-              
                     TextFormField(
                       decoration: InputDecoration(
                         labelText: AppLocalizations.of(context).amount,
@@ -362,7 +374,8 @@ void _checkAmountLimit() {
                         ),
                         focusedBorder: OutlineInputBorder(
                           borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                              color: Theme.of(context).colorScheme.primary,
+                              width: 2),
                         ),
                       ),
                       controller: amountController,
@@ -380,9 +393,8 @@ void _checkAmountLimit() {
                       },
                     ),
                     const SizedBox(height: 8),
-if (_isLoadingLimit)
-  const Text('Fetching daily limit...'),
-if (!_isLoadingLimit && _limit != null)
+                    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,
@@ -392,9 +404,12 @@ if (!_isLoadingLimit && _limit != null)
                       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,
+                            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(
@@ -423,7 +438,8 @@ if (!_isLoadingLimit && _limit != null)
                               context,
                               MaterialPageRoute(
                                 builder: (context) => TransactionPinScreen(
-                             onPinCompleted: (pinScreenContext, tpin) async {
+                                  onPinCompleted:
+                                      (pinScreenContext, tpin) async {
                                     final transfer = Transfer(
                                       fromAccount: widget.debitAccount,
                                       toAccount: accountNumberController.text,
@@ -433,14 +449,17 @@ if (!_isLoadingLimit && _limit != null)
                                       remarks: remarksController.text,
                                     );
 
-                               final paymentService = getIt<PaymentService>();
+                                    final paymentService =
+                                        getIt<PaymentService>();
                                     final paymentResponseFuture = paymentService
                                         .processQuickPayWithinBank(transfer);
 
-                               Navigator.of(pinScreenContext).pushReplacement(
+                                    Navigator.of(pinScreenContext)
+                                        .pushReplacement(
                                       MaterialPageRoute(
                                         builder: (_) => PaymentAnimationScreen(
-                                       paymentResponse: paymentResponseFuture),
+                                            paymentResponse:
+                                                paymentResponseFuture),
                                       ),
                                     );
                                   },
@@ -456,6 +475,22 @@ if (!_isLoadingLimit && _limit != null)
               ),
             ),
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 

lib/features/security/security_error_screen.dart

@@ -11,7 +11,9 @@ class SecurityErrorScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Padding(
+      body: Stack(
+        children: [
+          Padding(
             padding: const EdgeInsets.all(20.0),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
@@ -21,17 +23,34 @@ class SecurityErrorScreen extends StatelessWidget {
                 Text(
                   message,
                   textAlign: TextAlign.center,
-              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
+                  style: const TextStyle(
+                      fontSize: 18, fontWeight: FontWeight.w600),
                 ),
                 const SizedBox(height: 40),
                 ElevatedButton(
-              onPressed: () =>
-                  SystemChannels.platform.invokeMethod('SystemNavigator.pop'),
+                  onPressed: () => SystemChannels.platform
+                      .invokeMethod('SystemNavigator.pop'),
                   child: const Text('Okay'),
                 ),
               ],
             ),
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }

lib/features/service/screens/atm_locator_screen.dart

@@ -0,0 +1,166 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/api/services/branch_service.dart'; // Added: Import BranchService for Atm model and API calls
+import 'package:kmobile/di/injection.dart'; // Added: Import for dependency injection (getIt)
+import 'package:shimmer/shimmer.dart';
+
+import '../../../l10n/app_localizations.dart'; // Added: Import for shimmer loading effect
+
+// Removed: The local 'Location' class is no longer needed as we use the 'Atm' model from branch_service.dart
+
+class ATMLocatorScreen extends StatefulWidget {
+  const ATMLocatorScreen({super.key});
+
+  @override
+  State<ATMLocatorScreen> createState() => _ATMLocatorScreenState();
+}
+
+class _ATMLocatorScreenState extends State<ATMLocatorScreen> {
+  final TextEditingController _searchController = TextEditingController();
+  var service =
+      getIt<BranchService>(); // Added: Instance of BranchService for API calls
+  bool _isLoading = true; // State variable to manage loading status
+  List<Atm> _allAtms = []; // Changed: List to hold all fetched Atm objects
+  List<Atm> _filteredAtms =
+      []; // Changed: List to hold filtered Atm objects for display
+
+  @override
+  void initState() {
+    super.initState();
+    _loadAtms(); // Changed: Call _loadAtms to fetch data on initialization
+  }
+
+  /// Fetches the list of ATMs from the API using BranchService.
+  Future<void> _loadAtms() async {
+    final data =
+        await service.fetchAtmList(); // Call the new fetchAtmList method
+    setState(() {
+      _allAtms = data; // Update the list of all ATMs
+      _filteredAtms = data; // Initialize filtered list with all ATMs
+      _isLoading = false; // Set loading to false once data is fetched
+    });
+  }
+
+  /// Filters the list of ATMs based on the search query.
+  void _filterAtms(String query) {
+    // Changed: Renamed from _filterLocations
+    setState(() {
+      if (query.isEmpty) {
+        _filteredAtms = _allAtms; // If query is empty, show all ATMs
+      } else {
+        _filteredAtms = _allAtms.where((atm) {
+          // Changed: Filter based on Atm object
+          final lowerQuery = query.toLowerCase();
+          return atm.name
+              .toLowerCase()
+              .contains(lowerQuery); // Filter by atm.name
+        }).toList();
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(
+            AppLocalizations.of(context).atmlocator), // Title for the app bar
+      ),
+      body: Stack(
+        children: [
+          Column(
+            children: [
+              Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: TextField(
+                  controller: _searchController,
+                  onChanged:
+                      _filterAtms, // Updated: Call _filterAtms on text change
+                  decoration: InputDecoration(
+                    hintText: AppLocalizations.of(context)
+                        .nameAddress, // Hint text for the search bar
+                    prefixIcon: const Icon(Icons.search), // Search icon
+                    border: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(12),
+                    ),
+                  ),
+                ),
+              ),
+
+              // Content area: Displays loading shimmer, "no ATMs found", or the list of ATMs
+              Expanded(
+                child: _isLoading
+                    ? _buildShimmerList() // Display shimmer while loading
+                    : _filteredAtms.isEmpty
+                        ? Center(
+                            child: Text(AppLocalizations.of(context)
+                                .noMatchingAtmsFound)) // Message if no ATMs found
+                        : ListView.builder(
+                            itemCount: _filteredAtms
+                                .length, // Number of items in the filtered list
+                            itemBuilder: (context, index) {
+                              final atm = _filteredAtms[
+                                  index]; // Get the current Atm object
+                              return _buildAtmItem(
+                                  atm); // Build the ATM list item
+                            },
+                          ),
+              ),
+            ],
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png', // Background logo image
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// Helper widget to build a single ATM list item.
+  Widget _buildAtmItem(Atm atm) {
+    // Changed: Takes an Atm object
+    return Card(
+      margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      child: ListTile(
+        leading: const Icon(Icons.credit_card), // Icon for ATM
+        title: Text(atm.name, // Display the ATM's name
+            style: const TextStyle(fontWeight: FontWeight.bold)),
+        onTap: () {
+          // No action on tap as per user request
+        },
+      ),
+    );
+  }
+
+  /// Helper widget to display a shimmer loading effect.
+  Widget _buildShimmerList() {
+    return ListView.builder(
+      itemCount: 10, // Number of shimmer items to display
+      itemBuilder: (context, index) => Shimmer.fromColors(
+        baseColor: Colors.grey.shade300,
+        highlightColor: Colors.grey.shade100,
+        child: ListTile(
+          leading: const CircleAvatar(
+            radius: 24,
+            backgroundColor: Colors.white,
+          ),
+          title: Container(
+            height: 16,
+            color: Colors.white,
+            margin: const EdgeInsets.symmetric(vertical: 4),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/service/screens/branch_details_screen.dart

@@ -0,0 +1,109 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/api/services/branch_service.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class BranchDetailsScreen extends StatelessWidget {
+  final Branch branch;
+
+  const BranchDetailsScreen({super.key, required this.branch});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(branch.branch_name),
+      ),
+      body: Stack(
+        children: [
+          SingleChildScrollView(
+            padding: const EdgeInsets.all(16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                _buildDetailRow(context, "Branch Name", branch.branch_name),
+                _buildDetailRow(context, "Branch Code", branch.branch_code),
+                _buildDetailRow(context, "Zone", branch.zone),
+                _buildDetailRow(context, "Tehsil", branch.tehsil),
+                _buildDetailRow(context, "Block", branch.block),
+                _buildDetailRow(context, "District", branch.distt_name),
+                _buildDetailRow(context, "Pincode", branch.pincode),
+                // _buildDetailRow(context, "Post Office", branch.post_office),
+                // _buildDetailRow(context, "Date of Opening", branch.date_of_opening),
+                // _buildDetailRow(context, "Branch Type", branch.type_of_branch),
+                _buildDetailRow(context, "Telephone No.", branch.telephone_no),
+                // _buildDetailRow("RTGS Account No.", branch.rtgs_acct_no),
+                // _buildDetailRow("RBI Code 1", branch.rbi_code_1),
+                // _buildDetailRow("RBI Code 2", branch.rbi_code_2),
+                // _buildDetailRow("Latitude", branch.br_lattitude),
+                // _buildDetailRow("Longitude", branch.br_longitude),
+              ],
+            ),
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildDetailRow(BuildContext context, String label, String value) {
+    final theme = Theme.of(context);
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            label,
+            style: TextStyle(
+              fontSize: 14,
+              color: theme.textTheme.bodySmall?.color,
+            ),
+          ),
+          const SizedBox(height: 4),
+          label == "Telephone No."
+              ? InkWell(
+                  onTap: () => _launchUrl('tel:$value'),
+                  child: Text(
+                    value,
+                    style: TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w500,
+                      color:
+                          theme.colorScheme.primary, // Indicate it's clickable
+                      decoration: TextDecoration.underline,
+                    ),
+                  ),
+                )
+              : Text(
+                  value,
+                  style: const TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+          Divider(height: 16, color: theme.dividerColor),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _launchUrl(String urlString) async {
+    final Uri url = Uri.parse(urlString);
+    if (!await launchUrl(url)) {
+      throw 'Could not launch $urlString';
+    }
+  }
+}

lib/features/service/screens/branch_locator_screen.dart

@@ -1,27 +1,13 @@
 // ignore_for_file: unused_element
 
 import 'package:flutter/material.dart';
+import 'package:kmobile/api/services/branch_service.dart';
+import 'package:kmobile/di/injection.dart';
+import 'package:shimmer/shimmer.dart';
+import 'package:kmobile/features/service/screens/branch_details_screen.dart';
+
 import '../../../l10n/app_localizations.dart';
 
-// Enum to define the type of location
-enum LocationType { branch, atm }
-
-class Location {
-  final String name;
-  final String? code; // Nullable for ATMs
-  final String? ifsc; // Nullable for ATMs
-  final String address;
-  final LocationType type;
-
-  Location({
-    required this.name,
-    this.code,
-    this.ifsc,
-    required this.address,
-    required this.type,
-  });
-}
-
 class BranchLocatorScreen extends StatefulWidget {
   const BranchLocatorScreen({super.key});
 
@@ -31,76 +17,35 @@ class BranchLocatorScreen extends StatefulWidget {
 
 class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
   final TextEditingController _searchController = TextEditingController();
-
-  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<Location> _filteredLocations = [];
-  bool _isLoading = false;
+  var service = getIt<BranchService>();
+  bool _isLoading = true;
+  List<Branch> _allBranches = [];
+  List<Branch> _filteredBranches = [];
 
   @override
   void initState() {
     super.initState();
     // _fetchAndSetLocations();
-    _filteredLocations = _allLocations;
+    _loadBranches();
   }
 
-// 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 {
+  Future<void> _loadBranches() async {
+    final data = await service.fetchBranchList();
     setState(() {
+      _allBranches = data;
+      _filteredBranches = data;
       _isLoading = false;
     });
   }
-}
-*/
-  void _filterLocations(String query) {
+
+  void _filterBranches(String query) {
     setState(() {
       if (query.isEmpty) {
-        _filteredLocations = _allLocations;
+        _filteredBranches = _allBranches;
       } else {
-        _filteredLocations = _allLocations.where((location) {
+        _filteredBranches = _allBranches.where((branch) {
           final lowerQuery = query.toLowerCase();
-          return location.name.toLowerCase().contains(lowerQuery) ||
-              (location.code?.toLowerCase().contains(lowerQuery) ?? false) ||
-              (location.ifsc?.toLowerCase().contains(lowerQuery) ?? false) ||
-              location.address.toLowerCase().contains(lowerQuery);
+          return branch.branch_name.toLowerCase().contains(lowerQuery);
         }).toList();
       }
     });
@@ -110,17 +55,21 @@ Future<void> _fetchAndSetLocations() async {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context).branchLocator),
+        title: Text(
+          AppLocalizations.of(context).branchlocator,
         ),
-      body: Column(
+      ),
+      body: Stack(
+        children: [
+          Column(
             children: [
               Padding(
                 padding: const EdgeInsets.all(12.0),
                 child: TextField(
                   controller: _searchController,
-              onChanged: _filterLocations,
+                  onChanged: _filterBranches, // Updated
                   decoration: InputDecoration(
-                hintText: AppLocalizations.of(context).searchbranchby,
+                    hintText: AppLocalizations.of(context).searchbranch,
                     prefixIcon: const Icon(Icons.search),
                     border: OutlineInputBorder(
                       borderRadius: BorderRadius.circular(12),
@@ -132,19 +81,38 @@ Future<void> _fetchAndSetLocations() async {
               // Content area
               Expanded(
                 child: _isLoading
-                ? const Center(child: CircularProgressIndicator())
-                : _filteredLocations.isEmpty
-                    ? const Center(child: Text("No matching locations found"))
+                    ? _buildShimmerList() // Changed to shimmer
+                    : _filteredBranches.isEmpty
+                        ? Center(
+                            child: Text(AppLocalizations.of(context)
+                                .noMatchingBranchesFound)) // Updated tex
                         : ListView.builder(
-                        itemCount: _filteredLocations.length,
+                            itemCount: _filteredBranches.length,
                             itemBuilder: (context, index) {
-                          final location = _filteredLocations[index];
-                          return _buildLocationItem(location);
+                              final branch =
+                                  _filteredBranches[index]; // Changed to
+                              return _buildBranchItem(branch); // Updated
                             },
                           ),
               ),
             ],
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 
@@ -161,28 +129,49 @@ Future<void> _fetchAndSetLocations() async {
     );
   }
 
-// Helper widget to build a single location item
-  Widget _buildLocationItem(Location location) {
-    final isBranch = location.type == LocationType.branch;
+  // Helper widget to build a single branch item
+
+  Widget _buildBranchItem(Branch branch) {
     return Card(
       margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
       child: ListTile(
-        leading: CircleAvatar(
-          child: Icon(isBranch ? Icons.location_city : Icons.currency_rupee),
+        leading: const CircleAvatar(
+          child: Icon(Icons.account_balance),
         ),
-        title: Text(location.name,
+        title: Text(branch.branch_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}")),
+          // This is the updated part
+          Navigator.push(
+            context,
+            MaterialPageRoute(
+              builder: (_) => BranchDetailsScreen(branch: branch),
+            ),
           );
         },
       ),
     );
   }
+
+  // Shimmer loading list
+  Widget _buildShimmerList() {
+    return ListView.builder(
+      itemCount: 10, // Number of shimmer items
+      itemBuilder: (context, index) => Shimmer.fromColors(
+        baseColor: Colors.grey.shade300,
+        highlightColor: Colors.grey.shade100,
+        child: ListTile(
+          leading: const CircleAvatar(
+            radius: 24,
+            backgroundColor: Colors.white,
+          ),
+          title: Container(
+            height: 16,
+            color: Colors.white,
+            margin: const EdgeInsets.symmetric(vertical: 4),
+          ),
+        ),
+      ),
+    );
+  }
 }

lib/features/service/screens/faqs_screen.dart

@@ -1,6 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:kmobile/l10n/app_localizations.dart';
 
+// Data model for a single FAQ item
+class FaqItem {
+  final String question;
+  final String answer;
+
+  FaqItem({required this.question, required this.answer});
+}
+
 class FaqsScreen extends StatefulWidget {
   const FaqsScreen({super.key});
 
@@ -9,38 +17,96 @@ class FaqsScreen extends StatefulWidget {
 }
 
 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
-  }
+  // List of FAQs
+  final List<FaqItem> _faqs = [
+    FaqItem(
+      question: "How do I log in to the mobile banking app?",
+      answer:
+          "You can log in using your customer number and password. Biometric login (fingerprint) and MPIN is also available for supported devices.",
+    ),
+    FaqItem(
+      question: "Is my banking information secure on this app?",
+      answer:
+          "Yes. We use industry-standard encryption and multi-factor authentication to ensure your data is safe.",
+    ),
+    FaqItem(
+      question: "How can I check my account balance?",
+      answer:
+          "Once logged in, your account balance will be displayed on the home screen. You can also view detailed balances under the “Accounts” section.",
+    ),
+    FaqItem(
+      question: "Can I transfer money to other bank accounts?",
+      answer:
+          "Yes. You can use NEFT, RTGS or IMPS to transfer funds to any bank account in India.",
+    ),
+    FaqItem(
+      question: "How do I view my transaction history?",
+      answer:
+          "Click on the “Account Statement” icon under the Home Screen to view recent and past transactions.",
+    ),
+  ];
 
   @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,
+        title: Text(AppLocalizations.of(context).faq),
+      ),
+      body: Stack(
+        children: [
+          // Background logo
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07,
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200,
+                    height: 200,
+                  ),
+                ),
+              ),
+            ),
+          ),
+          // FAQ List
+          ListView.builder(
+            padding: const EdgeInsets.all(8.0),
+            itemCount: _faqs.length,
+            itemBuilder: (context, index) {
+              final faq = _faqs[index];
+              return Card(
+                margin:
+                    const EdgeInsets.symmetric(vertical: 8.0, horizontal: 4.0),
+                elevation: 2.0,
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(12.0),
+                ),
+                child: ExpansionTile(
+                  title: Text(
+                    faq.question,
+                    style: const TextStyle(
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                  children: <Widget>[
+                    Padding(
+                      padding: const EdgeInsets.fromLTRB(16.0, 0, 16.0, 16.0),
+                      child: Text(
+                        faq.answer,
+                        style: TextStyle(
+                          fontSize: 14,
+                          color: Colors.grey[700],
+                          height: 1.5,
                         ),
-                textAlign: TextAlign.left,
                       ),
                     ),
                   ],
                 ),
+              );
+            },
+          ),
+        ],
       ),
     );
   }

lib/features/service/screens/quick_links_screen.dart

@@ -1,5 +1,18 @@
+//
+
 import 'package:flutter/material.dart';
 import 'package:kmobile/l10n/app_localizations.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+// Data model for a single Quick Link item
+class QuickLink {
+  final String title;
+  final String url;
+  // The icon is no longer used in the UI but is kept in the model for potential future use.
+  final IconData icon;
+
+  QuickLink({required this.title, required this.url, required this.icon});
+}
 
 class QuickLinksScreen extends StatefulWidget {
   const QuickLinksScreen({super.key});
@@ -9,18 +22,48 @@ class QuickLinksScreen extends StatefulWidget {
 }
 
 class _QuickLinksScreenState extends State<QuickLinksScreen> {
-  @override
-  void initState() {
-    super.initState();
-    _getQuickLinks();
-  }
+  // List of Quick Links
+  final List<QuickLink> _quickLinks = [
+    QuickLink(
+        title: "National Bank of Agriculture & Rural Development",
+        url: "http://www.nabard.org/",
+        icon: Icons.account_balance),
+    QuickLink(
+        title: "Reserve Bank of India",
+        url: "http://www.rbi.org.in/home.aspx",
+        icon: Icons.account_balance_wallet),
+    QuickLink(
+        title: "Indian Institute of Banking & Finance",
+        url: "http://www.iibf.org.in/",
+        icon: Icons.school),
+    QuickLink(
+        title: "Indian Bank Association",
+        url: "http://www.iba.org.in/",
+        icon: Icons.group_work),
+    QuickLink(
+        title: "Ministry of Finance",
+        url: "http://www.finmin.nic.in/",
+        icon: Icons.business),
+    QuickLink(
+        title: "Securities Exchange Board of India",
+        url: "http://www.sebi.gov.in/",
+        icon: Icons.show_chart),
+    QuickLink(
+        title: "Insurance Regulatory & Development Authority",
+        url: "https://www.irdai.gov.in/",
+        icon: Icons.shield_outlined),
+  ];
 
-  // 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
+  // Function to launch a URL
+  Future<void> _launchURL(String url, BuildContext context) async {
+    final Uri uri = Uri.parse(url);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri, mode: LaunchMode.externalApplication);
+    } else {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Could not launch $url')),
+      );
+    }
   }
 
   @override
@@ -29,6 +72,42 @@ class _QuickLinksScreenState extends State<QuickLinksScreen> {
       appBar: AppBar(
         title: Text(AppLocalizations.of(context).quickLinks),
       ),
+      body: Stack(
+        children: [
+          // Background logo
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07,
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200,
+                    height: 200,
+                  ),
+                ),
+              ),
+            ),
+          ),
+          // UPDATED: List of Quick Links
+          ListView.builder(
+            padding: const EdgeInsets.symmetric(vertical: 8.0),
+            itemCount: _quickLinks.length,
+            itemBuilder: (context, index) {
+              final link = _quickLinks[index];
+              return Card(
+                margin:
+                    const EdgeInsets.symmetric(vertical: 4.0, horizontal: 8.0),
+                child: ListTile(
+                  title: Text(link.title),
+                  trailing: const Icon(Icons.open_in_new, size: 20),
+                  onTap: () => _launchURL(link.url, context),
+                ),
+              );
+            },
+          ),
+        ],
+      ),
     );
   }
 }

lib/features/service/screens/service_screen.dart

@@ -1,5 +1,4 @@
-import 'package:kmobile/features/service/screens/branch_locator_screen.dart';
-
+import 'package:kmobile/features/service/screens/atm_locator_screen.dart';
 import '../../../l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
@@ -24,23 +23,15 @@ class _ServiceScreen extends State<ServiceScreen> {
         ),
         centerTitle: false,
       ),
-      body: ListView(
+      body: Stack(
         children: [
-          ServiceManagementTile(
-            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(
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                Expanded(
+                  child: ServiceManagementTile(
                     icon: Symbols.captive_portal,
                     label: AppLocalizations.of(context).quickLinks,
                     onTap: () {
@@ -49,32 +40,55 @@ class _ServiceScreen extends State<ServiceScreen> {
                             builder: (context) => const QuickLinksScreen()),
                       );
                     },
-            disabled: true,
+                    disabled: false,
                   ),
-          const Divider(height: 1),
-          ServiceManagementTile(
+                ),
+                const SizedBox(height: 16),
+                Expanded(
+                  child: ServiceManagementTile(
                     icon: Symbols.question_mark,
                     label: AppLocalizations.of(context).faq,
                     onTap: () {
                       Navigator.of(context).push(
-                MaterialPageRoute(builder: (context) => const FaqsScreen()),
+                        MaterialPageRoute(
+                            builder: (context) => const FaqsScreen()),
                       );
                     },
-            disabled: true,
+                    disabled: false,
                   ),
-          const Divider(height: 1),
-          ServiceManagementTile(
+                ),
+                const SizedBox(height: 16),
+                Expanded(
+                  child: ServiceManagementTile(
                     icon: Symbols.location_pin,
-            label: AppLocalizations.of(context).branchLocator,
+                    label: AppLocalizations.of(context).atmlocator,
                     onTap: () {
                       Navigator.push(
                           context,
                           MaterialPageRoute(
-                      builder: (context) => const BranchLocatorScreen()));
+                              builder: (context) => const ATMLocatorScreen()));
                     },
-            disabled: true,
+                    disabled: false,
+                  ),
+                ),
+                // No Spacer() needed here as Expanded children will fill space
+              ],
+            ),
+          ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
+                child: ClipOval(
+                  child: Image.asset(
+                    'assets/images/logo.png',
+                    width: 200, // Adjust size as needed
+                    height: 200, // Adjust size as needed
+                  ),
+                ),
+              ),
+            ),
           ),
-          const Divider(height: 1),
         ],
       ),
     );
@@ -98,23 +112,42 @@ class ServiceManagementTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    return ListTile(
-      leading: Icon(
+    return Card(
+      margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(12.0),
+      ),
+      elevation: 4, // Add some elevation for better visual separation
+      child: InkWell(
+        onTap:
+            disabled ? null : onTap, // Disable InkWell if the tile is disabled
+        borderRadius: BorderRadius.circular(12.0),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 24.0, horizontal: 16.0),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Icon(
                 icon,
-        color: disabled ? theme.disabledColor : null,
+                size: 48, // Make icon larger
+                color:
+                    disabled ? theme.disabledColor : theme.colorScheme.primary,
               ),
-      title: Text(
+              const SizedBox(height: 12),
+              Text(
                 label,
-        style: TextStyle(
-          color: disabled ? theme.disabledColor : null,
+                textAlign: TextAlign.center,
+                style: theme.textTheme.titleLarge?.copyWith(
+                  fontWeight: FontWeight.bold,
+                  color: disabled
+                      ? theme.disabledColor
+                      : theme.colorScheme.onSurface,
+                ),
+              ),
+            ],
           ),
         ),
-      trailing: Icon(
-        Symbols.arrow_right,
-        size: 20,
-        color: disabled ? theme.disabledColor : null,
       ),
-      onTap: disabled ? null : onTap,
     );
   }
 }