Localization Chamges #2

.gitignore

@@ -41,11 +41,3 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
-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

@@ -7,10 +7,6 @@
 
 # The following line activates a set of recommended lints for Flutter apps,
 # packages, and plugins designed to encourage good coding practices.
-analyzer:
-  errors:
-    dead_code: ignore
-    non_constant_identifier_names: ignore
 include: package:flutter_lints/flutter.yaml
 
 linter:

android/app/build.gradle

@@ -22,19 +22,12 @@ 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"
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
-        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -52,27 +45,17 @@ 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 29
+        minSdkVersion flutter.minSdkVersion
         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.release
+            // TODO: Add your own signing config for the release build.
-            minifyEnabled true
+            // Signing with the debug keys for now, so `flutter run --release` works.
-            shrinkResources true
+            signingConfig signingConfigs.debug
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 }
@@ -81,6 +64,4 @@ flutter {
     source '../..'
 }
 
-dependencies {
+dependencies {}
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
-}

android/app/proguard-rules.pro

@@ -1,21 +0,0 @@
--keep class io.flutter.app.** { *; }
--keep class io.flutter.plugin.**  { *; }
--keep class io.flutter.util.**  { *; }
--keep class io.flutter.view.**  { *; }
--keep class io.flutter.embedding.**  { *; }
--keep class io.flutter.embedding.engine.plugins.**  { *; }
--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.
-# This is generated automatically by the Android Gradle plugin.
--dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
--dontwarn com.google.android.play.core.splitinstall.SplitInstallException
--dontwarn com.google.android.play.core.splitinstall.SplitInstallManager
--dontwarn com.google.android.play.core.splitinstall.SplitInstallManagerFactory
--dontwarn com.google.android.play.core.splitinstall.SplitInstallRequest$Builder
--dontwarn com.google.android.play.core.splitinstall.SplitInstallRequest
--dontwarn com.google.android.play.core.splitinstall.SplitInstallSessionState
--dontwarn com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener
--dontwarn com.google.android.play.core.tasks.OnFailureListener
--dontwarn com.google.android.play.core.tasks.OnSuccessListener
--dontwarn com.google.android.play.core.tasks.Task

android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,6 @@
         android:label="kmobile"
         android:name="${applicationName}"
         android:usesCleartextTraffic="true"
-        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
@@ -40,20 +39,6 @@
          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,12 +1,5 @@
 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() {
+import io.flutter.embedding.android.FlutterFragmentActivity
-         override fun onCreate(savedInstanceState: Bundle?) {
+
-         super.onCreate(savedInstanceState)
+class MainActivity: FlutterFragmentActivity() 
-         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 = AppIcon;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				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 = AppIcon;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

ios/Runner/Info.plist

@@ -47,19 +47,5 @@
 	<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/interceptors/auth_interceptor.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: unused_local_variable
-
 import 'package:dio/dio.dart';
 import '../../data/repositories/auth_repository.dart';
 

lib/api/services/auth_service.dart

@@ -25,8 +25,7 @@ class AuthService {
         print(e.toString());
       }
       if (e.response?.statusCode == 401) {
-        throw AuthException(
+        throw AuthException('Invalid credentials');
-            e.response?.data['error'] ?? 'SOMETHING WENT WRONG');
       }
       throw NetworkException('Network error during login');
     } catch (e) {
@@ -92,72 +91,4 @@ 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,6 +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';
 
@@ -40,12 +40,9 @@ 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) {
-      throw UnexpectedException(
+      rethrow;
-          'Unexpected error during login: ${e.toString()}');
     }
     return Ifsc.fromJson({});
   }
@@ -63,10 +60,6 @@ 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");
@@ -74,7 +67,7 @@ class BeneficiaryService {
     return response.data['name'];
   }
 
-  // Beneficiary Validate And ADD
+  // Send Data for Validation
   Future<bool> sendForValidation(Beneficiary beneficiary) async {
     try {
       final response = await _dio.post(
@@ -109,21 +102,8 @@ class BeneficiaryService {
         throw Exception("Failed to fetch beneficiaries");
       }
     } catch (e) {
+      print("Error fetching beneficiaries: $e");
       return [];
     }
   }
-
-  Future<void> deleteBeneficiary(String accountNo) async {
-    try {
-      final response = await _dio.delete('/api/beneficiary/$accountNo');
-
-      if (response.statusCode != 204) {
-        throw Exception('Failed to delete beneficiary');
-      }
-    } on DioException catch (e) {
-      throw Exception('Network error: ${e.message}');
-    } catch (e) {
-      throw Exception('Unexpected error: ${e.toString()}');
-    }
-  }
 }

lib/api/services/branch_service.dart

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

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

@@ -1,138 +0,0 @@
-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/imps_service.dart

@@ -12,7 +12,7 @@ class ImpsService {
     try {
       await Future.delayed(const Duration(seconds: 3));
       final response = await _dio.post(
-        '/api/payment/imps',
+        '/api/payment/rtgs',
         data: transaction.toJson(),
       );
 
@@ -20,7 +20,7 @@ class ImpsService {
         return ImpsResponse.fromJson(response.data);
       } else {
         throw Exception(
-            'IMPS transaction failed with status code: ${response.statusCode}');
+            'RTGS transaction failed with status code: ${response.statusCode}');
       }
     } on DioException {
       rethrow;
@@ -29,3 +29,5 @@ class ImpsService {
     }
   }
 }
+
+

lib/api/services/limit_service.dart

@@ -1,87 +0,0 @@
-// 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/neft_service.dart

@@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:dio/dio.dart';
 import 'package:kmobile/data/models/neft_response.dart';
 import 'package:kmobile/data/models/neft_transaction.dart';
@@ -25,7 +23,6 @@ class NeftService {
             'NEFT transaction failed with status code: ${response.statusCode}');
       }
     } on DioException {
-      log('DioException Occured');
       rethrow;
     } catch (e) {
       throw Exception('An unexpected error occurred: ${e.toString()}');

lib/api/services/payment_service.dart

@@ -38,3 +38,4 @@ class PaymentService {
     }
   }
 }
+

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');
+      final response = await _dio.get('/api/customer/details');
       if (response.statusCode == 200) {
         log('Response: ${response.data}');
         return (response.data as List)

lib/app.dart

@@ -2,8 +2,6 @@ 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';
@@ -12,15 +10,14 @@ 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/accounts/screens/account_statement_screen.dart';
+import 'features/card/screens/card_management_screen.dart';
-import 'package:kmobile/features/auth/controllers/auth_state.dart';
+import 'features/auth/screens/welcome_screen.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});
@@ -35,46 +32,25 @@ class KMobile extends StatefulWidget {
   }
 }
 
-class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
+class _KMobileState extends State<KMobile> {
-  Timer? _backgroundTimer;
+  bool showSplash = true;
   Locale? _locale;
 
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addObserver(this);
     loadPreferences();
-  }
+    Future.delayed(const Duration(seconds: 2), () {
-
+      setState(() {
-  @override
+        showSplash = false;
-  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(() {
@@ -91,6 +67,7 @@ class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
 
   @override
   Widget build(BuildContext context) {
+// Set status bar color and brightness
     SystemChrome.setSystemUIOverlayStyle(
       const SystemUiOverlayStyle(
         statusBarColor: Colors.transparent,
@@ -102,37 +79,30 @@ class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
       providers: [
         BlocProvider<AuthCubit>(create: (_) => getIt<AuthCubit>()),
         BlocProvider<ThemeCubit>(create: (_) => ThemeCubit()),
-        BlocProvider<ThemeModeCubit>(create: (_) => ThemeModeCubit()),
       ],
       child: BlocBuilder<ThemeCubit, ThemeState>(
         builder: (context, themeState) {
-          return BlocBuilder<ThemeModeCubit, ThemeModeState>(
+          print('global theme state changed');
-            builder: (context, modeState) {
+          return MaterialApp(
-              return MaterialApp(
+            debugShowCheckedModeBanner: false,
-                debugShowCheckedModeBanner: false,
+            locale: _locale ?? const Locale('en'),
-                locale: _locale ?? const Locale('en'),
+            supportedLocales: const [
-                supportedLocales: const [
+              Locale('en'),
-                  Locale('en'),
+              Locale('hi'),
-                  Locale('hi'),
+            ],
-                ],
+            localizationsDelegates: const [
-                localizationsDelegates: const [
+              AppLocalizations.delegate,
-                  AppLocalizations.delegate,
+              GlobalMaterialLocalizations.delegate,
-                  GlobalMaterialLocalizations.delegate,
+              GlobalWidgetsLocalizations.delegate,
-                  GlobalWidgetsLocalizations.delegate,
+              GlobalCupertinoLocalizations.delegate,
-                  GlobalCupertinoLocalizations.delegate,
+            ],
-                ],
+            title: 'kMobile',
-                title: 'kMobile',
+            theme: themeState.getThemeData(),
-                theme: themeState.getLightThemeData(),
+            darkTheme: themeState.getThemeData(),
-                darkTheme: themeState.getDarkThemeData(),
+            themeMode: ThemeMode.system,
-                themeMode: context.watch<ThemeModeCubit>().state.mode,
+            onGenerateRoute: AppRoutes.generateRoute,
-                navigatorObservers: [
+            initialRoute: AppRoutes.splash,
-                  getIt<RouteObserver<ModalRoute<void>>>(),
+            home: showSplash ? const SplashScreen() : const AuthGate(),
-                ],
-                onGenerateRoute: AppRoutes.generateRoute,
-                initialRoute: AppRoutes.splash,
-                home: const AuthGate(),
-              );
-            },
           );
         },
       ),
@@ -142,6 +112,7 @@ class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
 
 class AuthGate extends StatefulWidget {
   const AuthGate({super.key});
+
   @override
   State<AuthGate> createState() => _AuthGateState();
 }
@@ -149,6 +120,7 @@ class AuthGate extends StatefulWidget {
 class _AuthGateState extends State<AuthGate> {
   bool _checking = true;
   bool _isLoggedIn = false;
+  bool _showWelcome = true;
   bool _hasMPin = false;
   bool _biometricEnabled = false;
   bool _biometricTried = false;
@@ -181,13 +153,9 @@ class _AuthGateState extends State<AuthGate> {
     final localAuth = LocalAuthentication();
     final canCheck = await localAuth.canCheckBiometrics;
     if (!canCheck) return false;
-    String localizedReason = "";
-    if (mounted) {
-      localizedReason = AppLocalizations.of(context).authenticateToAccess;
-    }
     try {
       final didAuth = await localAuth.authenticate(
-        localizedReason: localizedReason,
+        localizedReason: AppLocalizations.of(context).authenticateToAccess,
         options: const AuthenticationOptions(
           stickyAuth: true,
           biometricOnly: true,
@@ -202,8 +170,20 @@ class _AuthGateState extends State<AuthGate> {
   @override
   Widget build(BuildContext context) {
     if (_checking) {
-      return const LoginScreen();
+      return const SplashScreen();
     }
+    // ✅ Step 1: Show welcome screen first, only once
+    if (_showWelcome) {
+      return WelcomeScreen(
+        onContinue: () {
+          setState(() {
+            _showWelcome = false;
+          });
+        },
+      );
+    }
+
+    // ✅ Step 2: Check login status
     if (_isLoggedIn) {
       if (_hasMPin) {
         if (_biometricEnabled) {
@@ -211,11 +191,14 @@ class _AuthGateState extends State<AuthGate> {
             future: _tryBiometric(),
             builder: (context, snapshot) {
               if (snapshot.connectionState == ConnectionState.waiting) {
-                return const LoginScreen();
+                return const SplashScreen();
               }
+
               if (snapshot.data == true) {
-                return const NavigationScaffold();
+                return const NavigationScaffold(); // Authenticated
               }
+
+              // ❌ Biometric failed → Show MPIN screen
               return MPinScreen(
                 mode: MPinMode.enter,
                 onCompleted: (_) {
@@ -241,11 +224,13 @@ class _AuthGateState extends State<AuthGate> {
           );
         }
       } else {
+        // No MPIN set → show MPIN set screen + biometric dialog
         return MPinScreen(
           mode: MPinMode.set,
           onCompleted: (_) async {
             final storage = getIt<SecureStorage>();
             final localAuth = LocalAuthentication();
+
             final optIn = await showDialog<bool>(
               context: context,
               barrierDismissible: false,
@@ -266,16 +251,15 @@ class _AuthGateState extends State<AuthGate> {
                 ],
               ),
             );
+
             if (optIn == true) {
               final canCheck = await localAuth.canCheckBiometrics;
               bool didAuth = false;
-              String authEnable = "";
+
-              if (context.mounted) {
-                authEnable = AppLocalizations.of(context).authenticateToEnable;
-              }
               if (canCheck) {
                 didAuth = await localAuth.authenticate(
-                  localizedReason: authEnable,
+                  localizedReason:
+                      AppLocalizations.of(context).authenticateToEnable,
                   options: const AuthenticationOptions(
                     stickyAuth: true,
                     biometricOnly: true,
@@ -287,23 +271,25 @@ class _AuthGateState extends State<AuthGate> {
                 await storage.write('biometric_enabled', 'false');
               }
             }
-            if (context.mounted) {
+
-              Navigator.of(context).pushReplacement(
+            Navigator.of(context).pushReplacement(
-                MaterialPageRoute(
+              MaterialPageRoute(
-                  builder: (_) => const NavigationScaffold(),
+                builder: (_) => const NavigationScaffold(),
-                ),
+              ),
-              );
+            );
-            }
           },
         );
       }
     }
+
+    // ✅ Step 3: If not logged in, show login screen
     return const LoginScreen();
   }
 }
 
 class NavigationScaffold extends StatefulWidget {
   const NavigationScaffold({super.key});
+
   @override
   State<NavigationScaffold> createState() => _NavigationScaffoldState();
 }
@@ -311,28 +297,24 @@ class NavigationScaffold extends StatefulWidget {
 class _NavigationScaffoldState extends State<NavigationScaffold> {
   final PageController _pageController = PageController();
   int _selectedIndex = 0;
+
   final List<Widget> _pages = [
     const DashboardScreen(),
-    BlocBuilder<AuthCubit, AuthState>(
+    const CardManagementScreen(),
-      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(),
   ];
 
+  void _onItemTapped(int index) {
+    setState(() {
+      _selectedIndex = index;
+    });
+    _pageController.jumpToPage(index);
+  }
+
   @override
   Widget build(BuildContext context) {
+    print(
+        "--- NavigationScaffold is rebuilding with theme color: ${Theme.of(context).primaryColor}");
     return PopScope(
       canPop: false,
       onPopInvokedWithResult: (didPop, result) async {
@@ -371,9 +353,10 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
         bottomNavigationBar: BottomNavigationBar(
           currentIndex: _selectedIndex,
           type: BottomNavigationBarType.fixed,
-          backgroundColor: const Color(0XFF1E58AD),
+          backgroundColor: Theme.of(context)
-          selectedItemColor: Theme.of(context).colorScheme.onPrimary,
+              .scaffoldBackgroundColor, // Light blue background
-          unselectedItemColor: Theme.of(context).colorScheme.onSecondary,
+          selectedItemColor: Theme.of(context).primaryColor,
+          unselectedItemColor: Colors.black54,
           onTap: (index) {
             setState(() {
               _selectedIndex = index;
@@ -386,8 +369,8 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
               label: AppLocalizations.of(context).home,
             ),
             BottomNavigationBarItem(
-              icon: const Icon(Icons.swap_vert_sharp),
+              icon: const Icon(Icons.credit_card),
-              label: AppLocalizations.of(context).transactions,
+              label: AppLocalizations.of(context).card,
             ),
             BottomNavigationBarItem(
               icon: const Icon(Icons.miscellaneous_services),
@@ -400,9 +383,34 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
   }
 }
 
+class SplashScreen extends StatelessWidget {
+  const SplashScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            const CircularProgressIndicator(),
+            const SizedBox(height: 20),
+            Text(
+              AppLocalizations.of(context).loading,
+              style: Theme.of(context).textTheme.headlineMedium,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+// 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;
@@ -410,12 +418,8 @@ class BiometricPromptScreen extends StatelessWidget {
       onCompleted();
       return;
     }
-    String localizedReason = "";
-    if (context.mounted) {
-      localizedReason = AppLocalizations.of(context).enableFingerprintQuick;
-    }
     final didAuth = await localAuth.authenticate(
-      localizedReason: localizedReason,
+      localizedReason: AppLocalizations.of(context).enableFingerprintQuick,
       options: const AuthenticationOptions(
         stickyAuth: true,
         biometricOnly: true,
@@ -433,7 +437,7 @@ class BiometricPromptScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     Future.microtask(() => _showDialog(context));
-    return const SizedBox.shrink();
+    return const SplashScreen();
   }
 
   Future<void> _showDialog(BuildContext context) async {
@@ -459,9 +463,6 @@ class BiometricPromptScreen extends StatelessWidget {
         ],
       ),
     );
-    if (!context.mounted) {
-      return;
-    }
     if (result == true) {
       await _handleBiometric(context);
     } else {

lib/config/routes.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:kmobile/features/auth/screens/mpin_screen.dart';
-import 'package:kmobile/features/auth/screens/splash_screen.dart';
 import '../app.dart';
 import '../features/auth/screens/login_screen.dart';
 // import '../features/auth/screens/forgot_password_screen.dart';
@@ -10,7 +9,6 @@ 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
@@ -35,9 +33,7 @@ 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,5 +3,4 @@ enum ThemeType {
   green,
   orange,
   blue,
-  yellow,
 }

lib/config/themes.dart

@@ -1,72 +1,32 @@
-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 = _getSeedColor(type);
+    switch (type) {
-    final colorScheme = ColorScheme.fromSeed(
+      case ThemeType.green:
-      seedColor: seedColor,
+        return ThemeData(primarySwatch: Colors.green);
-      brightness: Brightness.light,
+      case ThemeType.orange:
-    );
+        return ThemeData(primarySwatch: Colors.orange);
-    return ThemeData.from(
+      case ThemeType.blue:
-      colorScheme: colorScheme,
+        return ThemeData(primarySwatch: Colors.blue);
-      useMaterial3: true,
+      case ThemeType.violet:
-      textTheme: GoogleFonts.rubikTextTheme(),
+      default:
-    ).copyWith(
+        return ThemeData(primarySwatch: Colors.deepPurple);
-        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,
-      useMaterial3: true,
-      textTheme: GoogleFonts.rubikTextTheme(
-        ThemeData(brightness: Brightness.dark).textTheme,
-      ),
-    ).copyWith(
-        appBarTheme: AppBarTheme(
-      backgroundColor: const Color(0xFF01A04C),
-      titleTextStyle: TextStyle(
-        color: colorScheme.onPrimary,
-        fontWeight: FontWeight.w700,
-        fontSize: 20,
-      ),
-      iconTheme: IconThemeData(color: colorScheme.onPrimary),
-      actionsIconTheme: IconThemeData(color: colorScheme.onPrimary),
-    ));
-  }
-
-  static Color _getSeedColor(ThemeType type) {
     switch (type) {
       case ThemeType.green:
-        return Colors.green;
+        return ThemeData.dark().copyWith(primaryColor: Colors.green);
       case ThemeType.orange:
-        return Colors.orange;
+        return ThemeData.dark().copyWith(primaryColor: Colors.orange);
       case ThemeType.blue:
-        return Colors.blue;
+        return ThemeData.dark().copyWith(primaryColor: Colors.blue);
       case ThemeType.violet:
-        return Colors.deepPurple;
+      default:
-      case ThemeType.yellow:
+        return ThemeData.dark().copyWith(primaryColor: Colors.deepPurple);
-        return Colors.yellow;
     }
   }
 }

lib/data/models/beneficiary.dart

@@ -1,8 +1,9 @@
+// ignore_for_file: non_constant_identifier_names
+
 class Beneficiary {
   final String accountNo;
   final String accountType;
   final String name;
-  final DateTime? createdAt;
   final String ifscCode;
   final String? bankName;
   final String? branchName;
@@ -12,7 +13,6 @@ class Beneficiary {
     required this.accountNo,
     required this.accountType,
     required this.name,
-    this.createdAt,
     required this.ifscCode,
     this.bankName,
     this.branchName,
@@ -23,9 +23,6 @@ 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'] ?? '',
@@ -56,6 +53,7 @@ class Beneficiary {
     final beneficiaryList = jsonList
         .map((beneficiary) => Beneficiary.fromJson(beneficiary))
         .toList();
+    print(beneficiaryList);
     return beneficiaryList;
   }
 

lib/data/models/imps_transaction.dart

@@ -6,7 +6,6 @@ class ImpsTransaction {
   final String? remitterName;
   final String beneficiaryName;
   final String tpin;
-  final String? remarks;
 
   ImpsTransaction({
     required this.fromAccount,
@@ -16,19 +15,18 @@ class ImpsTransaction {
     this.remitterName,
     required this.beneficiaryName,
     required this.tpin,
-    this.remarks,
   });
 
   Map<String, dynamic> toJson() {
     return {
-      'fromAccount': fromAccount,
+      'stFromAccDetails': fromAccount,
-      'toAccount': toAccount,
+      'stBenAccNo': toAccount,
-      'amount': amount,
+      'stTransferAmount': amount,
-      'ifscCode': ifscCode,
+      'stBenIFSC': ifscCode,
-      'remitterName': remitterName,
+      //'remitterName': remitterName,
-      'beneficiaryName': beneficiaryName,
+      'stBeneName': beneficiaryName,
+      'stRemarks': "Check",
       'tpin': tpin,
-      'remarks': remarks,
     };
   }
 }

lib/data/models/neft_transaction.dart

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

lib/data/models/rtgs_transaction.dart

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

lib/data/models/transaction.dart

@@ -4,18 +4,8 @@ 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,
@@ -23,19 +13,16 @@ 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,7 +4,6 @@ class Transfer {
   final String toAccountType;
   final String amount;
   String? tpin;
-  String? remarks;
 
   Transfer({
     required this.fromAccount,
@@ -12,7 +11,6 @@ class Transfer {
     required this.toAccountType,
     required this.amount,
     this.tpin,
-    this.remarks,
   });
 
   Map<String, dynamic> toJson() {
@@ -22,7 +20,6 @@ class Transfer {
       'toAccountType': toAccountType,
       'amount': amount,
       'tpin': tpin,
-      'remarks': remarks,
     };
   }
 }

lib/data/repositories/auth_repository.dart

@@ -13,12 +13,10 @@ 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>, AuthToken)> login(
+  Future<List<User>> login(String customerNo, String password) async {
-      String customerNo, String password) async {
     // Create credentials and call service
     final credentials =
         AuthCredentials(customerNo: customerNo, password: password);
@@ -29,7 +27,7 @@ class AuthRepository {
 
     // Get and save user profile
     final users = await _userService.getUserDetails();
-    return (users, authToken);
+    return users;
   }
 
   Future<bool> isLoggedIn() async {
@@ -49,38 +47,18 @@ 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) {
-      final authToken = AuthToken(
+      return 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,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:dio/dio.dart';
 import 'package:intl/intl.dart';
 import 'package:kmobile/data/models/transaction.dart';
@@ -23,6 +25,8 @@ 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,10 +1,5 @@
-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';
 import 'package:get_it/get_it.dart';
 import 'package:dio/dio.dart';
 import 'package:kmobile/api/services/beneficiary_service.dart';
@@ -12,10 +7,8 @@ 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';
@@ -23,12 +16,9 @@ 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());
@@ -52,15 +42,8 @@ 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(
@@ -68,23 +51,21 @@ Future<void> setupDependencies() async {
       );
 
   // Register controllers/cubits
-  getIt.registerFactory<AuthCubit>(() => AuthCubit(
+  getIt.registerFactory<AuthCubit>(
-      getIt<AuthRepository>(), getIt<UserService>(), getIt<SecureStorage>()));
+      () => AuthCubit(getIt<AuthRepository>(), getIt<UserService>()));
 }
 
 Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com', //test
+          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080',
-      //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
+      //'http://localhost:8081',
-      //'https://kccbmbnk.net', //prod small
+      connectTimeout: const Duration(seconds: 5),
-      connectTimeout: const Duration(seconds: 60),
+      receiveTimeout: const Duration(seconds: 10),
-      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

@@ -1,5 +1,7 @@
 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 AccountInfoScreen extends StatefulWidget {
@@ -18,161 +20,104 @@ class AccountInfoScreen extends StatefulWidget {
 
 class _AccountInfoScreen extends State<AccountInfoScreen> {
   late User selectedUser;
-
   @override
   void initState() {
     super.initState();
-
     selectedUser = widget.users[widget.selectedIndex];
   }
 
-  String getFullAccountType(String? accountType) {
-    if (accountType == null || accountType.isEmpty) return 'N/A';
-    // Convert to title case
-    switch (accountType.toLowerCase()) {
-      case 'sa':
-        return AppLocalizations.of(context).savingsAccount;
-      case 'sb':
-        return AppLocalizations.of(context).savingsAccount;
-      case 'ln':
-        return AppLocalizations.of(context).loanAccount;
-      case 'td':
-        return AppLocalizations.of(context).termDeposit;
-      case 'rd':
-        return AppLocalizations.of(context).recurringDeposit;
-      case 'ca':
-        return "Current Account";
-      case 'cc':
-        return "Cash Credit Account";
-      case 'od':
-        return "Overdraft Account";
-      default:
-        return AppLocalizations.of(context).unknownAccount;
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     final users = widget.users;
-
     int selectedIndex = widget.selectedIndex;
-
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context)
+        leading: IconButton(
-            .accountInfo
+          icon: const Icon(Symbols.arrow_back_ios_new),
-            .replaceFirst(RegExp('\n'), '')),
+          onPressed: () {
-      ),
+            Navigator.pop(context);
-      body: Stack(
+          },
-        children: [
+        ),
-          Padding(
+        title: Text(
-            padding: const EdgeInsets.all(8.0),
+          AppLocalizations.of(context).accountInfo,
-            child: Column(
+          style: const TextStyle(
-              children: [
+            color: Colors.black,
-                Card(
+            fontWeight: FontWeight.w500,
-                  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(
+        centerTitle: false,
-              child: Opacity(
+        actions: [
-                opacity: 0.07, // Reduced opacity
+          Padding(
-
+            padding: const EdgeInsets.only(right: 10.0),
-                child: ClipOval(
+            child: CircleAvatar(
-                  child: Image.asset(
+              backgroundColor: Colors.grey[200],
-                    'assets/images/logo.png',
+              radius: 20,
-
+              child: SvgPicture.asset(
-                    width: 200, // Adjust size as needed
+                'assets/images/avatar_male.svg',
-
+                width: 40,
-                    height: 200, // Adjust size as needed
+                height: 40,
-                  ),
+                fit: BoxFit.cover,
-                ),
               ),
             ),
           ),
         ],
       ),
+      body: ListView(
+        padding: const EdgeInsets.all(16.0),
+        children: [
+          Text(
+            AppLocalizations.of(context).accountNumber,
+            style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14),
+          ),
+
+          /// Dropdown to change account
+          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()),
+              );
+            }).toList(),
+          ),
+
+          InfoRow(
+            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
+              ? InfoRow(
+                  title: AppLocalizations.of(context).approvedAmount,
+                  value: selectedUser.approvedAmount ?? 'N/A',
+                )
+              : const SizedBox.shrink(),
+        ],
+      ),
     );
   }
 }
@@ -185,7 +130,6 @@ class InfoRow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
     return Container(
       width: double.infinity,
       margin: const EdgeInsets.symmetric(vertical: 8),
@@ -194,19 +138,16 @@ class InfoRow extends StatelessWidget {
         children: [
           Text(
             title,
-            style: TextStyle(
+            style: const TextStyle(
-              fontSize: 18,
+              fontSize: 15,
-              fontWeight: FontWeight.bold,
+              fontWeight: FontWeight.w500,
-              color: theme.colorScheme.onSurfaceVariant,
+              color: Colors.black87,
             ),
           ),
           const SizedBox(height: 3),
           Text(
             value,
-            style: TextStyle(
+            style: const TextStyle(fontSize: 16, color: Colors.black),
-                fontSize: 20,
-                fontWeight: FontWeight.bold,
-                color: theme.colorScheme.onSurface),
           ),
         ],
       ),

lib/features/accounts/screens/all_accounts_screen.dart

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

@@ -11,98 +11,130 @@ class TransactionDetailsScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     final bool isCredit = transaction.type?.toUpperCase() == 'CR';
 
+  //   Future<void> _shareScreenshot() async {
+  //   try {
+  //     RenderRepaintBoundary boundary =
+  //         _shareKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
+  //     ui.Image image = await boundary.toImage(pixelRatio: 3.0);
+  //     ByteData? byteData = await image.toByteData(format: ui.ImageByteFormat.png);
+  //     Uint8List pngBytes = byteData!.buffer.asUint8List();
+  //     final tempDir = await getTemporaryDirectory();
+  //     final file = await File('${tempDir.path}/payment_result.png').create();
+  //     await file.writeAsBytes(pngBytes);
+
+    //     await Share.shareXFiles(
+    //       [XFile(file.path)],
+    //       text: AppLocalizations.of(context).paymentResult,
+    //     );
+    //   } catch (e) {
+    //     if (!mounted) return;
+    //     ScaffoldMessenger.of(context).showSnackBar(
+    //       SnackBar(
+    //         content: Text(
+    //           '${AppLocalizations.of(context).failedToShareScreenshot}: $e',
+    //         ),
+    //       ),
+    //     );
+    //   }
+    // }
+
     return Scaffold(
       appBar:
           AppBar(title: Text(AppLocalizations.of(context).transactionDetails)),
-      body: Stack(
+      body: Padding(
-        children: [
+        padding: const EdgeInsets.all(16.0),
-          Padding(
+        child: Column(
-            padding: const EdgeInsets.all(16.0),
+          children: [
-            child: Column(
+            // Absolute center for amount + icon + date + details
-              children: [
+            Expanded(
-                Expanded(
+              flex: 3,
-                  flex: 3,
+              child: Center(
-                  child: Center(
+                child: Column(
-                    child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    // Amount + icon + Share Button
+                    Row(
                       mainAxisSize: MainAxisSize.min,
                       children: [
-                        // Amount + icon + Share Button
-                        Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            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(height: 8),
-                        // Date centered
                         Text(
-                          transaction.date ?? "",
+                          "₹ ${transaction.amount}",
-                          style: TextStyle(
+                          style: const TextStyle(
-                            fontSize: 16,
+                            fontSize: 40,
-                            color: Theme.of(context).textTheme.bodySmall?.color,
+                            fontWeight: FontWeight.bold,
                           ),
-                          textAlign: TextAlign.center,
+                        ),
+                        const SizedBox(width: 8),
+                        Icon(
+                          isCredit ? Symbols.call_received : Symbols.call_made,
+                          color: isCredit ? Colors.green : Colors.red,
+                          size: 28,
                         ),
                       ],
                     ),
-                  ),
+                    const SizedBox(height: 8),
-                ),
+                    // Date centered
-                Divider(color: Theme.of(context).dividerColor),
+                    Text(
-                Expanded(
+                      transaction.date ?? "",
-                  flex: 5,
+                      style: const TextStyle(
-                  child: ListView(
+                        fontSize: 16,
-                    children: [
+                        color: Colors.grey,
-                      _buildDetailRow(
+                      ),
-                          AppLocalizations.of(context).transactionType,
+                      textAlign: TextAlign.center,
-                          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(),
+
+            // All details
+            Expanded(
+              flex: 5,
+              child: ListView(
+                children: [
+                  // ignore: unnecessary_cast
+                  _buildDetailRow(
+                      AppLocalizations.of(context).transactionType as String,
+                      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 ?? "")
+                  ]
+                ],
+              ),
+            ),
+            // ElevatedButton.icon(
+            //     onPressed: _shareScreenshot,
+            //     icon: Icon(
+            //       Icons.share_rounded,
+            //       color: Theme.of(context).primaryColor,
+            //     ),
+            //     label: Text(
+            //       AppLocalizations.of(context).share,
+            //       style: TextStyle(color: Theme.of(context).primaryColor),
+            //     ),
+            //     style: ElevatedButton.styleFrom(
+            //       backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+            //       padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
+            //       shape: RoundedRectangleBorder(
+            //         side: BorderSide(color: Theme.of(context).primaryColor, width: 1),
+            //         borderRadius: BorderRadius.circular(30),
+            //       ),
+            //       textStyle: const TextStyle(
+            //         fontSize: 18,
+            //         fontWeight: FontWeight.w600,
+            //         color: Colors.black,
+            //       ),
+            //     ),
+            //   ),
+          ],
+        ),
       ),
     );
   }
@@ -118,14 +150,14 @@ class TransactionDetailsScreen extends StatelessWidget {
             "$label: ",
             style: const TextStyle(
               fontWeight: FontWeight.bold,
-              fontSize: 17,
+              fontSize: 20,
             ),
           ),
           const SizedBox(height: 30),
           Expanded(
             child: Text(
               value,
-              style: const TextStyle(fontSize: 16),
+              style: const TextStyle(fontSize: 20),
             ),
           ),
         ],
@@ -133,3 +165,5 @@ class TransactionDetailsScreen extends StatelessWidget {
     );
   }
 }
+
+

lib/features/auth/controllers/auth_cubit.dart

@@ -1,19 +1,14 @@
 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, this._secureStorage)
+  AuthCubit(this._authRepository, this._userService) : super(AuthInitial()) {
-      : super(AuthInitial()) {
     checkAuthStatus();
   }
 
@@ -34,62 +29,22 @@ 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, authToken) =
+      final users = await _authRepository.login(customerNo, password);
-          await _authRepository.login(customerNo, password);
+      emit(Authenticated(users));
-
-      if (authToken.tnc == false) {
-        emit(ShowTncDialog(authToken, users));
-      } else {
-        await _checkMpinAndNavigate(users);
-      }
     } catch (e) {
       emit(AuthError(e is AuthException ? e.message : e.toString()));
     }
   }
-
-  Future<void> onTncDialogResult(
-      bool agreed, AuthToken authToken, List<User> users) async {
-    if (agreed) {
-      try {
-        await _authRepository.acceptTnc();
-        // The user is NOT fully authenticated yet. Just check for MPIN.
-        await _checkMpinAndNavigate(users);
-      } catch (e) {
-        emit(AuthError('Failed to accept TNC: $e'));
-      }
-    } else {
-      emit(NavigateToTncRequiredScreen());
-    }
-  }
-
-  void mpinSetupCompleted() {
-    if (state is NavigateToMpinSetupScreen) {
-      final users = (state as NavigateToMpinSetupScreen).users;
-      emit(Authenticated(users));
-    } else {
-      // Handle unexpected state if necessary
-      emit(AuthError("Invalid state during MPIN setup completion."));
-    }
-  }
-
-  Future<void> _checkMpinAndNavigate(List<User> users) async {
-    final mpin = await _secureStorage.read('mpin');
-    if (mpin == null) {
-      // No MPIN, tell UI to navigate to MPIN setup, carrying user data
-      emit(NavigateToMpinSetupScreen(users));
-    } else {
-      // MPIN exists, user is authenticated
-      emit(Authenticated(users));
-    }
-  }
 }

lib/features/auth/controllers/auth_state.dart

@@ -1,12 +1,9 @@
 import 'package:equatable/equatable.dart';
-import 'package:kmobile/data/models/user.dart';
+import '../../../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 {}
@@ -15,44 +12,20 @@ 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_cubit.dart

@@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:kmobile/config/theme_type.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -19,7 +17,7 @@ class ThemeCubit extends Cubit<ThemeState> {
   }
 
   Future<void> changeTheme(ThemeType type) async {
-    log("Attempting to change theme...");
+    print("Attempting to change theme to: ${type.toString()}");
     final prefs = await SharedPreferences.getInstance();
     await prefs.setInt('theme_type', type.index);
     emit(ThemeState(themeType: type));

lib/features/auth/controllers/theme_mode_cubit.dart

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

@@ -1,11 +0,0 @@
-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,27 +12,6 @@ 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,31 +6,16 @@ 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: token,
+      accessToken: json['token'],
-      expiresAt: _decodeExpiryFromToken(
+      expiresAt: _decodeExpiryFromToken(json['token']),
-          token), // This method is still valid for JWT expiry
-      tnc: tncMobileValue, // Use the correctly extracted value
     );
   }
 
@@ -57,45 +42,8 @@ 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, tnc];
+  List<Object> get props => [accessToken, expiresAt];
 }

lib/features/auth/screens/login_screen.dart

@@ -1,11 +1,11 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:kmobile/app.dart';
-import 'package:kmobile/features/auth/screens/mpin_screen.dart';
-import 'package:kmobile/features/auth/screens/set_password_screen.dart';
-import 'package:kmobile/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 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:kmobile/di/injection.dart';
+import 'package:kmobile/features/auth/screens/mpin_screen.dart';
+import 'package:kmobile/security/secure_storage.dart';
+import '../../../app.dart';
 import '../controllers/auth_cubit.dart';
 import '../controllers/auth_state.dart';
 
@@ -22,9 +22,24 @@ class LoginScreenState extends State<LoginScreen>
   final _customerNumberController = TextEditingController();
   final _passwordController = TextEditingController();
   bool _obscurePassword = true;
+  //bool _showWelcome = true;
+  late AnimationController _logoController;
+  late Animation<double> _logoAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+    _logoController = AnimationController(
+      vsync: this,
+      duration: const Duration(seconds: 1),
+    )..repeat(reverse: true);
+
+    _logoAnimation = Tween<double>(begin: 0.2, end: 1).animate(_logoController);
+  }
 
   @override
   void dispose() {
+    _logoController.dispose();
     _customerNumberController.dispose();
     _passwordController.dispose();
     super.dispose();
@@ -41,252 +56,45 @@ 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) {
+        listener: (context, state) async {
-          if (state is ShowTncDialog) {
+          if (state is Authenticated) {
-            showDialog<bool>(
+            final storage = getIt<SecureStorage>();
-              context: context,
+            final mpin = await storage.read('mpin');
-              barrierDismissible: false,
+            if (mpin == null) {
-              builder: (dialogContext) => TncDialog(
+              // ignore: use_build_context_synchronously
-                onProceed: () async {
+              Navigator.of(context).pushReplacement(
-                  // Pop the dialog before the cubit action
+                MaterialPageRoute(
-                  Navigator.of(dialogContext).pop();
+                  builder: (_) => MPinScreen(
-                  await context
+                    mode: MPinMode.set,
-                      .read<AuthCubit>()
+                    onCompleted: (_) {
-                      .onTncDialogResult(true, state.authToken, state.users);
+                      Navigator.of(
-                },
+                        context,
-              ),
+                        rootNavigator: true,
-            );
+                      ).pushReplacement(
-          } else if (state is NavigateToTncRequiredScreen) {
+                        MaterialPageRoute(
-            Navigator.of(context).pushNamed(TncRequiredScreen.routeName);
+                          builder: (_) => const NavigationScaffold(),
-          } 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 if (state is Authenticated) {
-            // This is the single source of truth for navigating to the dashboard
-            Navigator.of(context, rootNavigator: true).pushAndRemoveUntil(
-              MaterialPageRoute(builder: (_) => const NavigationScaffold()),
-              (route) => false,
-            );
-          } else if (state is AuthError) {
-            if (state.message == 'MIGRATED_USER_HAS_NO_PASSWORD') {
-              Navigator.of(context).push(MaterialPageRoute(
-                  builder: (_) => SetPasswordScreen(
-                        customerNo: _customerNumberController.text.trim(),
-                      )));
             } else {
-              ScaffoldMessenger.of(context)
+              // ignore: use_build_context_synchronously
-                  .showSnackBar(SnackBar(content: Text(state.message)));
+              Navigator.of(context).pushReplacement(
+                MaterialPageRoute(builder: (_) => const NavigationScaffold()),
+              );
             }
+          } else if (state is AuthError) {
+            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(
@@ -294,19 +102,24 @@ class LoginScreenState extends State<LoginScreen>
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  Image.asset(
+                  // 🔁 Animated Blinking Logo
-                    'assets/images/logo.png',
+                  FadeTransition(
-                    width: 150,
+                    opacity: _logoAnimation,
-                    height: 150,
+                    child: Image.asset(
-                    errorBuilder: (context, error, stackTrace) {
+                      'assets/images/logo.png',
-                      return Icon(
+                      width: 150,
-                        Icons.account_balance,
+                      height: 150,
-                        size: 100,
+                      errorBuilder: (context, error, stackTrace) {
-                        color: Theme.of(context).primaryColor,
+                        return Icon(
-                      );
+                          Icons.account_balance,
-                    },
+                          size: 100,
+                          color: Theme.of(context).primaryColor,
+                        );
+                      },
+                    ),
                   ),
                   const SizedBox(height: 16),
+                  // Title
                   Text(
                     AppLocalizations.of(context).kccb,
                     style: TextStyle(
@@ -316,22 +129,21 @@ class LoginScreenState extends State<LoginScreen>
                     ),
                   ),
                   const SizedBox(height: 48),
+
                   TextFormField(
                     controller: _customerNumberController,
                     decoration: InputDecoration(
                       labelText: AppLocalizations.of(context).customerNumber,
+                      // prefixIcon: Icon(Icons.person),
                       border: const OutlineInputBorder(),
                       isDense: true,
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
-                      enabledBorder: OutlineInputBorder(
+                      enabledBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(
+                        borderSide: BorderSide(color: Colors.black),
-                            color: Theme.of(context).colorScheme.outline),
                       ),
-                      focusedBorder: OutlineInputBorder(
+                      focusedBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(
+                        borderSide: BorderSide(color: Colors.black, width: 2),
-                            color: Theme.of(context).colorScheme.primary,
-                            width: 2),
                       ),
                     ),
                     keyboardType: TextInputType.number,
@@ -344,25 +156,24 @@ class LoginScreenState extends State<LoginScreen>
                     },
                   ),
                   const SizedBox(height: 24),
+                  // Password
                   TextFormField(
                     controller: _passwordController,
                     obscureText: _obscurePassword,
                     textInputAction: TextInputAction.done,
-                    onFieldSubmitted: (_) => _submitForm(),
+                    onFieldSubmitted: (_) =>
+                        _submitForm(), // ⌨️ Enter key submits
                     decoration: InputDecoration(
                       labelText: AppLocalizations.of(context).password,
                       border: const OutlineInputBorder(),
                       isDense: true,
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
-                      enabledBorder: OutlineInputBorder(
+                      enabledBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(
+                        borderSide: BorderSide(color: Colors.black),
-                            color: Theme.of(context).colorScheme.outline),
                       ),
-                      focusedBorder: OutlineInputBorder(
+                      focusedBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(
+                        borderSide: BorderSide(color: Colors.black, width: 2),
-                            color: Theme.of(context).colorScheme.primary,
-                            width: 2),
                       ),
                       suffixIcon: IconButton(
                         icon: Icon(
@@ -385,6 +196,7 @@ class LoginScreenState extends State<LoginScreen>
                     },
                   ),
                   const SizedBox(height: 24),
+                  //Login Button
                   SizedBox(
                     width: 250,
                     child: ElevatedButton(
@@ -395,23 +207,50 @@ class LoginScreenState extends State<LoginScreen>
                         backgroundColor:
                             Theme.of(context).scaffoldBackgroundColor,
                         foregroundColor: Theme.of(context).primaryColorDark,
-                        side: BorderSide(
+                        side: const BorderSide(color: Colors.black, width: 1),
-                            color: Theme.of(context).colorScheme.outline,
-                            width: 1),
                         elevation: 0,
                       ),
                       child: state is AuthLoading
                           ? const CircularProgressIndicator()
                           : Text(
                               AppLocalizations.of(context).login,
-                              style: TextStyle(
+                              style: const TextStyle(fontSize: 16),
-                                  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,13 +1,12 @@
 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 }
 
@@ -15,91 +14,34 @@ 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> with TickerProviderStateMixin {
+class _MPinScreenState extends State<MPinScreen> {
   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();
-    // Bounce animation for single dot entry
+    if (widget.mode == MPinMode.enter) {
-    _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) {
@@ -120,13 +62,11 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   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();
       }
@@ -134,7 +74,6 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   void deleteDigit() {
-    if (_shakeController.isAnimating || _waveController.isAnimating) return;
     if (mPin.isNotEmpty) {
       setState(() {
         mPin.removeLast();
@@ -144,148 +83,71 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   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)) {
-          // Correct PIN
+          widget.onCompleted?.call(pin);
-          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:
-        // Navigate to confirm and wait for result
+        // propagate parent onCompleted into confirm step
-        final result = await Navigator.push(
+        Navigator.push(
           context,
           MaterialPageRoute(
             builder: (_) => MPinScreen(
               mode: MPinMode.confirm,
               initialPin: pin,
-              onCompleted: (confirmedPin) {
+              onCompleted: widget.onCompleted, // <-- use parent callback
-                // 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);
 
-          // 2) Call the onCompleted callback to let the parent handle navigation
+          // 3) now clear the entire navigation stack and go to your main scaffold
           if (mounted) {
-            widget.onCompleted?.call(pin);
+            Navigator.of(context, rootNavigator: true).pushAndRemoveUntil(
+              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(BuildContext context) {
+  Widget buildMPinDots() {
-    return AnimatedBuilder(
+    return Row(
-      animation: Listenable.merge(
+      mainAxisAlignment: MainAxisAlignment.center,
-          [_bounceController, _shakeController, _waveController]),
+      children: List.generate(4, (index) {
-      builder: (context, child) {
+        return Container(
-        double shakeOffset = 0;
+          margin: const EdgeInsets.all(8),
-        if (_shakeController.isAnimating) {
+          width: 15,
-          // 4 cycles of sine wave for shake
+          height: 15,
-          shakeOffset = sin(_shakeController.value * 4 * pi) * 12;
+          decoration: BoxDecoration(
-        }
+            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,
-                  ),
-                ),
-              );
-            }),
           ),
         );
-      },
+      }),
     );
   }
 
@@ -303,10 +165,9 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: row.map((key) {
             return Padding(
-              padding: const EdgeInsets.all(1.0),
+              padding: const EdgeInsets.all(8.0),
               child: GestureDetector(
                 onTap: () {
-                  HapticFeedback.lightImpact();
                   if (key == '<') {
                     deleteDigit();
                   } else if (key == 'Enter') {
@@ -324,10 +185,11 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
                   }
                 },
                 child: Container(
-                  width: 80,
+                  width: 70,
-                  height: 80,
+                  height: 70,
-                  decoration: const BoxDecoration(
+                  decoration: BoxDecoration(
                     shape: BoxShape.circle,
+                    color: Colors.grey[200],
                   ),
                   alignment: Alignment.center,
                   child: key == 'Enter'
@@ -335,10 +197,10 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
                       : Text(
                           key == '<' ? '⌫' : key,
                           style: TextStyle(
-                            fontSize: 30,
+                            fontSize: 20,
                             color: key == 'Enter'
                                 ? Theme.of(context).primaryColor
-                                : Theme.of(context).colorScheme.onSurface,
+                                : Colors.black,
                           ),
                         ),
                 ),
@@ -351,9 +213,6 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   String getTitle() {
-    if (widget.customTitle != null) {
-      return widget.customTitle!;
-    }
     switch (widget.mode) {
       case MPinMode.enter:
         return AppLocalizations.of(context).enterMPIN;
@@ -370,7 +229,7 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
       body: SafeArea(
         child: Column(
           children: [
-            const SizedBox(height: 50),
+            const Spacer(),
             // Logo
             Image.asset('assets/images/logo.png', height: 100),
             const SizedBox(height: 20),
@@ -378,18 +237,19 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
               getTitle(),
               style: const TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
             ),
-            const Spacer(),
+            const SizedBox(height: 20),
-            buildMPinDots(context),
+            buildMPinDots(),
             if (errorText != null)
               Padding(
                 padding: const EdgeInsets.only(top: 8.0),
                 child: Text(
                   errorText!,
-                  style: TextStyle(color: Theme.of(context).colorScheme.error),
+                  style: const TextStyle(color: Colors.red),
                 ),
               ),
             const Spacer(),
             buildNumberPad(),
+            const Spacer(),
           ],
         ),
       ),

lib/features/auth/screens/set_password_screen.dart

@@ -1,296 +0,0 @@
-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,94 +0,0 @@
-import 'package:package_info_plus/package_info_plus.dart';
-
-import '../../../l10n/app_localizations.dart';
-
-import 'package:flutter/material.dart';
-
-class SplashScreen extends StatefulWidget {
-  const SplashScreen({super.key});
-
-  @override
-  State<SplashScreen> createState() => _SplashScreenState();
-}
-
-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(
-        fit: StackFit.expand,
-        children: <Widget>[
-          Positioned.fill(
-            child: Image.asset(
-              'assets/images/kconnect2.webp',
-              fit: BoxFit.cover,
-            ),
-          ),
-          Center(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Text(
-                  AppLocalizations.of(context).kccbMobile,
-                  style: const TextStyle(
-                    fontSize: 36,
-                    fontWeight: FontWeight.bold,
-                    color: Color(0xFFFFFFFF),
-                  ),
-                ),
-                const SizedBox(height: 12),
-                Text(
-                  AppLocalizations.of(context).kccBankFull,
-                  textAlign: TextAlign.center,
-                  style: const TextStyle(
-                    fontSize: 18,
-                    color: Color(0xFFFFFFFF),
-                    letterSpacing: 1.2,
-                  ),
-                ),
-              ],
-            ),
-          ),
-          const Positioned(
-            bottom: 40,
-            left: 0,
-            right: 0,
-            child: Center(
-              child: CircularProgressIndicator(color: Color(0xFFFFFFFF)),
-            ),
-          ),
-          Positioned(
-            bottom: 90,
-            left: 0,
-            right: 0,
-            child: Text(
-              _version,
-              textAlign: TextAlign.center,
-              style: const TextStyle(
-                color: Color(0xFFFFFFFF),
-                fontSize: 14,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/features/auth/screens/tnc_required_screen.dart

@@ -1,58 +0,0 @@
-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/auth/screens/welcome_screen.dart

@@ -0,0 +1,81 @@
+import '../../../l10n/app_localizations.dart';
+
+import 'package:flutter/material.dart';
+import 'dart:async';
+
+class WelcomeScreen extends StatefulWidget {
+  final VoidCallback onContinue;
+
+  const WelcomeScreen({super.key, required this.onContinue});
+
+  @override
+  State<WelcomeScreen> createState() => _WelcomeScreenState();
+}
+
+class _WelcomeScreenState extends State<WelcomeScreen> {
+  @override
+  void initState() {
+    super.initState();
+
+    // Automatically go to logizn after 4 seconds
+    Timer(const Duration(seconds: 4), () {
+      widget.onContinue();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Stack(
+        children: [
+          /// 🔹 Background Image
+          Positioned.fill(
+            child: Image.asset(
+              'assets/images/kconnect2.webp',
+              fit: BoxFit.cover,
+            ),
+          ),
+
+          /// 🔹 Centered Text Overlay
+          Center(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(
+                  AppLocalizations.of(context).kconnect,
+                  style: TextStyle(
+                    fontSize: 36,
+                    fontWeight: FontWeight.bold,
+                    color: Theme.of(context).dialogBackgroundColor,
+                    letterSpacing: 1.5,
+                  ),
+                ),
+                const SizedBox(height: 12),
+                Text(
+                  AppLocalizations.of(context).kccBankFull,
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    fontSize: 18,
+                    color: Theme.of(context).dialogBackgroundColor,
+                    letterSpacing: 1.2,
+                  ),
+                ),
+              ],
+            ),
+          ),
+
+          /// 🔹 Loading Spinner at Bottom
+          Positioned(
+            bottom: 40,
+            left: 0,
+            right: 0,
+            child: Center(
+              child: CircularProgressIndicator(
+                  color: Theme.of(context).scaffoldBackgroundColor),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/features/beneficiaries/screens/add_beneficiary_screen.dart

@@ -1,10 +1,11 @@
 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 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'beneficiary_result_page.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../di/injection.dart';
 import '../../../l10n/app_localizations.dart';
 import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
@@ -23,9 +24,7 @@ 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();
@@ -34,7 +33,6 @@ 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;
@@ -46,66 +44,30 @@ 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';
+        accountType = AppLocalizations.of(context).savings;
       });
     });
   }
 
-  @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;
 
-    try {
+    final result = await beneficiaryService.validateIFSC(ifsc);
-      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(snackbarMessage)),
+          SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
         );
         bankNameController.clear();
         branchNameController.clear();
+      } else {
+        bankNameController.text = result.bankName;
+        branchNameController.text = result.branchName;
       }
     }
   }
@@ -125,17 +87,11 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
 
     final service = getIt<BeneficiaryService>();
     try {
-      String beneficiaryName;
+      final String beneficiaryName = await service.validateBeneficiary(
-      if (ifsc.toLowerCase().contains('kace')) {
+        accountNo: accountNo,
-        beneficiaryName =
+        ifscCode: ifsc,
-            await service.validateBeneficiaryWithinBank(accountNo);
+        remitterName: remitter,
-      } else {
+      );
-        beneficiaryName = await service.validateBeneficiary(
-          accountNo: accountNo,
-          ifscCode: ifsc,
-          remitterName: remitter,
-        );
-      }
 
       setState(() {
         nameController.text = beneficiaryName;
@@ -165,9 +121,8 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
     // Ensure beneficiary is validated before proceeding to TPIN
     if (!_isBeneficiaryValidated) {
       ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
+        const SnackBar(
-            content: Text(AppLocalizations.of(context)
+            content: Text('Please validate beneficiary details first.')),
-                .pleaseValidateBeneficiaryDetailsFirst)),
       );
       return;
     }
@@ -258,312 +213,372 @@ 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: [
-      body: SafeArea(
+          Padding(
-        child: Stack(
+            padding: const EdgeInsets.only(right: 10.0),
-          children: [
+            child: CircleAvatar(
-            Form(
+              backgroundColor: Colors.grey[200],
-              key: _formKey,
+              radius: 20,
-              child: Column(
+              child: SvgPicture.asset(
-                children: [
+                'assets/images/avatar_male.svg',
-                  Expanded(
+                width: 40,
-                    child: SingleChildScrollView(
+                height: 40,
-                      physics: const AlwaysScrollableScrollPhysics(),
+                fit: BoxFit.cover,
-                      child: Padding(
-                        padding: const EdgeInsets.all(10.0),
-                        child: Column(
-                          children: [
-                            TextFormField(
-                              key: _accountNumberFieldKey,
-                              controller: accountNumberController,
-                              decoration: InputDecoration(
-                                labelText: AppLocalizations.of(
-                                  context,
-                                ).accountNumber,
-                                // prefixIcon: Icon(Icons.person),
-                                border: const OutlineInputBorder(),
-                                isDense: true,
-                              ),
-                              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;
-                              },
-                            ),
-                            const SizedBox(height: 24),
-                            // Confirm Account Number
-                            TextFormField(
-                              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),
-                            // 🔹 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,
-                              ),
-                            ),
-                            if (_isBeneficiaryValidated)
-                              Column(
-                                children: [
-                                  const SizedBox(height: 24),
-                                  TextFormField(
-                                    controller: nameController,
-                                    enabled: false,
-                                    decoration: InputDecoration(
-                                      suffixIcon: _isBeneficiaryValidated
-                                          ? const Icon(
-                                              Symbols.verified,
-                                              size: 25,
-                                              fill: 1,
-                                            )
-                                          : null,
-                                      suffixIconColor:
-                                          Theme.of(context).colorScheme.primary,
-                                      labelText: AppLocalizations.of(context)
-                                          .beneficiaryName,
-                                      border: const OutlineInputBorder(),
-                                      isDense: true,
-                                    ),
-                                    textInputAction: TextInputAction.next,
-                                    validator: (value) =>
-                                        value == null || value.isEmpty
-                                            ? AppLocalizations.of(context)
-                                                .nameRequired
-                                            : null,
-                                  ),
-                                ],
-                              ),
-                            const SizedBox(height: 24),
-                            if (!_isBeneficiaryValidated)
-                              Padding(
-                                padding: const EdgeInsets.only(bottom: 24),
-                                child: SizedBox(
-                                  width: double.infinity,
-                                  child: ElevatedButton(
-                                    onPressed: _isValidating ||
-                                            ifscController.text.length != 11
-                                        ? null
-                                        : () {
-                                            final isAccountValid =
-                                                _accountNumberFieldKey
-                                                    .currentState!
-                                                    .validate();
-                                            final isConfirmAccountValid =
-                                                _confirmAccountNumberFieldKey
-                                                    .currentState!
-                                                    .validate();
-                                            final isIfscValid = _ifscFieldKey
-                                                .currentState!
-                                                .validate();
-
-                                            if (isAccountValid &&
-                                                isConfirmAccountValid &&
-                                                isIfscValid) {
-                                              _validateBeneficiary();
-                                            }
-                                          },
-                                    child: _isValidating
-                                        ? const SizedBox(
-                                            width: 20,
-                                            height: 20,
-                                            child: CircularProgressIndicator(
-                                                strokeWidth: 2),
-                                          )
-                                        : Text(AppLocalizations.of(context)
-                                            .validateBeneficiary),
-                                  ),
-                                ),
-                              ),
-                            //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!;
-                                });
-                              },
-                            ),
-
-                            const SizedBox(height: 24),
-                            TextFormField(
-                              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),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                  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
+      body: SafeArea(
-                  child: ClipOval(
+        child: Form(
-                    child: Image.asset(
+          key: _formKey,
-                      'assets/images/logo.png',
+          child: Column(
-                      width: 200, // Adjust size as needed
+            children: [
-                      height: 200, // Adjust size as needed
+              Expanded(
+                child: SingleChildScrollView(
+                  physics: const AlwaysScrollableScrollPhysics(),
+                  child: Padding(
+                    padding: const EdgeInsets.all(10.0),
+                    child: Column(
+                      children: [
+                        TextFormField(
+                          controller: accountNumberController,
+                          decoration: InputDecoration(
+                            labelText: AppLocalizations.of(
+                              context,
+                            ).accountNumber,
+                            // 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,
+                              ),
+                            ),
+                          ),
+                          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;
+                          },
+                        ),
+                        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,
+                              ),
+                            ),
+                          ),
+                          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),
+                        // 🔹 IFSC Code Field
+                        TextFormField(
+                          controller: ifscController,
+                          maxLength: 11,
+                          inputFormatters: [
+                            LengthLimitingTextInputFormatter(11),
+                          ],
+                          decoration: InputDecoration(
+                            labelText: AppLocalizations.of(context).ifscCode,
+                            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,
+                              ),
+                            ),
+                          ),
+                          textCapitalization: TextCapitalization.characters,
+                          textInputAction: TextInputAction.next,
+                          onFieldSubmitted: (_) {
+                            _validateIFSC();
+                          },
+                          onChanged: (value) {
+                            final trimmed = value.trim().toUpperCase();
+                            if (trimmed.length < 11) {
+                              // clear bank/branch if backspace or changed
+                              bankNameController.clear();
+                              branchNameController.clear();
+                            }
+                          },
+                          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,
+                            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: [
+                            AppLocalizations.of(context).savings,
+                            AppLocalizations.of(context).current,
+                          ]
+                              .map(
+                                (type) => DropdownMenuItem(
+                                  value: type,
+                                  child: Text(type),
+                                ),
+                              )
+                              .toList(),
+                          onChanged: (value) {
+                            setState(() {
+                              accountType = value!;
+                            });
+                          },
+                        ),
+
+                        const SizedBox(height: 24),
+                        TextFormField(
+                          controller: phoneController,
+                          keyboardType: TextInputType.phone,
+                          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,
+                          validator: (value) =>
+                              value == null || value.length != 10
+                                  ? AppLocalizations.of(context).enterValidPhone
+                                  : null,
+                        ),
+                        const SizedBox(height: 35),
+                      ],
                     ),
                   ),
                 ),
               ),
-            ),
+              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),
+                      backgroundColor: Theme.of(context).primaryColorDark,
+                      foregroundColor:
+                          Theme.of(context).scaffoldBackgroundColor,
+                    ),
+                    child: Text(AppLocalizations.of(context).validateAndAdd),
+                  ),
+                ),
+              ),
+            ],
+          ),
         ),
       ),
     );

lib/features/beneficiaries/screens/beneficiary_details_screen.dart

@@ -1,185 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:kmobile/data/models/beneficiary.dart';
-import 'package:kmobile/di/injection.dart';
-import 'package:kmobile/widgets/bank_logos.dart';
-import 'package:kmobile/api/services/beneficiary_service.dart';
-
-import '../../../l10n/app_localizations.dart';
-
-class BeneficiaryDetailsScreen extends StatelessWidget {
-  final Beneficiary beneficiary;
-
-  BeneficiaryDetailsScreen({super.key, required this.beneficiary});
-
-  final service = getIt<BeneficiaryService>();
-
-  void _deleteBeneficiary(BuildContext context) async {
-    try {
-      await service.deleteBeneficiary(beneficiary.accountNo);
-      if (!context.mounted) {
-        return;
-      }
-      _showSuccessDialog(context);
-    } catch (e) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-            content: Text(
-                '${AppLocalizations.of(context).failedToDeleteBeneficiary} : $e')),
-      );
-    }
-  }
-
-  void _showSuccessDialog(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: Text(AppLocalizations.of(context).success),
-          content:
-              Text(AppLocalizations.of(context).beneficiaryDeletedSuccessfully),
-          actions: <Widget>[
-            TextButton(
-              child: Text(AppLocalizations.of(context).ok),
-              onPressed: () {
-                Navigator.of(context).popUntil((route) => route.isFirst);
-              },
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  void _showDeleteConfirmationDialog(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: Text(AppLocalizations.of(context).deleteBeneficiary),
-          content: Text(AppLocalizations.of(context)
-              .areYouSureYouWantToDeleteThisBeneficiary),
-          actions: <Widget>[
-            TextButton(
-              child: Text(AppLocalizations.of(context).cancel),
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-            ),
-            TextButton(
-              child: Text(AppLocalizations.of(context).delete),
-              onPressed: () {
-                _deleteBeneficiary(context);
-              },
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(AppLocalizations.of(context).beneficiarydetails),
-      ),
-      body: SafeArea(
-        child: Stack(
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(16.0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    children: [
-                      CircleAvatar(
-                        radius: 24,
-                        backgroundColor: Colors.transparent,
-                        child: getBankLogo(beneficiary.bankName, context),
-                      ),
-                      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),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-            IgnorePointer(
-              child: Center(
-                child: Opacity(
-                  opacity: 0.07, // Reduced opacity
-                  child: ClipOval(
-                    child: Image.asset(
-                      'assets/images/logo.png',
-                      width: 200, // Adjust size as needed
-                      height: 200, // Adjust size as needed
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildDetailRow(String label, String value) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8.0),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(label, style: const TextStyle(fontWeight: FontWeight.bold)),
-          const SizedBox(width: 16),
-          Flexible(
-            child: Text(
-              value,
-              textAlign: TextAlign.end,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/features/beneficiaries/screens/beneficiary_result_page.dart

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

lib/features/beneficiaries/screens/manage_beneficiaries_screen.dart

@@ -1,12 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
 import 'package:kmobile/features/beneficiaries/screens/add_beneficiary_screen.dart';
-import 'package:kmobile/features/beneficiaries/screens/beneficiary_details_screen.dart';
 import '../../../l10n/app_localizations.dart';
 import '../../../di/injection.dart';
 import 'package:kmobile/api/services/beneficiary_service.dart';
 import 'package:shimmer/shimmer.dart';
-import 'package:kmobile/widgets/bank_logos.dart';
 
 class ManageBeneficiariesScreen extends StatefulWidget {
   final String customerName;
@@ -21,47 +19,21 @@ 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,
@@ -88,43 +60,106 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
     );
   }
 
+  Widget _getBankLogo(String? bankName) {
+    if (bankName != null && bankName.toLowerCase().contains('state bank of')) {
+      return Image.asset(
+        'assets/images/sbi_logo.png',
+        width: 40,
+        height: 40,
+      );
+    }
+    if (bankName != null && bankName.toLowerCase().contains('kangra central')) {
+      return Image.asset(
+        'assets/images/icon.png',
+        width: 40,
+        height: 40,
+      );
+    }
+    if (bankName != null && bankName.toLowerCase().contains('hdfc bank ltd')) {
+      return Image.asset(
+        'assets/images/hdfc_logo.png',
+        width: 40,
+        height: 40,
+      );
+    }
+    if (bankName != null && bankName.toLowerCase().contains('icici bank ltd')) {
+      return Image.asset(
+        'assets/images/icici_logo.png',
+        width: 40,
+        height: 40,
+      );
+    }
+    if (bankName != null &&
+        bankName.toLowerCase().contains('punjab national bank')) {
+      return Image.asset(
+        'assets/images/pnb_logo.png',
+        width: 40,
+        height: 40,
+      );
+    }
+     if (bankName != null && bankName.toLowerCase().contains('axis')) {
+      return Image.asset(
+        'assets/images/axisBank_logo.png',
+        width: 40,
+        height: 40,
+      );
+    }
+    if (bankName != null && bankName.toLowerCase().contains('baroda')) {
+      return Image.asset(
+        'assets/images/bankofBaroda_logo.png',
+        width: 40,
+        height: 40,
+      );
+    }   
+    if (bankName != null && bankName.toLowerCase().contains('canara bank')) {
+      return Image.asset(
+        'assets/images/canaraBank_logo.png',
+        width: 40,
+        height: 40,
+      );
+    }
+    if (bankName != null && bankName.toLowerCase().contains('kotak')) {
+      return Image.asset(
+        'assets/images/kotak_logo.png',
+        width: 40,
+        height: 40,
+      );
+    }
+    else {
+      return const Icon(
+        Icons.account_balance,
+        size: 40,
+        color: Colors.grey,
+      );
+    }
+  }
+
   Widget _buildBeneficiaryList() {
-    if (_filteredBeneficiaries.isEmpty) {
+    if (_beneficiaries.isEmpty) {
       return Center(
           child: Text(AppLocalizations.of(context).noBeneficiaryFound));
     }
     return ListView.builder(
-      itemCount: _filteredBeneficiaries.length,
+      itemCount: _beneficiaries.length,
       itemBuilder: (context, index) {
-        final item = _filteredBeneficiaries[index];
+        final item = _beneficiaries[index];
-        return Card(
+        return ListTile(
-          margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+          leading: CircleAvatar(
-          child: ListTile(
+            radius: 24,
-            leading: CircleAvatar(
+            backgroundColor: Colors.transparent,
-              radius: 24,
+            child: _getBankLogo(item.bankName),
-              backgroundColor: Colors.transparent,
+          ),
-              child: getBankLogo(item.bankName, context),
+          title: Text(item.name),
-            ),
+          subtitle: Column(
-            title: Text(item.name),
+            crossAxisAlignment: CrossAxisAlignment.start,
-            subtitle: Column(
+            children: [
-              crossAxisAlignment: CrossAxisAlignment.start,
+              Text(item.accountNo),
-              children: [
+              if (item.bankName != null && item.bankName!.isNotEmpty)
-                Text(item.accountNo),
+                Text(
-                if (item.bankName != null && item.bankName!.isNotEmpty)
+                  item.bankName!,
-                  Text(
+                  style: TextStyle(fontSize: 12, color: Colors.grey[600]),
-                    item.bankName!,
-                    style: TextStyle(fontSize: 12, color: Colors.grey[600]),
-                  ),
-              ],
-            ),
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (_) => BeneficiaryDetailsScreen(beneficiary: item),
                 ),
-              );
+            ],
-            },
           ),
         );
       },
@@ -138,47 +173,7 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
       appBar: AppBar(
         title: Text(AppLocalizations.of(context).beneficiaries),
       ),
-      body: Stack(
+      body: _isLoading ? _buildShimmerList() : _buildBeneficiaryList(),
-        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(
@@ -191,6 +186,8 @@ 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,6 +1,8 @@
 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});
@@ -54,162 +56,161 @@ 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.all(10.0),
+            padding: const EdgeInsets.only(right: 10.0),
-            child: Form(
+            child: CircleAvatar(
-              key: _formKey,
+              backgroundColor: Colors.grey[200],
-              child: ListView(
+              radius: 20,
-                children: [
+              child: SvgPicture.asset(
-                  const SizedBox(height: 10),
+                'assets/images/avatar_male.svg',
-                  TextFormField(
+                width: 40,
-                    controller: _cardController,
+                height: 40,
-                    decoration: InputDecoration(
+                fit: BoxFit.cover,
-                      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

@@ -1,168 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CardDetailsScreen extends StatelessWidget {
-  const CardDetailsScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text("My Cards"),
-      ),
-      body: Stack(
-        children: [
-          Padding(
-            padding: const EdgeInsets.all(16.0),
-            child: ListView(
-              children: const [
-                CardTile(
-                  cardNumber: "**** **** **** 1234",
-                  cardNetwork: "VISA",
-                  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",
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class CardTile extends StatelessWidget {
-  final String cardNumber;
-  final String cardNetwork;
-  final String cardType;
-  final String validFrom;
-  final String validTo;
-
-  const CardTile({
-    super.key,
-    required this.cardNumber,
-    required this.cardNetwork,
-    required this.cardType,
-    required this.validFrom,
-    required this.validTo,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(16),
-        gradient: const LinearGradient(
-          colors: [Colors.blue, Colors.indigo],
-          begin: Alignment.topLeft,
-          end: Alignment.bottomRight,
-        ),
-        boxShadow: const [
-          BoxShadow(
-            color: Colors.black26,
-            blurRadius: 8,
-            spreadRadius: 2,
-            offset: Offset(2, 4),
-          ),
-        ],
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          // Top row: Logo + Bank name
-          Row(
-            children: [
-              Image.asset(
-                'assets/images/logo.png',
-                width: 40,
-                height: 40,
-              ),
-              const SizedBox(width: 8),
-              const Text(
-                "Kangra Central Co-operative Bank",
-                style: TextStyle(
-                  color: Colors.white,
-                  fontSize: 15.5,
-                  fontWeight: FontWeight.bold,
-                ),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
-              ),
-            ],
-          ),
-          const SizedBox(height: 24),
-
-          // Card number (masked)
-          Text(
-            cardNumber,
-            style: const TextStyle(
-              color: Colors.white,
-              fontSize: 22,
-              letterSpacing: 3,
-              fontWeight: FontWeight.w500,
-            ),
-          ),
-          const SizedBox(height: 16),
-
-          // Validity
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const Text("VALID FROM",
-                      style: TextStyle(color: Colors.white70, fontSize: 10)),
-                  Text(
-                    validFrom,
-                    style: const TextStyle(color: Colors.white, fontSize: 14),
-                  ),
-                ],
-              ),
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const Text("VALID UPTO",
-                      style: TextStyle(color: Colors.white70, fontSize: 10)),
-                  Text(
-                    validTo,
-                    style: const TextStyle(color: Colors.white, fontSize: 14),
-                  ),
-                ],
-              ),
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.end,
-                children: [
-                  Text(
-                    cardNetwork,
-                    style: const TextStyle(
-                      color: Colors.white,
-                      fontSize: 16,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                  Text(
-                    cardType,
-                    style: const TextStyle(
-                      color: Colors.white70,
-                      fontSize: 12,
-                    ),
-                  ),
-                ],
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/features/card/screens/card_management_screen.dart

@@ -1,8 +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';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
@@ -22,80 +20,62 @@ 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: [
-      body: Stack(
+          Padding(
-        children: [
+            padding: const EdgeInsets.only(right: 10.0),
-          ListView(
+            child: CircleAvatar(
-            children: [
+              backgroundColor: Colors.grey[200],
-              CardManagementTile(
+              radius: 20,
-                icon: Symbols.add,
+              child: SvgPicture.asset(
-                label: AppLocalizations.of(context).applyDebitCard,
+                'assets/images/avatar_male.svg',
-                onTap: () {},
+                width: 40,
-                disabled: true, // Add this
+                height: 40,
-              ),
+                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),
+        ],
+      ),
     );
   }
 }
@@ -104,36 +84,21 @@ 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(
+      leading: Icon(icon),
-        icon,
+      title: Text(label),
-        color: disabled ? theme.disabledColor : null,
+      trailing: const Icon(Symbols.arrow_right, size: 20),
-      ),
+      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,6 +1,8 @@
 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 {
@@ -44,162 +46,161 @@ 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.all(10.0),
+            padding: const EdgeInsets.only(right: 10.0),
-            child: Form(
+            child: CircleAvatar(
-              key: _formKey,
+              backgroundColor: Colors.grey[200],
-              child: ListView(
+              radius: 20,
-                children: [
+              child: SvgPicture.asset(
-                  const SizedBox(height: 10),
+                'assets/images/avatar_male.svg',
-                  TextFormField(
+                width: 40,
-                    controller: _cardController,
+                height: 40,
-                    decoration: InputDecoration(
+                fit: BoxFit.cover,
-                      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,4 +1,6 @@
 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 {
@@ -44,111 +46,116 @@ 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.all(16.0),
+            padding: const EdgeInsets.only(right: 10.0),
-            child: Form(
+            child: CircleAvatar(
-              key: _formKey,
+              backgroundColor: Colors.grey[200],
-              child: Column(
+              radius: 20,
-                children: [
+              child: SvgPicture.asset(
-                  TextFormField(
+                'assets/images/avatar_male.svg',
-                    controller: _pinController,
+                width: 40,
-                    obscureText: true,
+                height: 40,
-                    decoration: InputDecoration(
+                fit: BoxFit.cover,
-                      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

@@ -1,361 +0,0 @@
-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,176 +1,118 @@
 import 'package:flutter/material.dart';
-import 'package:kmobile/data/models/user.dart';
+import 'package:flutter_svg/svg.dart';
-import 'package:kmobile/features/cheque/screens/cheque_enquiry_screen.dart';
+import 'package:kmobile/features/enquiry/screens/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 {
-  final List<User> users;
+  const ChequeManagementScreen({super.key});
-  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.symmetric(vertical: 16.0),
+            padding: const EdgeInsets.only(right: 10.0),
-            child: Column(
+            child: CircleAvatar(
-              crossAxisAlignment: CrossAxisAlignment.stretch,
+              backgroundColor: Colors.grey[200],
-              children: [
+              radius: 20,
-                Expanded(
+              child: SvgPicture.asset(
-                  child: ChequeManagementCardTile(
+                'assets/images/avatar_male.svg',
-                    icon: Symbols.payments,
+                width: 40,
-                    label: AppLocalizations.of(context).chequeEnquiryTitle,
+                height: 40,
-                    subtitle:
+                fit: BoxFit.cover,
-                        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 ChequeManagementCardTile extends StatelessWidget {
+class ChequeManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
-  final String? subtitle;
   final VoidCallback onTap;
-  final bool disable;
 
-  const ChequeManagementCardTile({
+  const ChequeManagementTile({
     super.key,
     required this.icon,
     required this.label,
-    this.subtitle,
     required this.onTap,
-    this.disable = false,
   });
 
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
+    return ListTile(
-    return Card(
+      leading: Icon(icon),
-      margin: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+      title: Text(label),
-      shape: RoundedRectangleBorder(
+      trailing: const Icon(Symbols.arrow_right, size: 20),
-        borderRadius: BorderRadius.circular(12.0),
+      onTap: onTap,
-      ),
-      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

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

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

@@ -1,256 +0,0 @@
-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),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}