Formatting with Checkbook@2025

(for migrated users)

.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

analysis_options.yaml

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

android/app/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
     }
@@ -45,21 +52,27 @@ android {
         applicationId "com.example.kmobile"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 29
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
     buildTypes {
         release {
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            'proguard-rules.pro'
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
         }
     }
 }
@@ -68,4 +81,6 @@ flutter {
     source '../..'
 }
 
-dependencies {}
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
+}

android/app/proguard-rules.pro

@@ -1,77 +1,21 @@
-# Keep Flutter embedding and plugin registrant (important)
--keep class io.flutter.embedding.** { *; }
--keep class io.flutter.plugins.** { *; }
--keep class io.flutter.plugin.** { *; }
 -keep class io.flutter.app.** { *; }
-
+-keep class io.flutter.plugin.**  { *; }
-# Keep Application / Activity if you customized them (replace with your package name)
+-keep class io.flutter.util.**  { *; }
-# -keep class com.yourcompany.yourapp.MainActivity { *; }
+-keep class io.flutter.view.**  { *; }
-# -keep class com.yourcompany.yourapp.** { *; }
+-keep class io.flutter.embedding.**  { *; }
-
+-keep class io.flutter.embedding.engine.plugins.**  { *; }
-# Keep classes referenced from AndroidManifest via reflection or lifecycle
--keepclassmembers class * {
-    @android.webkit.JavascriptInterface <methods>;
-    public <init>(android.content.Context, ...);
-}
-
-# Keep native entry points (JNI) if any (example)
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
-# Keep classes that use reflection heavily (OKHttp/Retrofit/Gson)
-# Retrofit/OkHttp
--keep class okhttp3.** { *; }
--keep interface okhttp3.** { *; }
--keep class retrofit2.** { *; }
--keep interface retrofit2.** { *; }
-
-# Gson (models accessed by reflection)
--keep class com.google.gson.** { *; }
--keepattributes Signature
--keepattributes *Annotation*
-
-# Keep Firebase (if you use it)
 -keep class com.google.firebase.** { *; }
 -keep class com.google.android.gms.** { *; }
-
+# Please add these rules to your existing keep rules in order to suppress warnings.
-# WorkManager (if used)
+# This is generated automatically by the Android Gradle plugin.
--keep class androidx.work.impl.background.systemjob.SystemJobService { *; }
+-dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
--keep class androidx.work.** { *; }
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallException
-
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallManager
-# Room/DB entities - if you use Room, keep annotations and entity classes
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallManagerFactory
--keepclassmembers class * {
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallRequest$Builder
-    @androidx.room.* <fields>;
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallRequest
-}
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallSessionState
--keep class androidx.room.** { *; }
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener
-
+-dontwarn com.google.android.play.core.tasks.OnFailureListener
-# Keep classes loaded by reflection (e.g. through Class.forName)
+-dontwarn com.google.android.play.core.tasks.OnSuccessListener
--keepclassmembers,includedescriptorclasses class * {
+-dontwarn com.google.android.play.core.tasks.Task
-    public static <fields>;
-    public <init>(...);
-}
-
-# Keep Kotlin metadata (for Kotlin reflection)
--keep class kotlin.Metadata { *; }
-
-# Keep names of classes annotated with @Keep
--keep @androidx.annotation.Keep class * { *; }
--keepclassmembers class * {
-    @androidx.annotation.Keep *;
-}
-
-# If using Gson TypeAdapterFactory via reflection
--keepclassmembers class * {
-    static ** typeAdapterFactory*(...);
-}
-
-# Don't remove debug/logging if you want (optional)
-#-keep class android.util.Log { *; }
-
-# Keep any generated plugin registrant classes if present (older projects)
--keep class io.flutter.plugins.GeneratedPluginRegistrant { *; }
-
-# (Optional) Keep parcelable implementations if those are serialized dynamically
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}

android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
         android:label="kmobile"
         android:name="${applicationName}"
         android:usesCleartextTraffic="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
@@ -39,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"/>

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

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

ios/Runner.xcodeproj/project.pbxproj

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

ios/Runner/Info.plist

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

lib/api/services/auth_service.dart

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

lib/api/services/beneficiary_service.dart

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

lib/api/services/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

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

lib/api/services/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

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

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

lib/app.dart

@@ -2,6 +2,8 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
+import 'package:kmobile/features/auth/controllers/theme_mode_state.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import './l10n/app_localizations.dart';
@@ -10,14 +12,15 @@ 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/accounts/screens/account_statement_screen.dart';
-import 'features/auth/screens/splash_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';
 import 'features/auth/screens/mpin_screen.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'dart:async';
 
 class KMobile extends StatefulWidget {
   const KMobile({super.key});
@@ -32,25 +35,46 @@ class KMobile extends StatefulWidget {
   }
 }
 
-class _KMobileState extends State<KMobile> {
+class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
-  bool showSplash = true;
+  Timer? _backgroundTimer;
   Locale? _locale;
 
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
     loadPreferences();
-    Future.delayed(const Duration(seconds: 3), () {
+  }
-      setState(() {
+
-        showSplash = false;
+  @override
-      });
+  void dispose() {
-    });
+    WidgetsBinding.instance.removeObserver(this);
+    _backgroundTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    switch (state) {
+      case AppLifecycleState.resumed:
+        _backgroundTimer?.cancel();
+        break;
+      case AppLifecycleState.paused:
+        _backgroundTimer = Timer(const Duration(minutes: 2), () {
+          if (Platform.isAndroid) {
+            SystemNavigator.pop();
+          }
+          exit(0);
+        });
+        break;
+      default:
+        break;
+    }
   }
 
   Future<void> loadPreferences() async {
     final prefs = await SharedPreferences.getInstance();
-
-    // Load Locale
     final String? langCode = prefs.getString('locale');
     if (langCode != null) {
       setState(() {
@@ -78,29 +102,37 @@ class _KMobileState extends State<KMobile> {
       providers: [
         BlocProvider<AuthCubit>(create: (_) => getIt<AuthCubit>()),
         BlocProvider<ThemeCubit>(create: (_) => ThemeCubit()),
+        BlocProvider<ThemeModeCubit>(create: (_) => ThemeModeCubit()),
       ],
       child: BlocBuilder<ThemeCubit, ThemeState>(
         builder: (context, themeState) {
-          return MaterialApp(
+          return BlocBuilder<ThemeModeCubit, ThemeModeState>(
-            debugShowCheckedModeBanner: false,
+            builder: (context, modeState) {
-            locale: _locale ?? const Locale('en'),
+              return MaterialApp(
-            supportedLocales: const [
+                debugShowCheckedModeBanner: false,
-              Locale('en'),
+                locale: _locale ?? const Locale('en'),
-              Locale('hi'),
+                supportedLocales: const [
-            ],
+                  Locale('en'),
-            localizationsDelegates: const [
+                  Locale('hi'),
-              AppLocalizations.delegate,
+                ],
-              GlobalMaterialLocalizations.delegate,
+                localizationsDelegates: const [
-              GlobalWidgetsLocalizations.delegate,
+                  AppLocalizations.delegate,
-              GlobalCupertinoLocalizations.delegate,
+                  GlobalMaterialLocalizations.delegate,
-            ],
+                  GlobalWidgetsLocalizations.delegate,
-            title: 'kMobile',
+                  GlobalCupertinoLocalizations.delegate,
-            theme: themeState.getThemeData(),
+                ],
-            //darkTheme: themeState.getThemeData(),
+                title: 'kMobile',
-            themeMode: ThemeMode.light,
+                theme: themeState.getLightThemeData(),
-            onGenerateRoute: AppRoutes.generateRoute,
+                darkTheme: themeState.getDarkThemeData(),
-            initialRoute: AppRoutes.splash,
+                themeMode: context.watch<ThemeModeCubit>().state.mode,
-            home: showSplash ? const SplashScreen() : const AuthGate(),
+                navigatorObservers: [
+                  getIt<RouteObserver<ModalRoute<void>>>(),
+                ],
+                onGenerateRoute: AppRoutes.generateRoute,
+                initialRoute: AppRoutes.splash,
+                home: const AuthGate(),
+              );
+            },
           );
         },
       ),
@@ -110,7 +142,6 @@ class _KMobileState extends State<KMobile> {
 
 class AuthGate extends StatefulWidget {
   const AuthGate({super.key});
-
   @override
   State<AuthGate> createState() => _AuthGateState();
 }
@@ -171,9 +202,8 @@ class _AuthGateState extends State<AuthGate> {
   @override
   Widget build(BuildContext context) {
     if (_checking) {
-      return const SplashScreen();
+      return const LoginScreen();
     }
-
     if (_isLoggedIn) {
       if (_hasMPin) {
         if (_biometricEnabled) {
@@ -181,13 +211,11 @@ 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(); // Authenticated
+                return const NavigationScaffold();
               }
-
               return MPinScreen(
                 mode: MPinMode.enter,
                 onCompleted: (_) {
@@ -218,7 +246,6 @@ class _AuthGateState extends State<AuthGate> {
           onCompleted: (_) async {
             final storage = getIt<SecureStorage>();
             final localAuth = LocalAuthentication();
-
             final optIn = await showDialog<bool>(
               context: context,
               barrierDismissible: false,
@@ -239,7 +266,6 @@ class _AuthGateState extends State<AuthGate> {
                 ],
               ),
             );
-
             if (optIn == true) {
               final canCheck = await localAuth.canCheckBiometrics;
               bool didAuth = false;
@@ -247,7 +273,6 @@ class _AuthGateState extends State<AuthGate> {
               if (context.mounted) {
                 authEnable = AppLocalizations.of(context).authenticateToEnable;
               }
-
               if (canCheck) {
                 didAuth = await localAuth.authenticate(
                   localizedReason: authEnable,
@@ -262,7 +287,6 @@ class _AuthGateState extends State<AuthGate> {
                 await storage.write('biometric_enabled', 'false');
               }
             }
-
             if (context.mounted) {
               Navigator.of(context).pushReplacement(
                 MaterialPageRoute(
@@ -280,7 +304,6 @@ class _AuthGateState extends State<AuthGate> {
 
 class NavigationScaffold extends StatefulWidget {
   const NavigationScaffold({super.key});
-
   @override
   State<NavigationScaffold> createState() => _NavigationScaffoldState();
 }
@@ -288,10 +311,23 @@ class NavigationScaffold extends StatefulWidget {
 class _NavigationScaffoldState extends State<NavigationScaffold> {
   final PageController _pageController = PageController();
   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(),
   ];
 
@@ -335,10 +371,9 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
         bottomNavigationBar: BottomNavigationBar(
           currentIndex: _selectedIndex,
           type: BottomNavigationBarType.fixed,
-          backgroundColor: Theme.of(context)
+          backgroundColor: const Color(0XFF1E58AD),
-              .scaffoldBackgroundColor, // Light blue background
+          selectedItemColor: Theme.of(context).colorScheme.onPrimary,
-          selectedItemColor: Theme.of(context).primaryColor,
+          unselectedItemColor: Theme.of(context).colorScheme.onSecondary,
-          unselectedItemColor: Colors.black54,
           onTap: (index) {
             setState(() {
               _selectedIndex = index;
@@ -351,8 +386,8 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
               label: AppLocalizations.of(context).home,
             ),
             BottomNavigationBarItem(
-              icon: const Icon(Icons.credit_card),
+              icon: const Icon(Icons.swap_vert_sharp),
-              label: AppLocalizations.of(context).card,
+              label: AppLocalizations.of(context).transactions,
             ),
             BottomNavigationBarItem(
               icon: const Icon(Icons.miscellaneous_services),
@@ -365,11 +400,9 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
   }
 }
 
-// Add this widget at the end of the file
 class BiometricPromptScreen extends StatelessWidget {
   final VoidCallback onCompleted;
   const BiometricPromptScreen({super.key, required this.onCompleted});
-
   Future<void> _handleBiometric(BuildContext context) async {
     final localAuth = LocalAuthentication();
     final canCheck = await localAuth.canCheckBiometrics;
@@ -400,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/theme_type.dart

@@ -3,4 +3,5 @@ enum ThemeType {
   green,
   orange,
   blue,
+  yellow,
 }

lib/config/themes.dart

@@ -1,39 +1,72 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'theme_type.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 class AppThemes {
   static ThemeData getLightTheme(ThemeType type) {
-    final Color seedColor;
+    final Color seedColor = _getSeedColor(type);
-    switch (type) {
-      case ThemeType.green:
-        seedColor = Colors.green;
-        break;
-      case ThemeType.orange:
-        seedColor = Colors.orange;
-        break;
-      case ThemeType.blue:
-        seedColor = Colors.blue;
-        break;
-      case ThemeType.violet:
-        seedColor = Colors.deepPurple;
-        break;
-    }
-
     final colorScheme = ColorScheme.fromSeed(
       seedColor: seedColor,
-      brightness: Brightness.light, // Explicitly set for a light theme
+      brightness: Brightness.light,
+    );
+    return ThemeData.from(
+      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) {
+    final Color seedColor = _getSeedColor(type);
+    log(seedColor.toString());
+    final colorScheme = ColorScheme.fromSeed(
+      seedColor: seedColor,
+      brightness: Brightness.dark,
     );
 
     return ThemeData.from(
-            colorScheme: colorScheme,
+      colorScheme: colorScheme,
-            useMaterial3: true, // Recommended for modern Flutter apps
+      useMaterial3: true,
-            textTheme: GoogleFonts.rubikTextTheme())
+      textTheme: GoogleFonts.rubikTextTheme(
-        .copyWith(
+        ThemeData(brightness: Brightness.dark).textTheme,
-      scaffoldBackgroundColor: Colors.white,
-      bottomNavigationBarTheme: BottomNavigationBarThemeData(
-        backgroundColor: colorScheme.surface,
       ),
-    );
+    ).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) {
+    switch (type) {
+      case ThemeType.green:
+        return Colors.green;
+      case ThemeType.orange:
+        return Colors.orange;
+      case ThemeType.blue:
+        return Colors.blue;
+      case ThemeType.violet:
+        return Colors.deepPurple;
+      case ThemeType.yellow:
+        return Colors.yellow;
+    }
   }
 }

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

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

lib/data/models/neft_transaction.dart

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

lib/data/models/rtgs_transaction.dart

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

lib/data/models/transaction.dart

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

lib/data/models/transfer.dart

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

lib/data/repositories/auth_repository.dart

@@ -13,10 +13,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,18 +49,38 @@ 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 {
+    await _secureStorage.deleteAll();
   }
 
   Future<AuthToken?> _getAuthToken() async {
     final accessToken = await _secureStorage.read(_accessTokenKey);
     final expiryString = await _secureStorage.read(_tokenExpiryKey);
+    final tncString = await _secureStorage.read(_tncKey);
 
     if (accessToken != null && expiryString != null) {
-      return AuthToken(
+      final authToken = AuthToken(
         accessToken: accessToken,
         expiresAt: DateTime.parse(expiryString),
+        tnc:
+            tncString == 'true', // Parse 'true' string to true, otherwise false
       );
+      return authToken;
     }
     return null;
   }
+
+  Future<void> acceptTnc() async {
+    // This method calls the setTncFlag function
+    try {
+      await _authService.setTncflag();
+    } catch (e) {
+      // Handle or rethrow the error as needed
+      print('Error setting TNC flag: $e');
+      rethrow;
+    }
+  }
 }

lib/data/repositories/transaction_repository.dart

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

lib/di/injection.dart

@@ -1,3 +1,7 @@
+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';
 import 'package:kmobile/api/services/imps_service.dart';
@@ -8,8 +12,10 @@ import 'package:kmobile/api/services/payment_service.dart';
 import 'package:kmobile/api/services/user_service.dart';
 import 'package:kmobile/data/repositories/transaction_repository.dart';
 import 'package:kmobile/features/auth/controllers/theme_cubit.dart';
+import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
 import '../api/services/auth_service.dart';
 import '../api/interceptors/auth_interceptor.dart';
+import '../api/services/change_password_service.dart';
 import '../data/repositories/auth_repository.dart';
 import '../features/auth/controllers/auth_cubit.dart';
 import '../security/secure_storage.dart';
@@ -17,9 +23,12 @@ 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());
+  getIt.registerSingleton<ThemeModeCubit>(ThemeModeCubit());
 
   // Register Dio client
   getIt.registerSingleton<Dio>(_createDioClient());
@@ -43,9 +52,15 @@ Future<void> setupDependencies() async {
 
   getIt.registerSingleton<PaymentService>(PaymentService(getIt<Dio>()));
   getIt.registerSingleton<BeneficiaryService>(BeneficiaryService(getIt<Dio>()));
+  getIt.registerSingleton<LimitService>(LimitService(getIt<Dio>()));
   getIt.registerSingleton<NeftService>(NeftService(getIt<Dio>()));
   getIt.registerSingleton<RtgsService>(RtgsService(getIt<Dio>()));
   getIt.registerSingleton<ImpsService>(ImpsService(getIt<Dio>()));
+  getIt.registerSingleton<BranchService>(BranchService(getIt<Dio>()));
+  getIt.registerSingleton<ChequeService>(ChequeService(getIt<Dio>()));
+  getIt.registerLazySingleton<ChangePasswordService>(
+    () => ChangePasswordService(getIt<Dio>()),
+  );
 
   // Add auth interceptor after repository is available
   getIt<Dio>().interceptors.add(
@@ -53,21 +68,23 @@ Future<void> setupDependencies() async {
       );
 
   // Register controllers/cubits
-  getIt.registerFactory<AuthCubit>(
+  getIt.registerFactory<AuthCubit>(() => AuthCubit(
-      () => AuthCubit(getIt<AuthRepository>(), getIt<UserService>()));
+      getIt<AuthRepository>(), getIt<UserService>(), getIt<SecureStorage>()));
 }
 
 Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080',
+          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com', //test
-      //'http://localhost:8081',
+      //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
-      connectTimeout: const Duration(seconds: 5),
+      //'https://kccbmbnk.net', //prod small
-      receiveTimeout: const Duration(seconds: 10),
+      connectTimeout: const Duration(seconds: 60),
+      receiveTimeout: const Duration(seconds: 60),
       headers: {
         'Content-Type': 'application/json',
         'Accept': 'application/json',
+        'X-Login-Type': 'MB',
       },
     ),
   );

lib/features/accounts/screens/account_info_screen.dart

@@ -18,75 +18,159 @@ 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(
+        title: Text(AppLocalizations.of(context)
-          AppLocalizations.of(context).accountInfo,
+            .accountInfo
-        ),
+            .replaceFirst(RegExp('\n'), '')),
       ),
-      body: ListView(
+      body: Stack(
-        padding: const EdgeInsets.all(16.0),
         children: [
-          Text(
+          Padding(
-            AppLocalizations.of(context).accountNumber,
+            padding: const EdgeInsets.all(8.0),
-            style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14),
+            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.bold, fontSize: 18),
+                        ),
+                        DropdownButton<User>(
+                          value: selectedUser,
+                          onChanged: (User? newUser) {
+                            if (newUser != null) {
+                              setState(() {
+                                selectedUser = newUser;
+                              });
+                            }
+                          },
+                          items: widget.users.map((user) {
+                            return DropdownMenuItem<User>(
+                              value: user,
+                              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: AppLocalizations.of(context).accountStatus,
+                            value: 'OPEN',
+                          ),
+                          InfoRow(
+                            title:
+                                AppLocalizations.of(context).availableBalance,
+                            value: selectedUser.availableBalance ?? 'N/A',
+                          ),
+                          InfoRow(
+                            title: AppLocalizations.of(context).currentBalance,
+                            value: selectedUser.currentBalance ?? 'N/A',
+                          ),
+                          if (users[selectedIndex].approvedAmount != null)
+                            InfoRow(
+                              title:
+                                  AppLocalizations.of(context).approvedAmount,
+                              value: selectedUser.approvedAmount ?? 'N/A',
+                            ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
           ),
+          IgnorePointer(
+            child: Center(
+              child: Opacity(
+                opacity: 0.07, // Reduced opacity
 
-          DropdownButton<User>(
+                child: ClipOval(
-            value: selectedUser,
+                  child: Image.asset(
-            onChanged: (User? newUser) {
+                    'assets/images/logo.png',
-              if (newUser != null) {
-                setState(() {
-                  selectedUser = newUser;
-                });
-              }
-            },
-            items: widget.users.map((user) {
-              return DropdownMenuItem<User>(
-                value: user,
-                child: Text(user.accountNo.toString()),
-              );
-            }).toList(),
-          ),
 
-          InfoRow(
+                    width: 200, // Adjust size as needed
-            title: AppLocalizations.of(context).customerNumber,
-            value: selectedUser.cifNumber ?? 'N/A',
-          ),
-          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,
-            value: selectedUser.availableBalance ?? 'N/A',
-          ),
-          InfoRow(
-            title: AppLocalizations.of(context).currentBalance,
-            value: selectedUser.currentBalance ?? 'N/A',
-          ),
 
-          users[selectedIndex].approvedAmount != null
+                    height: 200, // Adjust size as needed
-              ? InfoRow(
+                  ),
-                  title: AppLocalizations.of(context).approvedAmount,
+                ),
-                  value: selectedUser.approvedAmount ?? 'N/A',
+              ),
-                )
+            ),
-              : const SizedBox.shrink(),
+          ),
         ],
       ),
     );
@@ -111,15 +195,18 @@ class InfoRow extends StatelessWidget {
           Text(
             title,
             style: TextStyle(
-              fontSize: 15,
+              fontSize: 18,
-              fontWeight: FontWeight.w500,
+              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,70 +14,95 @@ class TransactionDetailsScreen extends StatelessWidget {
     return Scaffold(
       appBar:
           AppBar(title: Text(AppLocalizations.of(context).transactionDetails)),
-      body: Padding(
+      body: Stack(
-        padding: const EdgeInsets.all(16.0),
+        children: [
-        child: Column(
+          Padding(
-          children: [
+            padding: const EdgeInsets.all(16.0),
-            Expanded(
+            child: Column(
-              flex: 3,
+              children: [
-              child: Center(
+                Expanded(
-                child: Column(
+                  flex: 3,
-                  mainAxisSize: MainAxisSize.min,
+                  child: Center(
-                  children: [
+                    child: Column(
-                    // Amount + icon + Share Button
-                    Row(
                       mainAxisSize: MainAxisSize.min,
                       children: [
-                        Text(
+                        // Amount + icon + Share Button
-                          "₹ ${transaction.amount}",
+                        Row(
-                          style: const TextStyle(
+                          mainAxisSize: MainAxisSize.min,
-                            fontSize: 40,
+                          children: [
-                            fontWeight: FontWeight.bold,
+                            Text(
-                          ),
+                              "₹ ${transaction.amount}",
+                              style: const TextStyle(
+                                fontSize: 40,
+                                fontWeight: FontWeight.bold,
+                              ),
+                            ),
+                            const SizedBox(width: 8),
+                            Icon(
+                              isCredit
+                                  ? Symbols.call_received
+                                  : Symbols.call_made,
+                              color: isCredit
+                                  ? const Color(0xFF10BB10)
+                                  : Theme.of(context).colorScheme.error,
+                              size: 28,
+                            ),
+                          ],
                         ),
-                        const SizedBox(width: 8),
+                        const SizedBox(height: 8),
-                        Icon(
+                        // Date centered
-                          isCredit ? Symbols.call_received : Symbols.call_made,
+                        Text(
-                          color: isCredit ? Colors.green : Colors.red,
+                          transaction.date ?? "",
-                          size: 28,
+                          style: TextStyle(
+                            fontSize: 16,
+                            color: Theme.of(context).textTheme.bodySmall?.color,
+                          ),
+                          textAlign: TextAlign.center,
                         ),
                       ],
                     ),
-                    const SizedBox(height: 8),
+                  ),
-                    // Date centered
+                ),
-                    Text(
+                Divider(color: Theme.of(context).dividerColor),
-                      transaction.date ?? "",
+                Expanded(
-                      style: const TextStyle(
+                  flex: 5,
-                        fontSize: 16,
+                  child: ListView(
-                        color: Colors.grey,
+                    children: [
-                      ),
+                      _buildDetailRow(
-                      textAlign: TextAlign.center,
+                          AppLocalizations.of(context).transactionType,
-                    ),
+                          transaction.type ?? ""),
-                  ],
+                      _buildDetailRow(AppLocalizations.of(context).transferType,
+                          transaction.name.split("/").first ?? ""),
+                      // if (transaction.name.length > 12) ...[
+                      //   _buildDetailRow(AppLocalizations.of(context).utrNo,
+                      //       transaction.name.split("= ")[1].split(" ")[0] ?? ""),
+                      //   _buildDetailRow(
+                      //       AppLocalizations.of(context).beneficiaryAccountNo,
+                      //       transaction.name.split("A/C ").last ?? "")
+                      // ]
+                      _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
+                  ),
                 ),
               ),
             ),
-            const Divider(),
+          ),
-            Expanded(
+        ],
-              flex: 5,
-              child: ListView(
-                children: [
-                  _buildDetailRow(AppLocalizations.of(context).transactionType,
-                      transaction.type ?? ""),
-                  _buildDetailRow(AppLocalizations.of(context).transferType,
-                      transaction.name.split("/").first ?? ""),
-                  if (transaction.name.length > 12) ...[
-                    _buildDetailRow(AppLocalizations.of(context).utrNo,
-                        transaction.name.split("= ")[1].split(" ")[0] ?? ""),
-                    _buildDetailRow(
-                        AppLocalizations.of(context).beneficiaryAccountNo,
-                        transaction.name.split("A/C ").last ?? "")
-                  ]
-                ],
-              ),
-            ),
-          ],
-        ),
       ),
     );
   }

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);
+      final (users, authToken) =
-      emit(Authenticated(users));
+          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;
-
+  const Authenticated(this.users);
-  Authenticated(this.users);
 
   @override
-  List<Object?> get props => [users];
+  List<Object> get props => [users];
 }
 
 class Unauthenticated extends AuthState {}
 
 class AuthError extends AuthState {
   final String message;
-
+  const AuthError(this.message);
-  AuthError(this.message);
 
   @override
-  List<Object?> get props => [message];
+  List<Object> get props => [message];
 }
+
+// --- New States for Navigation and Dialog ---
+
+// State to indicate that the TNC dialog needs to be shown
+class ShowTncDialog extends AuthState {
+  final AuthToken authToken;
+  final List<User> users;
+  const ShowTncDialog(this.authToken, this.users);
+
+  @override
+  List<Object> get props => [authToken, users];
+}
+
+// States to trigger specific navigations from the UI
+class NavigateToTncRequiredScreen extends AuthState {}
+
+class NavigateToMpinSetupScreen extends AuthState {
+  final List<User> users;
+
+  const NavigateToMpinSetupScreen(this.users);
+
+  @override
+  List<Object> get props => [users];
+}
+
+class NavigateToDashboardScreen extends AuthState {}

lib/features/auth/controllers/theme_mode_cubit.dart

@@ -0,0 +1,23 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'theme_mode_state.dart';
+
+class ThemeModeCubit extends Cubit<ThemeModeState> {
+  ThemeModeCubit() : super(const ThemeModeState(mode: ThemeMode.system)) {
+    loadThemeMode();
+  }
+
+  Future<void> loadThemeMode() async {
+    final prefs = await SharedPreferences.getInstance();
+    final modeIndex = prefs.getInt('theme_mode') ?? 0; // default system
+    final mode = ThemeMode.values[modeIndex];
+    emit(ThemeModeState(mode: mode));
+  }
+
+  Future<void> changeThemeMode(ThemeMode mode) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setInt('theme_mode', mode.index);
+    emit(ThemeModeState(mode: mode));
+  }
+}

lib/features/auth/controllers/theme_mode_state.dart

@@ -0,0 +1,11 @@
+import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
+
+class ThemeModeState extends Equatable {
+  final ThemeMode mode;
+
+  const ThemeModeState({required this.mode});
+
+  @override
+  List<Object?> get props => [mode];
+}

lib/features/auth/controllers/theme_state.dart

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

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

lib/features/auth/screens/mpin_screen.dart

@@ -1,12 +1,13 @@
 import '../../../l10n/app_localizations.dart';
+import 'dart:math';
 
-import 'dart:developer';
+// 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';
+import 'package:flutter/services.dart';
 
 enum MPinMode { enter, set, confirm }
 
@@ -14,34 +15,91 @@ 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
   State<MPinScreen> createState() => _MPinScreenState();
 }
 
-class _MPinScreenState extends State<MPinScreen> {
+class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   List<String> mPin = [];
   String? errorText;
 
+  // Animation controllers
+  late final AnimationController _bounceController;
+  late final Animation<double> _bounceAnimation;
+  late final AnimationController _shakeController;
+  late final AnimationController _waveController;
+  late final Animation<double> _waveAnimation;
+
+  // State flags for animations
+  bool _isError = false;
+  bool _isSuccess = false;
+
   @override
   void initState() {
     super.initState();
-    if (widget.mode == MPinMode.enter) {
+    // Bounce animation for single dot entry
+    _bounceController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 150),
+    );
+    _bounceAnimation = Tween<double>(begin: 1.0, end: 1.2).animate(
+      CurvedAnimation(
+        parent: _bounceController,
+        curve: Curves.elasticIn,
+        reverseCurve: Curves.elasticOut,
+      ),
+    )..addStatusListener((status) {
+        if (status == AnimationStatus.completed) {
+          _bounceController.reverse();
+        }
+      });
+
+    // Shake animation for error
+    _shakeController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 400),
+    );
+
+    // Wave animation for success
+    _waveController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 800),
+    );
+    _waveAnimation = Tween<double>(begin: 0, end: 1).animate(
+      CurvedAnimation(parent: _waveController, curve: Curves.easeInOut),
+    );
+
+    if (widget.mode == MPinMode.enter && !widget.disableBiometric) {
       _tryBiometricBeforePin();
     }
   }
 
+  @override
+  void dispose() {
+    _bounceController.dispose();
+    _shakeController.dispose();
+    _waveController.dispose();
+    super.dispose();
+  }
+
   Future<void> _tryBiometricBeforePin() async {
     final storage = getIt<SecureStorage>();
     final enabled = await storage.read('biometric_enabled');
-    log('biometric_enabled: $enabled');
+    // log('biometric_enabled: $enabled');
     if (enabled != null && enabled) {
       final auth = LocalAuthentication();
       if (await auth.canCheckBiometrics) {
@@ -62,11 +120,13 @@ class _MPinScreenState extends State<MPinScreen> {
   }
 
   void addDigit(String digit) {
+    if (_shakeController.isAnimating || _waveController.isAnimating) return;
     if (mPin.length < 4) {
       setState(() {
         mPin.add(digit);
         errorText = null;
       });
+      _bounceController.forward(from: 0);
       if (mPin.length == 4) {
         _handleComplete();
       }
@@ -74,6 +134,7 @@ class _MPinScreenState extends State<MPinScreen> {
   }
 
   void deleteDigit() {
+    if (_shakeController.isAnimating || _waveController.isAnimating) return;
     if (mPin.isNotEmpty) {
       setState(() {
         mPin.removeLast();
@@ -83,71 +144,148 @@ class _MPinScreenState extends State<MPinScreen> {
   }
 
   Future<void> _handleComplete() async {
+    if (_shakeController.isAnimating || _waveController.isAnimating) return;
+
     final pin = mPin.join();
     final storage = SecureStorage();
 
     switch (widget.mode) {
       case MPinMode.enter:
         final storedPin = await storage.read('mpin');
-        log('storedPin: $storedPin');
+        // log('storedPin: $storedPin');
         if (storedPin == int.tryParse(pin)) {
-          widget.onCompleted?.call(pin);
+          // Correct PIN
-        } else {
           setState(() {
+            _isSuccess = true;
+            errorText = null;
+          });
+          await Future.delayed(const Duration(milliseconds: 100));
+          _waveController.forward(from: 0).whenComplete(() {
+            widget.onCompleted?.call(pin);
+          });
+        } else {
+          // Incorrect PIN
+          setState(() {
+            _isError = true;
             errorText = AppLocalizations.of(context).incorrectMPIN;
+          });
+          await _shakeController.forward(from: 0);
+          setState(() {
             mPin.clear();
+            _isError = false;
+            // Keep error text until next digit is entered
           });
         }
         break;
       case MPinMode.set:
-        // propagate parent onCompleted into confirm step
+        // Navigate to confirm and wait for result
-        Navigator.push(
+        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(
+            widget.onCompleted?.call(pin);
-              MaterialPageRoute(builder: (_) => const NavigationScaffold()),
-              (route) => false,
-            );
           }
         } else {
           setState(() {
+            _isError = true;
             errorText = AppLocalizations.of(context).pinsDoNotMatch;
+          });
+          await _shakeController.forward(from: 0);
+          setState(() {
             mPin.clear();
+            _isError = false;
           });
         }
         break;
     }
   }
 
-  Widget buildMPinDots() {
+  Widget buildMPinDots(BuildContext context) {
-    return Row(
+    return AnimatedBuilder(
-      mainAxisAlignment: MainAxisAlignment.center,
+      animation: Listenable.merge(
-      children: List.generate(4, (index) {
+          [_bounceController, _shakeController, _waveController]),
-        return Container(
+      builder: (context, child) {
-          margin: const EdgeInsets.all(8),
+        double shakeOffset = 0;
-          width: 15,
+        if (_shakeController.isAnimating) {
-          height: 15,
+          // 4 cycles of sine wave for shake
-          decoration: BoxDecoration(
+          shakeOffset = sin(_shakeController.value * 4 * pi) * 12;
-            shape: BoxShape.circle,
+        }
-            color: index < mPin.length ? Colors.black : Colors.grey[400],
+
+        return Transform.translate(
+          offset: Offset(shakeOffset, 0),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: List.generate(4, (index) {
+              final isFilled = index < mPin.length;
+
+              // Bounce animation for single dot
+              final isAnimatingBounce =
+                  index == mPin.length - 1 && _bounceController.isAnimating;
+              double bounceScale =
+                  isAnimatingBounce ? _bounceAnimation.value : 1.0;
+
+              // Success wave animation
+              double waveScale = 1.0;
+              if (_isSuccess) {
+                final waveDelay = index * 0.15;
+                final waveValue =
+                    (_waveAnimation.value - waveDelay).clamp(0.0, 1.0);
+                // Grow and shrink
+                waveScale = 1.0 + sin(waveValue * pi) * 0.4;
+              }
+
+              // Determine dot color
+              Color dotColor;
+              if (_isError) {
+                dotColor = Theme.of(context).colorScheme.error;
+              } else if (_isSuccess) {
+                dotColor = Colors.green.shade600;
+              } else {
+                dotColor = isFilled
+                    ? Theme.of(context).colorScheme.onSurfaceVariant
+                    : Theme.of(context).colorScheme.surfaceContainerHighest;
+              }
+
+              return Transform.scale(
+                scale: bounceScale * waveScale,
+                child: Container(
+                  margin: const EdgeInsets.all(8),
+                  width: 25,
+                  height: 25,
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: dotColor,
+                  ),
+                ),
+              );
+            }),
           ),
         );
-      }),
+      },
     );
   }
 
@@ -165,9 +303,10 @@ class _MPinScreenState extends State<MPinScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: row.map((key) {
             return Padding(
-              padding: const EdgeInsets.all(8.0),
+              padding: const EdgeInsets.all(1.0),
               child: GestureDetector(
                 onTap: () {
+                  HapticFeedback.lightImpact();
                   if (key == '<') {
                     deleteDigit();
                   } else if (key == 'Enter') {
@@ -185,11 +324,10 @@ class _MPinScreenState extends State<MPinScreen> {
                   }
                 },
                 child: Container(
-                  width: 70,
+                  width: 80,
-                  height: 70,
+                  height: 80,
-                  decoration: BoxDecoration(
+                  decoration: const BoxDecoration(
                     shape: BoxShape.circle,
-                    color: Colors.grey[200],
                   ),
                   alignment: Alignment.center,
                   child: key == 'Enter'
@@ -197,10 +335,10 @@ class _MPinScreenState extends State<MPinScreen> {
                       : Text(
                           key == '<' ? '⌫' : key,
                           style: TextStyle(
-                            fontSize: 20,
+                            fontSize: 30,
                             color: key == 'Enter'
                                 ? Theme.of(context).primaryColor
-                                : Colors.black,
+                                : Theme.of(context).colorScheme.onSurface,
                           ),
                         ),
                 ),
@@ -213,6 +351,9 @@ class _MPinScreenState extends State<MPinScreen> {
   }
 
   String getTitle() {
+    if (widget.customTitle != null) {
+      return widget.customTitle!;
+    }
     switch (widget.mode) {
       case MPinMode.enter:
         return AppLocalizations.of(context).enterMPIN;
@@ -229,7 +370,7 @@ class _MPinScreenState extends State<MPinScreen> {
       body: SafeArea(
         child: Column(
           children: [
-            const Spacer(),
+            const SizedBox(height: 50),
             // Logo
             Image.asset('assets/images/logo.png', height: 100),
             const SizedBox(height: 20),
@@ -237,19 +378,18 @@ class _MPinScreenState extends State<MPinScreen> {
               getTitle(),
               style: const TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
             ),
-            const SizedBox(height: 20),
+            const Spacer(),
-            buildMPinDots(),
+            buildMPinDots(context),
             if (errorText != null)
               Padding(
                 padding: const EdgeInsets.only(top: 8.0),
                 child: Text(
                   errorText!,
-                  style: const TextStyle(color: Colors.red),
+                  style: TextStyle(color: Theme.of(context).colorScheme.error),
                 ),
               ),
             const Spacer(),
             buildNumberPad(),
-            const Spacer(),
           ],
         ),
       ),

lib/features/auth/screens/set_password_screen.dart

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

lib/features/auth/screens/splash_screen.dart

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

lib/features/auth/screens/tnc_required_screen.dart

@@ -0,0 +1,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

@@ -1,11 +1,10 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/api/services/beneficiary_service.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
-import 'beneficiary_result_page.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
+import 'beneficiary_result_page.dart';
 import '../../../di/injection.dart';
 import '../../../l10n/app_localizations.dart';
 import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
@@ -24,7 +23,9 @@ class AddBeneficiaryScreen extends StatefulWidget {
 
 class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final _formKey = GlobalKey<FormState>();
-
+  final _accountNumberFieldKey = GlobalKey<FormFieldState>();
+  final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
+  final _ifscFieldKey = GlobalKey<FormFieldState>();
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
@@ -33,6 +34,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final TextEditingController branchNameController = TextEditingController();
   final TextEditingController ifscController = TextEditingController();
   final TextEditingController phoneController = TextEditingController();
+  final _ifscFocusNode = FocusNode();
   final service = getIt<BeneficiaryService>();
 
   bool _isValidating = false;
@@ -44,6 +46,11 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   @override
   void initState() {
     super.initState();
+    _ifscFocusNode.addListener(() {
+      if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
+        _validateIFSC();
+      }
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
         accountType = 'Savings';
@@ -51,23 +58,54 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
     });
   }
 
+  @override
+  void dispose() {
+    accountNumberController.dispose();
+    confirmAccountNumberController.dispose();
+    nameController.dispose();
+    bankNameController.dispose();
+    branchNameController.dispose();
+    ifscController.dispose();
+    phoneController.dispose();
+    _ifscFocusNode.dispose();
+    super.dispose();
+  }
+
   void _validateIFSC() async {
     var beneficiaryService = getIt<BeneficiaryService>();
     final ifsc = ifscController.text.trim().toUpperCase();
     if (ifsc.isEmpty) return;
 
-    final result = await beneficiaryService.validateIFSC(ifsc);
+    try {
+      final result = await beneficiaryService.validateIFSC(ifsc);
+
+      if (mounted) {
+        if (result.bankName.isEmpty) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          );
+          bankNameController.clear();
+          branchNameController.clear();
+        } else {
+          bankNameController.text = result.bankName;
+          branchNameController.text = result.branchName;
+        }
+      }
+    } catch (e) {
+      if (mounted) {
+        final errorMessage = e.toString().toUpperCase();
+        String snackbarMessage =
+            AppLocalizations.of(context).somethingWentWrong;
+
+        if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
+          snackbarMessage = AppLocalizations.of(context).invalidIfsc;
+        }
 
-    if (mounted) {
-      if (result.bankName == '') {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          SnackBar(content: Text(snackbarMessage)),
         );
         bankNameController.clear();
         branchNameController.clear();
-      } else {
-        bankNameController.text = result.bankName;
-        branchNameController.text = result.branchName;
       }
     }
   }
@@ -220,369 +258,312 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Symbols.arrow_back_ios_new),
-          onPressed: () {
-            Navigator.pop(context);
-          },
-        ),
         title: Text(
           AppLocalizations.of(context).addBeneficiary,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 40,
-                height: 40,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
       ),
       body: SafeArea(
-        child: Form(
+        child: Stack(
-          key: _formKey,
+          children: [
-          child: Column(
+            Form(
-            children: [
+              key: _formKey,
-              Expanded(
+              child: Column(
-                child: SingleChildScrollView(
+                children: [
-                  physics: const AlwaysScrollableScrollPhysics(),
+                  Expanded(
-                  child: Padding(
+                    child: SingleChildScrollView(
-                    padding: const EdgeInsets.all(10.0),
+                      physics: const AlwaysScrollableScrollPhysics(),
-                    child: Column(
+                      child: Padding(
-                      children: [
+                        padding: const EdgeInsets.all(10.0),
-                        TextFormField(
+                        child: Column(
-                          controller: accountNumberController,
+                          children: [
-                          decoration: InputDecoration(
+                            TextFormField(
-                            labelText: AppLocalizations.of(
+                              key: _accountNumberFieldKey,
-                              context,
+                              controller: accountNumberController,
-                            ).accountNumber,
+                              decoration: InputDecoration(
-                            // prefixIcon: Icon(Icons.person),
+                                labelText: AppLocalizations.of(
-                            border: const OutlineInputBorder(),
+                                  context,
-                            isDense: true,
+                                ).accountNumber,
-                            filled: true,
+                                // prefixIcon: Icon(Icons.person),
-                            fillColor:
+                                border: const OutlineInputBorder(),
-                                Theme.of(context).scaffoldBackgroundColor,
+                                isDense: true,
-                            enabledBorder: const OutlineInputBorder(
+                              ),
-                              borderSide: BorderSide(color: Colors.black),
+                              obscureText: true,
+                              keyboardType: TextInputType.number,
+                              textInputAction: TextInputAction.next,
+                              onChanged: (value) {
+                                nameController.clear();
+                                setState(() {
+                                  _isBeneficiaryValidated = false;
+                                });
+                              },
+                              validator: (value) {
+                                if (value == null || value.length < 10) {
+                                  return AppLocalizations.of(
+                                    context,
+                                  ).enterValidAccountNumber;
+                                }
+                                return null;
+                              },
                             ),
-                            focusedBorder: const OutlineInputBorder(
+                            const SizedBox(height: 24),
-                              borderSide: BorderSide(
+                            // Confirm Account Number
-                                color: Colors.black,
+                            TextFormField(
-                                width: 2,
+                              key: _confirmAccountNumberFieldKey,
+                              controller: confirmAccountNumberController,
+                              decoration: InputDecoration(
+                                labelText: AppLocalizations.of(
+                                  context,
+                                ).confirmAccountNumber,
+                                // prefixIcon: Icon(Icons.person),
+                                border: const OutlineInputBorder(),
+                                isDense: true,
+                              ),
+                              keyboardType: TextInputType.number,
+                              textInputAction: TextInputAction.next,
+                              validator: (value) {
+                                if (value == null || value.isEmpty) {
+                                  return AppLocalizations.of(
+                                    context,
+                                  ).reenterAccountNumber;
+                                }
+                                if (value != accountNumberController.text) {
+                                  return AppLocalizations.of(
+                                    context,
+                                  ).accountMismatch;
+                                }
+                                return null;
+                              },
+                            ),
+                            const SizedBox(height: 24),
+                            TextFormField(
+                              focusNode: _ifscFocusNode,
+                              key: _ifscFieldKey,
+                              controller: ifscController,
+                              maxLength: 11,
+                              inputFormatters: [
+                                LengthLimitingTextInputFormatter(11),
+                              ],
+                              decoration: InputDecoration(
+                                labelText:
+                                    AppLocalizations.of(context).ifscCode,
+                                border: const OutlineInputBorder(),
+                                isDense: true,
+                              ),
+                              textCapitalization: TextCapitalization.characters,
+                              textInputAction: TextInputAction.next,
+                              onChanged: (value) {
+                                setState(() {
+                                  final trimmed = value.trim().toUpperCase();
+                                  if (trimmed.length < 11) {
+                                    // clear bank/branch if backspace or changed
+                                    bankNameController.clear();
+                                    branchNameController.clear();
+                                  }
+                                });
+                              },
+                              validator: (value) {
+                                final pattern =
+                                    RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
+                                if (value == null || value.trim().isEmpty) {
+                                  return AppLocalizations.of(context).enterIfsc;
+                                } else if (!pattern.hasMatch(
+                                  value.trim().toUpperCase(),
+                                )) {
+                                  return AppLocalizations.of(
+                                    context,
+                                  ).invalidIfscFormat;
+                                }
+                                return null;
+                              },
+                            ),
+                            const SizedBox(height: 24),
+                            //  Bank Name (Disabled)
+                            TextFormField(
+                              controller: bankNameController,
+                              enabled:
+                                  false, // changed from readOnly to disabled
+                              decoration: InputDecoration(
+                                labelText:
+                                    AppLocalizations.of(context).bankName,
+                                border: const OutlineInputBorder(),
+                                isDense: true,
                               ),
                             ),
-                          ),
+                            const SizedBox(height: 24),
-                          obscureText: true,
+                            // 🔹 Branch Name (Disabled)
-                          keyboardType: TextInputType.number,
+                            TextFormField(
-                          textInputAction: TextInputAction.next,
+                              controller: branchNameController,
-                          onChanged: (value) {
+                              enabled:
-                            nameController.clear();
+                                  false, // changed from readOnly to disabled
-                            setState(() {
+                              decoration: InputDecoration(
-                              _isBeneficiaryValidated = false;
+                                labelText:
-                            });
+                                    AppLocalizations.of(context).branchName,
-                          },
+                                border: const OutlineInputBorder(),
-                          validator: (value) {
+                                isDense: true,
-                            if (value == null || value.length < 10) {
-                              return AppLocalizations.of(
-                                context,
-                              ).enterValidAccountNumber;
-                            }
-                            return null;
-                          },
-                        ),
-                        const SizedBox(height: 24),
-                        // Confirm Account Number
-                        TextFormField(
-                          controller: confirmAccountNumberController,
-                          decoration: InputDecoration(
-                            labelText: AppLocalizations.of(
-                              context,
-                            ).confirmAccountNumber,
-                            // prefixIcon: Icon(Icons.person),
-                            border: const OutlineInputBorder(),
-                            isDense: true,
-                            filled: true,
-                            fillColor:
-                                Theme.of(context).scaffoldBackgroundColor,
-                            enabledBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(color: Colors.black),
-                            ),
-                            focusedBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(
-                                color: Colors.black,
-                                width: 2,
                               ),
                             ),
-                          ),
+                            if (_isBeneficiaryValidated)
-                          keyboardType: TextInputType.number,
+                              Column(
-                          textInputAction: TextInputAction.next,
+                                children: [
-                          validator: (value) {
+                                  const SizedBox(height: 24),
-                            if (value == null || value.isEmpty) {
+                                  TextFormField(
-                              return AppLocalizations.of(
+                                    controller: nameController,
-                                context,
+                                    enabled: false,
-                              ).reenterAccountNumber;
+                                    decoration: InputDecoration(
-                            }
+                                      suffixIcon: _isBeneficiaryValidated
-                            if (value != accountNumberController.text) {
+                                          ? const Icon(
-                              return AppLocalizations.of(
+                                              Symbols.verified,
-                                context,
+                                              size: 25,
-                              ).accountMismatch;
+                                              fill: 1,
-                            }
+                                            )
-                            return null;
+                                          : null,
-                          },
+                                      suffixIconColor:
-                        ),
+                                          Theme.of(context).colorScheme.primary,
-                        const SizedBox(height: 24),
+                                      labelText: AppLocalizations.of(context)
-                        // 🔹 IFSC Code Field
+                                          .beneficiaryName,
-                        TextFormField(
+                                      border: const OutlineInputBorder(),
-                          controller: ifscController,
+                                      isDense: true,
-                          maxLength: 11,
+                                    ),
-                          inputFormatters: [
+                                    textInputAction: TextInputAction.next,
-                            LengthLimitingTextInputFormatter(11),
+                                    validator: (value) =>
-                          ],
+                                        value == null || value.isEmpty
-                          decoration: InputDecoration(
+                                            ? AppLocalizations.of(context)
-                            labelText: AppLocalizations.of(context).ifscCode,
+                                                .nameRequired
-                            border: const OutlineInputBorder(),
+                                            : null,
-                            isDense: true,
+                                  ),
-                            filled: true,
+                                ],
-                            fillColor:
-                                Theme.of(context).scaffoldBackgroundColor,
-                            enabledBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(color: Colors.black),
-                            ),
-                            focusedBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(
-                                color: Colors.black,
-                                width: 2,
                               ),
-                            ),
+                            const SizedBox(height: 24),
-                          ),
+                            if (!_isBeneficiaryValidated)
-                          textCapitalization: TextCapitalization.characters,
+                              Padding(
-                          textInputAction: TextInputAction.next,
+                                padding: const EdgeInsets.only(bottom: 24),
-                          onFieldSubmitted: (_) {
+                                child: SizedBox(
-                            _validateIFSC();
+                                  width: double.infinity,
-                          },
+                                  child: ElevatedButton(
-                          onChanged: (value) {
+                                    onPressed: _isValidating ||
-                            final trimmed = value.trim().toUpperCase();
+                                            ifscController.text.length != 11
-                            if (trimmed.length < 11) {
+                                        ? null
-                              // clear bank/branch if backspace or changed
+                                        : () {
-                              bankNameController.clear();
+                                            final isAccountValid =
-                              branchNameController.clear();
+                                                _accountNumberFieldKey
-                            }
+                                                    .currentState!
-                          },
+                                                    .validate();
-                          validator: (value) {
+                                            final isConfirmAccountValid =
-                            final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
+                                                _confirmAccountNumberFieldKey
-                            if (value == null || value.trim().isEmpty) {
+                                                    .currentState!
-                              return AppLocalizations.of(context).enterIfsc;
+                                                    .validate();
-                            } else if (!pattern.hasMatch(
+                                            final isIfscValid = _ifscFieldKey
-                              value.trim().toUpperCase(),
+                                                .currentState!
-                            )) {
+                                                .validate();
-                              return AppLocalizations.of(
-                                context,
-                              ).invalidIfscFormat;
-                            }
-                            return null;
-                          },
-                        ),
-                        const SizedBox(height: 24),
-                        // 🔹 Bank Name (Disabled)
-                        TextFormField(
-                          controller: bankNameController,
-                          enabled: false, // changed from readOnly to disabled
-                          decoration: InputDecoration(
-                            labelText: AppLocalizations.of(context).bankName,
-                            border: const OutlineInputBorder(),
-                            isDense: true,
-                            filled: true,
-                            fillColor: Theme.of(context)
-                                .dialogBackgroundColor, // disabled color
-                            enabledBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(color: Colors.black),
-                            ),
-                            focusedBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(
-                                color: Colors.black,
-                                width: 2,
-                              ),
-                            ),
-                          ),
-                        ),
-                        const SizedBox(height: 24),
-                        // 🔹 Branch Name (Disabled)
-                        TextFormField(
-                          controller: branchNameController,
-                          enabled: false, // changed from readOnly to disabled
-                          decoration: InputDecoration(
-                            labelText: AppLocalizations.of(context).branchName,
-                            border: const OutlineInputBorder(),
-                            isDense: true,
-                            filled: true,
-                            fillColor: Theme.of(context).dialogBackgroundColor,
-                            enabledBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(color: Colors.black),
-                            ),
-                            focusedBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(
-                                color: Colors.black,
-                                width: 2,
-                              ),
-                            ),
-                          ),
-                        ),
-                        const SizedBox(height: 24),
-                        if (!_isBeneficiaryValidated)
-                          Padding(
-                            padding: const EdgeInsets.only(bottom: 24),
-                            child: SizedBox(
-                              width: double.infinity,
-                              child: ElevatedButton(
-                                onPressed: _isValidating
-                                    ? null
-                                    : () {
-                                        if (confirmAccountNumberController
-                                                .text ==
-                                            accountNumberController.text) {
-                                          _validateBeneficiary();
-                                        } else {
-                                          setState(() {
-                                            _validationError =
-                                                'Please enter a valid and matching account number.';
-                                          });
-                                        }
-                                      },
-                                child: _isValidating
-                                    ? const SizedBox(
-                                        width: 20,
-                                        height: 20,
-                                        child: CircularProgressIndicator(
-                                            strokeWidth: 2),
-                                      )
-                                    : Text(AppLocalizations.of(context)
-                                        .validateBeneficiary),
-                              ),
-                            ),
-                          ),
-                        //Beneficiary Name (Disabled)
-                        TextFormField(
-                          controller: nameController,
-                          enabled: false,
-                          decoration: InputDecoration(
-                            labelText:
-                                AppLocalizations.of(context).beneficiaryName,
-                            border: const OutlineInputBorder(),
-                            isDense: true,
-                            filled: true,
-                            fillColor: Theme.of(context).dialogBackgroundColor,
-                            enabledBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(color: Colors.black),
-                            ),
-                            focusedBorder: const OutlineInputBorder(
-                              borderSide:
-                                  BorderSide(color: Colors.black, width: 2),
-                            ),
-                          ),
-                          textInputAction: TextInputAction.next,
-                          validator: (value) => value == null || value.isEmpty
-                              ? AppLocalizations.of(context).nameRequired
-                              : null,
-                        ),
-                        const SizedBox(height: 24),
-                        // 🔹 Account Type Dropdown
-                        DropdownButtonFormField<String>(
-                          value: accountType,
-                          decoration: InputDecoration(
-                            labelText: AppLocalizations.of(context).accountType,
-                            border: const OutlineInputBorder(),
-                            isDense: true,
-                            filled: true,
-                            fillColor:
-                                Theme.of(context).scaffoldBackgroundColor,
-                            enabledBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(color: Colors.black),
-                            ),
-                            focusedBorder: const OutlineInputBorder(
-                              borderSide: BorderSide(
-                                color: Colors.black,
-                                width: 2,
-                              ),
-                            ),
-                          ),
-                          items: [
-                            'Savings',
-                            'Current',
-                          ]
-                              .map(
-                                (type) => DropdownMenuItem(
-                                  value: type,
-                                  child: Text(type),
-                                ),
-                              )
-                              .toList(),
-                          onChanged: (value) {
-                            setState(() {
-                              accountType = value!;
-                            });
-                          },
-                        ),
 
-                        const SizedBox(height: 24),
+                                            if (isAccountValid &&
-                        TextFormField(
+                                                isConfirmAccountValid &&
-                          controller: phoneController,
+                                                isIfscValid) {
-                          keyboardType: TextInputType.phone,
+                                              _validateBeneficiary();
-                          decoration: InputDecoration(
+                                            }
-                            labelText: AppLocalizations.of(context).phone,
+                                          },
-                            prefixIcon: const Icon(Icons.phone),
+                                    child: _isValidating
-                            border: const OutlineInputBorder(),
+                                        ? const SizedBox(
-                            isDense: true,
+                                            width: 20,
-                            filled: true,
+                                            height: 20,
-                            fillColor:
+                                            child: CircularProgressIndicator(
-                                Theme.of(context).scaffoldBackgroundColor,
+                                                strokeWidth: 2),
-                            enabledBorder: const OutlineInputBorder(
+                                          )
-                              borderSide: BorderSide(color: Colors.black),
+                                        : Text(AppLocalizations.of(context)
-                            ),
+                                            .validateBeneficiary),
-                            focusedBorder: const OutlineInputBorder(
+                                  ),
-                              borderSide: BorderSide(
+                                ),
-                                color: Colors.black,
-                                width: 2,
                               ),
+                            //Beneficiary Name (Disabled)
+                            // 🔹 Account Type Dropdown
+                            DropdownButtonFormField<String>(
+                              value: accountType,
+                              decoration: InputDecoration(
+                                labelText:
+                                    AppLocalizations.of(context).accountType,
+                                border: const OutlineInputBorder(),
+                                isDense: true,
+                              ),
+                              items: [
+                                'Savings',
+                                'Current',
+                              ]
+                                  .map(
+                                    (type) => DropdownMenuItem(
+                                      value: type,
+                                      child: Text(type),
+                                    ),
+                                  )
+                                  .toList(),
+                              onChanged: (value) {
+                                setState(() {
+                                  accountType = value!;
+                                });
+                              },
                             ),
-                          ),
+
-                          textInputAction: TextInputAction.done,
+                            const SizedBox(height: 24),
-                          validator: (value) =>
+                            TextFormField(
-                              value == null || value.length != 10
+                              controller: phoneController,
+                              keyboardType: TextInputType.phone,
+                              decoration: InputDecoration(
+                                labelText: AppLocalizations.of(context).phone,
+                                prefixIcon: const Icon(Icons.phone),
+                                border: const OutlineInputBorder(),
+                                isDense: true,
+                              ),
+                              textInputAction: TextInputAction.done,
+                              validator: (value) => value == null ||
+                                      value.length != 10
                                   ? AppLocalizations.of(context).enterValidPhone
                                   : null,
+                            ),
+                            const SizedBox(height: 35),
+                          ],
                         ),
-                        const SizedBox(height: 35),
+                      ),
-                      ],
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(vertical: 10),
+                    child: SizedBox(
+                      width: 250,
+                      child: ElevatedButton(
+                        onPressed: validateAndAddBeneficiary,
+                        style: ElevatedButton.styleFrom(
+                            shape: const StadiumBorder(),
+                            padding: const EdgeInsets.symmetric(vertical: 16),
+                            backgroundColor:
+                                Theme.of(context).colorScheme.primaryContainer,
+                            foregroundColor: Theme.of(context)
+                                .colorScheme
+                                .onPrimaryContainer),
+                        child: Text(
+                          AppLocalizations.of(context).validateAndAdd,
+                          style: const TextStyle(fontSize: 16),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            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
                     ),
                   ),
                 ),
               ),
-              Padding(
+            ),
-                padding: const EdgeInsets.all(16.0),
+          ],
-                child: SizedBox(
-                  width: 250,
-                  child: ElevatedButton(
-                    onPressed: validateAndAddBeneficiary,
-                    style: ElevatedButton.styleFrom(
-                      shape: const StadiumBorder(),
-                      padding: const EdgeInsets.symmetric(vertical: 16),
-                    ),
-                    child: Text(AppLocalizations.of(context).validateAndAdd),
-                  ),
-                ),
-              ),
-            ],
-          ),
         ),
       ),
     );

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'),
+          title: Text(AppLocalizations.of(context).success),
-          content: const Text('Beneficiary deleted successfully.'),
+          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,20 +55,19 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
       context: context,
       builder: (BuildContext context) {
         return AlertDialog(
-          title: const Text('Delete Beneficiary'),
+          title: Text(AppLocalizations.of(context).deleteBeneficiary),
-          content:
+          content: Text(AppLocalizations.of(context)
-              const Text('Are you sure you want to delete this beneficiary?'),
+              .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: () {
-                //Navigator.of(context).pop();
                 _deleteBeneficiary(context);
               },
             ),
@@ -81,57 +83,79 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
       appBar: AppBar(
         title: Text(AppLocalizations.of(context).beneficiarydetails),
       ),
-      body: Padding(
+      body: SafeArea(
-        padding: const EdgeInsets.all(16.0),
+        child: Stack(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Row(
+            Padding(
-              children: [
+              padding: const EdgeInsets.all(16.0),
-                CircleAvatar(
+              child: Column(
-                  radius: 24,
+                crossAxisAlignment: CrossAxisAlignment.start,
-                  backgroundColor: Colors.transparent,
+                children: [
-                  child: getBankLogo(beneficiary.bankName),
+                  Row(
-                ),
+                    children: [
-                const SizedBox(width: 16),
+                      CircleAvatar(
-                Text(
+                        radius: 24,
-                  beneficiary.name,
+                        backgroundColor: Colors.transparent,
-                  style: const TextStyle(
+                        child: getBankLogo(beneficiary.bankName, context),
-                      fontSize: 20, fontWeight: FontWeight.bold),
+                      ),
-                ),
+                      const SizedBox(width: 16),
-              ],
+                      Text(
+                        beneficiary.name,
+                        style: const TextStyle(
+                            fontSize: 20, fontWeight: FontWeight.bold),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 24),
+                  _buildDetailRow('${AppLocalizations.of(context).bankName} ',
+                      beneficiary.bankName ?? 'N/A'),
+                  _buildDetailRow(
+                      '${AppLocalizations.of(context).accountNumber} ',
+                      beneficiary.accountNo),
+                  _buildDetailRow(
+                      '${AppLocalizations.of(context).accountType} ',
+                      beneficiary.accountType),
+                  _buildDetailRow('${AppLocalizations.of(context).ifscCode} ',
+                      beneficiary.ifscCode),
+                  _buildDetailRow('${AppLocalizations.of(context).branchName} ',
+                      beneficiary.branchName ?? 'N/A'),
+                  const Spacer(),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    children: [
+                      // ElevatedButton.icon(
+                      //   onPressed: () {
+                      //     // Set Transaction Limit for this beneficiary
+                      //   },
+                      //   icon: const Icon(Icons.currency_rupee),
+                      //   label: const Text('Set Limit'),
+                      // ),
+                      ElevatedButton.icon(
+                        onPressed: () {
+                          // Delete beneficiary option
+                          _showDeleteConfirmationDialog(context);
+                        },
+                        icon: const Icon(Icons.delete),
+                        label: Text(AppLocalizations.of(context).delete),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
             ),
-            const SizedBox(height: 24),
+            IgnorePointer(
-            _buildDetailRow('${AppLocalizations.of(context).bankName} ',
+              child: Center(
-                beneficiary.bankName ?? 'N/A'),
+                child: Opacity(
-            _buildDetailRow('${AppLocalizations.of(context).accountNumber} ',
+                  opacity: 0.07, // Reduced opacity
-                beneficiary.accountNo),
+                  child: ClipOval(
-            _buildDetailRow('${AppLocalizations.of(context).accountType} ',
+                    child: Image.asset(
-                beneficiary.accountType),
+                      'assets/images/logo.png',
-            _buildDetailRow('${AppLocalizations.of(context).ifscCode} ',
+                      width: 200, // Adjust size as needed
-                beneficiary.ifscCode),
+                      height: 200, // Adjust size as needed
-            _buildDetailRow('${AppLocalizations.of(context).branchName} ',
+                    ),
-                beneficiary.branchName ?? 'N/A'),
+                  ),
-            const Spacer(),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-              children: [
-                // ElevatedButton.icon(
-                //   onPressed: () {
-                //     // Set Transaction Limit for this beneficiary
-                //   },
-                //   icon: const Icon(Icons.currency_rupee),
-                //   label: const Text('Set Limit'),
-                // ),
-                ElevatedButton.icon(
-                  onPressed: () {
-                    // Delete beneficiary option
-                    _showDeleteConfirmationDialog(context);
-                  },
-                  icon: const Icon(Icons.delete),
-                  label: Text(AppLocalizations.of(context).delete),
                 ),
-              ],
+              ),
             ),
           ],
         ),

lib/features/beneficiaries/screens/beneficiary_result_page.dart

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

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,40 +89,43 @@ 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];
+        final item = _filteredBeneficiaries[index];
-        return ListTile(
+        return Card(
-          leading: CircleAvatar(
+          margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
-            radius: 24,
+          child: ListTile(
-            backgroundColor: Colors.transparent,
+            leading: CircleAvatar(
-            child: getBankLogo(item.bankName),
+              radius: 24,
-          ),
+              backgroundColor: Colors.transparent,
-          title: Text(item.name),
+              child: getBankLogo(item.bankName, context),
-          subtitle: Column(
+            ),
-            crossAxisAlignment: CrossAxisAlignment.start,
+            title: Text(item.name),
-            children: [
+            subtitle: Column(
-              Text(item.accountNo),
+              crossAxisAlignment: CrossAxisAlignment.start,
-              if (item.bankName != null && item.bankName!.isNotEmpty)
+              children: [
-                Text(
+                Text(item.accountNo),
-                  item.bankName!,
+                if (item.bankName != null && item.bankName!.isNotEmpty)
-                  style: TextStyle(fontSize: 12, color: Colors.grey[600]),
+                  Text(
+                    item.bankName!,
+                    style: TextStyle(fontSize: 12, color: Colors.grey[600]),
+                  ),
+              ],
+            ),
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (_) => BeneficiaryDetailsScreen(beneficiary: item),
                 ),
-            ],
+              );
+            },
           ),
-          onTap: () {
-            Navigator.push(
-              context,
-              MaterialPageRoute(
-                builder: (_) => BeneficiaryDetailsScreen(beneficiary: item),
-              ),
-            );
-          },
         );
       },
     );
@@ -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(
@@ -122,8 +191,6 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
               ),
             );
           },
-          backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-          foregroundColor: Theme.of(context).primaryColor,
           elevation: 5,
           child: const Icon(Icons.add),
         ),

lib/features/card/screens/block_card_screen.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
 import '../../../l10n/app_localizations.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 class BlockCardScreen extends StatefulWidget {
   const BlockCardScreen({super.key});
@@ -56,161 +54,162 @@ class _BlockCardScreen extends State<BlockCardScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Symbols.arrow_back_ios_new),
-          onPressed: () {
-            Navigator.pop(context);
-          },
-        ),
         title: Text(
           AppLocalizations.of(context).blockCard,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
+      ),
+      body: Stack(
+        children: [
           Padding(
-            padding: const EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.all(10.0),
-            child: CircleAvatar(
+            child: Form(
-              backgroundColor: Colors.grey[200],
+              key: _formKey,
-              radius: 20,
+              child: ListView(
-              child: SvgPicture.asset(
+                children: [
-                'assets/images/avatar_male.svg',
+                  const SizedBox(height: 10),
-                width: 40,
+                  TextFormField(
-                height: 40,
+                    controller: _cardController,
-                fit: BoxFit.cover,
+                    decoration: InputDecoration(
+                      labelText: AppLocalizations.of(context).cardNumber,
+                      border: const OutlineInputBorder(),
+                      isDense: true,
+                      filled: true,
+                      fillColor: Theme.of(context).scaffoldBackgroundColor,
+                      enabledBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black),
+                      ),
+                      focusedBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black, width: 2),
+                      ),
+                    ),
+                    keyboardType: TextInputType.number,
+                    textInputAction: TextInputAction.next,
+                    validator: (value) => value != null && value.length == 11
+                        ? null
+                        : AppLocalizations.of(context).enterValidCardNumber,
+                  ),
+                  const SizedBox(height: 24),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: TextFormField(
+                          controller: _cvvController,
+                          decoration: InputDecoration(
+                            labelText: AppLocalizations.of(context).cvv,
+                            border: const OutlineInputBorder(),
+                            isDense: true,
+                            filled: true,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide:
+                                  BorderSide(color: Colors.black, width: 2),
+                            ),
+                          ),
+                          keyboardType: TextInputType.number,
+                          textInputAction: TextInputAction.next,
+                          obscureText: true,
+                          validator: (value) =>
+                              value != null && value.length == 3
+                                  ? null
+                                  : AppLocalizations.of(context).cvv3Digits,
+                        ),
+                      ),
+                      const SizedBox(width: 16),
+                      Expanded(
+                        child: TextFormField(
+                          controller: _expiryController,
+                          readOnly: true,
+                          onTap: _pickExpiryDate,
+                          decoration: InputDecoration(
+                            labelText: AppLocalizations.of(context).expiryDate,
+                            suffixIcon: const Icon(Icons.calendar_today),
+                            border: const OutlineInputBorder(),
+                            isDense: true,
+                            filled: true,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide:
+                                  BorderSide(color: Colors.black, width: 2),
+                            ),
+                          ),
+                          validator: (value) => value != null &&
+                                  value.isNotEmpty
+                              ? null
+                              : AppLocalizations.of(context).selectExpiryDate,
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 24),
+                  TextFormField(
+                    controller: _phoneController,
+                    decoration: InputDecoration(
+                      labelText: AppLocalizations.of(context).phone,
+                      prefixIcon: const Icon(Icons.phone),
+                      border: const OutlineInputBorder(),
+                      isDense: true,
+                      filled: true,
+                      fillColor: Theme.of(context).scaffoldBackgroundColor,
+                      enabledBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black),
+                      ),
+                      focusedBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black, width: 2),
+                      ),
+                    ),
+                    textInputAction: TextInputAction.done,
+                    keyboardType: TextInputType.phone,
+                    validator: (value) => value != null && value.length >= 10
+                        ? null
+                        : AppLocalizations.of(context).enterValidPhone,
+                  ),
+                  const SizedBox(height: 45),
+                  Align(
+                    alignment: Alignment.center,
+                    child: SizedBox(
+                      width: 250,
+                      child: ElevatedButton(
+                        onPressed: _blockCard,
+                        style: ElevatedButton.styleFrom(
+                          shape: const StadiumBorder(),
+                          padding: const EdgeInsets.symmetric(vertical: 16),
+                          backgroundColor: Theme.of(context).primaryColor,
+                          foregroundColor:
+                              Theme.of(context).scaffoldBackgroundColor,
+                        ),
+                        child: Text(AppLocalizations.of(context).block),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          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
+                  ),
+                ),
               ),
             ),
           ),
         ],
       ),
-      body: Padding(
-        padding: const EdgeInsets.all(10.0),
-        child: Form(
-          key: _formKey,
-          child: ListView(
-            children: [
-              const SizedBox(height: 10),
-              TextFormField(
-                controller: _cardController,
-                decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).cardNumber,
-                  border: const OutlineInputBorder(),
-                  isDense: true,
-                  filled: true,
-                  fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black),
-                  ),
-                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black, width: 2),
-                  ),
-                ),
-                keyboardType: TextInputType.number,
-                textInputAction: TextInputAction.next,
-                validator: (value) => value != null && value.length == 11
-                    ? null
-                    : AppLocalizations.of(context).enterValidCardNumber,
-              ),
-              const SizedBox(height: 24),
-              Row(
-                children: [
-                  Expanded(
-                    child: TextFormField(
-                      controller: _cvvController,
-                      decoration: InputDecoration(
-                        labelText: AppLocalizations.of(context).cvv,
-                        border: const OutlineInputBorder(),
-                        isDense: true,
-                        filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black),
-                        ),
-                        focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black, width: 2),
-                        ),
-                      ),
-                      keyboardType: TextInputType.number,
-                      textInputAction: TextInputAction.next,
-                      obscureText: true,
-                      validator: (value) => value != null && value.length == 3
-                          ? null
-                          : AppLocalizations.of(context).cvv3Digits,
-                    ),
-                  ),
-                  const SizedBox(width: 16),
-                  Expanded(
-                    child: TextFormField(
-                      controller: _expiryController,
-                      readOnly: true,
-                      onTap: _pickExpiryDate,
-                      decoration: InputDecoration(
-                        labelText: AppLocalizations.of(context).expiryDate,
-                        suffixIcon: const Icon(Icons.calendar_today),
-                        border: const OutlineInputBorder(),
-                        isDense: true,
-                        filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black),
-                        ),
-                        focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black, width: 2),
-                        ),
-                      ),
-                      validator: (value) => value != null && value.isNotEmpty
-                          ? null
-                          : AppLocalizations.of(context).selectExpiryDate,
-                    ),
-                  ),
-                ],
-              ),
-              const SizedBox(height: 24),
-              TextFormField(
-                controller: _phoneController,
-                decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).phone,
-                  prefixIcon: const Icon(Icons.phone),
-                  border: const OutlineInputBorder(),
-                  isDense: true,
-                  filled: true,
-                  fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black),
-                  ),
-                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black, width: 2),
-                  ),
-                ),
-                textInputAction: TextInputAction.done,
-                keyboardType: TextInputType.phone,
-                validator: (value) => value != null && value.length >= 10
-                    ? null
-                    : AppLocalizations.of(context).enterValidPhone,
-              ),
-              const SizedBox(height: 45),
-              Align(
-                alignment: Alignment.center,
-                child: SizedBox(
-                  width: 250,
-                  child: ElevatedButton(
-                    onPressed: _blockCard,
-                    style: ElevatedButton.styleFrom(
-                      shape: const StadiumBorder(),
-                      padding: const EdgeInsets.symmetric(vertical: 16),
-                      backgroundColor: Theme.of(context).primaryColor,
-                      foregroundColor:
-                          Theme.of(context).scaffoldBackgroundColor,
-                    ),
-                    child: Text(AppLocalizations.of(context).block),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
     );
   }
 }

lib/features/card/screens/card_details_screen.dart

@@ -9,27 +9,31 @@ class CardDetailsScreen extends StatelessWidget {
       appBar: AppBar(
         title: const Text("My Cards"),
       ),
-      body: Padding(
+      body: Stack(
-        padding: const EdgeInsets.all(16.0),
+        children: [
-        child: ListView(
+          Padding(
-          children: const [
+            padding: const EdgeInsets.all(16.0),
-            CardTile(
+            child: ListView(
-              cardNumber: "**** **** **** 1234",
+              children: const [
-              cardNetwork: "VISA",
+                CardTile(
-              cardType: "Debit Card",
+                  cardNumber: "**** **** **** 1234",
-              validFrom: "01/22",
+                  cardNetwork: "VISA",
-              validTo: "01/27",
+                  cardType: "Debit Card",
+                  validFrom: "01/22",
+                  validTo: "01/27",
+                ),
+                SizedBox(height: 16),
+                CardTile(
+                  cardNumber: "**** **** **** 5678",
+                  cardNetwork: "Mastercard",
+                  cardType: "Debit Card",
+                  validFrom: "07/21",
+                  validTo: "07/26",
+                ),
+              ],
             ),
-            SizedBox(height: 16),
+          ),
-            CardTile(
+        ],
-              cardNumber: "**** **** **** 5678",
-              cardNetwork: "Mastercard",
-              cardType: "Debit Card",
-              validFrom: "07/21",
-              validTo: "07/26",
-            ),
-          ],
-        ),
       ),
     );
   }
@@ -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,
@@ -161,4 +165,4 @@ class CardTile extends StatelessWidget {
       ),
     );
   }
-}
+}

lib/features/card/screens/card_management_screen.dart

@@ -1,5 +1,6 @@
+// ignore_for_file: unused_import
+
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/features/card/screens/block_card_screen.dart';
 import 'package:kmobile/features/card/screens/card_details_screen.dart';
 import 'package:kmobile/features/card/screens/card_pin_change_details_screen.dart';
@@ -21,99 +22,118 @@ class _CardManagementScreen extends State<CardManagementScreen> {
         automaticallyImplyLeading: false,
         title: Text(
           AppLocalizations.of(context).cardManagement,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
+      ),
-          Padding(
+      body: Stack(
-            padding: const EdgeInsets.only(right: 10.0),
+        children: [
-            child: CircleAvatar(
+          ListView(
-              backgroundColor: Colors.grey[200],
+            children: [
-              radius: 20,
+              CardManagementTile(
-              child: SvgPicture.asset(
+                icon: Symbols.add,
-                'assets/images/avatar_male.svg',
+                label: AppLocalizations.of(context).applyDebitCard,
-                width: 40,
+                onTap: () {},
-                height: 40,
+                disabled: true, // Add this
-                fit: BoxFit.cover,
+              ),
+              Divider(height: 1, color: Theme.of(context).dividerColor),
+              CardManagementTile(
+                icon: Symbols.remove_moderator,
+                label: AppLocalizations.of(context).blockUnblockCard,
+                onTap: () {
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => const BlockCardScreen(),
+                    ),
+                  );
+                },
+                disabled: true,
+              ),
+              Divider(height: 1, color: Theme.of(context).dividerColor),
+              CardManagementTile(
+                icon: Symbols.password_2,
+                label: AppLocalizations.of(context).changeCardPin,
+                onTap: () {
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => const CardPinChangeDetailsScreen(),
+                    ),
+                  );
+                },
+                disabled: true,
+              ),
+              Divider(height: 1, color: Theme.of(context).dividerColor),
+              CardManagementTile(
+                icon: Symbols.payment_card,
+                label: AppLocalizations.of(context).viewCardDeatils,
+                onTap: () {
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => const CardDetailsScreen(),
+                    ),
+                  );
+                },
+                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
+                  ),
+                ),
               ),
             ),
           ),
         ],
       ),
-      body: ListView(
-        children: [
-          CardManagementTile(
-            icon: Symbols.add,
-            label: AppLocalizations.of(context).applyDebitCard,
-            onTap: () {},
-          ),
-          const Divider(height: 1),
-          CardManagementTile(
-            icon: Symbols.remove_moderator,
-            label: AppLocalizations.of(context).blockUnblockCard,
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => const BlockCardScreen(),
-                ),
-              );
-            },
-          ),
-          const Divider(height: 1),
-          CardManagementTile(
-            icon: Symbols.password_2,
-            label: AppLocalizations.of(context).changeCardPin,
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => const CardPinChangeDetailsScreen(),
-                ),
-              );
-            },
-          ),
-          const Divider(height: 1),
-           CardManagementTile(
-            icon: Symbols.payment_card,
-            label: AppLocalizations.of(context).viewCardDeatils,
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => const CardDetailsScreen(),
-                ),
-              );
-            },
-          ),
-          const Divider(height: 1),
-        ],
-      ),
     );
   }
 }
 
-
 class CardManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
   final VoidCallback onTap;
+  final bool disabled;
 
   const CardManagementTile({
     super.key,
     required this.icon,
     required this.label,
     required this.onTap,
+    this.disabled = false,
   });
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     return ListTile(
-      leading: Icon(icon),
+      leading: Icon(
-      title: Text(label),
+        icon,
-      trailing: const Icon(Symbols.arrow_right, size: 20),
+        color: disabled ? theme.disabledColor : null,
-      onTap: onTap,
+      ),
+      title: Text(
+        label,
+        style: TextStyle(
+          color: disabled ? theme.disabledColor : null,
+        ),
+      ),
+      trailing: Icon(
+        Symbols.arrow_right,
+        size: 20,
+        color: disabled ? theme.disabledColor : null,
+      ),
+      onTap: disabled ? null : onTap,
     );
   }
 }

lib/features/card/screens/card_pin_change_details_screen.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
 import 'package:kmobile/features/card/screens/card_pin_set_screen.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class CardPinChangeDetailsScreen extends StatefulWidget {
@@ -46,161 +44,162 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Symbols.arrow_back_ios_new),
-          onPressed: () {
-            Navigator.pop(context);
-          },
-        ),
         title: Text(
           AppLocalizations.of(context).cardDetails,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
+      ),
+      body: Stack(
+        children: [
           Padding(
-            padding: const EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.all(10.0),
-            child: CircleAvatar(
+            child: Form(
-              backgroundColor: Colors.grey[200],
+              key: _formKey,
-              radius: 20,
+              child: ListView(
-              child: SvgPicture.asset(
+                children: [
-                'assets/images/avatar_male.svg',
+                  const SizedBox(height: 10),
-                width: 40,
+                  TextFormField(
-                height: 40,
+                    controller: _cardController,
-                fit: BoxFit.cover,
+                    decoration: InputDecoration(
+                      labelText: AppLocalizations.of(context).cardNumber,
+                      border: const OutlineInputBorder(),
+                      isDense: true,
+                      filled: true,
+                      fillColor: Theme.of(context).scaffoldBackgroundColor,
+                      enabledBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black),
+                      ),
+                      focusedBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black, width: 2),
+                      ),
+                    ),
+                    keyboardType: TextInputType.number,
+                    textInputAction: TextInputAction.next,
+                    validator: (value) => value != null && value.length == 11
+                        ? null
+                        : AppLocalizations.of(context).enterValidCardNumber,
+                  ),
+                  const SizedBox(height: 24),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: TextFormField(
+                          controller: _cvvController,
+                          decoration: InputDecoration(
+                            labelText: AppLocalizations.of(context).cvv,
+                            border: const OutlineInputBorder(),
+                            isDense: true,
+                            filled: true,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide:
+                                  BorderSide(color: Colors.black, width: 2),
+                            ),
+                          ),
+                          keyboardType: TextInputType.number,
+                          textInputAction: TextInputAction.next,
+                          obscureText: true,
+                          validator: (value) =>
+                              value != null && value.length == 3
+                                  ? null
+                                  : AppLocalizations.of(context).cvv3Digits,
+                        ),
+                      ),
+                      const SizedBox(width: 16),
+                      Expanded(
+                        child: TextFormField(
+                          controller: _expiryController,
+                          readOnly: true,
+                          onTap: _pickExpiryDate,
+                          decoration: InputDecoration(
+                            labelText: AppLocalizations.of(context).expiryDate,
+                            suffixIcon: const Icon(Icons.calendar_today),
+                            border: const OutlineInputBorder(),
+                            isDense: true,
+                            filled: true,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide:
+                                  BorderSide(color: Colors.black, width: 2),
+                            ),
+                          ),
+                          validator: (value) => value != null &&
+                                  value.isNotEmpty
+                              ? null
+                              : AppLocalizations.of(context).selectExpiryDate,
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 24),
+                  TextFormField(
+                    controller: _phoneController,
+                    decoration: InputDecoration(
+                      labelText: AppLocalizations.of(context).phone,
+                      prefixIcon: const Icon(Icons.phone),
+                      border: const OutlineInputBorder(),
+                      isDense: true,
+                      filled: true,
+                      fillColor: Theme.of(context).scaffoldBackgroundColor,
+                      enabledBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black),
+                      ),
+                      focusedBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black, width: 2),
+                      ),
+                    ),
+                    textInputAction: TextInputAction.done,
+                    keyboardType: TextInputType.phone,
+                    validator: (value) => value != null && value.length >= 10
+                        ? null
+                        : AppLocalizations.of(context).enterValidPhone,
+                  ),
+                  const SizedBox(height: 45),
+                  Align(
+                    alignment: Alignment.center,
+                    child: SizedBox(
+                      width: 250,
+                      child: ElevatedButton(
+                        onPressed: _nextButton,
+                        style: ElevatedButton.styleFrom(
+                          shape: const StadiumBorder(),
+                          padding: const EdgeInsets.symmetric(vertical: 16),
+                          backgroundColor: Theme.of(context).primaryColor,
+                          foregroundColor:
+                              Theme.of(context).scaffoldBackgroundColor,
+                        ),
+                        child: Text(AppLocalizations.of(context).next),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          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
+                  ),
+                ),
               ),
             ),
           ),
         ],
       ),
-      body: Padding(
-        padding: const EdgeInsets.all(10.0),
-        child: Form(
-          key: _formKey,
-          child: ListView(
-            children: [
-              const SizedBox(height: 10),
-              TextFormField(
-                controller: _cardController,
-                decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).cardNumber,
-                  border: const OutlineInputBorder(),
-                  isDense: true,
-                  filled: true,
-                  fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black),
-                  ),
-                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black, width: 2),
-                  ),
-                ),
-                keyboardType: TextInputType.number,
-                textInputAction: TextInputAction.next,
-                validator: (value) => value != null && value.length == 11
-                    ? null
-                    : AppLocalizations.of(context).enterValidCardNumber,
-              ),
-              const SizedBox(height: 24),
-              Row(
-                children: [
-                  Expanded(
-                    child: TextFormField(
-                      controller: _cvvController,
-                      decoration: InputDecoration(
-                        labelText: AppLocalizations.of(context).cvv,
-                        border: const OutlineInputBorder(),
-                        isDense: true,
-                        filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black),
-                        ),
-                        focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black, width: 2),
-                        ),
-                      ),
-                      keyboardType: TextInputType.number,
-                      textInputAction: TextInputAction.next,
-                      obscureText: true,
-                      validator: (value) => value != null && value.length == 3
-                          ? null
-                          : AppLocalizations.of(context).cvv3Digits,
-                    ),
-                  ),
-                  const SizedBox(width: 16),
-                  Expanded(
-                    child: TextFormField(
-                      controller: _expiryController,
-                      readOnly: true,
-                      onTap: _pickExpiryDate,
-                      decoration: InputDecoration(
-                        labelText: AppLocalizations.of(context).expiryDate,
-                        suffixIcon: const Icon(Icons.calendar_today),
-                        border: const OutlineInputBorder(),
-                        isDense: true,
-                        filled: true,
-                        fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black),
-                        ),
-                        focusedBorder: const OutlineInputBorder(
-                          borderSide: BorderSide(color: Colors.black, width: 2),
-                        ),
-                      ),
-                      validator: (value) => value != null && value.isNotEmpty
-                          ? null
-                          : AppLocalizations.of(context).selectExpiryDate,
-                    ),
-                  ),
-                ],
-              ),
-              const SizedBox(height: 24),
-              TextFormField(
-                controller: _phoneController,
-                decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).phone,
-                  prefixIcon: const Icon(Icons.phone),
-                  border: const OutlineInputBorder(),
-                  isDense: true,
-                  filled: true,
-                  fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black),
-                  ),
-                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black, width: 2),
-                  ),
-                ),
-                textInputAction: TextInputAction.done,
-                keyboardType: TextInputType.phone,
-                validator: (value) => value != null && value.length >= 10
-                    ? null
-                    : AppLocalizations.of(context).enterValidPhone,
-              ),
-              const SizedBox(height: 45),
-              Align(
-                alignment: Alignment.center,
-                child: SizedBox(
-                  width: 250,
-                  child: ElevatedButton(
-                    onPressed: _nextButton,
-                    style: ElevatedButton.styleFrom(
-                      shape: const StadiumBorder(),
-                      padding: const EdgeInsets.symmetric(vertical: 16),
-                      backgroundColor: Theme.of(context).primaryColor,
-                      foregroundColor:
-                          Theme.of(context).scaffoldBackgroundColor,
-                    ),
-                    child: Text(AppLocalizations.of(context).next),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
     );
   }
 }

lib/features/card/screens/card_pin_set_screen.dart

@@ -1,6 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class CardPinSetScreen extends StatefulWidget {
@@ -46,116 +44,111 @@ class _CardPinSetScreen extends State<CardPinSetScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Symbols.arrow_back_ios_new),
-          onPressed: () {
-            Navigator.pop(context);
-          },
-        ),
         title: Text(
           AppLocalizations.of(context).cardPin,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
+      ),
+      body: Stack(
+        children: [
           Padding(
-            padding: const EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.all(16.0),
-            child: CircleAvatar(
+            child: Form(
-              backgroundColor: Colors.grey[200],
+              key: _formKey,
-              radius: 20,
+              child: Column(
-              child: SvgPicture.asset(
+                children: [
-                'assets/images/avatar_male.svg',
+                  TextFormField(
-                width: 40,
+                    controller: _pinController,
-                height: 40,
+                    obscureText: true,
-                fit: BoxFit.cover,
+                    decoration: InputDecoration(
+                      labelText: AppLocalizations.of(context).enterNewPin,
+                      border: const OutlineInputBorder(),
+                      isDense: true,
+                      filled: true,
+                      fillColor: Theme.of(context).scaffoldBackgroundColor,
+                      enabledBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black),
+                      ),
+                      focusedBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black, width: 2),
+                      ),
+                    ),
+                    keyboardType: TextInputType.number,
+                    textInputAction: TextInputAction.next,
+                    validator: (value) {
+                      if (value == null || value.isEmpty) {
+                        return AppLocalizations.of(context).pleaseEnterNewPin;
+                      }
+                      if (value.length < 4) {
+                        return AppLocalizations.of(context).pin4Digits;
+                      }
+                      return null;
+                    },
+                  ),
+                  const SizedBox(height: 24),
+                  TextFormField(
+                    controller: _confirmPinController,
+                    obscureText: true,
+                    decoration: InputDecoration(
+                      labelText: AppLocalizations.of(context).enterAgain,
+                      border: const OutlineInputBorder(),
+                      isDense: true,
+                      filled: true,
+                      fillColor: Theme.of(context).scaffoldBackgroundColor,
+                      enabledBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black),
+                      ),
+                      focusedBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black, width: 2),
+                      ),
+                    ),
+                    keyboardType: TextInputType.number,
+                    textInputAction: TextInputAction.done,
+                    validator: (value) {
+                      if (value != _pinController.text) {
+                        return AppLocalizations.of(context).pinsDoNotMatch;
+                      }
+                      return null;
+                    },
+                  ),
+                  const SizedBox(height: 45),
+                  Align(
+                    alignment: Alignment.center,
+                    child: SizedBox(
+                      width: 250,
+                      child: ElevatedButton(
+                        onPressed: _submit,
+                        style: ElevatedButton.styleFrom(
+                          shape: const StadiumBorder(),
+                          padding: const EdgeInsets.symmetric(vertical: 16),
+                          backgroundColor: Theme.of(context).primaryColor,
+                          foregroundColor:
+                              Theme.of(context).scaffoldBackgroundColor,
+                        ),
+                        child: Text(AppLocalizations.of(context).submit),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          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
+                  ),
+                ),
               ),
             ),
           ),
         ],
       ),
-      body: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Form(
-          key: _formKey,
-          child: Column(
-            children: [
-              TextFormField(
-                controller: _pinController,
-                obscureText: true,
-                decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).enterNewPin,
-                  border: const OutlineInputBorder(),
-                  isDense: true,
-                  filled: true,
-                  fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black),
-                  ),
-                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black, width: 2),
-                  ),
-                ),
-                keyboardType: TextInputType.number,
-                textInputAction: TextInputAction.next,
-                validator: (value) {
-                  if (value == null || value.isEmpty) {
-                    return AppLocalizations.of(context).pleaseEnterNewPin;
-                  }
-                  if (value.length < 4) {
-                    return AppLocalizations.of(context).pin4Digits;
-                  }
-                  return null;
-                },
-              ),
-              const SizedBox(height: 24),
-              TextFormField(
-                controller: _confirmPinController,
-                obscureText: true,
-                decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).enterAgain,
-                  border: const OutlineInputBorder(),
-                  isDense: true,
-                  filled: true,
-                  fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black),
-                  ),
-                  focusedBorder: const OutlineInputBorder(
-                    borderSide: BorderSide(color: Colors.black, width: 2),
-                  ),
-                ),
-                keyboardType: TextInputType.number,
-                textInputAction: TextInputAction.done,
-                validator: (value) {
-                  if (value != _pinController.text) {
-                    return AppLocalizations.of(context).pinsDoNotMatch;
-                  }
-                  return null;
-                },
-              ),
-              const SizedBox(height: 45),
-              Align(
-                alignment: Alignment.center,
-                child: SizedBox(
-                  width: 250,
-                  child: ElevatedButton(
-                    onPressed: _submit,
-                    style: ElevatedButton.styleFrom(
-                      shape: const StadiumBorder(),
-                      padding: const EdgeInsets.symmetric(vertical: 16),
-                      backgroundColor: Theme.of(context).primaryColor,
-                      foregroundColor:
-                          Theme.of(context).scaffoldBackgroundColor,
-                    ),
-                    child: Text(AppLocalizations.of(context).submit),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
     );
   }
 }

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,118 +1,176 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
+import 'package:kmobile/data/models/user.dart';
-import 'package:kmobile/features/enquiry/screens/enquiry_screen.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(
-        leading: IconButton(
-          icon: const Icon(Symbols.arrow_back_ios_new),
-          onPressed: () {
-            Navigator.pop(context);
-          },
-        ),
         title: Text(
           AppLocalizations.of(context).chequeManagement,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
+      ),
+      body: Stack(
+        children: [
           Padding(
-            padding: const EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
-            child: CircleAvatar(
+            child: Column(
-              backgroundColor: Colors.grey[200],
+              crossAxisAlignment: CrossAxisAlignment.stretch,
-              radius: 20,
+              children: [
-              child: SvgPicture.asset(
+                Expanded(
-                'assets/images/avatar_male.svg',
+                  child: ChequeManagementCardTile(
-                width: 40,
+                    icon: Symbols.payments,
-                height: 40,
+                    label: AppLocalizations.of(context).chequeEnquiryTitle,
-                fit: BoxFit.cover,
+                    subtitle:
+                        AppLocalizations.of(context).chequeEnquirySubtitle,
+                    onTap: () {
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (context) => ChequeEnquiryScreen(
+                            users: users,
+                            selectedIndex: selectedAccountIndex,
+                          ),
+                        ),
+                      );
+                    },
+                  ),
+                ),
+                Expanded(
+                  child: ChequeManagementCardTile(
+                    icon: Symbols.block_sharp,
+                    label: AppLocalizations.of(context).stopCheque,
+                    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
+                  ),
+                ),
               ),
             ),
           ),
         ],
       ),
-      body: ListView(
-        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,
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => const EnquiryScreen()),
-              );
-            },
-          ),
-          const Divider(height: 1),
-          ChequeManagementTile(
-            icon: Symbols.approval_delegation,
-            label: AppLocalizations.of(context).chequeDeposit,
-            onTap: () {},
-          ),
-          const Divider(height: 1),
-          ChequeManagementTile(
-            icon: Symbols.front_hand,
-            label: AppLocalizations.of(context).stopCheque,
-            onTap: () {},
-          ),
-          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(
+    final theme = Theme.of(context);
-      leading: Icon(icon),
+    return Card(
-      title: Text(label),
+      margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
-      trailing: const Icon(Symbols.arrow_right, size: 20),
+      shape: RoundedRectangleBorder(
-      onTap: onTap,
+        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,84 +14,221 @@ 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) {
+      return primaryId ?? 'N/A';
+    }
+    final lastFour = primaryId.substring(primaryId.length - 4);
+    return '*' * (primaryId.length - 4) + lastFour;
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     return Scaffold(
-      appBar: AppBar(
+        appBar: AppBar(
-        title: Text(
+          title: Text(
-          AppLocalizations.of(context).customerInfo,
+            AppLocalizations.of(context)
+                .customerInfo
+                .replaceFirst(RegExp('\n'), ''),
+          ),
         ),
-      ),
+        body: SafeArea(
-      body: SingleChildScrollView(
+          child: Stack(
-        physics: const AlwaysScrollableScrollPhysics(),
+            children: [
-        child: Padding(
+              SingleChildScrollView(
-          padding: const EdgeInsets.all(16.0),
+                physics: const AlwaysScrollableScrollPhysics(),
-          child: SafeArea(
+                child: Padding(
-            child: Center(
+                  padding: const EdgeInsets.all(16.0),
-              child: Column(
+                  child: Column(
-                children: [
+                    children: [
-                  const SizedBox(height: 30),
+                      Card(
-                  CircleAvatar(
+                        elevation: 0,
-                    radius: 50,
+                        shape: RoundedRectangleBorder(
-                    child: SvgPicture.asset(
+                          borderRadius: BorderRadius.circular(12),
-                      'assets/images/avatar_male.svg',
+                          side: BorderSide(
-                      width: 150,
+                            color: theme.colorScheme.outline.withOpacity(0.2),
-                      height: 150,
+                            width: 1,
-                      fit: BoxFit.cover,
+                          ),
-                    ),
+                        ),
+                        child: Padding(
+                          padding: const EdgeInsets.all(16.0),
+                          child: Row(
+                            children: [
+                              const SizedBox(
+                                width: 56,
+                                height: 56,
+                                child: 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.
+                                      user.name ?? '',
+                                      style:
+                                          theme.textTheme.titleLarge?.copyWith(
+                                        fontWeight: FontWeight.w600,
+                                      ),
+                                    ),
+                                    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),
+                          ),
+                        ),
+                      ),
+                    ],
                   ),
-                  Padding(
+                ),
-                    padding: const EdgeInsets.only(top: 10.0),
+              ),
-                    child: Text(
+              IgnorePointer(
-                      user.name ?? '',
+                child: Center(
-                      style: TextStyle(
+                  child: Opacity(
-                        fontSize: 20,
+                    opacity: 0.07, // Reduced opacity
-                        color: theme.colorScheme.onSurface,
+                    child: ClipOval(
-                        fontWeight: FontWeight.w500,
+                      child: Image.asset(
+                        'assets/images/logo.png',
+                        width: 200, // Adjust size as needed
+                        height: 200, // Adjust size as needed
                       ),
                     ),
                   ),
-                  Text(
+                ),
-                    '${AppLocalizations.of(context).cif}: ${user.cifNumber ?? 'N/A'}',
-                    style: TextStyle(
-                        fontSize: 16,
-                        color: theme.colorScheme.onSurfaceVariant),
-                  ),
-                  const SizedBox(height: 30),
-                  InfoField(
-                    label: AppLocalizations.of(context).activeAccounts,
-                    value: user.activeAccounts?.toString() ?? '6',
-                  ),
-                  InfoField(
-                    label: AppLocalizations.of(context).mobileNumber,
-                    value: user.mobileNo ?? 'N/A',
-                  ),
-                  InfoField(
-                    label: AppLocalizations.of(context).dateOfBirth,
-                    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,
-                    value: user.address ?? 'N/A',
-                  ), // Replace with Aadhar if available
-                  InfoField(
-                    label: AppLocalizations.of(context).primaryId,
-                    value: user.primaryId ?? 'N/A',
-                  ), // Replace with PAN if available
-                ],
               ),
-            ),
+            ],
+          ),
+        ));
+  }
+
+  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() ?? 'N/A',
+        ),
+        InfoField(
+          label: AppLocalizations.of(context).mobileNumber,
+          value: user.mobileNo ?? 'N/A',
+        ),
+        InfoField(
+          label: AppLocalizations.of(context).dateOfBirth,
+          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',
+        ),
+        InfoField(
+          label: AppLocalizations.of(context).branchCode,
+          value: user.branchId ?? 'N/A',
+        ),
+        InfoField(
+          label: AppLocalizations.of(context).address,
+          value: user.address ?? 'N/A',
+        ),
+      ],
+    );
+  }
+
+  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),
+        ),
+      ],
     );
   }
 }
@@ -112,16 +250,16 @@ class InfoField extends StatelessWidget {
         children: [
           Text(
             label,
-            style: TextStyle(
+            style: theme.textTheme.bodySmall?.copyWith(
-              fontSize: 15,
+              color: theme.colorScheme.onSurface.withOpacity(0.6),
-              fontWeight: FontWeight.w500,
-              color: theme.colorScheme.onSurfaceVariant,
             ),
           ),
-          const SizedBox(height: 3),
+          const SizedBox(height: 4),
           Text(
-            value,
+            value.isEmpty ? 'N/A' : value,
-            style: TextStyle(fontSize: 16, color: theme.colorScheme.onSurface),
+            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 {
@@ -30,47 +30,190 @@ class DashboardScreen extends StatefulWidget {
   State<DashboardScreen> createState() => _DashboardScreenState();
 }
 
-class _DashboardScreenState extends State<DashboardScreen> {
+class _DashboardScreenState extends State<DashboardScreen>
+    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 {
+  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)!);
+  }
+
+  @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(() {
-      _txLoading = true;
+      _visibilityMap.clear();
-      _transactions = [];
     });
-    try {
+  }
-      final repo = getIt<TransactionRepository>();
+
-      final txs = await repo.fetchTransactions(accountNo);
+  Widget _buildAccountCard(User user, bool isSelected) {
-      var fiveTxns = <Transaction>[];
+    final theme = Theme.of(context);
-      //only take the first 5 transactions
+    final bool isCardVisible = _visibilityMap[user.accountNo] ?? false;
-      if (txs.length > 5) {
+    // Animated scale for the selected card
-        fiveTxns = txs.sublist(0, 5);
+    final scale = isSelected ? 1.02 : 0.9;
-      } else {
+    return Padding(
-        fiveTxns = txs;
+      padding: const EdgeInsets.symmetric(horizontal: 3.0),
-      }
+      child: AnimatedScale(
-      setState(() => _transactions = fiveTxns);
+        duration: const Duration(milliseconds: 200),
-    } catch (e) {
+        scale: scale,
-      log(accountNo, error: e);
+        child: Container(
-      if (!mounted) return;
+          padding: const EdgeInsets.symmetric(
-      ScaffoldMessenger.of(context).showSnackBar(
+            horizontal: 18,
-        SnackBar(
+            vertical: 10,
-          content: Text(
+          ),
-            AppLocalizations.of(context).failedToLoad(e.toString()),
+          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 {
@@ -98,10 +241,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
   Widget _buildBalanceShimmer() {
     final theme = Theme.of(context);
     return Shimmer.fromColors(
-      baseColor: theme.primaryColor,
+      baseColor: theme.colorScheme.primary,
       highlightColor: theme.colorScheme.onPrimary,
-      child: Container(
+      child: Container(height: 36, color: theme.scaffoldBackgroundColor),
-          width: 200, height: 42, color: theme.scaffoldBackgroundColor),
     );
   }
 
@@ -138,12 +280,20 @@ class _DashboardScreenState extends State<DashboardScreen> {
     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;
     }
@@ -194,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) {
@@ -208,16 +371,41 @@ class _DashboardScreenState extends State<DashboardScreen> {
       child: Scaffold(
         backgroundColor: theme.scaffoldBackgroundColor,
         appBar: AppBar(
-          backgroundColor: theme.scaffoldBackgroundColor,
+          leading: Padding(
-          automaticallyImplyLeading: false,
+            padding: const EdgeInsets.only(left: 10.0),
-          title: Text(
+            child: Material(
-            AppLocalizations.of(context).kconnect,
+              elevation: 4.0,
-            style: TextStyle(
+              clipBehavior: Clip.antiAlias,
-              color: theme.primaryColor,
+              shape: RoundedRectangleBorder(
-              fontWeight: FontWeight.w700,
+                side: const BorderSide(color: Colors.white, width: 1.5),
+                borderRadius: BorderRadius.circular(12.0),
+              ),
+              child: Container(
+                width: 40,
+                height: 40,
+                decoration: const BoxDecoration(
+                  color: Colors.white,
+                ),
+                child: Image.asset(
+                  'assets/images/logo.png',
+                  fit: BoxFit.fill,
+                ),
+              ),
             ),
           ),
-          centerTitle: true,
+          title: Text(
+            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.onPrimary,
+              fontWeight: FontWeight.w700,
+              fontSize: 20,
+            ),
+          ),
+          // Removed centerTitle: true to give more space for text wrapping
+
           actions: [
             Padding(
               padding: const EdgeInsets.only(right: 10.0),
@@ -227,18 +415,18 @@ class _DashboardScreenState extends State<DashboardScreen> {
                   Navigator.push(
                     context,
                     MaterialPageRoute(
-                      builder: (context) => const ProfileScreen(),
+                      builder: (context) => ProfileScreen(
+                          mobileNumber: mobileNumberToPass,
+                          customerNo: customerNo,
+                          customerName: customerName),
                     ),
                   );
                 },
-                child: CircleAvatar(
+                child: const CircleAvatar(
-                  backgroundColor: Colors.grey[200],
+                  radius: 21,
-                  radius: 20,
+                  child: Icon(
-                  child: SvgPicture.asset(
+                    Symbols.person,
-                    'assets/images/avatar_male.svg',
+                    size: 30,
-                    width: 40,
-                    height: 40,
-                    fit: BoxFit.cover,
                   ),
                 ),
               ),
@@ -253,205 +441,112 @@ 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((_) {
+                WidgetsBinding.instance.addPostFrameCallback((_) {});
-                  _loadTransactions(currAccount.accountNo!);
-                });
               }
+              _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(
                             fontSize: 20,
-                            color: theme.primaryColor,
+                            color: theme.colorScheme.primary,
                             fontWeight: FontWeight.w700,
                           ),
                         ),
                       ),
                       const SizedBox(height: 16),
 
-                      // Account Info Card
+                      // Account Info Cards
-                      Container(
+                      SizedBox(
-                        padding: const EdgeInsets.symmetric(
+                        height: 160,
-                          horizontal: 18,
+                        child: PageView.builder(
-                          vertical: 10,
+                          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: theme.primaryColor,
+                      const SizedBox(height: 8),
-                          borderRadius: BorderRadius.circular(16),
+                      Row(
-                        ),
+                        mainAxisAlignment: MainAxisAlignment.end,
-                        child: Column(
+                        children: [
-                          crossAxisAlignment: CrossAxisAlignment.start,
+                          GestureDetector(
-                          children: [
+                            onTap: () {
-                            Row(
+                              Navigator.push(
-                              children: [
+                                context,
-                                Text(
+                                MaterialPageRoute(
-                                  "${getFullAccountType(currAccount.accountType)}: ",
+                                  builder: (context) =>
-                                  style: TextStyle(
+                                      AllAccountsScreen(users: users),
-                                    color: theme.colorScheme.onPrimary,
-                                    fontSize: 18,
-                                    fontWeight: FontWeight.w700,
-                                  ),
                                 ),
-                                DropdownButton<int>(
+                              );
-                                  value: selectedAccountIndex,
+                            },
-                                  dropdownColor: theme.primaryColor,
+                            child: Text(
-                                  underline: const SizedBox(),
+                              AppLocalizations.of(context).viewall,
-                                  icon: const Icon(Icons.keyboard_arrow_down),
+                              style: TextStyle(
-                                  iconEnabledColor: theme.colorScheme.onPrimary,
+                                fontSize: 14,
-                                  style: TextStyle(
+                                fontWeight: FontWeight.bold,
-                                    color: theme.colorScheme.onPrimary,
+                                color: theme.colorScheme.primary,
-                                    fontSize: 18,
+                              ),
-                                  ),
-                                  items: List.generate(users.length, (index) {
-                                    return DropdownMenuItem<int>(
-                                      value: index,
-                                      child: Text(
-                                        users[index].accountNo ?? 'N/A',
-                                        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,
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            ),
-                            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,
@@ -480,6 +575,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                 ),
                               );
                             },
+                            disable: isPaymentDisabled,
                           ),
                           _buildQuickLink(Symbols.send_money,
                               AppLocalizations.of(context).fundTransfer, () {
@@ -491,9 +587,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                             users[selectedAccountIndex]
                                                 .accountNo!,
                                         remitterName:
-                                            users[selectedAccountIndex]
+                                            users[selectedAccountIndex].name!,
-                                                .name!)));
+                                        // Pass the full list of accounts
-                          }, disable: false),
+                                        accounts: users)));
+                          }, disable: isPaymentDisabled),
                           _buildQuickLink(
                             Symbols.server_person,
                             AppLocalizations.of(context).accountInfo,
@@ -517,15 +614,18 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                 MaterialPageRoute(
                                     builder: (context) =>
                                         AccountStatementScreen(
-                                          accountNo: users[selectedAccountIndex]
+                                          users: users,
-                                              .accountNo!,
+                                          selectedIndex: selectedAccountIndex,
-                                          balance: users[selectedAccountIndex]
-                                              .availableBalance!,
                                         )));
                           }),
-                          _buildQuickLink(Symbols.checkbook,
+                          _buildQuickLink(Icons.location_pin,
-                              AppLocalizations.of(context).handleCheque, () {},
+                              AppLocalizations.of(context).branchlocator, () {
-                              disable: true),
+                            Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                    builder: (context) =>
+                                        const BranchLocatorScreen()));
+                          }, disable: false),
                           _buildQuickLink(Icons.group,
                               AppLocalizations.of(context).manageBeneficiary,
                               () {
@@ -544,69 +644,23 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                     builder: (context) =>
                                         const EnquiryScreen()));
                           }),
-                        ],
+                          _buildQuickLink(
-                      ),
+                            Symbols.checkbook,
-                      const SizedBox(height: 5),
+                            AppLocalizations.of(context).chequeManagement,
-
+                            () {
-                      // 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 > 18
-                                      ? tx.name!.substring(0, 22)
-                                      : tx.name!)
-                                  : '',
-                              style: const TextStyle(fontSize: 12),
-                            ),
-                            trailing: Text(
-                              "₹${tx.amount}",
-                              style: const TextStyle(fontSize: 17),
-                            ),
-                            onTap: () {
                               Navigator.push(
                                 context,
                                 MaterialPageRoute(
-                                  builder: (_) =>
+                                  builder: (context) => ChequeManagementScreen(
-                                      TransactionDetailsScreen(transaction: tx),
+                                      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: Colors.grey[600],
-                              ),
-                            ),
-                          ),
-                        ),
                     ],
                   ),
                 ),
@@ -621,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,
@@ -654,27 +682,35 @@ class _DashboardScreenState extends State<DashboardScreen> {
     bool disable = false,
   }) {
     final theme = Theme.of(context);
-    return InkWell(
+    return Card(
-      onTap: disable ? null : onTap,
+      elevation: 2,
-      child: Column(
+      shape: RoundedRectangleBorder(
-        mainAxisSize: MainAxisSize.min,
+        borderRadius: BorderRadius.circular(12.0),
-        children: [
+      ),
-          Icon(
+      child: InkWell(
-            icon,
+        onTap: disable ? null : onTap,
-            size: 30,
+        borderRadius: BorderRadius.circular(12.0),
-            color: disable
+        child: Column(
-                ? theme.colorScheme.surfaceContainerHighest
+          mainAxisAlignment: MainAxisAlignment.center,
-                : theme.primaryColor,
+          children: [
-            grade: 200,
+            Icon(
-            weight: 700,
+              icon,
-          ),
+              size: 30,
-          const SizedBox(height: 4),
+              color: disable ? theme.disabledColor : theme.colorScheme.primary,
-          Text(
+            ),
-            label,
+            const SizedBox(height: 4),
-            textAlign: TextAlign.center,
+            Text(
-            style: const TextStyle(fontSize: 13),
+              label,
-          ),
+              textAlign: TextAlign.center,
-        ],
+              style: theme.textTheme.titleMedium?.copyWith(
+                fontWeight: FontWeight.bold,
+                fontSize: 12,
+                color:
+                    disable ? theme.disabledColor : theme.colorScheme.onSurface,
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }

lib/features/dashboard/widgets/account_card.dart

@@ -13,7 +13,7 @@ class AccountCard extends StatelessWidget {
       width: 300,
       padding: const EdgeInsets.all(20),
       decoration: BoxDecoration(
-        color: Theme.of(context).primaryColor,
+        color: Colors.white,
         borderRadius: BorderRadius.circular(12),
         boxShadow: [
           BoxShadow(
@@ -33,7 +33,7 @@ class AccountCard extends StatelessWidget {
               Text(
                 account.accountType,
                 style: TextStyle(
-                  color: Theme.of(context).scaffoldBackgroundColor,
+                  color: Theme.of(context).colorScheme.onPrimary,
                   fontSize: 18,
                   fontWeight: FontWeight.bold,
                 ),
@@ -42,7 +42,7 @@ class AccountCard extends StatelessWidget {
                 account.accountType == 'Savings'
                     ? Icons.savings
                     : Icons.account_balance,
-                color: Theme.of(context).scaffoldBackgroundColor,
+                color: Theme.of(context).colorScheme.onPrimary,
               ),
             ],
           ),
@@ -50,13 +50,13 @@ class AccountCard extends StatelessWidget {
           Text(
             account.accountNumber,
             style: TextStyle(
-                color: Theme.of(context).scaffoldBackgroundColor, fontSize: 16),
+                color: Theme.of(context).colorScheme.onPrimary, fontSize: 16),
           ),
           const SizedBox(height: 30),
           Text(
             '${account.currency} ${account.balance.toStringAsFixed(2)}',
             style: TextStyle(
-              color: Theme.of(context).scaffoldBackgroundColor,
+              color: Theme.of(context).colorScheme.onPrimary,
               fontSize: 22,
               fontWeight: FontWeight.bold,
             ),
@@ -65,7 +65,7 @@ class AccountCard extends StatelessWidget {
           Text(
             AppLocalizations.of(context).availableBalance,
             style: TextStyle(
-                color: Theme.of(context).scaffoldBackgroundColor, fontSize: 16),
+                color: Theme.of(context).colorScheme.onPrimary, fontSize: 16),
           ),
         ],
       ),

lib/features/enquiry/screens/enquiry_screen.dart

@@ -1,8 +1,4 @@
-// ignore_for_file: use_build_context_synchronously
-
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:url_launcher/url_launcher.dart';
 import '../../../l10n/app_localizations.dart';
 
@@ -14,43 +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)) {
+      // Use external application mode
+      await launchUrl(uri, mode: LaunchMode.externalApplication);
+    } else {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Could not launch $url')),
+      );
     }
   }
 
   Widget _buildContactItem(String role, String email, String phone) {
-    return Column(
+    return Card(
-      crossAxisAlignment: CrossAxisAlignment.start,
+      elevation: 4,
-      children: [
+      margin: const EdgeInsets.symmetric(vertical: 8),
-        Text(role, style: const TextStyle(color: Colors.grey)),
+      child: Padding(
-        const SizedBox(height: 4),
+        padding: const EdgeInsets.all(16.0),
-        GestureDetector(
+        child: Column(
-          onTap: () => _launchEmailAddress(email),
+          crossAxisAlignment: CrossAxisAlignment.start,
-          child: Text(email,
+          children: [
-              style: TextStyle(color: Theme.of(context).primaryColor)),
+            Text(role,
+                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,
+                            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)),
+                  ),
+                ],
+              ),
+            ),
+          ],
         ),
-        const SizedBox(height: 4),
+      ),
-        GestureDetector(
-          onTap: () => _launchPhoneNumber(phone),
-          child: Text(phone,
-              style:
-                  TextStyle(color: Theme.of(context).scaffoldBackgroundColor)),
-        ),
-      ],
     );
   }
 
@@ -58,88 +108,97 @@ class _EnquiryScreen extends State<EnquiryScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(
+        title: Text(AppLocalizations.of(context).enquiry),
-          icon: const Icon(Symbols.arrow_back_ios_new),
-          onPressed: () {
-            Navigator.pop(context);
-          },
-        ),
-        title: Text(
-          AppLocalizations.of(context).enquiry,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
-        ),
         centerTitle: false,
-        actions: [
+      ),
+      body: Stack(
+        children: [
           Padding(
-            padding: const EdgeInsets.only(right: 10.0),
+            padding: const EdgeInsets.all(16.0),
-            child: CircleAvatar(
+            child: Column(
-              backgroundColor: Colors.grey[200],
+              crossAxisAlignment: CrossAxisAlignment.start,
-              radius: 20,
+              children: [
-              child: SvgPicture.asset(
+                Card(
-                'assets/images/avatar_male.svg',
+                  elevation: 4,
-                width: 40,
+                  child: InkWell(
-                height: 40,
+                    onTap: () =>
-                fit: BoxFit.cover,
+                        _launchUrl("https://kccbhp.bank.in/complaint-form/"),
+                    child: Padding(
+                      padding: const EdgeInsets.all(16.0),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Text(
+                            AppLocalizations.of(context).complaintFormTitle,
+                            style: TextStyle(
+                              fontSize: 15,
+                              color: Theme.of(context).colorScheme.primary,
+                            ),
+                          ),
+                          Icon(
+                            Icons.open_in_new,
+                            color: Theme.of(context).colorScheme.primary,
+                            size: 16.0,
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+                const Divider(height: 32),
+                Text(
+                  AppLocalizations.of(context).keyContacts,
+                  style: const TextStyle(
+                    fontSize: 15,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+                const SizedBox(height: 16),
+                Expanded(
+                  child: ListView(
+                    children: [
+                      _buildContactItem(
+                        AppLocalizations.of(context).chairman,
+                        "chairman@kccb.in",
+                        "01892-222677",
+                      ),
+                      _buildContactItem(
+                        AppLocalizations.of(context).managingDirector,
+                        "md@kccb.in",
+                        "01892-224969",
+                      ),
+                      _buildContactItem(
+                        AppLocalizations.of(context).gmWest,
+                        "gmw@kccb.in",
+                        "01892-223280",
+                      ),
+                      _buildContactItem(
+                        AppLocalizations.of(context).gmNorth,
+                        "gmn@kccb.in",
+                        "01892-224607",
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+          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
+                  ),
+                ),
               ),
             ),
           ),
         ],
       ),
-      body: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            // … existing Mail us / Call us / Write to us …
-            const SizedBox(height: 20),
-            Text(
-              AppLocalizations.of(context).writeToUs,
-              style: const TextStyle(color: Colors.grey),
-            ),
-            const SizedBox(height: 4),
-            Text(
-              "complaint@kccb.in",
-              style: TextStyle(color: Theme.of(context).primaryColor),
-            ),
-
-            const SizedBox(height: 20),
-            Text(
-              AppLocalizations.of(context).keyContacts,
-              style: TextStyle(
-                fontSize: 17,
-                color: Theme.of(context).primaryColor,
-              ),
-              // horizontal line
-            ),
-            Divider(color: Colors.grey[300]),
-            const SizedBox(height: 16),
-            _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",
-              "01892-224607",
-            ),
-          ],
-        ),
-      ),
     );
   }
 }

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

@@ -2,6 +2,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:kmobile/api/services/limit_service.dart';
 import 'package:kmobile/api/services/neft_service.dart';
 import 'package:kmobile/api/services/rtgs_service.dart';
 import 'package:kmobile/api/services/imps_service.dart';
@@ -17,6 +19,7 @@ import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.da
 import '../../../l10n/app_localizations.dart';
 import 'package:kmobile/api/services/payment_service.dart';
 import 'package:kmobile/data/models/transfer.dart';
+
 enum TransactionMode { neft, rtgs, imps }
 
 class FundTransferAmountScreen extends StatefulWidget {
@@ -38,14 +41,72 @@ class FundTransferAmountScreen extends StatefulWidget {
       _FundTransferAmountScreenState();
 }
 
-class  _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
+class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
+  final _limitService = getIt<LimitService>();
+  Limit? _limit;
+  bool _isLoadingLimit = true;
+  bool _isAmountOverLimit = false;
+  final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
   final _amountController = TextEditingController();
+  final _remarksController = TextEditingController();
   final _formKey = GlobalKey<FormState>();
   TransactionMode _selectedMode = TransactionMode.neft;
 
+  @override
+  void initState() {
+    super.initState();
+    _loadLimit(); // Call the new method
+    _amountController.addListener(_checkAmountLimit);
+  }
+
+  Future<void> _loadLimit() async {
+    setState(() {
+      _isLoadingLimit = true;
+    });
+    try {
+      final limitData = await _limitService.getLimit();
+      setState(() {
+        _limit = limitData;
+        _isLoadingLimit = false;
+      });
+    } catch (e) {
+      // Handle error if needed
+      setState(() {
+        _isLoadingLimit = false;
+      });
+    }
+  }
+
+  // Add this method to check the amount against the limit
+  void _checkAmountLimit() {
+    if (_limit == null) return;
+
+    final amount = double.tryParse(_amountController.text) ?? 0;
+    final remainingLimit = _limit!.dailyLimit - _limit!.usedLimit;
+    final bool isOverLimit = amount > remainingLimit;
+
+    if (isOverLimit) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(
+              'Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
+          backgroundColor: Colors.red,
+        ),
+      );
+    }
+
+    if (_isAmountOverLimit != isOverLimit) {
+      setState(() {
+        _isAmountOverLimit = isOverLimit;
+      });
+    }
+  }
+
   @override
   void dispose() {
+    _amountController.removeListener(_checkAmountLimit);
     _amountController.dispose();
+    _remarksController.dispose();
     super.dispose();
   }
 
@@ -112,6 +173,7 @@ class  _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final neftService = getIt<NeftService>();
                   final completer = Completer<PaymentResponse>();
@@ -179,6 +241,7 @@ class  _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final impsService = getIt<ImpsService>();
                   final completer = Completer<PaymentResponse>();
@@ -235,6 +298,7 @@ class  _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final rtgsService = getIt<RtgsService>();
                   final completer = Completer<PaymentResponse>();
@@ -295,143 +359,181 @@ class  _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
     final loc = AppLocalizations.of(context);
     return Scaffold(
       appBar: AppBar(
-        title: Text(loc.fundTransfer),
+        title: Text(loc.fundTransfer.replaceFirst(RegExp('\n'), '')),
       ),
-      body: Padding(
+      body: SafeArea(
-        padding: const EdgeInsets.all(16.0),
+        child: Stack(
-        child: Form(
+          children: [
-          key: _formKey,
+            Padding(
-          child: Column(
+              padding: const EdgeInsets.all(16.0),
-            crossAxisAlignment: CrossAxisAlignment.start,
+              child: Form(
-            children: [
+                key: _formKey,
-              // Debit Account (User)
+                child: Column(
-              Text(
+                  crossAxisAlignment: CrossAxisAlignment.start,
-                loc.debitFrom,
+                  children: [
-                style: Theme.of(context).textTheme.titleSmall,
+                    // Debit Account (User)
-              ),
+                    Text(
-              Card(
+                      loc.debitFrom,
-                elevation: 0,
+                      style: Theme.of(context).textTheme.titleSmall,
-                margin: const EdgeInsets.symmetric(vertical: 8.0),
+                    ),
-                child: ListTile(
+                    Card(
-                  leading: Image.asset(
+                      elevation: 0,
-                    'assets/images/logo.png',
+                      margin: const EdgeInsets.symmetric(vertical: 8.0),
-                    width: 40,
+                      child: ListTile(
-                    height: 40,
+                        leading: Image.asset(
-                  ),
+                          'assets/images/logo.png',
-                  title: Text(widget.remitterName),
+                          width: 40,
-                  subtitle: Text(widget.debitAccountNo),
+                          height: 40,
-                ),
+                        ),
-              ),
+                        title: Text(widget.remitterName),
-              const SizedBox(height: 24),
+                        subtitle: Text(widget.debitAccountNo),
+                      ),
+                    ),
+                    const SizedBox(height: 24),
 
-              // Credit Account (Beneficiary)
+                    // Credit Account (Beneficiary)
-              Text(
+                    Text(
-                AppLocalizations.of(context).creditedTo,
+                      AppLocalizations.of(context).creditedTo,
-                style: Theme.of(context).textTheme.titleSmall,
+                      style: Theme.of(context).textTheme.titleSmall,
-              ),
+                    ),
-              Card(
+                    Card(
-                elevation: 0,
+                      elevation: 0,
-                margin: const EdgeInsets.symmetric(vertical: 8.0),
+                      margin: const EdgeInsets.symmetric(vertical: 8.0),
-                child: ListTile(
+                      child: ListTile(
-                  leading: getBankLogo(widget.creditBeneficiary.bankName),
+                        leading: getBankLogo(
-                  title: Text(widget.creditBeneficiary.name),
+                            widget.creditBeneficiary.bankName, context),
-                  subtitle: Text(widget.creditBeneficiary.accountNo),
+                        title: Text(widget.creditBeneficiary.name),
-                ),
+                        subtitle: Text(widget.creditBeneficiary.accountNo),
-              ),
+                      ),
-              const SizedBox(height: 24),
+                    ),
+                    const SizedBox(height: 24),
 
-              if (!widget.isOwnBank) ...[
+                    if (!widget.isOwnBank) ...[
-                // Transaction Mode Selection
+                      // Transaction Mode Selection
-                Text(
+                      Text(
-                  AppLocalizations.of(context).selectTransactionType,
+                        AppLocalizations.of(context).selectTransactionType,
-                  style: Theme.of(context).textTheme.titleMedium,
+                        style: Theme.of(context).textTheme.titleMedium,
-                ),
+                      ),
-                const SizedBox(height: 12),
+                      const SizedBox(height: 12),
-                Container(
+                      Container(
-                  decoration: BoxDecoration(
+                        decoration: BoxDecoration(
-                    color: Theme.of(context).cardColor,
+                          color: Theme.of(context).cardColor,
-                    borderRadius: BorderRadius.circular(12),
+                          borderRadius: BorderRadius.circular(12),
-                    border: Border.all(color: Colors.grey.shade300),
+                          border: Border.all(color: Colors.grey.shade300),
-                  ),
+                        ),
-                  child: ToggleButtons(
+                        child: ToggleButtons(
-                    isSelected: [
+                          isSelected: [
-                      _selectedMode == TransactionMode.neft,
+                            _selectedMode == TransactionMode.neft,
-                      _selectedMode == TransactionMode.rtgs,
+                            _selectedMode == TransactionMode.rtgs,
-                      _selectedMode == TransactionMode.imps,
+                            _selectedMode == TransactionMode.imps,
+                          ],
+                          onPressed: (index) {
+                            setState(() {
+                              _selectedMode = TransactionMode.values[index];
+                            });
+                          },
+                          borderRadius: BorderRadius.circular(10),
+                          selectedColor:
+                              Theme.of(context).colorScheme.onPrimary,
+                          fillColor: Theme.of(context).colorScheme.primary,
+                          color: Theme.of(context).colorScheme.onSurface,
+                          borderColor: Colors.transparent,
+                          selectedBorderColor: Colors.transparent,
+                          splashColor: Theme.of(context).colorScheme.primary,
+                          highlightColor: Theme.of(context).colorScheme.primary,
+                          children: [
+                            Padding(
+                              padding: const EdgeInsets.symmetric(
+                                  horizontal: 24.0, vertical: 12.0),
+                              child: Text(AppLocalizations.of(context).neft),
+                            ),
+                            Padding(
+                              padding: const EdgeInsets.symmetric(
+                                  horizontal: 24.0, vertical: 12.0),
+                              child: Text(AppLocalizations.of(context).rtgs),
+                            ),
+                            Padding(
+                              padding: const EdgeInsets.symmetric(
+                                  horizontal: 24.0, vertical: 12.0),
+                              child: Text(AppLocalizations.of(context).imps),
+                            ),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(height: 24),
                     ],
-                    onPressed: (index) {
+                    //Remarks
-                      setState(() {
+                    TextFormField(
-                        _selectedMode = TransactionMode.values[index];
+                      controller: _remarksController,
-                      });
+                      decoration: InputDecoration(
-                    },
+                        labelText: AppLocalizations.of(context).remarks,
-                    borderRadius: BorderRadius.circular(10),
+                        border: const OutlineInputBorder(),
-                    selectedColor: Theme.of(context).colorScheme.onPrimary,
-                    fillColor: Theme.of(context).primaryColor,
-                    color: Theme.of(context).colorScheme.onSurface,
-                    borderColor: Colors.transparent,
-                    selectedBorderColor: Colors.transparent,
-                    splashColor:
-                        Theme.of(context).primaryColor,
-                    highlightColor:
-                        Theme.of(context).primaryColor,
-                    children: [
-                      Padding(
-                        padding: const EdgeInsets.symmetric(
-                            horizontal: 24.0, vertical: 12.0),
-                        child: Text(AppLocalizations.of(context).neft),
                       ),
-                      Padding(
+                    ),
-                        padding: const EdgeInsets.symmetric(
+                    const SizedBox(height: 24),
-                            horizontal: 24.0, vertical: 12.0),
+                    // Amount
-                        child: Text(AppLocalizations.of(context).rtgs),
+                    TextFormField(
+                      controller: _amountController,
+                      keyboardType: TextInputType.number,
+                      decoration: InputDecoration(
+                        labelText: loc.amount,
+                        border: const OutlineInputBorder(),
+                        prefixIcon: const Icon(Icons.currency_rupee),
                       ),
-                      Padding(
+                      validator: (value) {
-                        padding: const EdgeInsets.symmetric(
+                        if (value == null || value.isEmpty) {
-                            horizontal: 24.0, vertical: 12.0),
+                          return loc.amountRequired;
-                        child: Text(AppLocalizations.of(context).imps),
+                        }
+                        if (double.tryParse(value) == null ||
+                            double.parse(value) <= 0) {
+                          return loc.validAmount;
+                        }
+                        return null;
+                      },
+                    ),
+                    const SizedBox(height: 8),
+                    if (_isLoadingLimit)
+                      Text(AppLocalizations.of(context).fetchingDailyLimit),
+                    if (!_isLoadingLimit && _limit != null)
+                      Text(
+                        '${AppLocalizations.of(context).remainingDailyLimit} ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}',
+                        style: Theme.of(context).textTheme.bodySmall,
                       ),
-                    ],
+                    const Spacer(),
-                  ),
-                ),
-                const SizedBox(height: 24),
-              ],
-              // Amount
-              TextFormField(
-                controller: _amountController,
-                keyboardType: TextInputType.number,
-                decoration: InputDecoration(
-                  labelText: loc.amount,
-                  border: const OutlineInputBorder(),
-                  prefixIcon: const Icon(Icons.currency_rupee),
-                ),
-                validator: (value) {
-                  if (value == null || value.isEmpty) {
-                    return loc.amountRequired;
-                  }
-                  if (double.tryParse(value) == null ||
-                      double.parse(value) <= 0) {
-                    return loc.validAmount;
-                  }
-                  return null;
-                },
-              ),
-              const Spacer(),
 
-              // Proceed Button
+                    // Proceed Button
-              SizedBox(
+                    SizedBox(
-                width: double.infinity,
+                      width: double.infinity,
-                child: ElevatedButton(
+                      child: ElevatedButton(
-                  onPressed: _onProceed,
+                        onPressed: _isAmountOverLimit ? null : _onProceed,
-                  style: ElevatedButton.styleFrom(
+                        style: ElevatedButton.styleFrom(
-                    padding: const EdgeInsets.symmetric(vertical: 16),
+                          padding: const EdgeInsets.symmetric(vertical: 16),
-                  ),
+                        ),
-                  child: Text(AppLocalizations.of(context).proceed),
+                        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 {
@@ -39,14 +51,28 @@ class _FundTransferBeneficiaryScreenState
     setState(() {
       _beneficiaries = data
           .where((b) => widget.isOwnBank
-              ? b.bankName ==
+              ? b.bankName!.toLowerCase().contains('kangra central')
-                  'THE KANGRA CENTRAL CO-OP BANK LIMITED' // Assuming 'KCCB' is your bank's name
+              : !b.bankName!.toLowerCase().contains('kangra central'))
-              : b.bankName != 'THE KANGRA CENTRAL CO-OP BANK LIMITED')
           .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,
@@ -74,46 +100,84 @@ 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];
+        final beneficiary = _filteredBeneficiaries[index];
-        return ListTile(
+
-          leading: CircleAvatar(
+        // --- Cooldown Logic ---
-            radius: 24,
+        bool isCoolingDown = false;
-            backgroundColor: Colors.transparent,
+        if (beneficiary.createdAt != null) {
-            child: getBankLogo(beneficiary.bankName),
+          final sixtyMinutesAgo =
-          ),
+              DateTime.now().subtract(const Duration(minutes: 60));
-          title: Text(beneficiary.name),
+          isCoolingDown = beneficiary.createdAt!.isAfter(sixtyMinutesAgo);
-          subtitle: Column(
+        }
-            crossAxisAlignment: CrossAxisAlignment.start,
+        // --- End of Cooldown Logic ---
-            children: [
+
-              Text(beneficiary.accountNo),
+        // By wrapping the ListTile in an Opacity widget, we can make it look
-              if (beneficiary.bankName != null &&
+        // disabled while ensuring the onTap callback still works.
-                  beneficiary.bankName!.isNotEmpty)
+        return Card(
-                Text(
+          margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
-                  beneficiary.bankName!,
+          child: Opacity(
-                  style: TextStyle(fontSize: 12, color: Colors.grey[600]),
+            opacity: isCoolingDown ? 0.5 : 1.0,
-                ),
+            child: ListTile(
-            ],
+              // REMOVED the 'enabled' property from here.
-          ),
+              leading: CircleAvatar(
-          onTap: () {
+                radius: 24,
-            Navigator.push(
+                backgroundColor: Colors.transparent,
-              context,
+                child: getBankLogo(beneficiary.bankName, context),
-              MaterialPageRoute(
-                builder: (context) => FundTransferAmountScreen(
-                  debitAccountNo: widget.creditAccountNo,
-                  creditBeneficiary: beneficiary,
-                  remitterName: widget.remitterName,
-                  isOwnBank: widget.isOwnBank,
-                ),
               ),
-            );
+              title: Text(beneficiary.name),
-          },
+              subtitle: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(beneficiary.accountNo),
+                  if (beneficiary.bankName != null &&
+                      beneficiary.bankName!.isNotEmpty)
+                    Text(
+                      beneficiary.bankName!,
+                      style: TextStyle(fontSize: 12, color: Colors.grey[600]),
+                    ),
+                ],
+              ),
+              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(
+                      builder: (context) => FundTransferAmountScreen(
+                        debitAccountNo: widget.creditAccountNo,
+                        creditBeneficiary: beneficiary,
+                        remitterName: widget.remitterName,
+                        isOwnBank: widget.isOwnBank,
+                      ),
+                    ),
+                  );
+                }
+              },
+            ),
+          ),
         );
       },
     );
@@ -125,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
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 }