Send_Message changed with flutter_sms

(for migrated users)

.gitignore

@@ -41,3 +41,6 @@ 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

analysis_options.yaml

@@ -7,6 +7,10 @@
 
 # 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

@@ -25,7 +25,7 @@ if (flutterVersionName == null) {
 android {
     namespace "com.example.kmobile"
     compileSdk flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    ndkVersion "27.0.12077973"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -45,7 +45,7 @@ android {
         applicationId "com.example.kmobile"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 29
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -56,6 +56,10 @@ android {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
         }
     }
 }

android/app/proguard-rules.pro

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

@@ -2,10 +2,13 @@
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>  
     <application
         android:label="kmobile"
         android:name="${applicationName}"
         android:usesCleartextTraffic="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

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

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

ios/Runner.xcodeproj/project.pbxproj

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

ios/Runner/Info.plist

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

lib/api/interceptors/auth_interceptor.dart

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

lib/api/services/auth_service.dart

@@ -4,7 +4,6 @@ import '../../features/auth/models/auth_token.dart';
 import '../../features/auth/models/auth_credentials.dart';
 import '../../core/errors/exceptions.dart';
 
-
 class AuthService {
   final Dio _dio;
   AuthService(this._dio);
@@ -26,11 +25,13 @@ class AuthService {
         print(e.toString());
       }
       if (e.response?.statusCode == 401) {
-        throw AuthException('Invalid credentials');
+        throw AuthException(
+            e.response?.data['error'] ?? 'SOMETHING WENT WRONG');
       }
       throw NetworkException('Network error during login');
     } catch (e) {
-      throw UnexpectedException('Unexpected error during login: ${e.toString()}');
+      throw UnexpectedException(
+          'Unexpected error during login: ${e.toString()}');
     }
   }
 
@@ -66,7 +67,8 @@ class AuthService {
       }
       throw NetworkException('Network error during TPIN check');
     } catch (e) {
-      throw UnexpectedException('Unexpected error during TPIN check: ${e.toString()}');
+      throw UnexpectedException(
+          'Unexpected error during TPIN check: ${e.toString()}');
     }
   }
 
@@ -86,8 +88,57 @@ class AuthService {
       }
       throw NetworkException('Network error during TPIN setup');
     } catch (e) {
-      throw UnexpectedException('Unexpected error during TPIN setup: ${e.toString()}');
+      throw UnexpectedException(
+          '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;
+  }
 }

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,9 +40,12 @@ class BeneficiaryService {
     } on DioException catch (e) {
       if (e.response?.statusCode == 404) {
         throw Exception('INVALID IFSC CODE');
+      } else if (e.response?.statusCode == 401) {
+        throw Exception('INVALID IFSC CODE');
       }
     } catch (e) {
-      rethrow;
+      throw UnexpectedException(
+          'Unexpected error during login: ${e.toString()}');
     }
     return Ifsc.fromJson({});
   }
@@ -60,6 +63,10 @@ class BeneficiaryService {
         'ifscCode': ifscCode,
         'remitterName': remitterName,
       },
+      options: Options(
+        sendTimeout: const Duration(seconds: 60),
+        receiveTimeout: const Duration(seconds: 60),
+      ),
     );
     if (response.statusCode != 200) {
       throw Exception("Invalid Beneficiary Details");
@@ -67,7 +74,7 @@ class BeneficiaryService {
     return response.data['name'];
   }
 
-  // Send Data for Validation
+  // Beneficiary Validate And ADD
   Future<bool> sendForValidation(Beneficiary beneficiary) async {
     try {
       final response = await _dio.post(
@@ -102,8 +109,21 @@ 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/change_password_service.dart

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

lib/api/services/imps_service.dart

@@ -0,0 +1,31 @@
+import 'package:dio/dio.dart';
+import 'package:kmobile/data/models/imps_response.dart';
+import 'package:kmobile/data/models/imps_transaction.dart';
+
+class ImpsService {
+  final Dio _dio;
+
+  ImpsService(this._dio);
+
+  Future<ImpsResponse> processImpsTransaction(
+      ImpsTransaction transaction) async {
+    try {
+      await Future.delayed(const Duration(seconds: 3));
+      final response = await _dio.post(
+        '/api/payment/imps',
+        data: transaction.toJson(),
+      );
+
+      if (response.statusCode == 200) {
+        return ImpsResponse.fromJson(response.data);
+      } else {
+        throw Exception(
+            'IMPS transaction failed with status code: ${response.statusCode}');
+      }
+    } on DioException {
+      rethrow;
+    } catch (e) {
+      throw Exception('An unexpected error occurred: ${e.toString()}');
+    }
+  }
+}

lib/api/services/neft_service.dart

@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:dio/dio.dart';
 import 'package:kmobile/data/models/neft_response.dart';
 import 'package:kmobile/data/models/neft_transaction.dart';
@@ -7,7 +9,8 @@ class NeftService {
 
   NeftService(this._dio);
 
-  Future<NeftResponse> processNeftTransaction(NeftTransaction transaction) async {
+  Future<NeftResponse> processNeftTransaction(
+      NeftTransaction transaction) async {
     try {
       await Future.delayed(const Duration(seconds: 3));
       final response = await _dio.post(
@@ -22,6 +25,7 @@ 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

@@ -1,5 +1,4 @@
 import 'dart:developer';
-
 import 'package:dio/dio.dart';
 import 'package:kmobile/data/models/payment_response.dart';
 import 'package:kmobile/data/models/transfer.dart';

lib/api/services/rtgs_service.dart

@@ -22,8 +22,8 @@ class RtgsService {
         throw Exception(
             'RTGS transaction failed with status code: ${response.statusCode}');
       }
-    } on DioException  {
-      rethrow ;
+    } on DioException {
+      rethrow;
     } catch (e) {
       throw Exception('An unexpected error occurred: ${e.toString()}');
     }

lib/api/services/send_sms_service.dart

@@ -0,0 +1,129 @@
+// // ignore_for_file: avoid_print
+// import 'dart:io';
+// import 'package:flutter/material.dart';
+// import 'send_sms.dart';
+// import 'package:simcards/sim_card.dart';
+// import 'package:simcards/simcards.dart';
+
+// import 'package:uuid/uuid.dart';
+
+// class SmsService {
+//   final Simcards _simcards = Simcards();
+
+//  Future<void> sendVerificationSms({
+//    required BuildContext context,
+//    required String destinationNumber,
+//    required String message,
+//  }) async {
+//    try {
+//      await _simcards.requestPermission();
+
+//      bool permissionGranted = await _simcards.hasPermission();
+//      if (!permissionGranted) {
+//        print("Permission denied." );
+//        return;
+//      }
+
+//      List<SimCard> simCardList = await _simcards.getSimCards();
+//      if (simCardList.isEmpty) {
+//        print("No SIM detected." );
+//        return;
+//      }
+
+//      await _sendSms(destinationNumber, message, simCardList.first);
+
+//    } catch (e) {
+//      print("Error in SMS process: $e");
+//    }
+//  }
+
+
+//    Future<void> _sendSms(
+//        String destinationNumber, String message, SimCard selectedSim) async {
+//      if (Platform.isAndroid) {
+//        try {
+//          var uuid = const Uuid();
+//          String uniqueId = uuid.v4(); 
+
+//          String smsMessage = uniqueId;
+//          String result = await sendSMS(
+//            message: smsMessage,
+//            recipients: [destinationNumber],
+//            sendDirect: true, 
+//          );
+//          print("SMS send result:  $result. Sent via ${selectedSim.displayName} (Note: OS default SIM isused).");
+
+//        } catch (e) {
+//          print("Error sending SMS: $e");
+//        }
+//      } else {
+//        print("SMS sending is only supported on Android.");
+//      }
+//    }
+// }
+
+// ignore_for_file: avoid_print
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:flutter_sms/flutter_sms.dart'; // <-- 1. IMPORT the new package
+import 'package:simcards/sim_card.dart';
+import 'package:simcards/simcards.dart';
+import 'package:uuid/uuid.dart';
+
+class SmsService {
+  final Simcards _simcards = Simcards();
+
+  Future<void> sendVerificationSms({
+    required BuildContext context,
+    required String destinationNumber,
+    required String message,
+  }) async {
+    try {
+      await _simcards.requestPermission();
+
+      bool permissionGranted = await _simcards.hasPermission();
+      if (!permissionGranted) {
+        print("Permission denied.");
+        return;
+      }
+
+      List<SimCard> simCardList = await _simcards.getSimCards();
+      if (simCardList.isEmpty) {
+        print("No SIM detected.");
+        return;
+      }
+
+      await _sendSms(destinationNumber, message, simCardList.first);
+    } catch (e) {
+      print("Error in SMS process: $e");
+    }
+  }
+
+  Future<void> _sendSms(
+      String destinationNumber, String message, SimCard selectedSim) async {
+    if (Platform.isAndroid) {
+      try {
+        var uuid = const Uuid();
+        String uniqueId = uuid.v4();
+
+        String smsMessage = uniqueId;
+
+        // v-- 2. UPDATE the function call below --v
+        String result = await sendSMS(
+          message: smsMessage,
+          recipients: [destinationNumber],
+        );
+        // ^-- The 'sendDirect' parameter is not available in this package. --^
+        // It will open the user's default messaging app with the fields pre-filled.
+
+        print(
+            "SMS send result:  $result. Sent via ${selectedSim.displayName} (Note: OS default SIM isused)."
+);
+      } catch (e) {
+        print("Error sending SMS: $e");
+      }
+    } else {
+      print("SMS sending is only supported on Android.");
+    }
+  }
+}

lib/app.dart

@@ -2,6 +2,8 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
+import 'package:kmobile/features/auth/controllers/theme_mode_state.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import './l10n/app_localizations.dart';
@@ -11,13 +13,14 @@ import 'config/routes.dart';
 import 'di/injection.dart';
 import 'features/auth/controllers/auth_cubit.dart';
 import 'features/card/screens/card_management_screen.dart';
-import 'features/auth/screens/welcome_screen.dart';
+import 'features/auth/screens/splash_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});
@@ -32,25 +35,52 @@ class KMobile extends StatefulWidget {
   }
 }
 
-class _KMobileState extends State<KMobile> {
+class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
+  Timer? _backgroundTimer;
   bool showSplash = true;
   Locale? _locale;
 
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
     loadPreferences();
-    Future.delayed(const Duration(seconds: 2), () {
+    Future.delayed(const Duration(seconds: 3), () {
       setState(() {
         showSplash = false;
       });
     });
   }
 
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    _backgroundTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    switch (state) {
+      case AppLifecycleState.resumed:
+        _backgroundTimer?.cancel();
+        break;
+      case AppLifecycleState.paused:
+        _backgroundTimer = Timer(const Duration(minutes: 2), () {
+          if (Platform.isAndroid) {
+            SystemNavigator.pop();
+          }
+          exit(0);
+        });
+        break;
+      default:
+        break;
+    }
+  }
+
   Future<void> loadPreferences() async {
     final prefs = await SharedPreferences.getInstance();
-
-    // Load Locale
     final String? langCode = prefs.getString('locale');
     if (langCode != null) {
       setState(() {
@@ -67,7 +97,6 @@ class _KMobileState extends State<KMobile> {
 
   @override
   Widget build(BuildContext context) {
-// Set status bar color and brightness
     SystemChrome.setSystemUIOverlayStyle(
       const SystemUiOverlayStyle(
         statusBarColor: Colors.transparent,
@@ -79,30 +108,34 @@ class _KMobileState extends State<KMobile> {
       providers: [
         BlocProvider<AuthCubit>(create: (_) => getIt<AuthCubit>()),
         BlocProvider<ThemeCubit>(create: (_) => ThemeCubit()),
+        BlocProvider<ThemeModeCubit>(create: (_) => ThemeModeCubit()),
       ],
       child: BlocBuilder<ThemeCubit, ThemeState>(
         builder: (context, themeState) {
-          print('global theme state changed');
-          return MaterialApp(
-            debugShowCheckedModeBanner: false,
-            locale: _locale ?? const Locale('en'),
-            supportedLocales: const [
-              Locale('en'),
-              Locale('hi'),
-            ],
-            localizationsDelegates: const [
-              AppLocalizations.delegate,
-              GlobalMaterialLocalizations.delegate,
-              GlobalWidgetsLocalizations.delegate,
-              GlobalCupertinoLocalizations.delegate,
-            ],
-            title: 'kMobile',
-            theme: themeState.getThemeData(),
-            darkTheme: themeState.getThemeData(),
-            themeMode: ThemeMode.system,
-            onGenerateRoute: AppRoutes.generateRoute,
-            initialRoute: AppRoutes.splash,
-            home: showSplash ? const SplashScreen() : const AuthGate(),
+          return BlocBuilder<ThemeModeCubit, ThemeModeState>(
+            builder: (context, modeState) {
+              return MaterialApp(
+                debugShowCheckedModeBanner: false,
+                locale: _locale ?? const Locale('en'),
+                supportedLocales: const [
+                  Locale('en'),
+                  Locale('hi'),
+                ],
+                localizationsDelegates: const [
+                  AppLocalizations.delegate,
+                  GlobalMaterialLocalizations.delegate,
+                  GlobalWidgetsLocalizations.delegate,
+                  GlobalCupertinoLocalizations.delegate,
+                ],
+                title: 'kMobile',
+                theme: themeState.getLightThemeData(),
+                darkTheme: themeState.getDarkThemeData(),
+                themeMode: context.watch<ThemeModeCubit>().state.mode,
+                onGenerateRoute: AppRoutes.generateRoute,
+                initialRoute: AppRoutes.splash,
+                home: showSplash ? const SplashScreen() : const AuthGate(),
+              );
+            },
           );
         },
       ),
@@ -112,7 +145,6 @@ class _KMobileState extends State<KMobile> {
 
 class AuthGate extends StatefulWidget {
   const AuthGate({super.key});
-
   @override
   State<AuthGate> createState() => _AuthGateState();
 }
@@ -120,7 +152,6 @@ 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;
@@ -153,9 +184,13 @@ 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: AppLocalizations.of(context).authenticateToAccess,
+        localizedReason: localizedReason,
         options: const AuthenticationOptions(
           stickyAuth: true,
           biometricOnly: true,
@@ -172,18 +207,6 @@ class _AuthGateState extends State<AuthGate> {
     if (_checking) {
       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) {
@@ -193,12 +216,9 @@ class _AuthGateState extends State<AuthGate> {
               if (snapshot.connectionState == ConnectionState.waiting) {
                 return const SplashScreen();
               }
-
               if (snapshot.data == true) {
-                return const NavigationScaffold(); // Authenticated
+                return const NavigationScaffold();
               }
-
-              // ❌ Biometric failed → Show MPIN screen
               return MPinScreen(
                 mode: MPinMode.enter,
                 onCompleted: (_) {
@@ -224,13 +244,11 @@ 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,
@@ -251,15 +269,16 @@ 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:
-                      AppLocalizations.of(context).authenticateToEnable,
+                  localizedReason: authEnable,
                   options: const AuthenticationOptions(
                     stickyAuth: true,
                     biometricOnly: true,
@@ -271,25 +290,23 @@ class _AuthGateState extends State<AuthGate> {
                 await storage.write('biometric_enabled', 'false');
               }
             }
-
-            Navigator.of(context).pushReplacement(
-              MaterialPageRoute(
-                builder: (_) => const NavigationScaffold(),
-              ),
-            );
+            if (context.mounted) {
+              Navigator.of(context).pushReplacement(
+                MaterialPageRoute(
+                  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();
 }
@@ -297,24 +314,14 @@ class NavigationScaffold extends StatefulWidget {
 class _NavigationScaffoldState extends State<NavigationScaffold> {
   final PageController _pageController = PageController();
   int _selectedIndex = 0;
-
   final List<Widget> _pages = [
     const DashboardScreen(),
     const CardManagementScreen(),
     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 {
@@ -353,10 +360,9 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
         bottomNavigationBar: BottomNavigationBar(
           currentIndex: _selectedIndex,
           type: BottomNavigationBarType.fixed,
-          backgroundColor: Theme.of(context)
-              .scaffoldBackgroundColor, // Light blue background
-          selectedItemColor: Theme.of(context).primaryColor,
-          unselectedItemColor: Colors.black54,
+          backgroundColor: const Color(0XFF1E58AD),
+          selectedItemColor: Theme.of(context).colorScheme.onPrimary,
+          unselectedItemColor: Theme.of(context).colorScheme.onSecondary,
           onTap: (index) {
             setState(() {
               _selectedIndex = index;
@@ -383,34 +389,9 @@ 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;
@@ -418,8 +399,12 @@ class BiometricPromptScreen extends StatelessWidget {
       onCompleted();
       return;
     }
+    String localizedReason = "";
+    if (context.mounted) {
+      localizedReason = AppLocalizations.of(context).enableFingerprintQuick;
+    }
     final didAuth = await localAuth.authenticate(
-      localizedReason: AppLocalizations.of(context).enableFingerprintQuick,
+      localizedReason: localizedReason,
       options: const AuthenticationOptions(
         stickyAuth: true,
         biometricOnly: true,
@@ -463,6 +448,9 @@ class BiometricPromptScreen extends StatelessWidget {
         ],
       ),
     );
+    if (!context.mounted) {
+      return;
+    }
     if (result == true) {
       await _handleBiometric(context);
     } else {

lib/config/routes.dart

@@ -1,5 +1,6 @@
 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';
@@ -35,7 +36,10 @@ class AppRoutes {
         return MaterialPageRoute(builder: (_) => const LoginScreen());
 
       case mPin:
-        return MaterialPageRoute(builder: (_) => const MPinScreen(mode: MPinMode.enter,));
+        return MaterialPageRoute(
+            builder: (_) => const MPinScreen(
+                  mode: MPinMode.enter,
+                ));
 
       case register:
         // Placeholder - create the RegisterScreen class and uncomment
@@ -68,7 +72,6 @@ class AppRoutes {
         // return MaterialPageRoute(builder: (_) => const PaymentsScreen());
         return _errorRoute();
 
-      
       default:
         return _errorRoute();
     }

lib/config/theme_type.dart

@@ -1,6 +1,7 @@
 enum ThemeType {
-violet,
-green,
-orange,
-blue,
+  violet,
+  green,
+  orange,
+  blue,
+  yellow,
 }

lib/config/themes.dart

@@ -1,33 +1,52 @@
+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) {
-    switch (type) {
-      case ThemeType.green:
-        return ThemeData(primarySwatch: Colors.green);
-      case ThemeType.orange:
-        return ThemeData(primarySwatch: Colors.orange);
-      case ThemeType.blue:
-        return ThemeData(primarySwatch: Colors.blue);
-      case ThemeType.violet:
-      default:
-        return ThemeData(primarySwatch: Colors.deepPurple);
-    }
+    final Color seedColor = _getSeedColor(type);
+    final colorScheme = ColorScheme.fromSeed(
+      seedColor: seedColor,
+      brightness: Brightness.light,
+    );
+    return ThemeData.from(
+      colorScheme: colorScheme,
+      useMaterial3: true,
+      textTheme: GoogleFonts.rubikTextTheme(),
+    );
   }
 
   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,
+      ),
+    );
+  }
+
+  static Color _getSeedColor(ThemeType type) {
     switch (type) {
       case ThemeType.green:
-        return ThemeData.dark().copyWith(primaryColor: Colors.green);
+        return Colors.green;
       case ThemeType.orange:
-        return ThemeData.dark().copyWith(primaryColor: Colors.orange);
+        return Colors.orange;
       case ThemeType.blue:
-        return ThemeData.dark().copyWith(primaryColor: Colors.blue);
+        return Colors.blue;
       case ThemeType.violet:
-      default:
-        return ThemeData.dark().copyWith(primaryColor: Colors.deepPurple);
+        return Colors.deepPurple;
+      case ThemeType.yellow:
+        return Colors.yellow;
     }
   }
 }
-

lib/core/errors/exceptions.dart

@@ -11,7 +11,7 @@ class NetworkException extends AppException {
   NetworkException(super.message);
 }
 
-class AuthException implements Exception{
+class AuthException implements Exception {
   final String message;
   AuthException(this.message);
 

lib/core/logger.dart

@@ -0,0 +1,15 @@
+import 'package:kmobile/core/toast.dart';
+
+class Logger {
+  static void info(String message) {
+    showToast('INFO: $message');
+  }
+
+  static void warning(String message) {
+    showToast('WARNING: $message');
+  }
+
+  static void error(String message) {
+    showToast('ERROR: $message');
+  }
+}

lib/core/toast.dart

@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+
+void showToast(String message) {
+  Fluttertoast.showToast(
+    msg: message,
+    toastLength: Toast.LENGTH_SHORT,
+    gravity: ToastGravity.BOTTOM,
+    timeInSecForIosWeb: 1,
+    backgroundColor: Colors.black,
+    textColor: Colors.white,
+    fontSize: 16.0,
+  );
+}

lib/data/models/beneficiary.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: non_constant_identifier_names
-
 class Beneficiary {
   final String accountNo;
   final String accountType;
@@ -53,7 +51,6 @@ class Beneficiary {
     final beneficiaryList = jsonList
         .map((beneficiary) => Beneficiary.fromJson(beneficiary))
         .toList();
-    print(beneficiaryList);
     return beneficiaryList;
   }
 
@@ -62,4 +59,3 @@ class Beneficiary {
     return 'Beneficiary(accountNo: $accountNo, accountType: $accountType, ifscCode: $ifscCode, name: $name)';
   }
 }
-

lib/data/models/ifsc.dart

@@ -30,4 +30,3 @@ class Ifsc {
     return 'IFSC(ifscCode: $ifscCode, bankName: $bankName, branchName: $branchName)';
   }
 }
-

lib/data/models/imps_response.dart

@@ -0,0 +1,16 @@
+class ImpsResponse {
+  final String message;
+  final String utr;
+
+  ImpsResponse({
+    required this.message,
+    required this.utr,
+  });
+
+  factory ImpsResponse.fromJson(Map<String, dynamic> json) {
+    return ImpsResponse(
+      message: json['message'] ?? '',
+      utr: json['utr'] ?? '',
+    );
+  }
+}

lib/data/models/imps_transaction.dart

@@ -0,0 +1,34 @@
+class ImpsTransaction {
+  final String fromAccount;
+  final String toAccount;
+  final String amount;
+  final String ifscCode;
+  final String? remitterName;
+  final String beneficiaryName;
+  final String tpin;
+  final String? remarks;
+
+  ImpsTransaction({
+    required this.fromAccount,
+    required this.toAccount,
+    required this.amount,
+    required this.ifscCode,
+    this.remitterName,
+    required this.beneficiaryName,
+    required this.tpin,
+    this.remarks,
+  });
+
+  Map<String, dynamic> toJson() {
+    return {
+      'fromAccount': fromAccount,
+      'toAccount': toAccount,
+      'amount': amount,
+      'ifscCode': ifscCode,
+      'remitterName': remitterName,
+      'beneficiaryName': beneficiaryName,
+      'tpin': tpin,
+      'remarks': remarks,
+    };
+  }
+}

lib/data/models/neft_transaction.dart

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

lib/data/models/rtgs_transaction.dart

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

lib/data/models/transaction.dart

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

lib/data/models/transfer.dart

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

lib/data/repositories/auth_repository.dart

@@ -18,7 +18,8 @@ class AuthRepository {
 
   Future<List<User>> login(String customerNo, String password) async {
     // Create credentials and call service
-    final credentials = AuthCredentials(customerNo: customerNo, password: password);
+    final credentials =
+        AuthCredentials(customerNo: customerNo, password: password);
     final authToken = await _authService.login(credentials);
 
     // Save token securely
@@ -44,7 +45,12 @@ class AuthRepository {
   // Private helper methods
   Future<void> _saveAuthToken(AuthToken token) async {
     await _secureStorage.write(_accessTokenKey, token.accessToken);
-    await _secureStorage.write(_tokenExpiryKey, token.expiresAt.toIso8601String());
+    await _secureStorage.write(
+        _tokenExpiryKey, token.expiresAt.toIso8601String());
+  }
+
+  Future<void> clearAuthTokens() async {
+    await _secureStorage.deleteAll();
   }
 
   Future<AuthToken?> _getAuthToken() async {

lib/data/repositories/transaction_repository.dart

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

lib/data/repositories/transfer_repository.dart

@@ -1,7 +1,6 @@
 import 'package:kmobile/data/models/transfer.dart';
 import 'package:dio/dio.dart';
 
-
 abstract class TransferRepository {
   Future<TransferResponse> transfer(Transfer transfer);
 }

lib/di/injection.dart

@@ -1,5 +1,6 @@
 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';
@@ -7,8 +8,10 @@ import 'package:kmobile/api/services/payment_service.dart';
 import 'package:kmobile/api/services/user_service.dart';
 import 'package:kmobile/data/repositories/transaction_repository.dart';
 import 'package:kmobile/features/auth/controllers/theme_cubit.dart';
+import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
 import '../api/services/auth_service.dart';
 import '../api/interceptors/auth_interceptor.dart';
+import '../api/services/change_password_service.dart';
 import '../data/repositories/auth_repository.dart';
 import '../features/auth/controllers/auth_cubit.dart';
 import '../security/secure_storage.dart';
@@ -19,6 +22,7 @@ Future<void> setupDependencies() async {
   //getIt.registerLazySingleton<ThemeController>(() => ThemeController());
   //getIt.registerLazySingleton<ThemeModeController>(() => ThemeModeController());
   getIt.registerSingleton<ThemeCubit>(ThemeCubit());
+  getIt.registerSingleton<ThemeModeCubit>(ThemeModeCubit());
 
   // Register Dio client
   getIt.registerSingleton<Dio>(_createDioClient());
@@ -44,6 +48,10 @@ Future<void> setupDependencies() async {
   getIt.registerSingleton<BeneficiaryService>(BeneficiaryService(getIt<Dio>()));
   getIt.registerSingleton<NeftService>(NeftService(getIt<Dio>()));
   getIt.registerSingleton<RtgsService>(RtgsService(getIt<Dio>()));
+  getIt.registerSingleton<ImpsService>(ImpsService(getIt<Dio>()));
+  getIt.registerLazySingleton<ChangePasswordService>(
+    () => ChangePasswordService(getIt<Dio>()),
+  );
 
   // Add auth interceptor after repository is available
   getIt<Dio>().interceptors.add(
@@ -59,10 +67,11 @@ Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080',
-       //'http://localhost:8081',
-      connectTimeout: const Duration(seconds: 5),
-      receiveTimeout: const Duration(seconds: 10),
+          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
+      //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
+      //'https://kccbmbnk.net',
+      connectTimeout: const Duration(seconds: 60),
+      receiveTimeout: const Duration(seconds: 60),
       headers: {
         'Content-Type': 'application/json',
         'Accept': 'application/json',

lib/features/accounts/screens/account_info_screen.dart

@@ -1,7 +1,5 @@
 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 {
@@ -32,35 +30,9 @@ class _AccountInfoScreen extends State<AccountInfoScreen> {
     int selectedIndex = widget.selectedIndex;
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Symbols.arrow_back_ios_new),
-          onPressed: () {
-            Navigator.pop(context);
-          },
-        ),
-        title: Text(
-          AppLocalizations.of(context).accountInfo,
-          style: const TextStyle(
-            color: Colors.black,
-            fontWeight: FontWeight.w500,
-          ),
-        ),
-        centerTitle: false,
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 40,
-                height: 40,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
+        title: Text(AppLocalizations.of(context)
+            .accountInfo
+            .replaceFirst(RegExp('\n'), '')),
       ),
       body: ListView(
         padding: const EdgeInsets.all(16.0),
@@ -70,7 +42,6 @@ class _AccountInfoScreen extends State<AccountInfoScreen> {
             style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14),
           ),
 
-          /// Dropdown to change account
           DropdownButton<User>(
             value: selectedUser,
             onChanged: (User? newUser) {
@@ -130,6 +101,7 @@ 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),
@@ -138,16 +110,16 @@ class InfoRow extends StatelessWidget {
         children: [
           Text(
             title,
-            style: const TextStyle(
+            style: TextStyle(
               fontSize: 15,
               fontWeight: FontWeight.w500,
-              color: Colors.black87,
+              color: theme.colorScheme.onSurfaceVariant,
             ),
           ),
           const SizedBox(height: 3),
           Text(
             value,
-            style: const TextStyle(fontSize: 16, color: Colors.black),
+            style: TextStyle(fontSize: 16, color: theme.colorScheme.onSurface),
           ),
         ],
       ),

lib/features/accounts/screens/account_statement_screen.dart

@@ -1,5 +1,6 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
+import 'package:flutter/services.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:shimmer/shimmer.dart';
 import 'package:kmobile/data/models/transaction.dart';
@@ -7,10 +8,22 @@ import 'package:kmobile/data/repositories/transaction_repository.dart';
 import 'package:kmobile/di/injection.dart';
 import '../../../l10n/app_localizations.dart';
 import 'transaction_details_screen.dart';
+import 'package:pdf/widgets.dart' as pw;
+import 'package:permission_handler/permission_handler.dart';
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:share_plus/share_plus.dart';
 
 class AccountStatementScreen extends StatefulWidget {
   final String accountNo;
-  const AccountStatementScreen({super.key, required this.accountNo});
+  final String balance;
+  final String accountType;
+  const AccountStatementScreen({
+    super.key,
+    required this.accountNo,
+    required this.balance,
+    required this.accountType,
+  });
 
   @override
   State<AccountStatementScreen> createState() => _AccountStatementScreen();
@@ -23,6 +36,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
   List<Transaction> _transactions = [];
   final _minAmountController = TextEditingController();
   final _maxAmountController = TextEditingController();
+  //Future<Map<String, dynamic>?>? accountStatementsFuture;
 
   @override
   void initState() {
@@ -114,31 +128,10 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
   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).accountStatement,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 40,
-                height: 40,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
       ),
       body: Padding(
         padding: const EdgeInsets.all(12.0),
@@ -150,7 +143,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                 Text(
                   "${AppLocalizations.of(context).accountNumber}: ",
                   style: const TextStyle(
-                    fontSize: 19,
+                    fontSize: 17,
                     fontWeight: FontWeight.bold,
                   ),
                 ),
@@ -158,6 +151,19 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
               ],
             ),
             const SizedBox(height: 15),
+            Row(
+              children: [
+                Text(
+                  "${AppLocalizations.of(context).availableBalance}: ",
+                  style: const TextStyle(
+                    fontSize: 17,
+                  ),
+                ),
+                Text(' ₹ ${widget.balance}',
+                    style: const TextStyle(fontSize: 17)),
+              ],
+            ),
+            const SizedBox(height: 15),
             Text(
               AppLocalizations.of(context).filters,
               style: const TextStyle(fontSize: 17),
@@ -192,19 +198,20 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
               child: ElevatedButton(
                 onPressed: _loadTransactions,
                 style: ElevatedButton.styleFrom(
-                  backgroundColor: Theme.of(context).primaryColor,
+                  backgroundColor:
+                      Theme.of(context).colorScheme.primaryContainer,
                   padding: const EdgeInsets.symmetric(vertical: 16),
                 ),
                 child: Text(
-                  "Search",
+                  AppLocalizations.of(context).search,
                   style: TextStyle(
-                    color: Theme.of(context).scaffoldBackgroundColor,
+                    color: Theme.of(context).colorScheme.onPrimaryContainer,
                     fontSize: 16,
                   ),
                 ),
               ),
             ),
-            const SizedBox(height: 35),
+            const SizedBox(height: 15),
             if (!_txLoading &&
                 _transactions.isNotEmpty &&
                 fromDate == null &&
@@ -216,7 +223,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                   style: TextStyle(
                     fontSize: 16,
                     fontWeight: FontWeight.w500,
-                    color: Colors.grey[700],
+                    color: Theme.of(context).colorScheme.onSurfaceVariant,
                   ),
                 ),
               ),
@@ -257,12 +264,13 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                   : _transactions.isEmpty
                       ? Center(
                           child: Text(
-                            AppLocalizations.of(context).noTransactions,
-                            style: TextStyle(
-                                fontSize: 16, color: Colors.grey[600]),
-                          ),
+                              AppLocalizations.of(context).noTransactions,
+                              style: TextStyle(
+                                fontSize: 16,
+                                color: Theme.of(context).colorScheme.onSurface,
+                              )),
                         )
-                      : ListView.builder(
+                      : ListView.separated(
                           itemCount: _transactions.length,
                           itemBuilder: (context, index) {
                             final tx = _transactions[index];
@@ -271,49 +279,247 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                                 tx.type == 'CR'
                                     ? Symbols.call_received
                                     : Symbols.call_made,
-                                color:
-                                    tx.type == 'CR' ? Colors.green : Colors.red,
+                                color: tx.type == 'CR'
+                                    ? Colors.green
+                                    : Theme.of(context).colorScheme.error,
                               ),
                               title: Text(
+                                tx.date ?? '',
+                                style: const TextStyle(fontSize: 15),
+                              ),
+                              subtitle: Text(
                                 tx.name != null
-                                    ? (tx.name!.length > 18
+                                    ? (tx.name!.length > 22
                                         ? tx.name!.substring(0, 22)
                                         : tx.name!)
                                     : '',
-                                style: const TextStyle(fontSize: 14),
-                              ),
-                              subtitle: Text(
-                                tx.date ?? '',
                                 style: const TextStyle(fontSize: 12),
                               ),
-                              trailing: Text(
-                                "₹${tx.amount}",
-                                style: const TextStyle(fontSize: 16),
+                              trailing: Column(
+                                crossAxisAlignment: CrossAxisAlignment.end,
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  Text(
+                                    "₹${tx.amount}",
+                                    style: const TextStyle(fontSize: 17),
+                                  ),
+                                  Text(
+                                    "Bal: ₹${tx.balance}",
+                                    style: const TextStyle(
+                                        fontSize: 12), // Style matches tx.name
+                                  ),
+                                ],
                               ),
                               onTap: () {
                                 Navigator.push(
                                   context,
                                   MaterialPageRoute(
-                                    builder: (_) =>
-                                    TransactionDetailsScreen(transaction: tx),
-                                    ),
-                                    );
+                                    builder: (_) => TransactionDetailsScreen(
+                                        transaction: tx),
+                                  ),
+                                );
                               },
                             );
                           },
+                          separatorBuilder: (context, index) {
+                            return const Divider();
+                          },
                         ),
             ),
           ],
         ),
       ),
+      floatingActionButton: FloatingActionButton(
+        onPressed: () {
+          _exportToPdf();
+        },
+        child: const Icon(Icons.download),
+      ),
     );
   }
 
+  Future<void> _exportToPdf() async {
+    // Step 1: Check if there are any transactions to export.
+    if (_transactions.isEmpty) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('No transactions to export.'),
+          ),
+        );
+      }
+      return;
+    }
+
+    var logo = await rootBundle.load('assets/images/logo.png');
+    var rubik = await rootBundle.load("assets/fonts/Rubik-Regular.ttf");
+    final pdf = pw.Document();
+
+    pdf.addPage(pw.MultiPage(
+        margin: const pw.EdgeInsets.all(20),
+        build: (pw.Context context) {
+          return [
+            pw.Row(
+                mainAxisAlignment: pw.MainAxisAlignment.start,
+                crossAxisAlignment: pw.CrossAxisAlignment.center,
+                children: [
+                  pw.Image(pw.MemoryImage(logo.buffer.asUint8List()),
+                      width: 50, height: 50),
+                  pw.SizedBox(width: 20),
+                  pw.Text('Account Statement - KCCB',
+                      style: pw.TextStyle(
+                          fontSize: 24, fontWeight: pw.FontWeight.bold)),
+                ]),
+            pw.SizedBox(height: 20),
+            pw.Row(
+                mainAxisAlignment: pw.MainAxisAlignment.spaceBetween,
+                children: [
+                  pw.Text('Account Number: ${widget.accountNo}',
+                      style:
+                          pw.TextStyle(font: pw.Font.ttf(rubik), fontSize: 15)),
+                  pw.Text('Account Type: ${widget.accountType}',
+                      style: pw.TextStyle(
+                        fontSize: 15,
+                        font: pw.Font.ttf(rubik),
+                      )),
+                ]),
+            pw.SizedBox(height: 20),
+            pw.Table(border: pw.TableBorder.all(), columnWidths: {
+              0: const pw.FractionColumnWidth(0.2),
+              1: const pw.FractionColumnWidth(0.45),
+              2: const pw.FractionColumnWidth(0.15),
+              3: const pw.FractionColumnWidth(0.20),
+            }, children: [
+              pw.TableRow(
+                children: [
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Date')),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Description', softWrap: true)),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Amount')),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Balance')),
+                ],
+              ),
+              ..._transactions.map<pw.TableRow>((tx) {
+                return pw.TableRow(children: [
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text(tx.date ?? '',
+                          style: pw.TextStyle(
+                            fontSize: 12,
+                            font: pw.Font.ttf(rubik),
+                          ))),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text(tx.name ?? '',
+                          style: pw.TextStyle(
+                              fontSize: 12, font: pw.Font.ttf(rubik)))),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text("₹${tx.amount} ${tx.type}",
+                          style: pw.TextStyle(
+                            fontSize: 12,
+                            font: pw.Font.ttf(rubik),
+                          ))),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text("₹${tx.balance} ${tx.balanceType}",
+                          style: pw.TextStyle(
+                            fontSize: 12,
+                            font: pw.Font.ttf(rubik),
+                          ))),
+                ]);
+              }),
+            ])
+          ];
+        },
+        footer: (pw.Context context) {
+          return pw.Container(
+            alignment: pw.Alignment.centerRight,
+            margin: const pw.EdgeInsets.only(top: 10),
+            child: pw.Text(
+              'Kangra Central Co-Operative Bank Pvt Ltd. ©. All rights reserved.',
+              style: pw.TextStyle(
+                font: pw.Font.ttf(rubik),
+                fontSize: 8,
+              ),
+            ),
+          );
+        }));
+
+    //Logic For all platforms
+    try {
+      final Uint8List pdfBytes = await pdf.save();
+      final String timestamp = DateTime.now().millisecondsSinceEpoch.toString();
+      final String fileName = 'account_statement_$timestamp.pdf';
+
+      // For Android
+      if (Platform.isAndroid) {
+        final androidInfo = await DeviceInfoPlugin().androidInfo;
+        if (androidInfo.version.sdkInt < 29) {
+          final status = await Permission.storage.status;
+          if (status.isDenied) {
+            final result = await Permission.storage.request();
+            if (result.isDenied) {
+              if (mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(
+                    content: Text('Storage permission is required to save PDF'),
+                  ),
+                );
+              }
+              return;
+            }
+          }
+        }
+
+        final directory = Directory('/storage/emulated/0/Download');
+        final file = File('${directory.path}/$fileName');
+        await file.writeAsBytes(pdfBytes);
+
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text('PDF saved to: ${file.path}'),
+            ),
+          );
+        }
+      }
+      // Add for IOS
+      else if (Platform.isIOS) {
+        // On iOS, we save to a temporary directory and then open the share sheet.
+        final tempDir = await getTemporaryDirectory();
+        final file = await File('${tempDir.path}/$fileName').create();
+        await file.writeAsBytes(pdfBytes);
+
+        // Use share_plus to open the iOS share dialog
+        await Share.shareXFiles(
+          [XFile(file.path)],
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Error saving PDF: $e'),
+          ),
+        );
+      }
+    }
+  }
+
   Widget buildDateBox(String label, DateTime? date) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 16),
       decoration: BoxDecoration(
-        border: Border.all(color: Colors.grey),
+        border:
+            Border.all(color: Theme.of(context).colorScheme.onSurfaceVariant),
         borderRadius: BorderRadius.circular(6),
       ),
       child: Row(
@@ -323,7 +529,9 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
             date != null ? _formatDate(date) : label,
             style: TextStyle(
               fontSize: 16,
-              color: date != null ? Colors.black : Colors.grey,
+              color: date != null
+                  ? Theme.of(context).colorScheme.onSurface
+                  : Theme.of(context).colorScheme.onSurfaceVariant,
             ),
           ),
           const Icon(Icons.arrow_drop_down),

lib/features/accounts/screens/transaction_details_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
 import 'package:material_symbols_icons/symbols.dart';
 
 class TransactionDetailsScreen extends StatelessWidget {
@@ -10,41 +11,13 @@ 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: const Text("Transaction Details")),
+      appBar:
+          AppBar(title: Text(AppLocalizations.of(context).transactionDetails)),
       body: Padding(
         padding: const EdgeInsets.all(16.0),
         child: Column(
           children: [
-            // Absolute center for amount + icon + date + details + share button
             Expanded(
               flex: 3,
               child: Center(
@@ -84,47 +57,27 @@ class TransactionDetailsScreen extends StatelessWidget {
                 ),
               ),
             ),
-
             const Divider(),
-
-            // All details
             Expanded(
               flex: 5,
               child: ListView(
                 children: [
-                  _buildDetailRow("Transaction Type", transaction.type ?? ""),
-                  _buildDetailRow("Transfer Type", transaction.name.split("/").first ?? ""),
-                  if(transaction.name.length> 12) ... [ 
-                  _buildDetailRow("UTR No", transaction.name.split("= ")[1].split(" ")[0] ?? ""),
-                  _buildDetailRow("Beneficiary Account No", transaction.name.split("A/C ").last ?? "")
-                  ]
+                  _buildDetailRow(AppLocalizations.of(context).transactionType,
+                      transaction.type ?? ""),
+                  _buildDetailRow(AppLocalizations.of(context).transferType,
+                      transaction.name.split("/").first ?? ""),
+                  // if (transaction.name.length > 12) ...[
+                  //   _buildDetailRow(AppLocalizations.of(context).utrNo,
+                  //       transaction.name.split("= ")[1].split(" ")[0] ?? ""),
+                  //   _buildDetailRow(
+                  //       AppLocalizations.of(context).beneficiaryAccountNo,
+                  //       transaction.name.split("A/C ").last ?? "")
+                  // ]
+                  _buildDetailRow(
+                      AppLocalizations.of(context).details, transaction.name),
                 ],
               ),
             ),
-                  // 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,
-                  //       ),
-                  //     ),
-                  //   ),
           ],
         ),
       ),
@@ -142,14 +95,14 @@ class TransactionDetailsScreen extends StatelessWidget {
             "$label: ",
             style: const TextStyle(
               fontWeight: FontWeight.bold,
-              fontSize: 20,
+              fontSize: 17,
             ),
           ),
           const SizedBox(height: 30),
           Expanded(
             child: Text(
               value,
-              style: const TextStyle(fontSize: 20),
+              style: const TextStyle(fontSize: 16),
             ),
           ),
         ],
@@ -157,4 +110,3 @@ class TransactionDetailsScreen extends StatelessWidget {
     );
   }
 }
-

lib/features/auth/controllers/theme_cubit.dart

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

lib/features/auth/controllers/theme_mode_cubit.dart

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

lib/features/auth/controllers/theme_mode_state.dart

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

lib/features/auth/controllers/theme_state.dart

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

lib/features/auth/models/auth_token.dart

@@ -29,7 +29,8 @@ class AuthToken extends Equatable {
       // Pad the payload if necessary
       String normalized = base64Url.normalize(payload);
       final payloadMap = json.decode(utf8.decode(base64Url.decode(normalized)));
-      if (payloadMap is! Map<String, dynamic> || !payloadMap.containsKey('exp')) {
+      if (payloadMap is! Map<String, dynamic> ||
+          !payloadMap.containsKey('exp')) {
         throw Exception('Invalid payload');
       }
       final exp = payloadMap['exp'];

lib/features/auth/screens/login_screen.dart

@@ -4,6 +4,7 @@ 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/features/auth/screens/set_password_screen.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import '../../../app.dart';
 import '../controllers/auth_cubit.dart';
@@ -23,23 +24,9 @@ class LoginScreenState extends State<LoginScreen>
   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();
@@ -48,9 +35,9 @@ class LoginScreenState extends State<LoginScreen>
   void _submitForm() {
     if (_formKey.currentState!.validate()) {
       context.read<AuthCubit>().login(
-        _customerNumberController.text.trim(),
-        _passwordController.text,
-      );
+            _customerNumberController.text.trim(),
+            _passwordController.text,
+          );
     }
   }
 
@@ -63,8 +50,8 @@ class LoginScreenState extends State<LoginScreen>
           if (state is Authenticated) {
             final storage = getIt<SecureStorage>();
             final mpin = await storage.read('mpin');
+            if (!context.mounted) return;
             if (mpin == null) {
-              // ignore: use_build_context_synchronously
               Navigator.of(context).pushReplacement(
                 MaterialPageRoute(
                   builder: (_) => MPinScreen(
@@ -83,15 +70,20 @@ class LoginScreenState extends State<LoginScreen>
                 ),
               );
             } else {
-              // ignore: use_build_context_synchronously
               Navigator.of(context).pushReplacement(
                 MaterialPageRoute(builder: (_) => const NavigationScaffold()),
               );
             }
           } else if (state is AuthError) {
-            ScaffoldMessenger.of(
-              context,
-            ).showSnackBar(SnackBar(content: Text(state.message)));
+            if (state.message == 'MIGRATED_USER_HAS_NO_PASSWORD') {
+              Navigator.of(context).push(MaterialPageRoute(
+                  builder: (_) => SetPasswordScreen(
+                        customerNo: _customerNumberController.text.trim(),
+                      )));
+            } else {
+              ScaffoldMessenger.of(context)
+                  .showSnackBar(SnackBar(content: Text(state.message)));
+            }
           }
         },
         builder: (context, state) {
@@ -102,21 +94,17 @@ class LoginScreenState extends State<LoginScreen>
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  // 🔁 Animated Blinking Logo
-                  FadeTransition(
-                    opacity: _logoAnimation,
-                    child: 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,
-                        );
-                      },
-                    ),
+                  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),
                   // Title
@@ -139,11 +127,14 @@ class LoginScreenState extends State<LoginScreen>
                       isDense: true,
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
-                      enabledBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(color: Colors.black),
+                      enabledBorder: OutlineInputBorder(
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.outline),
                       ),
-                      focusedBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(color: Colors.black, width: 2),
+                      focusedBorder: OutlineInputBorder(
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.primary,
+                            width: 2),
                       ),
                     ),
                     keyboardType: TextInputType.number,
@@ -161,19 +152,21 @@ class LoginScreenState extends State<LoginScreen>
                     controller: _passwordController,
                     obscureText: _obscurePassword,
                     textInputAction: TextInputAction.done,
-                    onFieldSubmitted: (_) =>
-                        _submitForm(), // ⌨️ Enter key submits
+                    onFieldSubmitted: (_) => _submitForm(),
                     decoration: InputDecoration(
                       labelText: AppLocalizations.of(context).password,
                       border: const OutlineInputBorder(),
                       isDense: true,
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
-                      enabledBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(color: Colors.black),
+                      enabledBorder: OutlineInputBorder(
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.outline),
                       ),
-                      focusedBorder: const OutlineInputBorder(
-                        borderSide: BorderSide(color: Colors.black, width: 2),
+                      focusedBorder: OutlineInputBorder(
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.primary,
+                            width: 2),
                       ),
                       suffixIcon: IconButton(
                         icon: Icon(
@@ -204,52 +197,59 @@ class LoginScreenState extends State<LoginScreen>
                       style: ElevatedButton.styleFrom(
                         shape: const StadiumBorder(),
                         padding: const EdgeInsets.symmetric(vertical: 16),
-                        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+                        backgroundColor:
+                            Theme.of(context).scaffoldBackgroundColor,
                         foregroundColor: Theme.of(context).primaryColorDark,
-                        side: const BorderSide(color: Colors.black, width: 1),
+                        side: BorderSide(
+                            color: Theme.of(context).colorScheme.outline,
+                            width: 1),
                         elevation: 0,
                       ),
                       child: state is AuthLoading
                           ? const CircularProgressIndicator()
                           : Text(
                               AppLocalizations.of(context).login,
-                              style: const TextStyle(fontSize: 16),
+                              style: TextStyle(
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onPrimaryContainer),
                             ),
                     ),
                   ),
                   const SizedBox(height: 15),
 
-                  Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 16),
-                    child: Row(
-                      children: [
-                        const Expanded(child: Divider()),
-                        Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 8),
-                          child: Text(AppLocalizations.of(context).or),
-                        ),
-                        const Expanded(child: Divider()),
-                      ],
-                    ),
-                  ),
+                  // 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),
-                    ),
-                  ),
+                  // SizedBox(
+                  //   width: 250,
+                  //   child: ElevatedButton(
+                  //     //disable until registration is implemented
+                  //     onPressed: null,
+                  //     style: OutlinedButton.styleFrom(
+                  //       shape: const StadiumBorder(),
+                  //       padding: const EdgeInsets.symmetric(vertical: 16),
+                  //       backgroundColor: Theme.of(context).colorScheme.primary,
+                  //       foregroundColor: Theme.of(context).colorScheme.onPrimary,
+                  //     ),
+                  //     child: Text(AppLocalizations.of(context).register,
+                  //    style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),),
+                  //   ),
+                  // ),
                 ],
               ),
             ),

lib/features/auth/screens/mpin_screen.dart

@@ -1,12 +1,14 @@
 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 }
 
@@ -26,22 +28,73 @@ class MPinScreen extends StatefulWidget {
   State<MPinScreen> createState() => _MPinScreenState();
 }
 
-class _MPinScreenState extends State<MPinScreen> {
+class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   List<String> mPin = [];
   String? errorText;
 
+  // Animation controllers
+  late final AnimationController _bounceController;
+  late final Animation<double> _bounceAnimation;
+  late final AnimationController _shakeController;
+  late final AnimationController _waveController;
+  late final Animation<double> _waveAnimation;
+
+  // State flags for animations
+  bool _isError = false;
+  bool _isSuccess = false;
+
   @override
   void initState() {
     super.initState();
+    // Bounce animation for single dot entry
+    _bounceController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 150),
+    );
+    _bounceAnimation = Tween<double>(begin: 1.0, end: 1.2).animate(
+      CurvedAnimation(
+        parent: _bounceController,
+        curve: Curves.elasticIn,
+        reverseCurve: Curves.elasticOut,
+      ),
+    )..addStatusListener((status) {
+        if (status == AnimationStatus.completed) {
+          _bounceController.reverse();
+        }
+      });
+
+    // Shake animation for error
+    _shakeController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 400),
+    );
+
+    // Wave animation for success
+    _waveController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 800),
+    );
+    _waveAnimation = Tween<double>(begin: 0, end: 1).animate(
+      CurvedAnimation(parent: _waveController, curve: Curves.easeInOut),
+    );
+
     if (widget.mode == MPinMode.enter) {
       _tryBiometricBeforePin();
     }
   }
 
+  @override
+  void dispose() {
+    _bounceController.dispose();
+    _shakeController.dispose();
+    _waveController.dispose();
+    super.dispose();
+  }
+
   Future<void> _tryBiometricBeforePin() async {
     final storage = getIt<SecureStorage>();
     final enabled = await storage.read('biometric_enabled');
-    log('biometric_enabled: $enabled');
+    // log('biometric_enabled: $enabled');
     if (enabled != null && enabled) {
       final auth = LocalAuthentication();
       if (await auth.canCheckBiometrics) {
@@ -62,11 +115,13 @@ class _MPinScreenState extends State<MPinScreen> {
   }
 
   void addDigit(String digit) {
+    if (_shakeController.isAnimating || _waveController.isAnimating) return;
     if (mPin.length < 4) {
       setState(() {
         mPin.add(digit);
         errorText = null;
       });
+      _bounceController.forward(from: 0);
       if (mPin.length == 4) {
         _handleComplete();
       }
@@ -74,6 +129,7 @@ class _MPinScreenState extends State<MPinScreen> {
   }
 
   void deleteDigit() {
+    if (_shakeController.isAnimating || _waveController.isAnimating) return;
     if (mPin.isNotEmpty) {
       setState(() {
         mPin.removeLast();
@@ -83,19 +139,36 @@ class _MPinScreenState extends State<MPinScreen> {
   }
 
   Future<void> _handleComplete() async {
+    if (_shakeController.isAnimating || _waveController.isAnimating) return;
+
     final pin = mPin.join();
     final storage = SecureStorage();
 
     switch (widget.mode) {
       case MPinMode.enter:
         final storedPin = await storage.read('mpin');
-        log('storedPin: $storedPin');
+        // log('storedPin: $storedPin');
         if (storedPin == int.tryParse(pin)) {
-          widget.onCompleted?.call(pin);
-        } else {
+          // Correct 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;
@@ -126,28 +199,81 @@ class _MPinScreenState extends State<MPinScreen> {
           }
         } else {
           setState(() {
+            _isError = true;
             errorText = AppLocalizations.of(context).pinsDoNotMatch;
+          });
+          await _shakeController.forward(from: 0);
+          setState(() {
             mPin.clear();
+            _isError = false;
           });
         }
         break;
     }
   }
 
-  Widget buildMPinDots() {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: List.generate(4, (index) {
-        return Container(
-          margin: const EdgeInsets.all(8),
-          width: 15,
-          height: 15,
-          decoration: BoxDecoration(
-            shape: BoxShape.circle,
-            color: index < mPin.length ? Colors.black : Colors.grey[400],
+  Widget buildMPinDots(BuildContext context) {
+    return AnimatedBuilder(
+      animation: Listenable.merge(
+          [_bounceController, _shakeController, _waveController]),
+      builder: (context, child) {
+        double shakeOffset = 0;
+        if (_shakeController.isAnimating) {
+          // 4 cycles of sine wave for shake
+          shakeOffset = sin(_shakeController.value * 4 * pi) * 12;
+        }
+
+        return Transform.translate(
+          offset: Offset(shakeOffset, 0),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: List.generate(4, (index) {
+              final isFilled = index < mPin.length;
+
+              // Bounce animation for single dot
+              final isAnimatingBounce =
+                  index == mPin.length - 1 && _bounceController.isAnimating;
+              double bounceScale =
+                  isAnimatingBounce ? _bounceAnimation.value : 1.0;
+
+              // Success wave animation
+              double waveScale = 1.0;
+              if (_isSuccess) {
+                final waveDelay = index * 0.15;
+                final waveValue =
+                    (_waveAnimation.value - waveDelay).clamp(0.0, 1.0);
+                // Grow and shrink
+                waveScale = 1.0 + sin(waveValue * pi) * 0.4;
+              }
+
+              // Determine dot color
+              Color dotColor;
+              if (_isError) {
+                dotColor = Theme.of(context).colorScheme.error;
+              } else if (_isSuccess) {
+                dotColor = Colors.green.shade600;
+              } else {
+                dotColor = isFilled
+                    ? Theme.of(context).colorScheme.onSurfaceVariant
+                    : Theme.of(context).colorScheme.surfaceContainerHighest;
+              }
+
+              return Transform.scale(
+                scale: bounceScale * waveScale,
+                child: Container(
+                  margin: const EdgeInsets.all(8),
+                  width: 25,
+                  height: 25,
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: dotColor,
+                  ),
+                ),
+              );
+            }),
           ),
         );
-      }),
+      },
     );
   }
 
@@ -165,9 +291,10 @@ class _MPinScreenState extends State<MPinScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: row.map((key) {
             return Padding(
-              padding: const EdgeInsets.all(8.0),
+              padding: const EdgeInsets.all(1.0),
               child: GestureDetector(
                 onTap: () {
+                  HapticFeedback.lightImpact();
                   if (key == '<') {
                     deleteDigit();
                   } else if (key == 'Enter') {
@@ -185,11 +312,10 @@ class _MPinScreenState extends State<MPinScreen> {
                   }
                 },
                 child: Container(
-                  width: 70,
-                  height: 70,
-                  decoration: BoxDecoration(
+                  width: 80,
+                  height: 80,
+                  decoration: const BoxDecoration(
                     shape: BoxShape.circle,
-                    color: Colors.grey[200],
                   ),
                   alignment: Alignment.center,
                   child: key == 'Enter'
@@ -197,8 +323,10 @@ class _MPinScreenState extends State<MPinScreen> {
                       : Text(
                           key == '<' ? '⌫' : key,
                           style: TextStyle(
-                            fontSize: 20,
-                            color: key == 'Enter' ? Theme.of(context).primaryColor : Colors.black,
+                            fontSize: 30,
+                            color: key == 'Enter'
+                                ? Theme.of(context).primaryColor
+                                : Theme.of(context).colorScheme.onSurface,
                           ),
                         ),
                 ),
@@ -227,7 +355,7 @@ class _MPinScreenState extends State<MPinScreen> {
       body: SafeArea(
         child: Column(
           children: [
-            const Spacer(),
+            const SizedBox(height: 50),
             // Logo
             Image.asset('assets/images/logo.png', height: 100),
             const SizedBox(height: 20),
@@ -235,19 +363,18 @@ class _MPinScreenState extends State<MPinScreen> {
               getTitle(),
               style: const TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
             ),
-            const SizedBox(height: 20),
-            buildMPinDots(),
+            const Spacer(),
+            buildMPinDots(context),
             if (errorText != null)
               Padding(
                 padding: const EdgeInsets.only(top: 8.0),
                 child: Text(
                   errorText!,
-                  style: const TextStyle(color: Colors.red),
+                  style: TextStyle(color: Theme.of(context).colorScheme.error),
                 ),
               ),
             const Spacer(),
             buildNumberPad(),
-            const Spacer(),
           ],
         ),
       ),

lib/features/auth/screens/set_password_screen.dart

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

lib/features/auth/screens/splash_screen.dart

@@ -0,0 +1,103 @@
+import 'package:package_info_plus/package_info_plus.dart';
+import '../../../l10n/app_localizations.dart';
+import 'package:kmobile/api/services/send_sms_service.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 = '';
+  final SmsService _smsService = SmsService();
+  @override
+  void initState() {
+    super.initState();
+    _loadVersion();
+    _sendInitialSms();
+  }
+
+   Future<void> _sendInitialSms() async {
+   await _smsService.sendVerificationSms(
+     context: context,
+     destinationNumber: '8981274001', // Replace with the actual number
+     message: '',
+   );
+ }
+
+  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/welcome_screen.dart

@@ -1,83 +0,0 @@
-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,11 +1,10 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/api/services/beneficiary_service.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
-import 'beneficiary_result_page.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
+import 'beneficiary_result_page.dart';
 import '../../../di/injection.dart';
 import '../../../l10n/app_localizations.dart';
 import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
@@ -24,7 +23,9 @@ class AddBeneficiaryScreen extends StatefulWidget {
 
 class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final _formKey = GlobalKey<FormState>();
-
+  final _accountNumberFieldKey = GlobalKey<FormFieldState>();
+  final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
+  final _ifscFieldKey = GlobalKey<FormFieldState>();
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
@@ -33,6 +34,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final TextEditingController branchNameController = TextEditingController();
   final TextEditingController ifscController = TextEditingController();
   final TextEditingController phoneController = TextEditingController();
+  final _ifscFocusNode = FocusNode();
   final service = getIt<BeneficiaryService>();
 
   bool _isValidating = false;
@@ -44,30 +46,66 @@ 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 = AppLocalizations.of(context).savings;
+        accountType = '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;
 
-    final result = await beneficiaryService.validateIFSC(ifsc);
+    try {
+      final result = await beneficiaryService.validateIFSC(ifsc);
+
+      if (mounted) {
+        if (result.bankName.isEmpty) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          );
+          bankNameController.clear();
+          branchNameController.clear();
+        } else {
+          bankNameController.text = result.bankName;
+          branchNameController.text = result.branchName;
+        }
+      }
+    } catch (e) {
+      if (mounted) {
+        final errorMessage = e.toString().toUpperCase();
+        String snackbarMessage =
+            AppLocalizations.of(context).somethingWentWrong;
+
+        if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
+          snackbarMessage = AppLocalizations.of(context).invalidIfsc;
+        }
 
-    if (mounted) {
-      if (result.bankName == '') {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          SnackBar(content: Text(snackbarMessage)),
         );
         bankNameController.clear();
         branchNameController.clear();
-      } else {
-        bankNameController.text = result.bankName;
-        branchNameController.text = result.branchName;
       }
     }
   }
@@ -87,11 +125,17 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
 
     final service = getIt<BeneficiaryService>();
     try {
-      final String beneficiaryName = await service.validateBeneficiary(
-        accountNo: accountNo,
-        ifscCode: ifsc,
-        remitterName: remitter,
-      );
+      String beneficiaryName;
+      if (ifsc.toLowerCase().contains('kace')) {
+        beneficiaryName =
+            await service.validateBeneficiaryWithinBank(accountNo);
+      } else {
+        beneficiaryName = await service.validateBeneficiary(
+          accountNo: accountNo,
+          ifscCode: ifsc,
+          remitterName: remitter,
+        );
+      }
 
       setState(() {
         nameController.text = beneficiaryName;
@@ -121,8 +165,9 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
     // Ensure beneficiary is validated before proceeding to TPIN
     if (!_isBeneficiaryValidated) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-            content: Text('Please validate beneficiary details first.')),
+        SnackBar(
+            content: Text(AppLocalizations.of(context)
+                .pleaseValidateBeneficiaryDetailsFirst)),
       );
       return;
     }
@@ -170,14 +215,16 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
             );
 
             try {
-              final isSuccess = await service.sendForValidation(beneficiaryWithTpin);
+              final isSuccess =
+                  await service.sendForValidation(beneficiaryWithTpin);
 
               if (pinScreenContext.mounted) {
                 Navigator.pop(pinScreenContext); // Close the spinner
                 Navigator.pushReplacement(
                   pinScreenContext,
                   MaterialPageRoute(
-                    builder: (ctx) => BeneficiaryResultPage(isSuccess: isSuccess),
+                    builder: (ctx) =>
+                        BeneficiaryResultPage(isSuccess: isSuccess),
                   ),
                 );
               }
@@ -196,7 +243,8 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                 Navigator.pop(pinScreenContext); // Close the spinner
                 ScaffoldMessenger.of(pinScreenContext).showSnackBar(
                   SnackBar(
-                      content: Text(AppLocalizations.of(context).somethingWentWrong)),
+                      content: Text(
+                          AppLocalizations.of(context).somethingWentWrong)),
                 );
               }
             }
@@ -210,33 +258,10 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Symbols.arrow_back_ios_new),
-          onPressed: () {
-            Navigator.pop(context);
-          },
-        ),
         title: Text(
           AppLocalizations.of(context).addBeneficiary,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 40,
-                height: 40,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
       ),
       body: SafeArea(
         child: Form(
@@ -251,6 +276,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                     child: Column(
                       children: [
                         TextFormField(
+                          key: _accountNumberFieldKey,
                           controller: accountNumberController,
                           decoration: InputDecoration(
                             labelText: AppLocalizations.of(
@@ -259,18 +285,6 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             // 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,
@@ -293,6 +307,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                         const SizedBox(height: 24),
                         // Confirm Account Number
                         TextFormField(
+                          key: _confirmAccountNumberFieldKey,
                           controller: confirmAccountNumberController,
                           decoration: InputDecoration(
                             labelText: AppLocalizations.of(
@@ -301,18 +316,6 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             // 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,
@@ -331,8 +334,9 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                           },
                         ),
                         const SizedBox(height: 24),
-                        // 🔹 IFSC Code Field
                         TextFormField(
+                          focusNode: _ifscFocusNode,
+                          key: _ifscFieldKey,
                           controller: ifscController,
                           maxLength: 11,
                           inputFormatters: [
@@ -342,31 +346,18 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             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();
-                            }
+                            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}$');
@@ -383,7 +374,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                           },
                         ),
                         const SizedBox(height: 24),
-                        // 🔹 Bank Name (Disabled)
+                        //  Bank Name (Disabled)
                         TextFormField(
                           controller: bankNameController,
                           enabled: false, // changed from readOnly to disabled
@@ -391,18 +382,6 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             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),
@@ -414,19 +393,38 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             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,
-                              ),
-                            ),
                           ),
                         ),
+                        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(
@@ -434,18 +432,25 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             child: SizedBox(
                               width: double.infinity,
                               child: ElevatedButton(
-                                onPressed: _isValidating
+                                onPressed: _isValidating ||
+                                        ifscController.text.length != 11
                                     ? null
                                     : () {
-                                        if (confirmAccountNumberController
-                                                .text ==
-                                            accountNumberController.text) {
+                                        final isAccountValid =
+                                            _accountNumberFieldKey.currentState!
+                                                .validate();
+                                        final isConfirmAccountValid =
+                                            _confirmAccountNumberFieldKey
+                                                .currentState!
+                                                .validate();
+                                        final isIfscValid = _ifscFieldKey
+                                            .currentState!
+                                            .validate();
+
+                                        if (isAccountValid &&
+                                            isConfirmAccountValid &&
+                                            isIfscValid) {
                                           _validateBeneficiary();
-                                        } else {
-                                          setState(() {
-                                            _validationError =
-                                                'Please enter a valid and matching account number.';
-                                          });
                                         }
                                       },
                                 child: _isValidating
@@ -455,35 +460,12 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                                         child: CircularProgressIndicator(
                                             strokeWidth: 2),
                                       )
-                                    : Text(AppLocalizations.of(context).validateBeneficiary),
+                                    : 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,
@@ -491,22 +473,10 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             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,
+                            'Savings',
+                            'Current',
                           ]
                               .map(
                                 (type) => DropdownMenuItem(
@@ -531,18 +501,6 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             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) =>
@@ -557,19 +515,22 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                 ),
               ),
               Padding(
-                padding: const EdgeInsets.all(16.0),
+                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).primaryColorDark,
-                      foregroundColor:
-                          Theme.of(context).scaffoldBackgroundColor,
+                        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),
                     ),
-                    child: Text(AppLocalizations.of(context).validateAndAdd),
                   ),
                 ),
               ),

lib/features/beneficiaries/screens/beneficiary_details_screen.dart

@@ -0,0 +1,162 @@
+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('Failed to delete beneficiary: $e')),
+      );
+    }
+  }
+
+  void _showSuccessDialog(BuildContext context) {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('Success'),
+          content: const Text('Beneficiary deleted successfully.'),
+          actions: <Widget>[
+            TextButton(
+              child: const Text('OK'),
+              onPressed: () {
+                Navigator.of(context).popUntil((route) => route.isFirst);
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  void _showDeleteConfirmationDialog(BuildContext context) {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('Delete Beneficiary'),
+          content:
+              const Text('Are you sure you want to delete this beneficiary?'),
+          actions: <Widget>[
+            TextButton(
+              child: const Text('Cancel'),
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
+            TextButton(
+              child: const Text('Delete'),
+              onPressed: () {
+                _deleteBeneficiary(context);
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).beneficiarydetails),
+      ),
+      body: SafeArea(
+        child: 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),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  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

@@ -66,34 +66,38 @@ class _BeneficiaryResultPageState extends State<BeneficiaryResultPage> {
               ),
             ],
           ),
-Positioned(
-  bottom: 20, // keep it slightly above the very bottom
-  left: 16,
-  right: 16,
-  child: SizedBox(
-    height: 56, // larger button height
-    child: ElevatedButton(
-      onPressed: () {
-        Navigator.pushReplacement( // ensures back goes to ScaffoldScreen
-          context,
-          MaterialPageRoute(
-            builder: (context) => const NavigationScaffold(),
+          Positioned(
+            bottom: 20, // keep it slightly above the very bottom
+            left: 16,
+            right: 16,
+            child: SizedBox(
+              height: 56, // larger button height
+              child: ElevatedButton(
+                onPressed: () {
+                  Navigator.pushReplacement(
+                    // ensures back goes to ScaffoldScreen
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => const NavigationScaffold(),
+                    ),
+                  );
+                },
+                style: ElevatedButton.styleFrom(
+                  shape: const StadiumBorder(),
+                  padding: const EdgeInsets.symmetric(vertical: 12),
+                  backgroundColor: Theme.of(context).primaryColorDark,
+                  foregroundColor: Theme.of(context).scaffoldBackgroundColor,
+                ),
+                child: Text(
+                  AppLocalizations.of(context).done,
+                  style: TextStyle(
+                      color: Theme.of(context)
+                          .colorScheme
+                          .onPrimaryContainer), // slightly bigger text
+                ),
+              ),
+            ),
           ),
-        );
-      },
-      style: ElevatedButton.styleFrom(
-        shape: const StadiumBorder(),
-        padding: const EdgeInsets.symmetric(vertical: 12),
-        backgroundColor: Theme.of(context).primaryColorDark,
-        foregroundColor: Theme.of(context).scaffoldBackgroundColor,
-      ),
-      child: Text(
-        AppLocalizations.of(context).done,
-        style: const TextStyle(fontSize: 18), // slightly bigger text
-      ),
-    ),
-  ),
-),
           if (widget.isSuccess)
             Align(
               alignment: Alignment.topCenter,

lib/features/beneficiaries/screens/manage_beneficiaries_screen.dart

@@ -1,10 +1,12 @@
 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;
@@ -60,79 +62,6 @@ 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 (_beneficiaries.isEmpty) {
       return Center(
@@ -146,7 +75,7 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
           leading: CircleAvatar(
             radius: 24,
             backgroundColor: Colors.transparent,
-            child: _getBankLogo(item.bankName),
+            child: getBankLogo(item.bankName, context),
           ),
           title: Text(item.name),
           subtitle: Column(
@@ -160,6 +89,14 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
                 ),
             ],
           ),
+          onTap: () {
+            Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (_) => BeneficiaryDetailsScreen(beneficiary: item),
+              ),
+            );
+          },
         );
       },
     );
@@ -185,8 +122,6 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
               ),
             );
           },
-          backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-          foregroundColor: Theme.of(context).primaryColor,
           elevation: 5,
           child: const Icon(Icons.add),
         ),

lib/features/card/screens/block_card_screen.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
 import '../../../l10n/app_localizations.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 class BlockCardScreen extends StatefulWidget {
   const BlockCardScreen({super.key});
@@ -56,33 +54,12 @@ 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: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 40,
-                height: 40,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
       ),
       body: Padding(
         padding: const EdgeInsets.all(10.0),

lib/features/card/screens/card_details_screen.dart

@@ -0,0 +1,164 @@
+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: 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: 18,
+                  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,6 +1,8 @@
+// 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';
@@ -20,24 +22,8 @@ class _CardManagementScreen extends State<CardManagementScreen> {
         automaticallyImplyLeading: false,
         title: Text(
           AppLocalizations.of(context).cardManagement,
-          style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 40,
-                height: 40,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
       ),
       body: ListView(
         children: [
@@ -45,6 +31,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
             icon: Symbols.add,
             label: AppLocalizations.of(context).applyDebitCard,
             onTap: () {},
+            disabled: true, // Add this
           ),
           const Divider(height: 1),
           CardManagementTile(
@@ -58,6 +45,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 ),
               );
             },
+            disabled: true,
           ),
           const Divider(height: 1),
           CardManagementTile(
@@ -71,6 +59,21 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 ),
               );
             },
+            disabled: true,
+          ),
+          const Divider(height: 1),
+          CardManagementTile(
+            icon: Symbols.payment_card,
+            label: AppLocalizations.of(context).viewCardDeatils,
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => const CardDetailsScreen(),
+                ),
+              );
+            },
+            disabled: true,
           ),
           const Divider(height: 1),
         ],
@@ -83,21 +86,36 @@ class CardManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
   final VoidCallback onTap;
+  final bool disabled;
 
   const CardManagementTile({
     super.key,
     required this.icon,
     required this.label,
     required this.onTap,
+    this.disabled = false,
   });
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     return ListTile(
-      leading: Icon(icon),
-      title: Text(label),
-      trailing: const Icon(Symbols.arrow_right, size: 20),
-      onTap: onTap,
+      leading: Icon(
+        icon,
+        color: disabled ? theme.disabledColor : null,
+      ),
+      title: Text(
+        label,
+        style: TextStyle(
+          color: disabled ? theme.disabledColor : null,
+        ),
+      ),
+      trailing: Icon(
+        Symbols.arrow_right,
+        size: 20,
+        color: disabled ? theme.disabledColor : null,
+      ),
+      onTap: disabled ? null : onTap,
     );
   }
 }

lib/features/card/screens/card_pin_change_details_screen.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
 import 'package:kmobile/features/card/screens/card_pin_set_screen.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class CardPinChangeDetailsScreen extends StatefulWidget {
@@ -46,32 +44,12 @@ 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),
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 40,
-                height: 40,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
       ),
       body: Padding(
         padding: const EdgeInsets.all(10.0),
@@ -189,7 +167,8 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen> {
                       shape: const StadiumBorder(),
                       padding: const EdgeInsets.symmetric(vertical: 16),
                       backgroundColor: Theme.of(context).primaryColor,
-                      foregroundColor: Theme.of(context).scaffoldBackgroundColor,
+                      foregroundColor:
+                          Theme.of(context).scaffoldBackgroundColor,
                     ),
                     child: Text(AppLocalizations.of(context).next),
                   ),

lib/features/card/screens/card_pin_set_screen.dart

@@ -1,6 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class CardPinSetScreen extends StatefulWidget {
@@ -46,32 +44,12 @@ 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),
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 40,
-                height: 40,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
       ),
       body: Padding(
         padding: const EdgeInsets.all(16.0),
@@ -144,7 +122,8 @@ class _CardPinSetScreen extends State<CardPinSetScreen> {
                       shape: const StadiumBorder(),
                       padding: const EdgeInsets.symmetric(vertical: 16),
                       backgroundColor: Theme.of(context).primaryColor,
-                      foregroundColor: Theme.of(context).scaffoldBackgroundColor,
+                      foregroundColor:
+                          Theme.of(context).scaffoldBackgroundColor,
                     ),
                     child: Text(AppLocalizations.of(context).submit),
                   ),

lib/features/cheque/screens/cheque_management_screen.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/features/enquiry/screens/enquiry_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
@@ -16,32 +15,12 @@ class _ChequeManagementScreen extends State<ChequeManagementScreen> {
   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),
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 40,
-                height: 40,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
       ),
       body: ListView(
         children: [

lib/features/customer_info/screens/customer_info_screen.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/data/models/user.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class CustomerInfoScreen extends StatefulWidget {
@@ -14,35 +13,25 @@ class CustomerInfoScreen extends StatefulWidget {
 
 class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
   late final User user = widget.user;
+
+  String _maskPrimaryId(String? primaryId) {
+    if (primaryId == null || primaryId.length <= 4) {
+      return primaryId ?? 'N/A';
+    }
+    final lastFour = primaryId.substring(primaryId.length - 4);
+    return '*' * (primaryId.length - 4) + lastFour;
+  }
+
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     return Scaffold(
       appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Symbols.arrow_back_ios_new),
-          onPressed: () {
-            Navigator.pop(context);
-          },
-        ),
         title: Text(
-          AppLocalizations.of(context).kMobile,
-          style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+          AppLocalizations.of(context)
+              .customerInfo
+              .replaceFirst(RegExp('\n'), ''),
         ),
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 100,
-                height: 100,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
       ),
       body: SingleChildScrollView(
         physics: const AlwaysScrollableScrollPhysics(),
@@ -54,7 +43,6 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                 children: [
                   const SizedBox(height: 30),
                   CircleAvatar(
-                    backgroundColor: Colors.grey[200],
                     radius: 50,
                     child: SvgPicture.asset(
                       'assets/images/avatar_male.svg',
@@ -67,16 +55,18 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                     padding: const EdgeInsets.only(top: 10.0),
                     child: Text(
                       user.name ?? '',
-                      style: const TextStyle(
+                      style: TextStyle(
                         fontSize: 20,
-                        color: Colors.black,
+                        color: theme.colorScheme.onSurface,
                         fontWeight: FontWeight.w500,
                       ),
                     ),
                   ),
                   Text(
                     '${AppLocalizations.of(context).cif}: ${user.cifNumber ?? 'N/A'}',
-                    style: const TextStyle(fontSize: 16, color: Colors.grey),
+                    style: TextStyle(
+                        fontSize: 16,
+                        color: theme.colorScheme.onSurfaceVariant),
                   ),
                   const SizedBox(height: 30),
                   InfoField(
@@ -89,8 +79,7 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                   ),
                   InfoField(
                     label: AppLocalizations.of(context).dateOfBirth,
-                    value:
-                        (user.dateOfBirth != null &&
+                    value: (user.dateOfBirth != null &&
                             user.dateOfBirth!.length == 8)
                         ? '${user.dateOfBirth!.substring(0, 2)}-${user.dateOfBirth!.substring(2, 4)}-${user.dateOfBirth!.substring(4, 8)}'
                         : 'N/A',
@@ -105,7 +94,7 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                   ), // Replace with Aadhar if available
                   InfoField(
                     label: AppLocalizations.of(context).primaryId,
-                    value: user.primaryId ?? 'N/A',
+                    value: _maskPrimaryId(user.primaryId),
                   ), // Replace with PAN if available
                 ],
               ),
@@ -125,6 +114,7 @@ class InfoField extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     return Container(
       width: double.infinity,
       margin: const EdgeInsets.symmetric(vertical: 8),
@@ -133,16 +123,16 @@ class InfoField extends StatelessWidget {
         children: [
           Text(
             label,
-            style: const TextStyle(
+            style: TextStyle(
               fontSize: 15,
               fontWeight: FontWeight.w500,
-              color: Colors.black87,
+              color: theme.colorScheme.onSurfaceVariant,
             ),
           ),
           const SizedBox(height: 3),
           Text(
             value,
-            style: const TextStyle(fontSize: 16, color: Colors.black),
+            style: TextStyle(fontSize: 16, color: theme.colorScheme.onSurface),
           ),
         ],
       ),

lib/features/dashboard/screens/dashboard_screen.dart

@@ -1,4 +1,3 @@
-// ignore_for_file: use_build_context_synchronously
 import 'dart:developer';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -13,7 +12,7 @@ import 'package:kmobile/features/auth/controllers/auth_state.dart';
 import 'package:kmobile/features/customer_info/screens/customer_info_screen.dart';
 import 'package:kmobile/features/beneficiaries/screens/manage_beneficiaries_screen.dart';
 import 'package:kmobile/features/enquiry/screens/enquiry_screen.dart';
-import 'package:kmobile/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart';
+import 'package:kmobile/features/fund_transfer/screens/fund_transfer_screen.dart';
 import 'package:kmobile/features/profile/profile_screen.dart';
 import 'package:kmobile/features/quick_pay/screens/quick_pay_screen.dart';
 import 'package:kmobile/security/secure_storage.dart';
@@ -31,7 +30,8 @@ class DashboardScreen extends StatefulWidget {
   State<DashboardScreen> createState() => _DashboardScreenState();
 }
 
-class _DashboardScreenState extends State<DashboardScreen> {
+class _DashboardScreenState extends State<DashboardScreen>
+    with SingleTickerProviderStateMixin {
   int selectedAccountIndex = 0;
   bool isVisible = false;
   bool isRefreshing = false;
@@ -82,8 +82,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
       // Call your AuthCubit or repository to refresh user/accounts data
       await context.read<AuthCubit>().refreshUserData();
     } catch (e) {
+      if (!context.mounted) {
+        return;
+      }
       ScaffoldMessenger.of(context).showSnackBar(
-        /*const*/ SnackBar(
+        SnackBar(
           content: Text(AppLocalizations.of(context).failedToRefresh),
         ),
       );
@@ -94,13 +97,12 @@ class _DashboardScreenState extends State<DashboardScreen> {
   }
 
   Widget _buildBalanceShimmer() {
+    final theme = Theme.of(context);
     return Shimmer.fromColors(
-      baseColor: Theme.of(context).dialogBackgroundColor,
-      highlightColor: Theme.of(context).dialogBackgroundColor,
+      baseColor: theme.colorScheme.primary,
+      highlightColor: theme.colorScheme.onPrimary,
       child: Container(
-          width: 100,
-          height: 32,
-          color: Theme.of(context).scaffoldBackgroundColor),
+          width: 200, height: 42, color: theme.scaffoldBackgroundColor),
     );
   }
 
@@ -137,6 +139,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
     switch (accountType.toLowerCase()) {
       case 'sa':
         return AppLocalizations.of(context).savingsAccount;
+      case 'sb':
+        return AppLocalizations.of(context).savingsAccount;
       case 'ln':
         return AppLocalizations.of(context).loanAccount;
       case 'td':
@@ -169,6 +173,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
             onPressed: () async {
               final auth = LocalAuthentication();
               final canCheck = await auth.canCheckBiometrics;
+              if (!mounted) return;
               bool ok = false;
               if (canCheck) {
                 ok = await auth.authenticate(
@@ -179,6 +184,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                 await storage.write('biometric_enabled', 'true');
               }
               await storage.write('biometric_prompt_shown', 'true');
+              if (!mounted) return;
               Navigator.of(context).pop();
             },
             child: Text(AppLocalizations.of(context).enable),
@@ -190,6 +196,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     return BlocListener<AuthCubit, AuthState>(
       listener: (context, state) async {
         if (state is Authenticated && !_biometricPromptShown) {
@@ -202,44 +209,54 @@ class _DashboardScreenState extends State<DashboardScreen> {
         }
       },
       child: Scaffold(
-        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+        backgroundColor: theme.scaffoldBackgroundColor,
         appBar: AppBar(
-          backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-          automaticallyImplyLeading: false,
-          title: Text(
-            AppLocalizations.of(context).kconnect,
-            style: TextStyle(
-              color: Theme.of(context).primaryColor,
-              fontWeight: FontWeight.w500,
-            ),
-          ),
-          centerTitle: true,
-          actions: [
-            Padding(
-              padding: const EdgeInsets.only(right: 10.0),
-              child: InkWell(
-                borderRadius: BorderRadius.circular(20),
-                onTap: () {
-                  Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                      builder: (context) => const ProfileScreen(),
-                    ),
-                  );
-                },
-                child: CircleAvatar(
-                  backgroundColor: Colors.grey[200],
-                  radius: 20,
-                  child: SvgPicture.asset(
-                    'assets/images/avatar_male.svg',
-                    width: 40,
-                    height: 40,
-                    fit: BoxFit.cover,
+          backgroundColor: theme.scaffoldBackgroundColor,
+          leading: Padding(
+            padding: const EdgeInsets.only(left: 10.0),
+            child: InkWell(
+              borderRadius: BorderRadius.circular(20),
+              onTap: () {
+                final authState = context.read<AuthCubit>().state;
+                String mobileNumberToPass = '';
+
+                if (authState is Authenticated) {
+                  if (selectedAccountIndex >= 0 &&
+                      selectedAccountIndex < authState.users.length) {
+                    mobileNumberToPass =
+                        authState.users[selectedAccountIndex].mobileNo ?? '';
+                  }
+                }
+
+                Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) =>
+                        ProfileScreen(mobileNumber: mobileNumberToPass),
                   ),
+                );
+              },
+              child: CircleAvatar(
+                backgroundColor: Colors.grey[200],
+                radius: 20,
+                child: SvgPicture.asset(
+                  'assets/images/avatar_male.svg',
+                  width: 40,
+                  height: 40,
+                  fit: BoxFit.cover,
                 ),
               ),
             ),
-          ],
+          ),
+          title: Text(
+            AppLocalizations.of(context).kccbMobile,
+            textAlign: TextAlign.left,
+            style: TextStyle(
+              color: theme.colorScheme.primary,
+              fontWeight: FontWeight.w700,
+            ),
+          ),
+          centerTitle: true,
         ),
         body: BlocBuilder<AuthCubit, AuthState>(
           builder: (context, state) {
@@ -268,10 +285,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
                       Padding(
                         padding: const EdgeInsets.only(left: 8.0),
                         child: Text(
-                          "${AppLocalizations.of(context).hi} $firstName",
-                          style: GoogleFonts.montserrat().copyWith(
-                            fontSize: 25,
-                            color: Theme.of(context).primaryColor,
+                          "${AppLocalizations.of(context).hi} $firstName!",
+                          style: GoogleFonts.baumans().copyWith(
+                            fontSize: 20,
+                            color: theme.colorScheme.primary,
                             fontWeight: FontWeight.w700,
                           ),
                         ),
@@ -285,7 +302,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                           vertical: 10,
                         ),
                         decoration: BoxDecoration(
-                          color: Theme.of(context).primaryColor,
+                          color: Color(0xFF01A04C),
                           borderRadius: BorderRadius.circular(16),
                         ),
                         child: Column(
@@ -294,24 +311,22 @@ class _DashboardScreenState extends State<DashboardScreen> {
                             Row(
                               children: [
                                 Text(
-                                  "${AppLocalizations.of(context).accountNumber}: ",
+                                  "${getFullAccountType(currAccount.accountType)}: ",
                                   style: TextStyle(
-                                    color:
-                                        Theme.of(context).dialogBackgroundColor,
-                                    fontSize: 12,
+                                    color: theme.colorScheme.onPrimary,
+                                    fontSize: 18,
+                                    fontWeight: FontWeight.w700,
                                   ),
                                 ),
                                 DropdownButton<int>(
                                   value: selectedAccountIndex,
-                                  dropdownColor: Theme.of(context).primaryColor,
+                                  dropdownColor: theme.colorScheme.primary,
                                   underline: const SizedBox(),
                                   icon: const Icon(Icons.keyboard_arrow_down),
-                                  iconEnabledColor:
-                                      Theme.of(context).dialogBackgroundColor,
+                                  iconEnabledColor: theme.colorScheme.onPrimary,
                                   style: TextStyle(
-                                    color:
-                                        Theme.of(context).dialogBackgroundColor,
-                                    fontSize: 14,
+                                    color: theme.colorScheme.onPrimary,
+                                    fontSize: 18,
                                   ),
                                   items: List.generate(users.length, (index) {
                                     return DropdownMenuItem<int>(
@@ -319,9 +334,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                       child: Text(
                                         users[index].accountNo ?? 'N/A',
                                         style: TextStyle(
-                                          color: Theme.of(context)
-                                              .dialogBackgroundColor,
-                                          fontSize: 14,
+                                          color: theme.colorScheme.onPrimary,
+                                          fontSize: 18,
+                                          fontWeight: FontWeight.w700,
                                         ),
                                       ),
                                     );
@@ -360,15 +375,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                           width: 20,
                                           height: 20,
                                           child: CircularProgressIndicator(
-                                            color: Theme.of(context)
-                                                .dialogBackgroundColor,
+                                            color: theme.colorScheme.onPrimary,
                                             strokeWidth: 2,
                                           ),
                                         )
                                       : Icon(
-                                          Icons.refresh,
-                                          color: Theme.of(context)
-                                              .dialogBackgroundColor,
+                                          Symbols.refresh,
+                                          color: theme.colorScheme.onPrimary,
                                         ),
                                   onPressed: isRefreshing
                                       ? null
@@ -377,22 +390,14 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                 ),
                               ],
                             ),
-                            Text(
-                              getFullAccountType(currAccount.accountType),
-                              style: TextStyle(
-                                color: Theme.of(context).dialogBackgroundColor,
-                                fontSize: 16,
-                              ),
-                            ),
-                            const SizedBox(height: 4),
+                            const SizedBox(height: 15),
                             Row(
                               mainAxisAlignment: MainAxisAlignment.start,
                               children: [
                                 Text(
                                   "₹ ",
                                   style: TextStyle(
-                                    color:
-                                        Theme.of(context).dialogBackgroundColor,
+                                    color: theme.colorScheme.onPrimary,
                                     fontSize: 40,
                                     fontWeight: FontWeight.w700,
                                   ),
@@ -403,10 +408,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                         isVisible
                                             ? currAccount.currentBalance ??
                                                 '0.00'
-                                            : '********',
+                                            : '*****',
                                         style: TextStyle(
-                                          color: Theme.of(context)
-                                              .dialogBackgroundColor,
+                                          color: theme.colorScheme.onPrimary,
                                           fontSize: 40,
                                           fontWeight: FontWeight.w700,
                                         ),
@@ -432,12 +436,15 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                       });
                                     }
                                   },
-                                  child: Icon(
-                                    isVisible
-                                        ? Symbols.visibility_lock
-                                        : Symbols.visibility,
-                                    color: Theme.of(context)
-                                        .scaffoldBackgroundColor,
+                                  child: Padding(
+                                    padding: const EdgeInsets.all(8.0),
+                                    child: Icon(
+                                      isVisible
+                                          ? Symbols.visibility_lock
+                                          : Symbols.visibility,
+                                      color: theme.scaffoldBackgroundColor,
+                                      weight: 800,
+                                    ),
                                   ),
                                 ),
                               ],
@@ -492,8 +499,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
                             Navigator.push(
                                 context,
                                 MaterialPageRoute(
-                                    builder: (context) =>
-                                        FundTransferBeneficiaryScreen(creditAccountNo: users[selectedAccountIndex].accountNo!, remitterName: users[selectedAccountIndex].name!)));
+                                    builder: (context) => FundTransferScreen(
+                                        creditAccountNo:
+                                            users[selectedAccountIndex]
+                                                .accountNo!,
+                                        remitterName:
+                                            users[selectedAccountIndex]
+                                                .name!)));
                           }, disable: false),
                           _buildQuickLink(
                             Symbols.server_person,
@@ -520,6 +532,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                         AccountStatementScreen(
                                           accountNo: users[selectedAccountIndex]
                                               .accountNo!,
+                                          balance: users[selectedAccountIndex]
+                                              .availableBalance!,
+                                          accountType:
+                                              users[selectedAccountIndex]
+                                                  .accountType!,
                                         )));
                           }),
                           _buildQuickLink(Symbols.checkbook,
@@ -562,34 +579,35 @@ class _DashboardScreenState extends State<DashboardScreen> {
                               tx.type == 'CR'
                                   ? Symbols.call_received
                                   : Symbols.call_made,
-                              color:
-                                  tx.type == 'CR' ? Colors.green : Colors.red,
+                              color: tx.type == 'CR'
+                                  ? const Color(0xFF10BB10)
+                                  : theme.colorScheme.error,
                             ),
                             title: Text(
+                              tx.date ?? '',
+                              style: const TextStyle(fontSize: 15),
+                            ),
+                            subtitle: Text(
                               tx.name != null
-                                  ? (tx.name!.length > 18
+                                  ? (tx.name!.length > 22
                                       ? tx.name!.substring(0, 22)
                                       : tx.name!)
                                   : '',
-                              style: const TextStyle(fontSize: 14),
-                            ),
-                            subtitle: Text(
-                              tx.date ?? '',
                               style: const TextStyle(fontSize: 12),
                             ),
                             trailing: Text(
                               "₹${tx.amount}",
-                              style: const TextStyle(fontSize: 16),
+                              style: const TextStyle(fontSize: 17),
                             ),
                             onTap: () {
-                                Navigator.push(
-                                  context,
-                                  MaterialPageRoute(
-                                    builder: (_) =>
-                                    TransactionDetailsScreen(transaction: tx),
-                                    ),
-                                    );
-                              },
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                  builder: (_) =>
+                                      TransactionDetailsScreen(transaction: tx),
+                                ),
+                              );
+                            },
                           ),
                         )
                       else
@@ -600,7 +618,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                               AppLocalizations.of(context).noTransactions,
                               style: TextStyle(
                                 fontSize: 16,
-                                color: Colors.grey[600],
+                                color: Theme.of(context).colorScheme.outline,
                               ),
                             ),
                           ),
@@ -620,30 +638,26 @@ class _DashboardScreenState extends State<DashboardScreen> {
   }
 
   List<Widget> _buildTransactionShimmer() {
+    final theme = Theme.of(context);
     return List.generate(3, (i) {
       return ListTile(
         leading: Shimmer.fromColors(
           baseColor: Colors.grey[300]!,
           highlightColor: Colors.grey[100]!,
           child: CircleAvatar(
-              radius: 12,
-              backgroundColor: Theme.of(context).scaffoldBackgroundColor),
+              radius: 12, backgroundColor: theme.scaffoldBackgroundColor),
         ),
         title: Shimmer.fromColors(
           baseColor: Colors.grey[300]!,
           highlightColor: Colors.grey[100]!,
           child: Container(
-              height: 10,
-              width: 100,
-              color: Theme.of(context).scaffoldBackgroundColor),
+              height: 10, width: 100, color: theme.scaffoldBackgroundColor),
         ),
         subtitle: Shimmer.fromColors(
           baseColor: Colors.grey[300]!,
           highlightColor: Colors.grey[100]!,
           child: Container(
-              height: 8,
-              width: 60,
-              color: Theme.of(context).scaffoldBackgroundColor),
+              height: 8, width: 60, color: theme.scaffoldBackgroundColor),
         ),
       );
     });
@@ -655,6 +669,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
     VoidCallback onTap, {
     bool disable = false,
   }) {
+    final theme = Theme.of(context);
     return InkWell(
       onTap: disable ? null : onTap,
       child: Column(
@@ -663,7 +678,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
           Icon(
             icon,
             size: 30,
-            color: disable ? Colors.grey : Theme.of(context).primaryColor,
+            color: disable
+                ? theme.colorScheme.onSurface.withOpacity(0.3)
+                : theme.colorScheme.primary,
+            grade: 200,
+            weight: 700,
           ),
           const SizedBox(height: 4),
           Text(

lib/features/dashboard/widgets/account_card.dart

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

lib/features/dashboard/widgets/transaction_list_item.dart

@@ -25,7 +25,8 @@ class TransactionListItem extends StatelessWidget {
             Container(
               padding: const EdgeInsets.all(10),
               decoration: BoxDecoration(
-                color: _getCategoryColor(transaction.category).withAlpha((0.1 * 255).toInt()),
+                color: _getCategoryColor(transaction.category)
+                    .withAlpha((0.1 * 255).toInt()),
                 borderRadius: BorderRadius.circular(8),
               ),
               child: Icon(
@@ -48,7 +49,8 @@ class TransactionListItem extends StatelessWidget {
                     ),
                   ),
                   Text(
-                    DateFormat('MMM dd, yyyy • h:mm a').format(transaction.date),
+                    DateFormat('MMM dd, yyyy • h:mm a')
+                        .format(transaction.date),
                     style: TextStyle(
                       color: Colors.grey[600],
                       fontSize: 12,

lib/features/enquiry/screens/enquiry_screen.dart

@@ -1,8 +1,6 @@
 // ignore_for_file: use_build_context_synchronously
 
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:url_launcher/url_launcher.dart';
 import '../../../l10n/app_localizations.dart';
 
@@ -32,20 +30,34 @@ class _EnquiryScreen extends State<EnquiryScreen> {
     }
   }
 
+  Future<void> _launchUrl(String url) async {
+    final Uri uri = Uri.parse(url);
+    if (await canLaunchUrl(uri)) {
+      await launchUrl(uri);
+    } else {
+      // Consider adding a 'urlLaunchError' key to your AppLocalizations
+      debugPrint('Could not launch $url');
+    }
+  }
+
   Widget _buildContactItem(String role, String email, String phone) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(role, style: const TextStyle(color: Colors.grey)),
+        Text(role,
+            style: TextStyle(color: Theme.of(context).colorScheme.onSurface)),
         const SizedBox(height: 4),
         GestureDetector(
           onTap: () => _launchEmailAddress(email),
-          child: Text(email, style:  TextStyle(color: Theme.of(context).primaryColor)),
+          child: Text(email,
+              style: TextStyle(color: Theme.of(context).colorScheme.primary)),
         ),
         const SizedBox(height: 4),
         GestureDetector(
           onTap: () => _launchPhoneNumber(phone),
-          child: Text(phone, style:  TextStyle(color: Theme.of(context).scaffoldBackgroundColor)),
+          child: Text(phone,
+              style:
+                  TextStyle(color: Theme.of(context).scaffoldBackgroundColor)),
         ),
       ],
     );
@@ -55,60 +67,43 @@ class _EnquiryScreen extends State<EnquiryScreen> {
   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).enquiry,
-          style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
-        ),
+        title: Text(AppLocalizations.of(context).enquiry),
         centerTitle: false,
-        actions: [
-          Padding(
-            padding: const EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundColor: Colors.grey[200],
-              radius: 20,
-              child: SvgPicture.asset(
-                'assets/images/avatar_male.svg',
-                width: 40,
-                height: 40,
-                fit: BoxFit.cover,
-              ),
-            ),
-          ),
-        ],
       ),
       body: Padding(
         padding: const EdgeInsets.all(16.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            // … existing Mail us / Call us / Write to us …
-            const SizedBox(height: 20),
-            Text(
-              AppLocalizations.of(context).writeToUs,
-              style: const TextStyle(color: Colors.grey),
-            ),
-            const SizedBox(height: 4),
-            Text(
-              "complaint@kccb.in",
-              style: TextStyle(color: Theme.of(context).primaryColor),
-            ),
-
             const SizedBox(height: 20),
+            GestureDetector(
+                onTap: () => _launchUrl("https://kccb.in/complaint-form"),
+                child: Row(mainAxisSize: MainAxisSize.min, children: [
+                  Text(
+                    "Complaint Form",
+                    style: TextStyle(
+                      fontSize: 17,
+                      color: Theme.of(context).colorScheme.primary,
+                      decorationColor: Theme.of(context).colorScheme.primary,
+                    ),
+                  ),
+                  const SizedBox(width: 4),
+                  Icon(
+                    Icons.open_in_new,
+                    color: Theme.of(context).colorScheme.primary,
+                    size: 16.0,
+                  ),
+                ])),
+            const SizedBox(height: 40),
             Text(
               AppLocalizations.of(context).keyContacts,
               style: TextStyle(
                 fontSize: 17,
-                color: Theme.of(context).primaryColor,
+                color: Theme.of(context).colorScheme.primary,
               ),
               // horizontal line
             ),
-            Divider(color: Colors.grey[300]),
+            Divider(color: Theme.of(context).colorScheme.outline),
             const SizedBox(height: 16),
             _buildContactItem(
               AppLocalizations.of(context).chairman,

lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart

@@ -1,12 +1,12 @@
-// ignore_for_file: avoid_print
-
 import 'dart:async';
 import 'dart:convert';
-
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:kmobile/api/services/neft_service.dart';
 import 'package:kmobile/api/services/rtgs_service.dart';
+import 'package:kmobile/api/services/imps_service.dart';
+import 'package:kmobile/data/models/imps_transaction.dart';
+import 'package:kmobile/widgets/bank_logos.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
 import 'package:kmobile/data/models/neft_transaction.dart';
 import 'package:kmobile/data/models/payment_response.dart';
@@ -15,19 +15,23 @@ import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/features/fund_transfer/screens/payment_animation.dart';
 import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
 import '../../../l10n/app_localizations.dart';
+import 'package:kmobile/api/services/payment_service.dart';
+import 'package:kmobile/data/models/transfer.dart';
 
-enum TransactionMode { neft, rtgs }
+enum TransactionMode { neft, rtgs, imps }
 
 class FundTransferAmountScreen extends StatefulWidget {
   final String debitAccountNo;
   final Beneficiary creditBeneficiary;
   final String remitterName;
+  final bool isOwnBank;
 
   const FundTransferAmountScreen({
     super.key,
     required this.debitAccountNo,
     required this.creditBeneficiary,
     required this.remitterName,
+    this.isOwnBank = false,
   });
 
   @override
@@ -37,178 +41,258 @@ class FundTransferAmountScreen extends StatefulWidget {
 
 class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
   final _amountController = TextEditingController();
+  final _remarksController = TextEditingController();
   final _formKey = GlobalKey<FormState>();
   TransactionMode _selectedMode = TransactionMode.neft;
 
   @override
   void dispose() {
     _amountController.dispose();
+    _remarksController.dispose();
     super.dispose();
   }
 
-  Widget _getBankLogo(String? bankName) {
-    if (bankName != null && bankName.toLowerCase().contains('state bank of india')) {
-      return Image.asset(
-        'assets/images/sbi_logo.png',
-        width: 40,
-        height: 40,
-      );
-    } else {
-      return const Icon(
-        Icons.account_balance,
-        size: 40,
-        color: Colors.grey,
-      );
-    }
-  }
-
   void _onProceed() {
     if (_formKey.currentState!.validate()) {
       final amount = double.tryParse(_amountController.text) ?? 0;
+      if (widget.isOwnBank) {
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => TransactionPinScreen(
+              onPinCompleted: (pinScreenContext, tpin) async {
+                final transfer = Transfer(
+                  fromAccount: widget.debitAccountNo,
+                  toAccount: widget.creditBeneficiary.accountNo,
+                  toAccountType: 'Savings', // Assuming 'SB' for savings
+                  amount: _amountController.text,
+                  tpin: tpin,
+                );
 
-      if (_selectedMode == TransactionMode.rtgs && amount < 200000) {
-        showDialog(
-          context: context,
-          builder: (ctx) => AlertDialog(
-            title: const Text('Invalid Amount for RTGS'),
-            content: const Text(
-                'RTGS transactions require a minimum amount of 200,000. Please enter a higher amount or select NEFT as the transaction mode.'),
-            actions: [
-              TextButton(
-                onPressed: () => Navigator.of(ctx).pop(),
-                child: const Text('OK'),
-              ),
-            ],
+                final paymentService = getIt<PaymentService>();
+                final paymentResponseFuture =
+                    paymentService.processQuickPayWithinBank(transfer);
+
+                Navigator.of(pinScreenContext).pushReplacement(
+                  MaterialPageRoute(
+                    builder: (_) => PaymentAnimationScreen(
+                        paymentResponse: paymentResponseFuture),
+                  ),
+                );
+              },
+            ),
           ),
         );
-        return; // Stop further execution
-      }
+      } else {
+        if (_selectedMode == TransactionMode.rtgs && amount < 200000) {
+          showDialog(
+            context: context,
+            builder: (ctx) => AlertDialog(
+              title: Text(AppLocalizations.of(context).invalidRtgs),
+              content: Text(AppLocalizations.of(context).invalidRtgsPopUp),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.of(ctx).pop(),
+                  child: Text(AppLocalizations.of(context).ok),
+                ),
+              ],
+            ),
+          );
+          return; // Stop further execution
+        }
 
-      Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => TransactionPinScreen(
-            onPinCompleted: (pinScreenContext, tpin) async {
-              if (_selectedMode == TransactionMode.neft) {
-                final neftTx = NeftTransaction(
-                  fromAccount: widget.debitAccountNo,
-                  toAccount: widget.creditBeneficiary.accountNo,
-                  amount: _amountController.text,
-                  ifscCode: widget.creditBeneficiary.ifscCode,
-                  remitterName: widget.remitterName,
-                  beneficiaryName: widget.creditBeneficiary.name,
-                  tpin: tpin,
-                );
-                final neftService = getIt<NeftService>();
-
-                final completer = Completer<PaymentResponse>();
-
-                Navigator.of(pinScreenContext).pushReplacement(
-                  MaterialPageRoute(
-                    builder: (_) => PaymentAnimationScreen(
-                        paymentResponse: completer.future),
-                  ),
-                );
-
-                try {
-                  final neftResponse =
-                      await neftService.processNeftTransaction(neftTx);
-                  final paymentResponse = PaymentResponse(
-                    isSuccess: neftResponse.message.toUpperCase() == 'SUCCESS',
-                    date: DateTime.now(),
-                    creditedAccount: neftTx.toAccount,
-                    amount: neftTx.amount,
-                    currency: 'INR',
-                    utr: neftResponse.utr,
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => TransactionPinScreen(
+              onPinCompleted: (pinScreenContext, tpin) async {
+                if (_selectedMode == TransactionMode.neft) {
+                  final neftTx = NeftTransaction(
+                    fromAccount: widget.debitAccountNo,
+                    toAccount: widget.creditBeneficiary.accountNo,
+                    amount: _amountController.text,
+                    ifscCode: widget.creditBeneficiary.ifscCode,
+                    remitterName: widget.remitterName,
+                    beneficiaryName: widget.creditBeneficiary.name,
+                    tpin: tpin,
+                    remarks: _remarksController.text,
                   );
-                  completer.complete(paymentResponse);
-                } on DioException catch(e) {
-                  print('dio exception');
-                  print(e.toString());
+                  final neftService = getIt<NeftService>();
+                  final completer = Completer<PaymentResponse>();
 
-                  final error = jsonDecode(e.response.toString())['error'];
-                  var errorMessage = 
-                  {
-                    "INCORRECT_TPIN" : "Please Enter the correct TPIN",
-                    "INSUFFICIENT_FUNDS": "Your account does not have sufficient balance"
-                  }[error] ?? "Something Went Wrong";
+                  Navigator.of(pinScreenContext).pushReplacement(
+                    MaterialPageRoute(
+                      builder: (_) => PaymentAnimationScreen(
+                          paymentResponse: completer.future),
+                    ),
+                  );
+
+                  try {
+                    final neftResponse =
+                        await neftService.processNeftTransaction(neftTx);
+                    final paymentResponse = PaymentResponse(
+                      isSuccess:
+                          neftResponse.message.toUpperCase() == 'SUCCESS',
+                      date: DateTime.now(),
+                      creditedAccount: neftTx.toAccount,
+                      amount: neftTx.amount,
+                      currency: 'INR',
+                      utr: neftResponse.utr,
+                    );
+                    completer.complete(paymentResponse);
+                  } on DioException catch (e) {
+                    String errorMessage;
+                    if (e.response != null && e.response!.data != null) {
+                      try {
+                        // final error = jsonDecode(e.response!.toString())['error'];
+                        final error = e.response?.data['error'];
+                        errorMessage = {
+                              "INCORRECT_TPIN": "Please Enter the correct TPIN",
+                              "INSUFFICIENT_FUNDS":
+                                  "Your account does not have sufficient balance"
+                            }[error] ??
+                            "Something Went Wrong";
+                      } catch (_) {
+                        errorMessage = "Something Went Wrong";
+                      }
+                    } else {
+                      errorMessage = "Something Went Wrong";
+                    }
+                    final paymentResponse = PaymentResponse(
+                      isSuccess: false,
+                      errorMessage: errorMessage,
+                    );
+                    completer.complete(paymentResponse);
+                  } catch (e) {
+                    if (!pinScreenContext.mounted) return;
+                    final paymentResponse = PaymentResponse(
+                      isSuccess: false,
+                      errorMessage: AppLocalizations.of(pinScreenContext)
+                          .somethingWentWrong,
+                    );
+                    completer.complete(paymentResponse);
+                  }
+                }
+                //IMPS transaction
+                else if (_selectedMode == TransactionMode.imps) {
+                  final impsTx = ImpsTransaction(
+                    fromAccount: widget.debitAccountNo,
+                    toAccount: widget.creditBeneficiary.accountNo,
+                    amount: _amountController.text,
+                    ifscCode: widget.creditBeneficiary.ifscCode,
+                    remitterName: widget.remitterName,
+                    beneficiaryName: widget.creditBeneficiary.name,
+                    tpin: tpin,
+                    remarks: _remarksController.text,
+                  );
+                  final impsService = getIt<ImpsService>();
+                  final completer = Completer<PaymentResponse>();
+
+                  Navigator.of(pinScreenContext).pushReplacement(
+                    MaterialPageRoute(
+                      builder: (_) => PaymentAnimationScreen(
+                          paymentResponse: completer.future),
+                    ),
+                  );
+
+                  try {
+                    final impsResponse =
+                        await impsService.processImpsTransaction(impsTx);
+                    final paymentResponse = PaymentResponse(
+                      isSuccess:
+                          impsResponse.message.toUpperCase() == 'SUCCESS',
+                      date: DateTime.now(),
+                      creditedAccount: impsTx.toAccount,
+                      amount: impsTx.amount,
+                      currency: 'INR',
+                      utr: impsResponse.utr,
+                    );
+                    completer.complete(paymentResponse);
+                  } on DioException catch (e) {
+                    final error = jsonDecode(e.response.toString())['error'];
+                    var errorMessage = {
+                          "INCORRECT_TPIN": "Please Enter the correct TPIN",
+                          "INSUFFICIENT_FUNDS":
+                              "Your account does not have sufficient balance"
+                        }[error] ??
+                        "Something Went Wrong";
 
                     final paymentResponse = PaymentResponse(
-                    isSuccess: false,
-                    errorMessage: errorMessage,
-                  );
-                  completer.complete(paymentResponse);
-                } catch (e) {
-                  print('generic exception');
-                  print(e.toString());
-                  final paymentResponse = PaymentResponse(
-                    isSuccess: false,
-                    errorMessage: "Something went Wrong",
-                  );
-                  completer.complete(paymentResponse);
+                      isSuccess: false,
+                      errorMessage: errorMessage,
+                    );
+                    completer.complete(paymentResponse);
+                  } catch (e) {
+                    final paymentResponse = PaymentResponse(
+                      isSuccess: false,
+                      errorMessage: "Something went Wrong",
+                    );
+                    completer.complete(paymentResponse);
+                  }
                 }
-              } else {
-                final rtgsTx = RtgsTransaction(
-                  fromAccount: widget.debitAccountNo,
-                  toAccount: widget.creditBeneficiary.accountNo,
-                  amount: _amountController.text,
-                  ifscCode: widget.creditBeneficiary.ifscCode,
-                  remitterName: widget.remitterName,
-                  beneficiaryName: widget.creditBeneficiary.name,
-                  tpin: tpin,
-                );
-                final rtgsService = getIt<RtgsService>();
-                final completer = Completer<PaymentResponse>();
-
-                Navigator.of(pinScreenContext).pushReplacement(
-                  MaterialPageRoute(
-                    builder: (_) => PaymentAnimationScreen(
-                        paymentResponse: completer.future),
-                  ),
-                );
-
-                try {
-                  final rtgsResponse =
-                      await rtgsService.processRtgsTransaction(rtgsTx);
-                  final paymentResponse = PaymentResponse(
-                    isSuccess: rtgsResponse.message.toUpperCase() == 'SUCCESS',
-                    date: DateTime.now(),
-                    creditedAccount: rtgsTx.toAccount,
-                    amount: rtgsTx.amount,
-                    currency: 'INR',
-                    utr: rtgsResponse.utr,
+                //RTGS
+                else {
+                  final rtgsTx = RtgsTransaction(
+                    fromAccount: widget.debitAccountNo,
+                    toAccount: widget.creditBeneficiary.accountNo,
+                    amount: _amountController.text,
+                    ifscCode: widget.creditBeneficiary.ifscCode,
+                    remitterName: widget.remitterName,
+                    beneficiaryName: widget.creditBeneficiary.name,
+                    tpin: tpin,
+                    remarks: _remarksController.text,
                   );
-                  completer.complete(paymentResponse);
-                } on DioException catch(e) {
-                  print('dio exception');
-                  print(e.toString());
+                  final rtgsService = getIt<RtgsService>();
+                  final completer = Completer<PaymentResponse>();
 
-                  final error = jsonDecode(e.response.toString())['error'];
-                  var errorMessage = 
-                  {
-                    "INCORRECT_TPIN" : "Please Enter the correct TPIN",
-                    "INSUFFICIENT_FUNDS": "Your account does not have sufficient balance"
-                  }[error] ?? "Something Went Wrong";
+                  Navigator.of(pinScreenContext).pushReplacement(
+                    MaterialPageRoute(
+                      builder: (_) => PaymentAnimationScreen(
+                          paymentResponse: completer.future),
+                    ),
+                  );
+
+                  try {
+                    final rtgsResponse =
+                        await rtgsService.processRtgsTransaction(rtgsTx);
+                    final paymentResponse = PaymentResponse(
+                      isSuccess:
+                          rtgsResponse.message.toUpperCase() == 'SUCCESS',
+                      date: DateTime.now(),
+                      creditedAccount: rtgsTx.toAccount,
+                      amount: rtgsTx.amount,
+                      currency: 'INR',
+                      utr: rtgsResponse.utr,
+                    );
+                    completer.complete(paymentResponse);
+                  } on DioException catch (e) {
+                    final error = jsonDecode(e.response.toString())['error'];
+                    var errorMessage = {
+                          "INCORRECT_TPIN": "Please Enter the correct TPIN",
+                          "INSUFFICIENT_FUNDS":
+                              "Your account does not have sufficient balance"
+                          // ignore: use_build_context_synchronously
+                        }[error] ??
+                        "Something Went Wrong";
 
                     final paymentResponse = PaymentResponse(
-                    isSuccess: false,
-                    errorMessage: errorMessage,
-                  );
-                  completer.complete(paymentResponse);
-                } catch (e) {
-                  print('generic exception');
-                  print(e.toString());
-                  final paymentResponse = PaymentResponse(
-                    isSuccess: false,
-                    errorMessage: "Something went Wrong",
-                  );
-                  completer.complete(paymentResponse);
+                      isSuccess: false,
+                      errorMessage: errorMessage,
+                    );
+                    completer.complete(paymentResponse);
+                  } catch (e) {
+                    final paymentResponse = PaymentResponse(
+                      isSuccess: false,
+                      errorMessage: "Something Went Wrong",
+                    );
+                    completer.complete(paymentResponse);
+                  }
                 }
-              }
-            },
+              },
+            ),
           ),
-        ),
-      );
+        );
+      }
     }
   }
 
@@ -217,129 +301,151 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
     final loc = AppLocalizations.of(context);
     return Scaffold(
       appBar: AppBar(
-        title: Text(loc.fundTransfer),
+        title: Text(loc.fundTransfer.replaceFirst(RegExp('\n'), '')),
       ),
-      body: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Form(
-          key: _formKey,
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              // Debit Account (User)
-              Text(
-                loc.debitFrom,
-                style: Theme.of(context).textTheme.titleSmall,
-              ),
-              Card(
-                elevation: 0,
-                margin: const EdgeInsets.symmetric(vertical: 8.0),
-                child: ListTile(
-                  leading: Image.asset(
-                    'assets/images/logo.png',
-                    width: 40,
-                    height: 40,
+      body: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Form(
+            key: _formKey,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // Debit Account (User)
+                Text(
+                  loc.debitFrom,
+                  style: Theme.of(context).textTheme.titleSmall,
+                ),
+                Card(
+                  elevation: 0,
+                  margin: const EdgeInsets.symmetric(vertical: 8.0),
+                  child: ListTile(
+                    leading: Image.asset(
+                      'assets/images/logo.png',
+                      width: 40,
+                      height: 40,
+                    ),
+                    title: Text(widget.remitterName),
+                    subtitle: Text(widget.debitAccountNo),
                   ),
-                  title: Text(widget.remitterName),
-                  subtitle: Text(widget.debitAccountNo),
                 ),
-              ),
-              const SizedBox(height: 24),
+                const SizedBox(height: 24),
 
-              // Credit Account (Beneficiary)
-              Text(
-                "Credit To",
-                style: Theme.of(context).textTheme.titleSmall,
-              ),
-              Card(
-                elevation: 0,
-                margin: const EdgeInsets.symmetric(vertical: 8.0),
-                child: ListTile(
-                  leading: _getBankLogo(widget.creditBeneficiary.bankName),
-                  title: Text(widget.creditBeneficiary.name),
-                  subtitle: Text(widget.creditBeneficiary.accountNo),
+                // Credit Account (Beneficiary)
+                Text(
+                  AppLocalizations.of(context).creditedTo,
+                  style: Theme.of(context).textTheme.titleSmall,
                 ),
-              ),
-              const SizedBox(height: 24),
+                Card(
+                  elevation: 0,
+                  margin: const EdgeInsets.symmetric(vertical: 8.0),
+                  child: ListTile(
+                    leading:
+                        getBankLogo(widget.creditBeneficiary.bankName, context),
+                    title: Text(widget.creditBeneficiary.name),
+                    subtitle: Text(widget.creditBeneficiary.accountNo),
+                  ),
+                ),
+                const SizedBox(height: 24),
 
-              // Transaction Mode Selection
-              Text(
-                "Select Transaction Mode",
-                style: Theme.of(context).textTheme.titleMedium,
-              ),
-              const SizedBox(height: 12),
-              Container(
-                decoration: BoxDecoration(
-                  color: Theme.of(context).cardColor,
-                  borderRadius: BorderRadius.circular(12),
-                  border: Border.all(color: Colors.grey.shade300),
+                if (!widget.isOwnBank) ...[
+                  // Transaction Mode Selection
+                  Text(
+                    AppLocalizations.of(context).selectTransactionType,
+                    style: Theme.of(context).textTheme.titleMedium,
+                  ),
+                  const SizedBox(height: 12),
+                  Container(
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).cardColor,
+                      borderRadius: BorderRadius.circular(12),
+                      border: Border.all(color: Colors.grey.shade300),
+                    ),
+                    child: ToggleButtons(
+                      isSelected: [
+                        _selectedMode == TransactionMode.neft,
+                        _selectedMode == TransactionMode.rtgs,
+                        _selectedMode == TransactionMode.imps,
+                      ],
+                      onPressed: (index) {
+                        setState(() {
+                          _selectedMode = TransactionMode.values[index];
+                        });
+                      },
+                      borderRadius: BorderRadius.circular(10),
+                      selectedColor: Theme.of(context).colorScheme.onPrimary,
+                      fillColor: Theme.of(context).colorScheme.primary,
+                      color: Theme.of(context).colorScheme.onSurface,
+                      borderColor: Colors.transparent,
+                      selectedBorderColor: Colors.transparent,
+                      splashColor: Theme.of(context).colorScheme.primary,
+                      highlightColor: Theme.of(context).colorScheme.primary,
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: 24.0, vertical: 12.0),
+                          child: Text(AppLocalizations.of(context).neft),
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: 24.0, vertical: 12.0),
+                          child: Text(AppLocalizations.of(context).rtgs),
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: 24.0, vertical: 12.0),
+                          child: Text(AppLocalizations.of(context).imps),
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(height: 24),
+                ],
+                //Remarks
+                TextFormField(
+                  controller: _remarksController,
+                  decoration: InputDecoration(
+                    labelText: AppLocalizations.of(context).remarks,
+                    border: const OutlineInputBorder(),
+                  ),
                 ),
-                child: ToggleButtons(
-                  isSelected: [
-                    _selectedMode == TransactionMode.neft,
-                    _selectedMode == TransactionMode.rtgs
-                  ],
-                  onPressed: (index) {
-                    setState(() {
-                      _selectedMode = TransactionMode.values[index];
-                    });
+                const SizedBox(height: 24),
+                // Amount
+                TextFormField(
+                  controller: _amountController,
+                  keyboardType: TextInputType.number,
+                  decoration: InputDecoration(
+                    labelText: loc.amount,
+                    border: const OutlineInputBorder(),
+                    prefixIcon: const Icon(Icons.currency_rupee),
+                  ),
+                  validator: (value) {
+                    if (value == null || value.isEmpty) {
+                      return loc.amountRequired;
+                    }
+                    if (double.tryParse(value) == null ||
+                        double.parse(value) <= 0) {
+                      return loc.validAmount;
+                    }
+                    return null;
                   },
-                  borderRadius: BorderRadius.circular(10),
-                  selectedColor: Theme.of(context).colorScheme.onPrimary,
-                  fillColor: Theme.of(context).primaryColor,
-                  color: Theme.of(context).colorScheme.onSurface,
-                  borderColor: Colors.transparent,
-                  selectedBorderColor: Colors.transparent,
-                  splashColor: Theme.of(context).primaryColor.withOpacity(0.1),
-                  highlightColor: Theme.of(context).primaryColor.withOpacity(0.05),
-                  children: const [
-                    Padding(
-                      padding: EdgeInsets.symmetric(horizontal: 24.0, vertical: 12.0),
-                      child: Text('NEFT'),
-                    ),
-                    Padding(
-                      padding: EdgeInsets.symmetric(horizontal: 24.0, vertical: 12.0),
-                      child: Text('RTGS'),
-                    ),
-                  ],
                 ),
-              ),
-              const SizedBox(height: 24),
+                const Spacer(),
 
-              // Amount
-              TextFormField(
-                controller: _amountController,
-                keyboardType: TextInputType.number,
-                decoration: InputDecoration(
-                  labelText: loc.amount,
-                  border: const OutlineInputBorder(),
-                  prefixIcon: const Icon(Icons.currency_rupee),
-                ),
-                validator: (value) {
-                  if (value == null || value.isEmpty) {
-                    return loc.amountRequired;
-                  }
-                  if (double.tryParse(value) == null ||
-                      double.parse(value) <= 0) {
-                    return loc.validAmount;
-                  }
-                  return null;
-                },
-              ),
-              const Spacer(),
-
-              // Proceed Button
-              SizedBox(
-                width: double.infinity,
-                child: ElevatedButton(
-                  onPressed: _onProceed,
-                  style: ElevatedButton.styleFrom(
-                    padding: const EdgeInsets.symmetric(vertical: 16),
+                // Proceed Button
+                SizedBox(
+                  width: double.infinity,
+                  child: ElevatedButton(
+                    onPressed: _onProceed,
+                    style: ElevatedButton.styleFrom(
+                      padding: const EdgeInsets.symmetric(vertical: 16),
+                    ),
+                    child: Text(AppLocalizations.of(context).proceed),
                   ),
-                  child: const Text("Proceed"),
                 ),
-              ),
-            ],
+                const SizedBox(height: 10),
+              ],
+            ),
           ),
         ),
       ),

lib/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:kmobile/widgets/bank_logos.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
 import 'package:kmobile/features/fund_transfer/screens/fund_transfer_amount_screen.dart';
 import '../../../l10n/app_localizations.dart';
@@ -9,8 +10,12 @@ import 'package:shimmer/shimmer.dart';
 class FundTransferBeneficiaryScreen extends StatefulWidget {
   final String creditAccountNo;
   final String remitterName;
+  final bool isOwnBank;
   const FundTransferBeneficiaryScreen(
-      {super.key, required this.creditAccountNo, required this.remitterName});
+      {super.key,
+      required this.creditAccountNo,
+      required this.remitterName,
+      required this.isOwnBank});
 
   @override
   State<FundTransferBeneficiaryScreen> createState() =>
@@ -32,7 +37,11 @@ class _FundTransferBeneficiaryScreenState
   Future<void> _loadBeneficiaries() async {
     final data = await service.fetchBeneficiaryList();
     setState(() {
-      _beneficiaries = data;
+      _beneficiaries = data
+          .where((b) => widget.isOwnBank
+              ? b.bankName!.toLowerCase().contains('kangra central')
+              : !b.bankName!.toLowerCase().contains('kangra central'))
+          .toList();
       _isLoading = false;
     });
   }
@@ -63,51 +72,6 @@ class _FundTransferBeneficiaryScreenState
     );
   }
 
-  Widget _getBankLogo(String? bankName) {
-    if (bankName != null && bankName.toLowerCase().contains('state bank ')) {
-      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,
-      );
-    }    
-    else {
-      return const Icon(
-        Icons.account_balance,
-        size: 40,
-        color: Colors.grey,
-      );
-    }
-  }
-
   Widget _buildBeneficiaryList() {
     if (_beneficiaries.isEmpty) {
       return Center(
@@ -121,14 +85,15 @@ class _FundTransferBeneficiaryScreenState
           leading: CircleAvatar(
             radius: 24,
             backgroundColor: Colors.transparent,
-            child: _getBankLogo(beneficiary.bankName),
+            child: getBankLogo(beneficiary.bankName, context),
           ),
           title: Text(beneficiary.name),
           subtitle: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(beneficiary.accountNo),
-              if (beneficiary.bankName != null && beneficiary.bankName!.isNotEmpty)
+              if (beneficiary.bankName != null &&
+                  beneficiary.bankName!.isNotEmpty)
                 Text(
                   beneficiary.bankName!,
                   style: TextStyle(fontSize: 12, color: Colors.grey[600]),
@@ -143,6 +108,7 @@ class _FundTransferBeneficiaryScreenState
                   debitAccountNo: widget.creditAccountNo,
                   creditBeneficiary: beneficiary,
                   remitterName: widget.remitterName,
+                  isOwnBank: widget.isOwnBank,
                 ),
               ),
             );

lib/features/fund_transfer/screens/fund_transfer_screen.dart

@@ -1,152 +1,90 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
+import 'package:kmobile/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import '../../../l10n/app_localizations.dart';
 
-class FundTransferScreen extends StatefulWidget {
-  const FundTransferScreen({super.key});
+class FundTransferScreen extends StatelessWidget {
+  final String creditAccountNo;
+  final String remitterName;
 
-  @override
-  State<FundTransferScreen> createState() => _FundTransferScreen();
-}
-
-class _FundTransferScreen extends State<FundTransferScreen> {
-  String amount = "";
-
-  void onKeyTap(String key) {
-    setState(() {
-      if (key == 'back') {
-        if (amount.isNotEmpty) {
-          amount = amount.substring(0, amount.length - 1);
-        }
-      } else if (key == 'done') {
-        if (kDebugMode) {
-          print('${AppLocalizations.of(context).amountEntered} $amount');
-          // Navigator.push(
-          //     context,
-          //     MaterialPageRoute(
-          //         builder: (context) => const TransactionPinScreen(
-          //             transactionData: {},
-          //             transactionCode: 'TRANSFER'
-          //         )));
-        }
-      } else {
-        amount += key;
-      }
-    });
-  }
-
-  Widget buildKey(String value) {
-    if (value == 'done') {
-      return GestureDetector(
-        onTap: () => onKeyTap(value),
-        child: const Icon(Symbols.check, size: 30),
-      );
-    } else if (value == 'back') {
-      return GestureDetector(
-        onTap: () => onKeyTap(value),
-        child: const Icon(Symbols.backspace, size: 30),
-      );
-    } else {
-      return GestureDetector(
-        onTap: () => onKeyTap(value),
-        child: Center(
-          child: Text(
-            value,
-            style: const TextStyle(fontSize: 24, color: Colors.black),
-          ),
-        ),
-      );
-    }
-  }
-
-  final keys = [
-    '1',
-    '2',
-    '3',
-    '4',
-    '5',
-    '6',
-    '7',
-    '8',
-    '9',
-    'done',
-    '0',
-    'back',
-  ];
+  const FundTransferScreen({
+    super.key,
+    required this.creditAccountNo,
+    required this.remitterName,
+  });
 
   @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).fundTransfer,
-          style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
-        ),
-        centerTitle: false,
-        actions: const [
-          Padding(
-            padding: EdgeInsets.only(right: 10.0),
-            child: CircleAvatar(
-              backgroundImage: AssetImage('assets/images/avatar.jpg'),
-              // Replace with your image
-              radius: 20,
-            ),
-          ),
-        ],
+        title: Text(AppLocalizations.of(context)
+            .fundTransfer
+            .replaceFirst(RegExp('\n'), '')),
       ),
-      body: Column(
+      body: ListView(
         children: [
-          const Spacer(),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Text(AppLocalizations.of(context).debitFrom),
-              const Text(
-                '0300015678903456',
-                style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500),
-              ),
-            ],
+          FundTransferManagementTile(
+            icon: Symbols.input_circle,
+            label: AppLocalizations.of(context).ownBank,
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => FundTransferBeneficiaryScreen(
+                    creditAccountNo: creditAccountNo,
+                    remitterName: remitterName,
+                    isOwnBank: true,
+                  ),
+                ),
+              );
+            },
           ),
-          const SizedBox(height: 20),
-          Text(
-            AppLocalizations.of(context).enterAmount,
-            style: const TextStyle(fontSize: 20),
-          ),
-          const SizedBox(height: 20),
-          Container(
-            padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
-            decoration: BoxDecoration(
-              color: Colors.grey.shade200,
-              borderRadius: BorderRadius.circular(12),
-            ),
-            child: Text(
-              amount.isEmpty ? "0" : amount,
-              style: const TextStyle(fontSize: 32, fontWeight: FontWeight.bold),
-            ),
-          ),
-          const Spacer(),
-          Container(
-            padding: const EdgeInsets.all(16.0),
-            color: Theme.of(context).scaffoldBackgroundColor,
-            child: GridView.count(
-              crossAxisCount: 3,
-              shrinkWrap: true,
-              physics: const NeverScrollableScrollPhysics(),
-              mainAxisSpacing: 12,
-              crossAxisSpacing: 12,
-              childAspectRatio: 1.2,
-              children: keys.map((key) => buildKey(key)).toList(),
-            ),
+          const Divider(height: 1),
+          FundTransferManagementTile(
+            icon: Symbols.output_circle,
+            label: AppLocalizations.of(context).outsideBank,
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => FundTransferBeneficiaryScreen(
+                    creditAccountNo: creditAccountNo,
+                    remitterName: remitterName,
+                    isOwnBank: false,
+                  ),
+                ),
+              );
+            },
           ),
+          const Divider(height: 1),
         ],
       ),
     );
   }
 }
+
+class FundTransferManagementTile extends StatelessWidget {
+  final IconData icon;
+  final String label;
+  final VoidCallback onTap;
+  final bool disable;
+
+  const FundTransferManagementTile({
+    super.key,
+    required this.icon,
+    required this.label,
+    required this.onTap,
+    this.disable = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: Icon(icon),
+      title: Text(label),
+      trailing: const Icon(Symbols.arrow_right, size: 20),
+      onTap: onTap,
+      enabled: !disable,
+    );
+  }
+}

lib/features/fund_transfer/screens/payment_animation.dart

@@ -27,7 +27,8 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
   @override
   void initState() {
     super.initState();
-    _confettiController = ConfettiController(duration: const Duration(seconds: 2));
+    _confettiController =
+        ConfettiController(duration: const Duration(seconds: 2));
   }
 
   @override
@@ -41,7 +42,8 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
       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);
+      ByteData? byteData =
+          await image.toByteData(format: ui.ImageByteFormat.png);
       Uint8List pngBytes = byteData!.buffer.asUint8List();
 
       final tempDir = await getTemporaryDirectory();
@@ -129,7 +131,8 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
                             ? Column(
                                 children: [
                                   Text(
-                                    AppLocalizations.of(context).paymentSuccessful,
+                                    AppLocalizations.of(context)
+                                        .paymentSuccessful,
                                     style: const TextStyle(
                                       fontSize: 22,
                                       fontWeight: FontWeight.bold,
@@ -160,7 +163,8 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
                                       "Date: ${response.date!.toLocal().toIso8601String()}",
                                       style: const TextStyle(fontSize: 16),
                                     ),
-                                  if (response.utr != null && response.utr!.isNotEmpty)
+                                  if (response.utr != null &&
+                                      response.utr!.isNotEmpty)
                                     Padding(
                                       padding: const EdgeInsets.only(top: 8.0),
                                       child: Text(
@@ -182,7 +186,8 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
                                   ),
                                   const SizedBox(height: 16),
                                   if (response.errorMessage != null)
-                                    Text(response.errorMessage ?? '',
+                                    Text(
+                                      response.errorMessage ?? '',
                                       style: const TextStyle(fontSize: 16),
                                     ),
                                 ],
@@ -204,34 +209,35 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
                       onPressed: _shareScreenshot,
                       icon: Icon(
                         Icons.share_rounded,
-                        color: Theme.of(context).primaryColor,
+                        color: Theme.of(context).colorScheme.primary,
                       ),
                       label: Text(
                         AppLocalizations.of(context).share,
-                        style: TextStyle(color: Theme.of(context).primaryColor),
+                        style: TextStyle(
+                            color: Theme.of(context).colorScheme.primary),
                       ),
                       style: ElevatedButton.styleFrom(
-                        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
-                        padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 45, vertical: 12),
                         shape: RoundedRectangleBorder(
-                          side: BorderSide(color: Theme.of(context).primaryColor, width: 1),
                           borderRadius: BorderRadius.circular(30),
                         ),
                         textStyle: const TextStyle(
                           fontSize: 18,
                           fontWeight: FontWeight.w600,
-                          color: Colors.black,
                         ),
                       ),
                     ),
                     ElevatedButton.icon(
                       onPressed: () {
-                        Navigator.of(context).popUntil((route) => route.isFirst);
+                        Navigator.of(context)
+                            .popUntil((route) => route.isFirst);
                       },
                       icon: const Icon(Icons.check),
                       label: Text(AppLocalizations.of(context).done),
                       style: ElevatedButton.styleFrom(
-                        padding: const EdgeInsets.symmetric(horizontal: 45, vertical: 12),
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 45, vertical: 12),
                         shape: RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(30),
                         ),

lib/features/fund_transfer/screens/tpin_otp_screen.dart

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