Localization Chamges #2

.gitignore

@@ -41,6 +41,3 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
-lib/l10n/app_localizations.dart
-lib/l10n/app_localizations_en.dart
-lib/l10n/app_localizations_hi.dart

analysis_options.yaml

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

android/app/build.gradle

@@ -25,7 +25,7 @@ if (flutterVersionName == null) {
 android {
     namespace "com.example.kmobile"
     compileSdk flutter.compileSdkVersion
-    ndkVersion "27.0.12077973"
+    ndkVersion flutter.ndkVersion
 
     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 29
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -56,10 +56,6 @@ 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

@@ -1,21 +0,0 @@
--keep class io.flutter.app.** { *; }
--keep class io.flutter.plugin.**  { *; }
--keep class io.flutter.util.**  { *; }
--keep class io.flutter.view.**  { *; }
--keep class io.flutter.embedding.**  { *; }
--keep class io.flutter.embedding.engine.plugins.**  { *; }
--keep class com.google.firebase.** { *; }
--keep class com.google.android.gms.** { *; }
-# Please add these rules to your existing keep rules in order to suppress warnings.
-# This is generated automatically by the Android Gradle plugin.
--dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
--dontwarn com.google.android.play.core.splitinstall.SplitInstallException
--dontwarn com.google.android.play.core.splitinstall.SplitInstallManager
--dontwarn com.google.android.play.core.splitinstall.SplitInstallManagerFactory
--dontwarn com.google.android.play.core.splitinstall.SplitInstallRequest$Builder
--dontwarn com.google.android.play.core.splitinstall.SplitInstallRequest
--dontwarn com.google.android.play.core.splitinstall.SplitInstallSessionState
--dontwarn com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener
--dontwarn com.google.android.play.core.tasks.OnFailureListener
--dontwarn com.google.android.play.core.tasks.OnSuccessListener
--dontwarn com.google.android.play.core.tasks.Task

android/app/src/main/AndroidManifest.xml

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

ios/Runner.xcodeproj/project.pbxproj

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

ios/Runner/Info.plist

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

lib/api/interceptors/auth_interceptor.dart

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

lib/api/services/auth_service.dart

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

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';
 
@@ -41,12 +41,8 @@ class BeneficiaryService {
       if (e.response?.statusCode == 404) {
         throw Exception('INVALID IFSC CODE');
       }
-      else if (e.response?.statusCode == 401) {
-        throw Exception('INVALID IFSC CODE');
-      }
     } catch (e) {
-      throw UnexpectedException(
-          'Unexpected error during login: ${e.toString()}');
+      rethrow;
     }
     return Ifsc.fromJson({});
   }
@@ -64,10 +60,6 @@ class BeneficiaryService {
         'ifscCode': ifscCode,
         'remitterName': remitterName,
       },
-      options: Options(
-        sendTimeout: const Duration(seconds: 60),
-        receiveTimeout: const Duration(seconds: 60),
-      ),
     );
     if (response.statusCode != 200) {
       throw Exception("Invalid Beneficiary Details");
@@ -75,7 +67,7 @@ class BeneficiaryService {
     return response.data['name'];
   }
 
-  // Beneficiary Validate And ADD
+  // Send Data for Validation
   Future<bool> sendForValidation(Beneficiary beneficiary) async {
     try {
       final response = await _dio.post(
@@ -110,21 +102,8 @@ class BeneficiaryService {
         throw Exception("Failed to fetch beneficiaries");
       }
     } catch (e) {
+      print("Error fetching beneficiaries: $e");
       return [];
     }
   }
-
-  Future<void> deleteBeneficiary(String accountNo) async {
-    try {
-      final response = await _dio.delete('/api/beneficiary/$accountNo');
-
-      if (response.statusCode != 204) {
-        throw Exception('Failed to delete beneficiary');
-      }
-    } on DioException catch (e) {
-      throw Exception('Network error: ${e.message}');
-    } catch (e) {
-      throw Exception('Unexpected error: ${e.toString()}');
-    }
-  }
 }

lib/api/services/change_password_service.dart

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

lib/api/services/imps_service.dart

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

lib/api/services/neft_service.dart

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

lib/api/services/payment_service.dart

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

lib/app.dart

@@ -2,8 +2,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
-import 'package:kmobile/features/auth/controllers/theme_mode_state.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import './l10n/app_localizations.dart';
@@ -13,7 +11,7 @@ import 'config/routes.dart';
 import 'di/injection.dart';
 import 'features/auth/controllers/auth_cubit.dart';
 import 'features/card/screens/card_management_screen.dart';
-import 'features/auth/screens/splash_screen.dart';
+import 'features/auth/screens/welcome_screen.dart';
 import 'features/auth/screens/login_screen.dart';
 import 'features/service/screens/service_screen.dart';
 import 'features/dashboard/screens/dashboard_screen.dart';
@@ -42,7 +40,7 @@ class _KMobileState extends State<KMobile> {
   void initState() {
     super.initState();
     loadPreferences();
-    Future.delayed(const Duration(seconds: 3), () {
+    Future.delayed(const Duration(seconds: 2), () {
       setState(() {
         showSplash = false;
       });
@@ -69,6 +67,7 @@ class _KMobileState extends State<KMobile> {
 
   @override
   Widget build(BuildContext context) {
+// Set status bar color and brightness
     SystemChrome.setSystemUIOverlayStyle(
       const SystemUiOverlayStyle(
         statusBarColor: Colors.transparent,
@@ -80,12 +79,10 @@ class _KMobileState extends State<KMobile> {
       providers: [
         BlocProvider<AuthCubit>(create: (_) => getIt<AuthCubit>()),
         BlocProvider<ThemeCubit>(create: (_) => ThemeCubit()),
-        BlocProvider<ThemeModeCubit>(create: (_) => ThemeModeCubit()),
       ],
       child: BlocBuilder<ThemeCubit, ThemeState>(
         builder: (context, themeState) {
-          return BlocBuilder<ThemeModeCubit, ThemeModeState>(
-            builder: (context, modeState) {
+          print('global theme state changed');
           return MaterialApp(
             debugShowCheckedModeBanner: false,
             locale: _locale ?? const Locale('en'),
@@ -100,16 +97,14 @@ class _KMobileState extends State<KMobile> {
               GlobalCupertinoLocalizations.delegate,
             ],
             title: 'kMobile',
-                theme: themeState.getLightThemeData(),
-                darkTheme: themeState.getDarkThemeData(),
-                themeMode: context.watch<ThemeModeCubit>().state.mode,
+            theme: themeState.getThemeData(),
+            darkTheme: themeState.getThemeData(),
+            themeMode: ThemeMode.system,
             onGenerateRoute: AppRoutes.generateRoute,
             initialRoute: AppRoutes.splash,
             home: showSplash ? const SplashScreen() : const AuthGate(),
           );
         },
-          );
-        },
       ),
     );
   }
@@ -125,6 +120,7 @@ class AuthGate extends StatefulWidget {
 class _AuthGateState extends State<AuthGate> {
   bool _checking = true;
   bool _isLoggedIn = false;
+  bool _showWelcome = true;
   bool _hasMPin = false;
   bool _biometricEnabled = false;
   bool _biometricTried = false;
@@ -157,13 +153,9 @@ class _AuthGateState extends State<AuthGate> {
     final localAuth = LocalAuthentication();
     final canCheck = await localAuth.canCheckBiometrics;
     if (!canCheck) return false;
-    String localizedReason = "";
-    if (mounted) {
-      localizedReason = AppLocalizations.of(context).authenticateToAccess;
-    }
     try {
       final didAuth = await localAuth.authenticate(
-        localizedReason: localizedReason,
+        localizedReason: AppLocalizations.of(context).authenticateToAccess,
         options: const AuthenticationOptions(
           stickyAuth: true,
           biometricOnly: true,
@@ -180,7 +172,18 @@ 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) {
@@ -195,6 +198,7 @@ class _AuthGateState extends State<AuthGate> {
                 return const NavigationScaffold(); // Authenticated
               }
 
+              // ❌ Biometric failed → Show MPIN screen
               return MPinScreen(
                 mode: MPinMode.enter,
                 onCompleted: (_) {
@@ -220,6 +224,7 @@ class _AuthGateState extends State<AuthGate> {
           );
         }
       } else {
+        // No MPIN set → show MPIN set screen + biometric dialog
         return MPinScreen(
           mode: MPinMode.set,
           onCompleted: (_) async {
@@ -250,14 +255,11 @@ class _AuthGateState extends State<AuthGate> {
             if (optIn == true) {
               final canCheck = await localAuth.canCheckBiometrics;
               bool didAuth = false;
-              String authEnable = "";
-              if (context.mounted) {
-                authEnable = AppLocalizations.of(context).authenticateToEnable;
-              }
 
               if (canCheck) {
                 didAuth = await localAuth.authenticate(
-                  localizedReason: authEnable,
+                  localizedReason:
+                      AppLocalizations.of(context).authenticateToEnable,
                   options: const AuthenticationOptions(
                     stickyAuth: true,
                     biometricOnly: true,
@@ -270,17 +272,17 @@ class _AuthGateState extends State<AuthGate> {
               }
             }
 
-            if (context.mounted) {
             Navigator.of(context).pushReplacement(
               MaterialPageRoute(
                 builder: (_) => const NavigationScaffold(),
               ),
             );
-            }
           },
         );
       }
     }
+
+    // ✅ Step 3: If not logged in, show login screen
     return const LoginScreen();
   }
 }
@@ -302,8 +304,17 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
     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 {
@@ -342,10 +353,10 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
         bottomNavigationBar: BottomNavigationBar(
           currentIndex: _selectedIndex,
           type: BottomNavigationBarType.fixed,
-          backgroundColor: const Color(0XFF1E58AD),
-          selectedItemColor: Theme.of(context).colorScheme.onPrimary,
-          unselectedItemColor:
-              Theme.of(context).colorScheme.onSecondary,
+          backgroundColor: Theme.of(context)
+              .scaffoldBackgroundColor, // Light blue background
+          selectedItemColor: Theme.of(context).primaryColor,
+          unselectedItemColor: Colors.black54,
           onTap: (index) {
             setState(() {
               _selectedIndex = index;
@@ -372,6 +383,29 @@ 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;
@@ -384,12 +418,8 @@ class BiometricPromptScreen extends StatelessWidget {
       onCompleted();
       return;
     }
-    String localizedReason = "";
-    if (context.mounted) {
-      localizedReason = AppLocalizations.of(context).enableFingerprintQuick;
-    }
     final didAuth = await localAuth.authenticate(
-      localizedReason: localizedReason,
+      localizedReason: AppLocalizations.of(context).enableFingerprintQuick,
       options: const AuthenticationOptions(
         stickyAuth: true,
         biometricOnly: true,
@@ -433,9 +463,6 @@ class BiometricPromptScreen extends StatelessWidget {
         ],
       ),
     );
-    if (!context.mounted) {
-      return;
-    }
     if (result == true) {
       await _handleBiometric(context);
     } else {

lib/config/routes.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:kmobile/features/auth/screens/mpin_screen.dart';
-import 'package:kmobile/features/auth/screens/splash_screen.dart';
 import '../app.dart';
 import '../features/auth/screens/login_screen.dart';
 // import '../features/auth/screens/forgot_password_screen.dart';

lib/config/theme_type.dart

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

lib/config/themes.dart

@@ -1,52 +1,32 @@
-import 'dart:developer';
-
 import 'package:flutter/material.dart';
 import 'theme_type.dart';
-import 'package:google_fonts/google_fonts.dart';
 
 class AppThemes {
   static ThemeData getLightTheme(ThemeType type) {
-    final Color seedColor = _getSeedColor(type);
-    final colorScheme = ColorScheme.fromSeed(
-      seedColor: seedColor,
-      brightness: Brightness.light,
-    );
-    return ThemeData.from(
-      colorScheme: colorScheme,
-      useMaterial3: true,
-      textTheme: GoogleFonts.rubikTextTheme(),
-    );
+    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);
+    }
   }
 
   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 Colors.green;
+        return ThemeData.dark().copyWith(primaryColor: Colors.green);
       case ThemeType.orange:
-        return Colors.orange;
+        return ThemeData.dark().copyWith(primaryColor: Colors.orange);
       case ThemeType.blue:
-        return Colors.blue;
+        return ThemeData.dark().copyWith(primaryColor: Colors.blue);
       case ThemeType.violet:
-        return Colors.deepPurple;
-      case ThemeType.yellow:
-        return Colors.yellow;
+      default:
+        return ThemeData.dark().copyWith(primaryColor: Colors.deepPurple);
     }
   }
 }

lib/data/models/beneficiary.dart

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

lib/data/models/imps_transaction.dart

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

lib/data/models/neft_transaction.dart

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

lib/data/models/rtgs_transaction.dart

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

lib/data/models/transaction.dart

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

lib/data/repositories/auth_repository.dart

@@ -49,12 +49,6 @@ class AuthRepository {
         _tokenExpiryKey, token.expiresAt.toIso8601String());
   }
 
-Future<void> clearAuthTokens() async {
-    await _secureStorage.deleteAll();
-
-  }
-
-
   Future<AuthToken?> _getAuthToken() async {
     final accessToken = await _secureStorage.read(_accessTokenKey);
     final expiryString = await _secureStorage.read(_tokenExpiryKey);

lib/data/repositories/transaction_repository.dart

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

lib/di/injection.dart

@@ -1,6 +1,5 @@
 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';
@@ -8,10 +7,8 @@ import 'package:kmobile/api/services/payment_service.dart';
 import 'package:kmobile/api/services/user_service.dart';
 import 'package:kmobile/data/repositories/transaction_repository.dart';
 import 'package:kmobile/features/auth/controllers/theme_cubit.dart';
-import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
 import '../api/services/auth_service.dart';
 import '../api/interceptors/auth_interceptor.dart';
-import '../api/services/change_password_service.dart';
 import '../data/repositories/auth_repository.dart';
 import '../features/auth/controllers/auth_cubit.dart';
 import '../security/secure_storage.dart';
@@ -22,7 +19,6 @@ 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());
@@ -48,8 +44,6 @@ 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(
@@ -65,11 +59,10 @@ Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-          '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),
+          '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),
       headers: {
         'Content-Type': 'application/json',
         'Accept': 'application/json',

lib/features/accounts/screens/account_info_screen.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/data/models/user.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class AccountInfoScreen extends StatefulWidget {
@@ -30,9 +32,35 @@ class _AccountInfoScreen extends State<AccountInfoScreen> {
     int selectedIndex = widget.selectedIndex;
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context)
-            .accountInfo
-            .replaceFirst(RegExp('\n'), '')),
+        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,
+              ),
+            ),
+          ),
+        ],
       ),
       body: ListView(
         padding: const EdgeInsets.all(16.0),
@@ -42,6 +70,7 @@ class _AccountInfoScreen extends State<AccountInfoScreen> {
             style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14),
           ),
 
+          /// Dropdown to change account
           DropdownButton<User>(
             value: selectedUser,
             onChanged: (User? newUser) {
@@ -101,7 +130,6 @@ class InfoRow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
     return Container(
       width: double.infinity,
       margin: const EdgeInsets.symmetric(vertical: 8),
@@ -110,16 +138,16 @@ class InfoRow extends StatelessWidget {
         children: [
           Text(
             title,
-            style: TextStyle(
+            style: const TextStyle(
               fontSize: 15,
               fontWeight: FontWeight.w500,
-              color: theme.colorScheme.onSurfaceVariant,
+              color: Colors.black87,
             ),
           ),
           const SizedBox(height: 3),
           Text(
             value,
-            style: TextStyle(fontSize: 16, color: theme.colorScheme.onSurface),
+            style: const TextStyle(fontSize: 16, color: Colors.black),
           ),
         ],
       ),

lib/features/accounts/screens/account_statement_screen.dart

@@ -1,6 +1,5 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:shimmer/shimmer.dart';
 import 'package:kmobile/data/models/transaction.dart';
@@ -8,22 +7,10 @@ import 'package:kmobile/data/repositories/transaction_repository.dart';
 import 'package:kmobile/di/injection.dart';
 import '../../../l10n/app_localizations.dart';
 import 'transaction_details_screen.dart';
-import 'package:pdf/widgets.dart' as pw;
-import 'package:permission_handler/permission_handler.dart';
-import 'package:device_info_plus/device_info_plus.dart';
- import 'package:path_provider/path_provider.dart';
- import 'package:share_plus/share_plus.dart';
 
 class AccountStatementScreen extends StatefulWidget {
   final String accountNo;
-  final String balance;
-  final String accountType;
-  const AccountStatementScreen({
-    super.key,
-    required this.accountNo,
-    required this.balance,
-    required this.accountType,
-  });
+  const AccountStatementScreen({super.key, required this.accountNo});
 
   @override
   State<AccountStatementScreen> createState() => _AccountStatementScreen();
@@ -36,7 +23,6 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
   List<Transaction> _transactions = [];
   final _minAmountController = TextEditingController();
   final _maxAmountController = TextEditingController();
-  //Future<Map<String, dynamic>?>? accountStatementsFuture;
 
   @override
   void initState() {
@@ -128,10 +114,31 @@ 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),
@@ -143,7 +150,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                 Text(
                   "${AppLocalizations.of(context).accountNumber}: ",
                   style: const TextStyle(
-                    fontSize: 17,
+                    fontSize: 19,
                     fontWeight: FontWeight.bold,
                   ),
                 ),
@@ -151,19 +158,6 @@ 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),
@@ -198,20 +192,19 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
               child: ElevatedButton(
                 onPressed: _loadTransactions,
                 style: ElevatedButton.styleFrom(
-                  backgroundColor:
-                      Theme.of(context).colorScheme.primaryContainer,
+                  backgroundColor: Theme.of(context).primaryColor,
                   padding: const EdgeInsets.symmetric(vertical: 16),
                 ),
                 child: Text(
-                  AppLocalizations.of(context).search,
+                  "Search",
                   style: TextStyle(
-                    color: Theme.of(context).colorScheme.onPrimaryContainer,
+                    color: Theme.of(context).scaffoldBackgroundColor,
                     fontSize: 16,
                   ),
                 ),
               ),
             ),
-            const SizedBox(height: 15),
+            const SizedBox(height: 35),
             if (!_txLoading &&
                 _transactions.isNotEmpty &&
                 fromDate == null &&
@@ -223,7 +216,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                   style: TextStyle(
                     fontSize: 16,
                     fontWeight: FontWeight.w500,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                    color: Colors.grey[700],
                   ),
                 ),
               ),
@@ -266,11 +259,10 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                           child: Text(
                             AppLocalizations.of(context).noTransactions,
                             style: TextStyle(
-                                fontSize: 16,
-                                color: Theme.of(context).colorScheme.onSurface,
-                              )),
+                                fontSize: 16, color: Colors.grey[600]),
+                          ),
                         )
-                      : ListView.separated(
+                      : ListView.builder(
                           itemCount: _transactions.length,
                           itemBuilder: (context, index) {
                             final tx = _transactions[index];
@@ -279,36 +271,25 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                                 tx.type == 'CR'
                                     ? Symbols.call_received
                                     : Symbols.call_made,
-                                color: tx.type == 'CR'
-                                    ? Colors.green
-                                    : Theme.of(context).colorScheme.error,
+                                color:
+                                    tx.type == 'CR' ? Colors.green : Colors.red,
                               ),
                               title: Text(
-                                tx.date ?? '',
-                                style: const TextStyle(fontSize: 15),
-                              ),
-                              subtitle: Text(
                                 tx.name != null
-                                    ? (tx.name!.length > 22
+                                    ? (tx.name!.length > 18
                                         ? tx.name!.substring(0, 22)
                                         : tx.name!)
                                     : '',
+                                style: const TextStyle(fontSize: 14),
+                              ),
+                              subtitle: Text(
+                                tx.date ?? '',
                                 style: const TextStyle(fontSize: 12),
                               ),
-                             trailing: Column(
-  crossAxisAlignment: CrossAxisAlignment.end,
-  mainAxisAlignment: MainAxisAlignment.center,
-  children: [
-    Text(
+                              trailing: Text(
                                 "₹${tx.amount}",
-      style: const TextStyle(fontSize: 17),
+                                style: const TextStyle(fontSize: 16),
                               ),
-    Text(
-      "Bal: ₹${tx.balance}",
-      style: const TextStyle(fontSize: 12), // Style matches tx.name
-    ),
-  ],
-),                                                                   
                               onTap: () {
                                 Navigator.push(
                                   context,
@@ -320,207 +301,19 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                               },
                             );
                           },
-                          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: Theme.of(context).colorScheme.onSurfaceVariant),
+        border: Border.all(color: Colors.grey),
         borderRadius: BorderRadius.circular(6),
       ),
       child: Row(
@@ -530,9 +323,7 @@ else if (Platform.isIOS) {
             date != null ? _formatDate(date) : label,
             style: TextStyle(
               fontSize: 16,
-              color: date != null
-                  ? Theme.of(context).colorScheme.onSurface
-                  : Theme.of(context).colorScheme.onSurfaceVariant,
+              color: date != null ? Colors.black : Colors.grey,
             ),
           ),
           const Icon(Icons.arrow_drop_down),

lib/features/accounts/screens/transaction_details_screen.dart

@@ -11,6 +11,33 @@ class TransactionDetailsScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     final bool isCredit = transaction.type?.toUpperCase() == 'CR';
 
+  //   Future<void> _shareScreenshot() async {
+  //   try {
+  //     RenderRepaintBoundary boundary =
+  //         _shareKey.currentContext!.findRenderObject() as RenderRepaintBoundary;
+  //     ui.Image image = await boundary.toImage(pixelRatio: 3.0);
+  //     ByteData? byteData = await image.toByteData(format: ui.ImageByteFormat.png);
+  //     Uint8List pngBytes = byteData!.buffer.asUint8List();
+  //     final tempDir = await getTemporaryDirectory();
+  //     final file = await File('${tempDir.path}/payment_result.png').create();
+  //     await file.writeAsBytes(pngBytes);
+
+    //     await Share.shareXFiles(
+    //       [XFile(file.path)],
+    //       text: AppLocalizations.of(context).paymentResult,
+    //     );
+    //   } catch (e) {
+    //     if (!mounted) return;
+    //     ScaffoldMessenger.of(context).showSnackBar(
+    //       SnackBar(
+    //         content: Text(
+    //           '${AppLocalizations.of(context).failedToShareScreenshot}: $e',
+    //         ),
+    //       ),
+    //     );
+    //   }
+    // }
+
     return Scaffold(
       appBar:
           AppBar(title: Text(AppLocalizations.of(context).transactionDetails)),
@@ -18,6 +45,7 @@ class TransactionDetailsScreen extends StatelessWidget {
         padding: const EdgeInsets.all(16.0),
         child: Column(
           children: [
+            // Absolute center for amount + icon + date + details
             Expanded(
               flex: 3,
               child: Center(
@@ -57,27 +85,54 @@ class TransactionDetailsScreen extends StatelessWidget {
                 ),
               ),
             ),
+
             const Divider(),
+
+            // All details
             Expanded(
               flex: 5,
               child: ListView(
                 children: [
-                  _buildDetailRow(AppLocalizations.of(context).transactionType,
+                  // ignore: unnecessary_cast
+                  _buildDetailRow(
+                      AppLocalizations.of(context).transactionType as String,
                       transaction.type ?? ""),
                   _buildDetailRow(AppLocalizations.of(context).transferType,
                       transaction.name.split("/").first ?? ""),
-                  // if (transaction.name.length > 12) ...[
-                  //   _buildDetailRow(AppLocalizations.of(context).utrNo,
-                  //       transaction.name.split("= ")[1].split(" ")[0] ?? ""),
-                  //   _buildDetailRow(
-                  //       AppLocalizations.of(context).beneficiaryAccountNo,
-                  //       transaction.name.split("A/C ").last ?? "")
-                  // ]
-                   _buildDetailRow(AppLocalizations.of(context).details,
-                      transaction.name),
+                  if (transaction.name.length > 12) ...[
+                    _buildDetailRow(AppLocalizations.of(context).utrNo,
+                        transaction.name.split("= ")[1].split(" ")[0] ?? ""),
+                    _buildDetailRow(
+                        AppLocalizations.of(context).beneficiaryAccountNo,
+                        transaction.name.split("A/C ").last ?? "")
+                  ]
                 ],
               ),
             ),
+            // ElevatedButton.icon(
+            //     onPressed: _shareScreenshot,
+            //     icon: Icon(
+            //       Icons.share_rounded,
+            //       color: Theme.of(context).primaryColor,
+            //     ),
+            //     label: Text(
+            //       AppLocalizations.of(context).share,
+            //       style: TextStyle(color: Theme.of(context).primaryColor),
+            //     ),
+            //     style: ElevatedButton.styleFrom(
+            //       backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+            //       padding: const EdgeInsets.symmetric(horizontal: 32, vertical: 12),
+            //       shape: RoundedRectangleBorder(
+            //         side: BorderSide(color: Theme.of(context).primaryColor, width: 1),
+            //         borderRadius: BorderRadius.circular(30),
+            //       ),
+            //       textStyle: const TextStyle(
+            //         fontSize: 18,
+            //         fontWeight: FontWeight.w600,
+            //         color: Colors.black,
+            //       ),
+            //     ),
+            //   ),
           ],
         ),
       ),
@@ -95,14 +150,14 @@ class TransactionDetailsScreen extends StatelessWidget {
             "$label: ",
             style: const TextStyle(
               fontWeight: FontWeight.bold,
-              fontSize: 17,
+              fontSize: 20,
             ),
           ),
           const SizedBox(height: 30),
           Expanded(
             child: Text(
               value,
-              style: const TextStyle(fontSize: 16),
+              style: const TextStyle(fontSize: 20),
             ),
           ),
         ],
@@ -110,3 +165,5 @@ class TransactionDetailsScreen extends StatelessWidget {
     );
   }
 }
+
+

lib/features/auth/controllers/theme_cubit.dart

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

lib/features/auth/controllers/theme_mode_cubit.dart

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

lib/features/auth/controllers/theme_mode_state.dart

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

lib/features/auth/controllers/theme_state.dart

@@ -1,4 +1,4 @@
-/*import 'package:equatable/equatable.dart';
+import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:kmobile/config/theme_type.dart';
 import 'package:kmobile/config/themes.dart';
@@ -14,28 +14,4 @@ class ThemeState extends Equatable {
 
   @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/screens/login_screen.dart

@@ -4,7 +4,6 @@ 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';
@@ -24,9 +23,23 @@ 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();
@@ -50,8 +63,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(
@@ -70,20 +83,15 @@ class LoginScreenState extends State<LoginScreen>
                 ),
               );
             } else {
+              // ignore: use_build_context_synchronously
               Navigator.of(context).pushReplacement(
                 MaterialPageRoute(builder: (_) => const NavigationScaffold()),
               );
             }
           } else if (state is AuthError) {
-            if (state.message == 'MIGRATED_USER_HAS_NO_PASSWORD') {
-              Navigator.of(context).push(MaterialPageRoute(
-                  builder: (_) => SetPasswordScreen(
-                        customerNo: _customerNumberController.text.trim(),
-                      )));
-            } else {
-              ScaffoldMessenger.of(context)
-                  .showSnackBar(SnackBar(content: Text(state.message)));
-            }
+            ScaffoldMessenger.of(
+              context,
+            ).showSnackBar(SnackBar(content: Text(state.message)));
           }
         },
         builder: (context, state) {
@@ -94,7 +102,10 @@ class LoginScreenState extends State<LoginScreen>
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  Image.asset(
+                  // 🔁 Animated Blinking Logo
+                  FadeTransition(
+                    opacity: _logoAnimation,
+                    child: Image.asset(
                       'assets/images/logo.png',
                       width: 150,
                       height: 150,
@@ -106,6 +117,7 @@ class LoginScreenState extends State<LoginScreen>
                         );
                       },
                     ),
+                  ),
                   const SizedBox(height: 16),
                   // Title
                   Text(
@@ -127,14 +139,11 @@ class LoginScreenState extends State<LoginScreen>
                       isDense: true,
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
-                      enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                            color: Theme.of(context).colorScheme.outline),
+                      enabledBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black),
                       ),
-                      focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                            color: Theme.of(context).colorScheme.primary,
-                            width: 2),
+                      focusedBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black, width: 2),
                       ),
                     ),
                     keyboardType: TextInputType.number,
@@ -152,21 +161,19 @@ class LoginScreenState extends State<LoginScreen>
                     controller: _passwordController,
                     obscureText: _obscurePassword,
                     textInputAction: TextInputAction.done,
-                    onFieldSubmitted: (_) => _submitForm(),
+                    onFieldSubmitted: (_) =>
+                        _submitForm(), // ⌨️ Enter key submits
                     decoration: InputDecoration(
                       labelText: AppLocalizations.of(context).password,
                       border: const OutlineInputBorder(),
                       isDense: true,
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
-                      enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                            color: Theme.of(context).colorScheme.outline),
+                      enabledBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black),
                       ),
-                      focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(
-                            color: Theme.of(context).colorScheme.primary,
-                            width: 2),
+                      focusedBorder: const OutlineInputBorder(
+                        borderSide: BorderSide(color: Colors.black, width: 2),
                       ),
                       suffixIcon: IconButton(
                         icon: Icon(
@@ -200,56 +207,50 @@ class LoginScreenState extends State<LoginScreen>
                         backgroundColor:
                             Theme.of(context).scaffoldBackgroundColor,
                         foregroundColor: Theme.of(context).primaryColorDark,
-                        side: BorderSide(
-                            color: Theme.of(context).colorScheme.outline,
-                            width: 1),
+                        side: const BorderSide(color: Colors.black, width: 1),
                         elevation: 0,
                       ),
                       child: state is AuthLoading
                           ? const CircularProgressIndicator()
                           : Text(
                               AppLocalizations.of(context).login,
-                              style: TextStyle(
-                                  color: Theme.of(context)
-                                      .colorScheme
-                                      .onPrimaryContainer),
+                              style: const TextStyle(fontSize: 16),
                             ),
                     ),
                   ),
                   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).colorScheme.primary,
-                  //       foregroundColor: Theme.of(context).colorScheme.onPrimary,
-                  //     ),
-                  //     child: Text(AppLocalizations.of(context).register,
-                  //    style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),),
-                  //   ),
-                  // ),
+                  SizedBox(
+                    width: 250,
+                    child: ElevatedButton(
+                      //disable until registration is implemented
+                      onPressed: null,
+                      style: OutlinedButton.styleFrom(
+                        shape: const StadiumBorder(),
+                        padding: const EdgeInsets.symmetric(vertical: 16),
+                        backgroundColor: Theme.of(context).primaryColorLight,
+                        foregroundColor: Colors.black,
+                      ),
+                      child: Text(AppLocalizations.of(context).register),
+                    ),
+                  ),
                 ],
               ),
             ),

lib/features/auth/screens/mpin_screen.dart

@@ -1,14 +1,12 @@
 import '../../../l10n/app_localizations.dart';
-import 'dart:math';
 
-// import 'dart:developer';
+import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:kmobile/app.dart';
 import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:local_auth/local_auth.dart';
-import 'package:flutter/services.dart';
 
 enum MPinMode { enter, set, confirm }
 
@@ -28,73 +26,22 @@ class MPinScreen extends StatefulWidget {
   State<MPinScreen> createState() => _MPinScreenState();
 }
 
-class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
+class _MPinScreenState extends State<MPinScreen> {
   List<String> mPin = [];
   String? errorText;
 
-  // Animation controllers
-  late final AnimationController _bounceController;
-  late final Animation<double> _bounceAnimation;
-  late final AnimationController _shakeController;
-  late final AnimationController _waveController;
-  late final Animation<double> _waveAnimation;
-
-  // State flags for animations
-  bool _isError = false;
-  bool _isSuccess = false;
-
   @override
   void initState() {
     super.initState();
-    // Bounce animation for single dot entry
-    _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) {
@@ -115,13 +62,11 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   void addDigit(String digit) {
-    if (_shakeController.isAnimating || _waveController.isAnimating) return;
     if (mPin.length < 4) {
       setState(() {
         mPin.add(digit);
         errorText = null;
       });
-      _bounceController.forward(from: 0);
       if (mPin.length == 4) {
         _handleComplete();
       }
@@ -129,7 +74,6 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   void deleteDigit() {
-    if (_shakeController.isAnimating || _waveController.isAnimating) return;
     if (mPin.isNotEmpty) {
       setState(() {
         mPin.removeLast();
@@ -139,36 +83,19 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
   }
 
   Future<void> _handleComplete() async {
-    if (_shakeController.isAnimating || _waveController.isAnimating) return;
-
     final pin = mPin.join();
     final storage = SecureStorage();
 
     switch (widget.mode) {
       case MPinMode.enter:
         final storedPin = await storage.read('mpin');
-        // log('storedPin: $storedPin');
+        log('storedPin: $storedPin');
         if (storedPin == int.tryParse(pin)) {
-          // Correct PIN
-          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;
@@ -199,81 +126,28 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
           }
         } else {
           setState(() {
-            _isError = true;
             errorText = AppLocalizations.of(context).pinsDoNotMatch;
-          });
-          await _shakeController.forward(from: 0);
-          setState(() {
             mPin.clear();
-            _isError = false;
           });
         }
         break;
     }
   }
 
-  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(
+  Widget buildMPinDots() {
+    return 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(
+        return Container(
           margin: const EdgeInsets.all(8),
-                  width: 25,
-                  height: 25,
+          width: 15,
+          height: 15,
           decoration: BoxDecoration(
             shape: BoxShape.circle,
-                    color: dotColor,
-                  ),
+            color: index < mPin.length ? Colors.black : Colors.grey[400],
           ),
         );
       }),
-          ),
-        );
-      },
     );
   }
 
@@ -291,10 +165,9 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: row.map((key) {
             return Padding(
-              padding: const EdgeInsets.all(1.0),
+              padding: const EdgeInsets.all(8.0),
               child: GestureDetector(
                 onTap: () {
-                  HapticFeedback.lightImpact();
                   if (key == '<') {
                     deleteDigit();
                   } else if (key == 'Enter') {
@@ -312,10 +185,11 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
                   }
                 },
                 child: Container(
-                  width: 80,
-                  height: 80,
-                  decoration: const BoxDecoration(
+                  width: 70,
+                  height: 70,
+                  decoration: BoxDecoration(
                     shape: BoxShape.circle,
+                    color: Colors.grey[200],
                   ),
                   alignment: Alignment.center,
                   child: key == 'Enter'
@@ -323,10 +197,10 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
                       : Text(
                           key == '<' ? '⌫' : key,
                           style: TextStyle(
-                            fontSize: 30,
+                            fontSize: 20,
                             color: key == 'Enter'
                                 ? Theme.of(context).primaryColor
-                                : Theme.of(context).colorScheme.onSurface,
+                                : Colors.black,
                           ),
                         ),
                 ),
@@ -355,7 +229,7 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
       body: SafeArea(
         child: Column(
           children: [
-            const SizedBox(height: 50),
+            const Spacer(),
             // Logo
             Image.asset('assets/images/logo.png', height: 100),
             const SizedBox(height: 20),
@@ -363,18 +237,19 @@ class _MPinScreenState extends State<MPinScreen> with TickerProviderStateMixin {
               getTitle(),
               style: const TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
             ),
-            const Spacer(),
-            buildMPinDots(context),
+            const SizedBox(height: 20),
+            buildMPinDots(),
             if (errorText != null)
               Padding(
                 padding: const EdgeInsets.only(top: 8.0),
                 child: Text(
                   errorText!,
-                  style: TextStyle(color: Theme.of(context).colorScheme.error),
+                  style: const TextStyle(color: Colors.red),
                 ),
               ),
             const Spacer(),
             buildNumberPad(),
+            const Spacer(),
           ],
         ),
       ),

lib/features/auth/screens/set_password_screen.dart

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

lib/features/auth/screens/welcome_screen.dart

@@ -1,58 +1,77 @@
 import '../../../l10n/app_localizations.dart';
 
 import 'package:flutter/material.dart';
+import 'dart:async';
 
-class SplashScreen extends StatefulWidget {
-  const SplashScreen({super.key});
+class WelcomeScreen extends StatefulWidget {
+  final VoidCallback onContinue;
+
+  const WelcomeScreen({super.key, required this.onContinue});
 
   @override
-  State<SplashScreen> createState() => _SplashScreenState();
+  State<WelcomeScreen> createState() => _WelcomeScreenState();
 }
 
-class _SplashScreenState extends State<SplashScreen> {
+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).kccbMobile,
-                  style: const TextStyle(
+                  AppLocalizations.of(context).kconnect,
+                  style: TextStyle(
                     fontSize: 36,
                     fontWeight: FontWeight.bold,
-                    color: Color(0xFFFFFFFF),
+                    color: Theme.of(context).dialogBackgroundColor,
+                    letterSpacing: 1.5,
                   ),
                 ),
                 const SizedBox(height: 12),
                 Text(
                   AppLocalizations.of(context).kccBankFull,
                   textAlign: TextAlign.center,
-                  style: const TextStyle(
+                  style: TextStyle(
                     fontSize: 18,
-                    color: Color(0xFFFFFFFF),
+                    color: Theme.of(context).dialogBackgroundColor,
                     letterSpacing: 1.2,
                   ),
                 ),
               ],
             ),
           ),
-          const Positioned(
+
+          /// 🔹 Loading Spinner at Bottom
+          Positioned(
             bottom: 40,
             left: 0,
             right: 0,
             child: Center(
               child: CircularProgressIndicator(
-                  color: Color(0xFFFFFFFF)),
+                  color: Theme.of(context).scaffoldBackgroundColor),
             ),
           ),
         ],

lib/features/beneficiaries/screens/add_beneficiary_screen.dart

@@ -1,10 +1,11 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/api/services/beneficiary_service.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
-import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'beneficiary_result_page.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../di/injection.dart';
 import '../../../l10n/app_localizations.dart';
 import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
@@ -23,9 +24,7 @@ class AddBeneficiaryScreen extends StatefulWidget {
 
 class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final _formKey = GlobalKey<FormState>();
-  final _accountNumberFieldKey = GlobalKey<FormFieldState>();
-final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
-final _ifscFieldKey = GlobalKey<FormFieldState>();
+
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
@@ -34,7 +33,6 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
   final TextEditingController branchNameController = TextEditingController();
   final TextEditingController ifscController = TextEditingController();
   final TextEditingController phoneController = TextEditingController();
-  final _ifscFocusNode = FocusNode();
   final service = getIt<BeneficiaryService>();
 
   bool _isValidating = false;
@@ -46,41 +44,22 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
   @override
   void initState() {
     super.initState();
-    _ifscFocusNode.addListener(() {
-  if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
-    _validateIFSC();
-  }
-});
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
-        accountType = 'Savings';
+        accountType = AppLocalizations.of(context).savings;
       });
     });
   }
 
-   @override
- void dispose() {
-   accountNumberController.dispose();
-   confirmAccountNumberController.dispose();
-   nameController.dispose();
-   bankNameController.dispose();
-   branchNameController.dispose();
-   ifscController.dispose();
-   phoneController.dispose();
-   _ifscFocusNode.dispose(); 
-   super.dispose();
- }
-
   void _validateIFSC() async {
     var beneficiaryService = getIt<BeneficiaryService>();
     final ifsc = ifscController.text.trim().toUpperCase();
     if (ifsc.isEmpty) return;
 
-      try {
     final result = await beneficiaryService.validateIFSC(ifsc);
 
     if (mounted) {
-        if (result.bankName.isEmpty) {
+      if (result.bankName == '') {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
         );
@@ -91,22 +70,6 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
         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;
-        }
-
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(snackbarMessage)),
-        );
-        bankNameController.clear();
-        branchNameController.clear();
-      }
-    }
   }
 
   void _validateBeneficiary() async {
@@ -124,17 +87,11 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
 
     final service = getIt<BeneficiaryService>();
     try {
-      String beneficiaryName;
-      if (ifsc.toLowerCase().contains('kace')) {
-        beneficiaryName =
-            await service.validateBeneficiaryWithinBank(accountNo);
-      } else {
-        beneficiaryName = await service.validateBeneficiary(
+      final String beneficiaryName = await service.validateBeneficiary(
         accountNo: accountNo,
         ifscCode: ifsc,
         remitterName: remitter,
       );
-      }
 
       setState(() {
         nameController.text = beneficiaryName;
@@ -164,9 +121,8 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
     // Ensure beneficiary is validated before proceeding to TPIN
     if (!_isBeneficiaryValidated) {
       ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-            content: Text(AppLocalizations.of(context)
-                .pleaseValidateBeneficiaryDetailsFirst)),
+        const SnackBar(
+            content: Text('Please validate beneficiary details first.')),
       );
       return;
     }
@@ -257,10 +213,33 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
   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(
@@ -275,7 +254,6 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                     child: Column(
                       children: [
                         TextFormField(
-                          key: _accountNumberFieldKey,
                           controller: accountNumberController,
                           decoration: InputDecoration(
                             labelText: AppLocalizations.of(
@@ -284,6 +262,18 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                             // 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,
@@ -306,7 +296,6 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                         const SizedBox(height: 24),
                         // Confirm Account Number
                         TextFormField(
-                          key: _confirmAccountNumberFieldKey,
                           controller: confirmAccountNumberController,
                           decoration: InputDecoration(
                             labelText: AppLocalizations.of(
@@ -315,6 +304,18 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                             // 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,
@@ -325,15 +326,16 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                               ).reenterAccountNumber;
                             }
                             if (value != accountNumberController.text) {
-                              return AppLocalizations.of(context,).accountMismatch;
+                              return AppLocalizations.of(
+                                context,
+                              ).accountMismatch;
                             }
                             return null;
                           },
                         ),
                         const SizedBox(height: 24),
+                        // 🔹 IFSC Code Field
                         TextFormField(
-                          focusNode: _ifscFocusNode,
-                          key: _ifscFieldKey,
                           controller: ifscController,
                           maxLength: 11,
                           inputFormatters: [
@@ -343,18 +345,31 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                             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) {
-   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}$');
@@ -371,7 +386,7 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                           },
                         ),
                         const SizedBox(height: 24),
-                        //  Bank Name (Disabled)
+                        // 🔹 Bank Name (Disabled)
                         TextFormField(
                           controller: bankNameController,
                           enabled: false, // changed from readOnly to disabled
@@ -379,6 +394,18 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                             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),
@@ -390,37 +417,18 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                             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)
@@ -429,20 +437,20 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                             child: SizedBox(
                               width: double.infinity,
                               child: ElevatedButton(
-onPressed: _isValidating || ifscController.text.length != 11
-? null
-: () {
-    final isAccountValid =
-        _accountNumberFieldKey.currentState!.validate();
-    final isConfirmAccountValid =
-        _confirmAccountNumberFieldKey.currentState!.validate();
-    final isIfscValid = _ifscFieldKey.currentState!.validate();
-
-    if (isAccountValid && isConfirmAccountValid && isIfscValid) {
+                                onPressed: _isValidating
+                                    ? null
+                                    : () {
+                                        if (confirmAccountNumberController
+                                                .text ==
+                                            accountNumberController.text) {
                                           _validateBeneficiary();
+                                        } else {
+                                          setState(() {
+                                            _validationError =
+                                                'Please enter a valid and matching account number.';
+                                          });
                                         }
                                       },
-
                                 child: _isValidating
                                     ? const SizedBox(
                                         width: 20,
@@ -456,6 +464,30 @@ onPressed: _isValidating || ifscController.text.length != 11
                             ),
                           ),
                         //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,
@@ -463,10 +495,22 @@ onPressed: _isValidating || ifscController.text.length != 11
                             labelText: AppLocalizations.of(context).accountType,
                             border: const OutlineInputBorder(),
                             isDense: true,
+                            filled: true,
+                            fillColor:
+                                Theme.of(context).scaffoldBackgroundColor,
+                            enabledBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: const OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Colors.black,
+                                width: 2,
+                              ),
+                            ),
                           ),
                           items: [
-                            'Savings',
-                            'Current',
+                            AppLocalizations.of(context).savings,
+                            AppLocalizations.of(context).current,
                           ]
                               .map(
                                 (type) => DropdownMenuItem(
@@ -491,6 +535,18 @@ onPressed: _isValidating || ifscController.text.length != 11
                             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) =>
@@ -505,7 +561,7 @@ onPressed: _isValidating || ifscController.text.length != 11
                 ),
               ),
               Padding(
-                padding: const EdgeInsets.symmetric(vertical: 10),
+                padding: const EdgeInsets.all(16.0),
                 child: SizedBox(
                   width: 250,
                   child: ElevatedButton(
@@ -513,14 +569,11 @@ onPressed: _isValidating || ifscController.text.length != 11
                     style: ElevatedButton.styleFrom(
                       shape: const StadiumBorder(),
                       padding: const EdgeInsets.symmetric(vertical: 16),
-                        backgroundColor:
-                            Theme.of(context).colorScheme.primaryContainer,
+                      backgroundColor: Theme.of(context).primaryColorDark,
                       foregroundColor:
-                            Theme.of(context).colorScheme.onPrimaryContainer),
-                    child: Text(
-                      AppLocalizations.of(context).validateAndAdd,
-                      style: const TextStyle(fontSize: 16),
+                          Theme.of(context).scaffoldBackgroundColor,
                     ),
+                    child: Text(AppLocalizations.of(context).validateAndAdd),
                   ),
                 ),
               ),

lib/features/beneficiaries/screens/beneficiary_details_screen.dart

@@ -1,162 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:kmobile/data/models/beneficiary.dart';
-import 'package:kmobile/di/injection.dart';
-import 'package:kmobile/widgets/bank_logos.dart';
-import 'package:kmobile/api/services/beneficiary_service.dart';
-
-import '../../../l10n/app_localizations.dart';
-
-class BeneficiaryDetailsScreen extends StatelessWidget {
-  final Beneficiary beneficiary;
-
-  BeneficiaryDetailsScreen({super.key, required this.beneficiary});
-
-  final service = getIt<BeneficiaryService>();
-
-  void _deleteBeneficiary(BuildContext context) async {
-    try {
-      await service.deleteBeneficiary(beneficiary.accountNo);
-      if (!context.mounted) {
-        return;
-      }
-      _showSuccessDialog(context);
-    } catch (e) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('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

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

lib/features/beneficiaries/screens/manage_beneficiaries_screen.dart

@@ -1,12 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
 import 'package:kmobile/features/beneficiaries/screens/add_beneficiary_screen.dart';
-import 'package:kmobile/features/beneficiaries/screens/beneficiary_details_screen.dart';
 import '../../../l10n/app_localizations.dart';
 import '../../../di/injection.dart';
 import 'package:kmobile/api/services/beneficiary_service.dart';
 import 'package:shimmer/shimmer.dart';
-import 'package:kmobile/widgets/bank_logos.dart';
 
 class ManageBeneficiariesScreen extends StatefulWidget {
   final String customerName;
@@ -62,6 +60,80 @@ 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(
@@ -75,7 +147,7 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
           leading: CircleAvatar(
             radius: 24,
             backgroundColor: Colors.transparent,
-            child: getBankLogo(item.bankName, context),
+            child: _getBankLogo(item.bankName),
           ),
           title: Text(item.name),
           subtitle: Column(
@@ -89,14 +161,6 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
                 ),
             ],
           ),
-          onTap: () {
-            Navigator.push(
-              context,
-              MaterialPageRoute(
-                builder: (_) => BeneficiaryDetailsScreen(beneficiary: item),
-              ),
-            );
-          },
         );
       },
     );
@@ -122,6 +186,8 @@ class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen> {
               ),
             );
           },
+          backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+          foregroundColor: Theme.of(context).primaryColor,
           elevation: 5,
           child: const Icon(Icons.add),
         ),

lib/features/card/screens/block_card_screen.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
 import '../../../l10n/app_localizations.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 class BlockCardScreen extends StatefulWidget {
   const BlockCardScreen({super.key});
@@ -54,12 +56,33 @@ 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

@@ -1,164 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CardDetailsScreen extends StatelessWidget {
-  const CardDetailsScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text("My Cards"),
-      ),
-      body: 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,8 +1,6 @@
-// ignore_for_file: unused_import
-
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/features/card/screens/block_card_screen.dart';
-import 'package:kmobile/features/card/screens/card_details_screen.dart';
 import 'package:kmobile/features/card/screens/card_pin_change_details_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
@@ -22,8 +20,25 @@ 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: [
@@ -31,7 +46,6 @@ class _CardManagementScreen extends State<CardManagementScreen> {
             icon: Symbols.add,
             label: AppLocalizations.of(context).applyDebitCard,
             onTap: () {},
-          disabled: true, // Add this
           ),
           const Divider(height: 1),
           CardManagementTile(
@@ -45,7 +59,6 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 ),
               );
             },
-          disabled: true, 
           ),
           const Divider(height: 1),
           CardManagementTile(
@@ -59,21 +72,6 @@ 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),
         ],
@@ -86,36 +84,21 @@ class CardManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
   final VoidCallback onTap;
-  final bool disabled; 
 
   const CardManagementTile({
     super.key,
     required this.icon,
     required this.label,
     required this.onTap,
-    this.disabled = false, 
   });
 
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
     return ListTile(
-      leading: Icon(
-        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, 
+      leading: Icon(icon),
+      title: Text(label),
+      trailing: const Icon(Symbols.arrow_right, size: 20),
+      onTap: onTap,
     );
   }
 }

lib/features/card/screens/card_pin_change_details_screen.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
 import 'package:kmobile/features/card/screens/card_pin_set_screen.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class CardPinChangeDetailsScreen extends StatefulWidget {
@@ -44,12 +46,33 @@ class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
         title: Text(
           AppLocalizations.of(context).cardDetails,
           style:
               const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          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_pin_set_screen.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class CardPinSetScreen extends StatefulWidget {
@@ -44,12 +46,33 @@ class _CardPinSetScreen extends State<CardPinSetScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
         title: Text(
           AppLocalizations.of(context).cardPin,
           style:
               const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
         ),
         centerTitle: false,
+        actions: [
+          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),

lib/features/cheque/screens/cheque_management_screen.dart

@@ -1,4 +1,5 @@
 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';
@@ -15,12 +16,33 @@ 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),
         ),
         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,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/data/models/user.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
 class CustomerInfoScreen extends StatefulWidget {
@@ -13,25 +14,36 @@ 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(
-        title: Text(
-          AppLocalizations.of(context)
-              .customerInfo
-              .replaceFirst(RegExp('\n'), ''),
+        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),
+        ),
+        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(),
@@ -43,6 +55,7 @@ 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',
@@ -55,18 +68,16 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                     padding: const EdgeInsets.only(top: 10.0),
                     child: Text(
                       user.name ?? '',
-                      style: TextStyle(
+                      style: const TextStyle(
                         fontSize: 20,
-                        color: theme.colorScheme.onSurface,
+                        color: Colors.black,
                         fontWeight: FontWeight.w500,
                       ),
                     ),
                   ),
                   Text(
                     '${AppLocalizations.of(context).cif}: ${user.cifNumber ?? 'N/A'}',
-                    style: TextStyle(
-                        fontSize: 16,
-                        color: theme.colorScheme.onSurfaceVariant),
+                    style: const TextStyle(fontSize: 16, color: Colors.grey),
                   ),
                   const SizedBox(height: 30),
                   InfoField(
@@ -94,7 +105,7 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                   ), // Replace with Aadhar if available
                   InfoField(
                     label: AppLocalizations.of(context).primaryId,
-                  value: _maskPrimaryId(user.primaryId),
+                    value: user.primaryId ?? 'N/A',
                   ), // Replace with PAN if available
                 ],
               ),
@@ -114,7 +125,6 @@ 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),
@@ -123,16 +133,16 @@ class InfoField extends StatelessWidget {
         children: [
           Text(
             label,
-            style: TextStyle(
+            style: const TextStyle(
               fontSize: 15,
               fontWeight: FontWeight.w500,
-              color: theme.colorScheme.onSurfaceVariant,
+              color: Colors.black87,
             ),
           ),
           const SizedBox(height: 3),
           Text(
             value,
-            style: TextStyle(fontSize: 16, color: theme.colorScheme.onSurface),
+            style: const TextStyle(fontSize: 16, color: Colors.black),
           ),
         ],
       ),

lib/features/dashboard/screens/dashboard_screen.dart

@@ -1,3 +1,4 @@
+// ignore_for_file: use_build_context_synchronously
 import 'dart:developer';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -12,7 +13,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_screen.dart';
+import 'package:kmobile/features/fund_transfer/screens/fund_transfer_beneficiary_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';
@@ -81,11 +82,8 @@ 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(
-        SnackBar(
+        /*const*/ SnackBar(
           content: Text(AppLocalizations.of(context).failedToRefresh),
         ),
       );
@@ -96,12 +94,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
   }
 
   Widget _buildBalanceShimmer() {
-    final theme = Theme.of(context);
     return Shimmer.fromColors(
-      baseColor: theme.colorScheme.primary,
-      highlightColor: theme.colorScheme.onPrimary,
+      baseColor: Theme.of(context).dialogBackgroundColor,
+      highlightColor: Theme.of(context).dialogBackgroundColor,
       child: Container(
-          width: 200, height: 42, color: theme.scaffoldBackgroundColor),
+          width: 100,
+          height: 32,
+          color: Theme.of(context).scaffoldBackgroundColor),
     );
   }
 
@@ -138,8 +137,6 @@ 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':
@@ -172,7 +169,6 @@ 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(
@@ -183,7 +179,6 @@ 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),
@@ -195,7 +190,6 @@ 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) {
@@ -208,16 +202,15 @@ class _DashboardScreenState extends State<DashboardScreen> {
         }
       },
       child: Scaffold(
-        backgroundColor: theme.scaffoldBackgroundColor,
+        backgroundColor: Theme.of(context).scaffoldBackgroundColor,
         appBar: AppBar(
-          backgroundColor: theme.scaffoldBackgroundColor,
+          backgroundColor: Theme.of(context).scaffoldBackgroundColor,
           automaticallyImplyLeading: false,
           title: Text(
-            AppLocalizations.of(context).kccbMobile,
-            textAlign: TextAlign.left,
+            AppLocalizations.of(context).kconnect,
             style: TextStyle(
-              color: theme.colorScheme.primary,
-              fontWeight: FontWeight.w700,
+              color: Theme.of(context).primaryColor,
+              fontWeight: FontWeight.w500,
             ),
           ),
           centerTitle: true,
@@ -227,19 +220,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
               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),
+                      builder: (context) => const ProfileScreen(),
                     ),
                   );
                 },
@@ -284,10 +268,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
                       Padding(
                         padding: const EdgeInsets.only(left: 8.0),
                         child: Text(
-                          "${AppLocalizations.of(context).hi} $firstName!",
-                          style: GoogleFonts.baumans().copyWith(
-                            fontSize: 20,
-                            color: theme.colorScheme.primary,
+                          "${AppLocalizations.of(context).hi} $firstName",
+                          style: GoogleFonts.montserrat().copyWith(
+                            fontSize: 25,
+                            color: Theme.of(context).primaryColor,
                             fontWeight: FontWeight.w700,
                           ),
                         ),
@@ -301,7 +285,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                           vertical: 10,
                         ),
                         decoration: BoxDecoration(
-                          color: Color(0xFF01A04C),
+                          color: Theme.of(context).primaryColor,
                           borderRadius: BorderRadius.circular(16),
                         ),
                         child: Column(
@@ -310,22 +294,24 @@ class _DashboardScreenState extends State<DashboardScreen> {
                             Row(
                               children: [
                                 Text(
-                                  "${getFullAccountType(currAccount.accountType)}: ",
+                                  "${AppLocalizations.of(context).accountNumber}: ",
                                   style: TextStyle(
-                                    color: theme.colorScheme.onPrimary,
-                                    fontSize: 18,
-                                    fontWeight: FontWeight.w700,
+                                    color:
+                                        Theme.of(context).dialogBackgroundColor,
+                                    fontSize: 12,
                                   ),
                                 ),
                                 DropdownButton<int>(
                                   value: selectedAccountIndex,
-                                  dropdownColor: theme.colorScheme.primary,
+                                  dropdownColor: Theme.of(context).primaryColor,
                                   underline: const SizedBox(),
                                   icon: const Icon(Icons.keyboard_arrow_down),
-                                  iconEnabledColor: theme.colorScheme.onPrimary,
+                                  iconEnabledColor:
+                                      Theme.of(context).dialogBackgroundColor,
                                   style: TextStyle(
-                                    color: theme.colorScheme.onPrimary,
-                                    fontSize: 18,
+                                    color:
+                                        Theme.of(context).dialogBackgroundColor,
+                                    fontSize: 14,
                                   ),
                                   items: List.generate(users.length, (index) {
                                     return DropdownMenuItem<int>(
@@ -333,9 +319,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                       child: Text(
                                         users[index].accountNo ?? 'N/A',
                                         style: TextStyle(
-                                          color: theme.colorScheme.onPrimary,
-                                          fontSize: 18,
-                                          fontWeight: FontWeight.w700,
+                                          color: Theme.of(context)
+                                              .dialogBackgroundColor,
+                                          fontSize: 14,
                                         ),
                                       ),
                                     );
@@ -374,13 +360,15 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                           width: 20,
                                           height: 20,
                                           child: CircularProgressIndicator(
-                                            color: theme.colorScheme.onPrimary,
+                                            color: Theme.of(context)
+                                                .dialogBackgroundColor,
                                             strokeWidth: 2,
                                           ),
                                         )
                                       : Icon(
-                                          Symbols.refresh,
-                                          color: theme.colorScheme.onPrimary,
+                                          Icons.refresh,
+                                          color: Theme.of(context)
+                                              .dialogBackgroundColor,
                                         ),
                                   onPressed: isRefreshing
                                       ? null
@@ -389,14 +377,22 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                 ),
                               ],
                             ),
-                            const SizedBox(height: 15),
+                            Text(
+                              getFullAccountType(currAccount.accountType),
+                              style: TextStyle(
+                                color: Theme.of(context).dialogBackgroundColor,
+                                fontSize: 16,
+                              ),
+                            ),
+                            const SizedBox(height: 4),
                             Row(
                               mainAxisAlignment: MainAxisAlignment.start,
                               children: [
                                 Text(
                                   "₹ ",
                                   style: TextStyle(
-                                    color: theme.colorScheme.onPrimary,
+                                    color:
+                                        Theme.of(context).dialogBackgroundColor,
                                     fontSize: 40,
                                     fontWeight: FontWeight.w700,
                                   ),
@@ -407,9 +403,10 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                         isVisible
                                             ? currAccount.currentBalance ??
                                                 '0.00'
-                                            : '*****',
+                                            : '********',
                                         style: TextStyle(
-                                          color: theme.colorScheme.onPrimary,
+                                          color: Theme.of(context)
+                                              .dialogBackgroundColor,
                                           fontSize: 40,
                                           fontWeight: FontWeight.w700,
                                         ),
@@ -435,15 +432,12 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                       });
                                     }
                                   },
-                                  child: Padding(
-                                    padding: const EdgeInsets.all(8.0),
                                   child: Icon(
                                     isVisible
                                         ? Symbols.visibility_lock
                                         : Symbols.visibility,
-                                      color: theme.scaffoldBackgroundColor,
-                                      weight: 800,
-                                    ),
+                                    color: Theme.of(context)
+                                        .scaffoldBackgroundColor,
                                   ),
                                 ),
                               ],
@@ -498,7 +492,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
                             Navigator.push(
                                 context,
                                 MaterialPageRoute(
-                                    builder: (context) => FundTransferScreen(
+                                    builder: (context) =>
+                                        FundTransferBeneficiaryScreen(
                                             creditAccountNo:
                                                 users[selectedAccountIndex]
                                                     .accountNo!,
@@ -531,10 +526,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                         AccountStatementScreen(
                                           accountNo: users[selectedAccountIndex]
                                               .accountNo!,
-                                          balance: users[selectedAccountIndex]
-                                              .availableBalance!,
-                                          accountType: users[selectedAccountIndex]
-                                          .accountType!,
                                         )));
                           }),
                           _buildQuickLink(Symbols.checkbook,
@@ -577,25 +568,24 @@ class _DashboardScreenState extends State<DashboardScreen> {
                               tx.type == 'CR'
                                   ? Symbols.call_received
                                   : Symbols.call_made,
-                              color: tx.type == 'CR'
-                                  ? const Color(0xFF10BB10)
-                                  : theme.colorScheme.error,
+                              color:
+                                  tx.type == 'CR' ? Colors.green : Colors.red,
                             ),
                             title: Text(
-                              tx.date ?? '',
-                              style: const TextStyle(fontSize: 15),
-                            ),
-                            subtitle: Text(
                               tx.name != null
-                                  ? (tx.name!.length > 22
+                                  ? (tx.name!.length > 18
                                       ? 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: 17),
+                              style: const TextStyle(fontSize: 16),
                             ),
                             onTap: () {
                               Navigator.push(
@@ -616,7 +606,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                               AppLocalizations.of(context).noTransactions,
                               style: TextStyle(
                                 fontSize: 16,
-                                color: Theme.of(context).colorScheme.outline,
+                                color: Colors.grey[600],
                               ),
                             ),
                           ),
@@ -636,26 +626,30 @@ class _DashboardScreenState extends State<DashboardScreen> {
   }
 
   List<Widget> _buildTransactionShimmer() {
-    final theme = Theme.of(context);
     return List.generate(3, (i) {
       return ListTile(
         leading: Shimmer.fromColors(
           baseColor: Colors.grey[300]!,
           highlightColor: Colors.grey[100]!,
           child: CircleAvatar(
-              radius: 12, backgroundColor: theme.scaffoldBackgroundColor),
+              radius: 12,
+              backgroundColor: Theme.of(context).scaffoldBackgroundColor),
         ),
         title: Shimmer.fromColors(
           baseColor: Colors.grey[300]!,
           highlightColor: Colors.grey[100]!,
           child: Container(
-              height: 10, width: 100, color: theme.scaffoldBackgroundColor),
+              height: 10,
+              width: 100,
+              color: Theme.of(context).scaffoldBackgroundColor),
         ),
         subtitle: Shimmer.fromColors(
           baseColor: Colors.grey[300]!,
           highlightColor: Colors.grey[100]!,
           child: Container(
-              height: 8, width: 60, color: theme.scaffoldBackgroundColor),
+              height: 8,
+              width: 60,
+              color: Theme.of(context).scaffoldBackgroundColor),
         ),
       );
     });
@@ -667,7 +661,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
     VoidCallback onTap, {
     bool disable = false,
   }) {
-    final theme = Theme.of(context);
     return InkWell(
       onTap: disable ? null : onTap,
       child: Column(
@@ -676,11 +669,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
           Icon(
             icon,
             size: 30,
-            color: disable
-                ? theme.colorScheme.onSurface.withOpacity(0.3)
-                : theme.colorScheme.primary,
-            grade: 200,
-            weight: 700,
+            color: disable ? Colors.grey : Theme.of(context).primaryColor,
           ),
           const SizedBox(height: 4),
           Text(

lib/features/dashboard/widgets/account_card.dart

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

lib/features/enquiry/screens/enquiry_screen.dart

@@ -1,6 +1,8 @@
 // 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';
 
@@ -30,27 +32,16 @@ class _EnquiryScreen extends State<EnquiryScreen> {
     }
   }
 
-   Future<void> _launchUrl(String url) async {
-   final Uri uri = Uri.parse(url);
-   if (await canLaunchUrl(uri)) {
-     await launchUrl(uri);
-   } else {
-     // Consider adding a 'urlLaunchError' key to your AppLocalizations
-     debugPrint('Could not launch $url');
-   }
- }  
-
   Widget _buildContactItem(String role, String email, String phone) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(role,
-            style: TextStyle(color: Theme.of(context).colorScheme.onSurface)),
+        Text(role, style: const TextStyle(color: Colors.grey)),
         const SizedBox(height: 4),
         GestureDetector(
           onTap: () => _launchEmailAddress(email),
           child: Text(email,
-              style: TextStyle(color: Theme.of(context).colorScheme.primary)),
+              style: TextStyle(color: Theme.of(context).primaryColor)),
         ),
         const SizedBox(height: 4),
         GestureDetector(
@@ -67,47 +58,61 @@ class _EnquiryScreen extends State<EnquiryScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context).enquiry),
+        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),
+        ),
         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),
- 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,
+            Text(
+              AppLocalizations.of(context).writeToUs,
+              style: const TextStyle(color: Colors.grey),
             ),
-   ),
-    const SizedBox(width: 4), 
- Icon(
-   Icons.open_in_new, 
-   color: Theme.of(context).colorScheme.primary,
-   size: 16.0, 
- ),
- ]
-)
+            const SizedBox(height: 4),
+            Text(
+              "complaint@kccb.in",
+              style: TextStyle(color: Theme.of(context).primaryColor),
             ),
 
-            const SizedBox(height: 40),
+            const SizedBox(height: 20),
             Text(
               AppLocalizations.of(context).keyContacts,
               style: TextStyle(
                 fontSize: 17,
-                color: Theme.of(context).colorScheme.primary,
+                color: Theme.of(context).primaryColor,
               ),
               // horizontal line
             ),
-            Divider(color: Theme.of(context).colorScheme.outline),
+            Divider(color: Colors.grey[300]),
             const SizedBox(height: 16),
             _buildContactItem(
               AppLocalizations.of(context).chairman,

lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart

@@ -1,12 +1,10 @@
+// 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,23 +13,19 @@ 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, imps }
+enum TransactionMode { neft, rtgs }
 
 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
@@ -41,49 +35,36 @@ 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,
-                );
 
-                final paymentService = getIt<PaymentService>();
-                final paymentResponseFuture =
-                    paymentService.processQuickPayWithinBank(transfer);
-
-                Navigator.of(pinScreenContext).pushReplacement(
-                  MaterialPageRoute(
-                    builder: (_) => PaymentAnimationScreen(
-                        paymentResponse: paymentResponseFuture),
-                  ),
-                );
-              },
-            ),
-          ),
-        );
-      } else {
       if (_selectedMode == TransactionMode.rtgs && amount < 200000) {
         showDialog(
           context: context,
@@ -115,9 +96,9 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   remitterName: widget.remitterName,
                   beneficiaryName: widget.creditBeneficiary.name,
                   tpin: tpin,
-                    remarks: _remarksController.text,
                 );
                 final neftService = getIt<NeftService>();
+
                 final completer = Completer<PaymentResponse>();
 
                 Navigator.of(pinScreenContext).pushReplacement(
@@ -131,8 +112,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   final neftResponse =
                       await neftService.processNeftTransaction(neftTx);
                   final paymentResponse = PaymentResponse(
-                      isSuccess:
-                          neftResponse.message.toUpperCase() == 'SUCCESS',
+                    isSuccess: neftResponse.message.toUpperCase() == 'SUCCESS',
                     date: DateTime.now(),
                     creditedAccount: neftTx.toAccount,
                     amount: neftTx.amount,
@@ -141,81 +121,17 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   );
                   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>();
+                  print('dio exception');
+                  print(e.toString());
 
-                  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",
+                        "INCORRECT_TPIN":
+                            AppLocalizations.of(context).correctTpin,
                         "INSUFFICIENT_FUNDS":
-                              "Your account does not have sufficient balance"
+                            AppLocalizations.of(context).insufficientFund
                       }[error] ??
-                        "Something Went Wrong";
+                      AppLocalizations.of(context).somethingWentWrong;
 
                   final paymentResponse = PaymentResponse(
                     isSuccess: false,
@@ -223,14 +139,74 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   );
                   completer.complete(paymentResponse);
                 } catch (e) {
+                  print('generic exception');
+                  print(e.toString());
                   final paymentResponse = PaymentResponse(
                     isSuccess: false,
-                      errorMessage: "Something went Wrong",
+                    errorMessage:
+                        AppLocalizations.of(context).somethingWentWrong,
                   );
                   completer.complete(paymentResponse);
                 }
               }
-                //RTGS
+              //  else if (_selectedMode == TransactionMode.imps){
+              //   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,
+              //     );
+              //     completer.complete(paymentResponse);
+              //   } on DioException catch(e) {
+              //     print('dio exception');
+              //     print(e.toString());
+
+              //     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);
+              //   }
+              // }
               else {
                 final rtgsTx = RtgsTransaction(
                   fromAccount: widget.debitAccountNo,
@@ -240,7 +216,6 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   remitterName: widget.remitterName,
                   beneficiaryName: widget.creditBeneficiary.name,
                   tpin: tpin,
-                    remarks: _remarksController.text,
                 );
                 final rtgsService = getIt<RtgsService>();
                 final completer = Completer<PaymentResponse>();
@@ -256,8 +231,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   final rtgsResponse =
                       await rtgsService.processRtgsTransaction(rtgsTx);
                   final paymentResponse = PaymentResponse(
-                      isSuccess:
-                          rtgsResponse.message.toUpperCase() == 'SUCCESS',
+                    isSuccess: rtgsResponse.message.toUpperCase() == 'SUCCESS',
                     date: DateTime.now(),
                     creditedAccount: rtgsTx.toAccount,
                     amount: rtgsTx.amount,
@@ -266,14 +240,18 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   );
                   completer.complete(paymentResponse);
                 } on DioException catch (e) {
+                  print('dio exception');
+                  print(e.toString());
+
                   final error = jsonDecode(e.response.toString())['error'];
                   var errorMessage = {
-                          "INCORRECT_TPIN": "Please Enter the correct TPIN",
+                        "INCORRECT_TPIN":
+                            AppLocalizations.of(context).correctTpin,
                         "INSUFFICIENT_FUNDS":
-                              "Your account does not have sufficient balance"
+                            AppLocalizations.of(context).insufficientFund
                         // ignore: use_build_context_synchronously
                       }[error] ??
-                        "Something Went Wrong";
+                      AppLocalizations.of(context).somethingWentWrong;
 
                   final paymentResponse = PaymentResponse(
                     isSuccess: false,
@@ -281,9 +259,12 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   );
                   completer.complete(paymentResponse);
                 } catch (e) {
+                  print('generic exception');
+                  print(e.toString());
                   final paymentResponse = PaymentResponse(
                     isSuccess: false,
-                      errorMessage: "Something Went Wrong",
+                    errorMessage:
+                        AppLocalizations.of(context).somethingWentWrong,
                   );
                   completer.complete(paymentResponse);
                 }
@@ -294,17 +275,15 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
       );
     }
   }
-  }
 
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
     return Scaffold(
       appBar: AppBar(
-        title: Text(loc.fundTransfer.replaceFirst(RegExp('\n'), '')),
+        title: Text(loc.fundTransfer),
       ),
-      body: SafeArea(
-        child: Padding(
+      body: Padding(
         padding: const EdgeInsets.all(16.0),
         child: Form(
           key: _formKey,
@@ -340,15 +319,13 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                 elevation: 0,
                 margin: const EdgeInsets.symmetric(vertical: 8.0),
                 child: ListTile(
-                    leading:
-                        getBankLogo(widget.creditBeneficiary.bankName, context),
+                  leading: _getBankLogo(widget.creditBeneficiary.bankName),
                   title: Text(widget.creditBeneficiary.name),
                   subtitle: Text(widget.creditBeneficiary.accountNo),
                 ),
               ),
               const SizedBox(height: 24),
 
-                if (!widget.isOwnBank) ...[
               // Transaction Mode Selection
               Text(
                 AppLocalizations.of(context).selectTransactionType,
@@ -364,8 +341,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                 child: ToggleButtons(
                   isSelected: [
                     _selectedMode == TransactionMode.neft,
-                        _selectedMode == TransactionMode.rtgs,
-                        _selectedMode == TransactionMode.imps,
+                    _selectedMode == TransactionMode.rtgs
                   ],
                   onPressed: (index) {
                     setState(() {
@@ -374,12 +350,13 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   },
                   borderRadius: BorderRadius.circular(10),
                   selectedColor: Theme.of(context).colorScheme.onPrimary,
-                      fillColor: Theme.of(context).colorScheme.primary,
+                  fillColor: Theme.of(context).primaryColor,
                   color: Theme.of(context).colorScheme.onSurface,
                   borderColor: Colors.transparent,
                   selectedBorderColor: Colors.transparent,
-                      splashColor: Theme.of(context).colorScheme.primary,
-                      highlightColor: Theme.of(context).colorScheme.primary,
+                  splashColor: Theme.of(context).primaryColor.withOpacity(0.1),
+                  highlightColor:
+                      Theme.of(context).primaryColor.withOpacity(0.05),
                   children: [
                     Padding(
                       padding: const EdgeInsets.symmetric(
@@ -391,25 +368,15 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                           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),
-                        ),
+                    // 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(),
-                    ),
-                  ),
-                 const SizedBox(height: 24),
+
               // Amount
               TextFormField(
                 controller: _amountController,
@@ -443,12 +410,10 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   child: Text(AppLocalizations.of(context).proceed),
                 ),
               ),
-                const SizedBox(height: 10),
             ],
           ),
         ),
       ),
-      ),
     );
   }
 }

lib/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart

@@ -1,5 +1,4 @@
 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';
@@ -10,12 +9,8 @@ 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,
-      required this.isOwnBank});
+      {super.key, required this.creditAccountNo, required this.remitterName});
 
   @override
   State<FundTransferBeneficiaryScreen> createState() =>
@@ -37,11 +32,7 @@ class _FundTransferBeneficiaryScreenState
   Future<void> _loadBeneficiaries() async {
     final data = await service.fetchBeneficiaryList();
     setState(() {
-      _beneficiaries = data
-          .where((b) => widget.isOwnBank
-              ? b.bankName!.toLowerCase().contains('kangra central')
-              : !b.bankName!.toLowerCase().contains('kangra central'))
-          .toList();
+      _beneficiaries = data;
       _isLoading = false;
     });
   }
@@ -72,6 +63,51 @@ 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(
@@ -85,7 +121,7 @@ class _FundTransferBeneficiaryScreenState
           leading: CircleAvatar(
             radius: 24,
             backgroundColor: Colors.transparent,
-            child: getBankLogo(beneficiary.bankName, context),
+            child: _getBankLogo(beneficiary.bankName),
           ),
           title: Text(beneficiary.name),
           subtitle: Column(
@@ -108,7 +144,6 @@ class _FundTransferBeneficiaryScreenState
                   debitAccountNo: widget.creditAccountNo,
                   creditBeneficiary: beneficiary,
                   remitterName: widget.remitterName,
-                  isOwnBank: widget.isOwnBank,
                 ),
               ),
             );

lib/features/fund_transfer/screens/fund_transfer_screen.dart

@@ -1,90 +1,153 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:kmobile/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart';
-import 'package:material_symbols_icons/symbols.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../l10n/app_localizations.dart';
 
-class FundTransferScreen extends StatelessWidget {
-  final String creditAccountNo;
-  final String remitterName;
+class FundTransferScreen extends StatefulWidget {
+  const FundTransferScreen({super.key});
 
-  const FundTransferScreen({
-    super.key,
-    required this.creditAccountNo,
-    required this.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',
+  ];
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context)
-            .fundTransfer
-            .replaceFirst(RegExp('\n'), '')),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
         ),
-      body: ListView(
+        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,
+            ),
+          ),
+        ],
+      ),
+      body: Column(
         children: [
-          FundTransferManagementTile(
-            icon: Symbols.input_circle,
-            label: AppLocalizations.of(context).ownBank,
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => FundTransferBeneficiaryScreen(
-                    creditAccountNo: creditAccountNo,
-                    remitterName: remitterName,
-                    isOwnBank: true,
+          const Spacer(),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(AppLocalizations.of(context).debitFrom),
+              const Text(
+                '0300015678903456',
+                style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500),
+              ),
+            ],
+          ),
+          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 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 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),
         ],
       ),
     );
   }
 }
-
-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

@@ -209,21 +209,26 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
                       onPressed: _shareScreenshot,
                       icon: Icon(
                         Icons.share_rounded,
-                        color: Theme.of(context).colorScheme.primary,
+                        color: Theme.of(context).primaryColor,
                       ),
                       label: Text(
                         AppLocalizations.of(context).share,
-                        style: TextStyle(color: Theme.of(context).colorScheme.primary),
+                        style: TextStyle(color: Theme.of(context).primaryColor),
                       ),
                       style: ElevatedButton.styleFrom(
+                        backgroundColor:
+                            Theme.of(context).scaffoldBackgroundColor,
                         padding: const EdgeInsets.symmetric(
-                            horizontal: 45, vertical: 12),
+                            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,
                         ),
                       ),
                     ),

lib/features/fund_transfer/screens/tpin_otp_screen.dart

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

lib/features/fund_transfer/screens/tpin_prompt_screen.dart

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

lib/features/fund_transfer/screens/transaction_pin_screen.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:kmobile/api/services/auth_service.dart';
 import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/features/fund_transfer/screens/tpin_prompt_screen.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 import '../../../l10n/app_localizations.dart';
 
@@ -15,40 +15,15 @@ class TransactionPinScreen extends StatefulWidget {
   State<TransactionPinScreen> createState() => _TransactionPinScreenState();
 }
 
-class _TransactionPinScreenState extends State<TransactionPinScreen>
-    with SingleTickerProviderStateMixin {
+class _TransactionPinScreenState extends State<TransactionPinScreen> {
   final List<String> _pin = [];
   bool _loading = true;
   bool _isSubmitting = false;
 
-  late final AnimationController _bounceController;
-  late final Animation<double> _bounceAnimation;
-
   @override
   void initState() {
     super.initState();
     _checkIfTpinIsSet();
-
-    _bounceController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 150),
-    );
-    _bounceAnimation = Tween<double>(begin: 1.0, end: 1.1).animate(
-      CurvedAnimation(
-          parent: _bounceController,
-          curve: Curves.elasticIn,
-          reverseCurve: Curves.elasticOut),
-    )..addStatusListener((status) {
-        if (status == AnimationStatus.completed) {
-          _bounceController.reverse();
-        }
-      });
-  }
-
-  @override
-  void dispose() {
-    _bounceController.dispose();
-    super.dispose();
   }
 
   Future<void> _checkIfTpinIsSet() async {
@@ -83,7 +58,6 @@ class _TransactionPinScreenState extends State<TransactionPinScreen>
         if (_pin.isNotEmpty) _pin.removeLast();
       } else if (_pin.length < 6) {
         _pin.add(value);
-        _bounceController.forward(from: 0);
       }
     });
   }
@@ -110,46 +84,29 @@ class _TransactionPinScreenState extends State<TransactionPinScreen>
   }
 
   Widget _buildPinIndicators() {
-    return AnimatedBuilder(
-        animation: _bounceAnimation,
-        builder: (context, child) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: List.generate(6, (index) {
-              final isAnimating =
-                  index == _pin.length - 1 && _bounceController.isAnimating;
-              return Transform.scale(
-                scale: isAnimating ? _bounceAnimation.value : 1.0,
-                child: Container(
+        return Container(
           margin: const EdgeInsets.symmetric(horizontal: 8),
-                  width: 30,
-                  height: 30,
+          width: 20,
+          height: 20,
           decoration: BoxDecoration(
             shape: BoxShape.circle,
+            border: Border.all(color: Theme.of(context).primaryColor, width: 2),
             color: index < _pin.length
-                          ? Theme.of(context).colorScheme.onSurfaceVariant
-                          : Theme.of(context)
-                              .colorScheme
-                              .surfaceContainerHighest),
+                ? Theme.of(context).primaryColor
+                : Colors.transparent,
           ),
         );
       }),
     );
-        });
   }
 
   Widget _buildKey(String label, {IconData? icon}) {
     return Expanded(
       child: InkWell(
-        onTap: () {
-          HapticFeedback.lightImpact();
-          if (label == 'done') {
-            _submitPin();
-          } else {
-            _onKeyPressed(label);
-          }
-        },
-        borderRadius: BorderRadius.circular(48),
+        onTap: () => label == 'done' ? _submitPin() : _onKeyPressed(label),
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: 20),
           child: Center(
@@ -186,13 +143,22 @@ class _TransactionPinScreenState extends State<TransactionPinScreen>
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(AppLocalizations.of(context).tpin),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
+        title: Text(
+          AppLocalizations.of(context).tpin,
+          style:
+              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
+        ),
         centerTitle: false,
       ),
       body: _loading
           ? const Center(child: CircularProgressIndicator())
-          : SafeArea(
-              child: Padding(
+          : Padding(
               padding: const EdgeInsets.only(bottom: 20.0),
               child: Column(
                 children: [
@@ -201,15 +167,13 @@ class _TransactionPinScreenState extends State<TransactionPinScreen>
                     AppLocalizations.of(context).enterTpin,
                     style: const TextStyle(fontSize: 18),
                   ),
-                    const SizedBox(height: 50),
+                  const SizedBox(height: 20),
                   _buildPinIndicators(),
                   const Spacer(),
                   _buildKeypad(),
                 ],
               ),
             ),
-            ),
     );
   }
 }
-

lib/features/fund_transfer/screens/transaction_success_screen.dart

@@ -67,13 +67,13 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
                   const SizedBox(height: 6),
                   Text(
                     "On $transactionDate",
-                    style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6)),
+                    style: const TextStyle(fontSize: 14, color: Colors.black54),
                     textAlign: TextAlign.center,
                   ),
                   const SizedBox(height: 16),
                   Text(
                     "${AppLocalizations.of(context).toAccountNumber}: $creditAccount",
-                     style: TextStyle(fontSize: 12, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8)),
+                    style: const TextStyle(fontSize: 12, color: Colors.black87),
                     textAlign: TextAlign.center,
                   ),
                 ],
@@ -91,15 +91,15 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
                       child: OutlinedButton.icon(
                         onPressed: _shareScreenshot,
                         icon: const Icon(Icons.share, size: 18),
-                        label: Text(AppLocalizations.of(context).share,
-                        style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
-                        ),
+                        label: Text(AppLocalizations.of(context).share),
                         style: ElevatedButton.styleFrom(
                           shape: const StadiumBorder(),
                           padding: const EdgeInsets.symmetric(vertical: 16),
-                          backgroundColor: Theme.of(context).primaryColorDark,
-                          foregroundColor:
+                          backgroundColor:
                               Theme.of(context).scaffoldBackgroundColor,
+                          foregroundColor: Theme.of(context).primaryColorLight,
+                          side: const BorderSide(color: Colors.black, width: 1),
+                          elevation: 0,
                         ),
                       ),
                     ),

lib/features/profile/change_password/change_password_otp_screen.dart

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

lib/features/profile/change_password/change_password_screen.dart

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

lib/features/profile/logout_dialog.dart

@@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../../l10n/app_localizations.dart';
-
-class LogoutDialog extends StatelessWidget {
-  const LogoutDialog({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(AppLocalizations.of(context).logout),
-      content: Text(AppLocalizations.of(context).logoutCheck),
-      actions: [
-        TextButton(
-          onPressed: () => Navigator.pop(context, false), // dismiss
-          child: Text(AppLocalizations.of(context).no),
-        ),
-        TextButton(
-          onPressed: () => Navigator.pop(context, true), // confirm
-          child: Text(AppLocalizations.of(context).yes),
-        ),
-      ],
-    );
-  }
-}

lib/features/profile/preferences/color_theme_dialog.dart

@@ -22,7 +22,7 @@ class ColorThemeDialog extends StatelessWidget {
         ),
         ListTile(
           leading: const CircleAvatar(backgroundColor: Colors.green),
-          title: Text(AppLocalizations.of(context).green),
+          title: const Text('Green'),
           onTap: () {
             context.read<ThemeCubit>().changeTheme(ThemeType.green);
             Navigator.pop(context);
@@ -30,7 +30,7 @@ class ColorThemeDialog extends StatelessWidget {
         ),
         ListTile(
           leading: const CircleAvatar(backgroundColor: Colors.orange),
-          title: Text(AppLocalizations.of(context).orange),
+          title: const Text('Orange'),
           onTap: () {
             context.read<ThemeCubit>().changeTheme(ThemeType.orange);
             Navigator.pop(context);

lib/features/profile/preferences/preference_screen.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:kmobile/features/profile/preferences/theme_mode_dialog.dart';
 import 'language_dialog.dart';
 import 'color_theme_dialog.dart';
 import '../../../l10n/app_localizations.dart';
@@ -22,12 +21,6 @@ class PreferenceScreen extends StatelessWidget {
         builder: (context, state) {
           return ListView(
             children: [
-              //Set Prefered Username
-              //  ListTile(
-              //     leading: const Icon(Icons.person),
-              //     title: const Text("Set Prefered Username"),
-              //     onTap: () {
-              //     }),
               // Language Selection
               ListTile(
                 leading: const Icon(Icons.language),
@@ -35,7 +28,8 @@ class PreferenceScreen extends StatelessWidget {
                 onTap: () {
                   showDialog(
                     context: context,
-                    builder: (_) => const LanguageDialog(),
+                    builder: (_) =>
+                        const LanguageDialog(), // your custom language dialog
                   );
                 },
               ),
@@ -43,14 +37,19 @@ class PreferenceScreen extends StatelessWidget {
               ListTile(
                 leading: const Icon(Icons.brightness_6),
                 title: Text(AppLocalizations.of(context).themeMode),
-                onTap: () {
-                  showThemeModeDialog(context);
-                },
+                enabled: false,
+                //trailing: Switch(
+                // value: state.isDarkMode,
+                // onChanged: (val) {
+                //   context.read<ThemeCubit>().toggleDarkMode(val);
+                // },
+                //),
               ),
               //Color_Theme_Selection
               ListTile(
                   leading: const Icon(Icons.color_lens),
                   title: Text(AppLocalizations.of(context).themeColor),
+                  //enabled: false,
                   onTap: () {
                     showDialog(
                       context: context,

lib/features/profile/preferences/theme_mode_dialog.dart

@@ -1,46 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
-import '../../../l10n/app_localizations.dart';
-
-String _getThemeModeText(ThemeMode mode, AppLocalizations l10n) {
-  switch (mode) {
-    case ThemeMode.system:
-      return l10n.themeModeSystem;
-    case ThemeMode.light:
-      return l10n.themeModeLight;
-    case ThemeMode.dark:
-      return l10n.themeModeDark;
-  }
-}
-
-Future<void> showThemeModeDialog(BuildContext context) async {
-  final cubit = context.read<ThemeModeCubit>();
-  final currentMode = context.read<ThemeModeCubit>().state.mode;
-  final l10n = AppLocalizations.of(context); 
-
-  await showDialog(
-    context: context,
-    builder: (context) {
-      return AlertDialog(
-        title: Text(l10n.selectThemeMode), 
-        content: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: ThemeMode.values.map((mode) {
-            return RadioListTile<ThemeMode>(
-              title: Text(_getThemeModeText(mode, l10n)),
-              value: mode,
-              groupValue: currentMode,
-              onChanged: (value) {
-                if (value != null) {
-                  cubit.changeThemeMode(value);
-                  Navigator.pop(context);
-                }
-              },
-            );
-          }).toList(),
-        ),
-      );
-    },
-  );
-}

lib/features/profile/profile_screen.dart

@@ -1,29 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:kmobile/data/repositories/auth_repository.dart';
-import 'package:kmobile/features/profile/change_password/change_password_screen.dart';
-import 'package:kmobile/features/profile/logout_dialog.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import '../../di/injection.dart';
 import '../../l10n/app_localizations.dart';
 import 'package:kmobile/features/profile/preferences/preference_screen.dart';
 
-class ProfileScreen extends StatefulWidget {
-  final String mobileNumber;
-  const ProfileScreen({super.key, required this.mobileNumber});
-
-  @override
-  State<ProfileScreen> createState() => _ProfileScreenState();
-}
-
-class _ProfileScreenState extends State<ProfileScreen> {
-    Future<void> _handleLogout(BuildContext context) async {
-    final auth = getIt<AuthRepository>();
-    final prefs = await SharedPreferences.getInstance();
-    await prefs.clear(); // clear saved session/token
-    await auth.clearAuthTokens();
-    // Navigate to login and remove all previous routes
-    Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false);
-  }
+class ProfileScreen extends StatelessWidget {
+  const ProfileScreen({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -37,7 +17,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
         children: [
           ListTile(
             leading: const Icon(Icons.settings),
-            title: Text(loc.preferences), 
+            title: Text(loc.preferences), // Localized "Preferences"
             onTap: () {
               Navigator.push(
                 context,
@@ -46,44 +26,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
               );
             },
           ),
-          ListTile(
-            leading: const Icon(Icons.password),
-            title: Text(loc.changeLoginPassword), 
-            onTap: () {
-            Navigator.push(  
-              context,
-            MaterialPageRoute(builder: (context) => ChangePasswordScreen(
-              mobileNumber: widget.mobileNumber,
-            )),
-            );
-            },
-          ),
-          // ListTile(
-          //   leading: const Icon(Icons.password),
-          //   title: const Text("Manage TPIN"), 
-          //   onTap: () async {
-          //   },
-          // ),
-          //           ListTile(
-          //   leading: const Icon(Icons.password),
-          //   title: const Text("Change Login MPIN"), 
-          //   onTap: () async {
-          //   },
-          // ),
-            ListTile(
-            leading: const Icon(Icons.logout),
-            title: Text(AppLocalizations.of(context).logout), 
-            onTap: () async {
-              final shouldLogout = await showDialog<bool>(
-                context: context,
-                builder: (_) => const LogoutDialog(),
-              );
-
-              if (shouldLogout == true) {
-                await _handleLogout(context);
-              }
-            },
-          ),
+          // You can add more profile options here later
         ],
       ),
     );

lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart

@@ -1,11 +1,7 @@
 import 'dart:async';
-import 'dart:developer';
-import 'package:dio/dio.dart';
 import 'package:flutter/services.dart';
-import 'package:kmobile/api/services/imps_service.dart';
 import 'package:kmobile/api/services/neft_service.dart';
 import 'package:kmobile/api/services/rtgs_service.dart';
-import 'package:kmobile/data/models/imps_transaction.dart';
 import 'package:kmobile/data/models/neft_transaction.dart';
 import 'package:kmobile/data/models/payment_response.dart';
 import 'package:kmobile/data/models/rtgs_transaction.dart';
@@ -13,7 +9,9 @@ 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:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:flutter_swipe_button/flutter_swipe_button.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../../../../di/injection.dart';
 import '../../../../api/services/beneficiary_service.dart';
 
@@ -38,8 +36,6 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   final ifscController = TextEditingController();
   final phoneController = TextEditingController();
   final amountController = TextEditingController();
-  final remarksController = TextEditingController();
-  final _ifscFocusNode = FocusNode();
   final service = getIt<BeneficiaryService>();
 
   late String accountType;
@@ -50,14 +46,9 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   @override
   void initState() {
     super.initState();
-    _ifscFocusNode.addListener(() {
-  if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
-    _validateIFSC();
-  }
-});
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
-        accountType = 'Savings';
+        accountType = AppLocalizations.of(context).savings;
       });
     });
   }
@@ -66,11 +57,10 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     final ifsc = ifscController.text.trim().toUpperCase();
     if (ifsc.isEmpty) return;
 
-    try {
     final result = await service.validateIFSC(ifsc);
 
     if (mounted) {
-        if (result.bankName.isEmpty) {
+      if (result.bankName == '') {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
         );
@@ -81,22 +71,6 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
         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;
-        }
-
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(snackbarMessage)),
-        );
-        bankNameController.clear();
-        branchNameController.clear();
-      }
-    }
   }
 
   void _validateBeneficiary() async {
@@ -110,6 +84,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
 
     final String accountNo = accountNumberController.text.trim();
     final String ifsc = ifscController.text.trim();
+    // ignore: prefer_const_declarations
     final String remitter = "Unknown";
 
     final service = getIt<BeneficiaryService>();
@@ -143,7 +118,6 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     return [
       AppLocalizations.of(context).neft,
       AppLocalizations.of(context).rtgs,
-      AppLocalizations.of(context).imps,
     ];
   }
 
@@ -160,9 +134,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     ifscController.dispose();
     phoneController.dispose();
     amountController.dispose();
-    remarksController.dispose();
     super.dispose();
-    _ifscFocusNode.dispose();
   }
 
   void _onProceedToPay() {
@@ -179,8 +151,6 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
       final amount = double.tryParse(amountController.text) ?? 0;
       final selectedMode = transactionModes(context)[selectedTransactionIndex];
       final isRtgs = selectedMode == AppLocalizations.of(context).rtgs;
-      final isNeft = selectedMode == AppLocalizations.of(context).neft;
-      final isImps = selectedMode == AppLocalizations.of(context).imps;
 
       if (isRtgs && amount < 200000) {
         showDialog(
@@ -204,17 +174,16 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
         MaterialPageRoute(
           builder: (context) => TransactionPinScreen(
             onPinCompleted: (pinScreenContext, tpin) async {
-              if (isNeft) {
+              if (!isRtgs) {
                 // NEFT
                 final neftTx = NeftTransaction(
                   fromAccount: widget.debitAccount,
                   toAccount: accountNumberController.text,
                   amount: amountController.text,
                   ifscCode: ifscController.text,
-                  remitterName: "Unknown",
+                  remitterName: "Unknown", // TODO: Get actual remitter name
                   beneficiaryName: nameController.text,
                   tpin: tpin,
-                  remarks: remarksController.text,
                 );
                 final neftService = getIt<NeftService>();
                 final completer = Completer<PaymentResponse>();
@@ -238,115 +207,27 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                     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";
+                } catch (e) {
+                  final paymentResponse = PaymentResponse(
+                    isSuccess: false,
+                    errorMessage: e.toString(),
+                  );
+                  completer.complete(paymentResponse);
                 }
               } else {
-                    errorMessage = "Something Went Wrong";
-                  }
-                  final paymentResponse = PaymentResponse(
-                    isSuccess: false,
-                    errorMessage: errorMessage,
-                  );
-                  completer.complete(paymentResponse);
-                } catch (e) {
-                  final paymentResponse = PaymentResponse(
-                    isSuccess: false,
-                    errorMessage: e.toString(),
-                  );
-                  completer.complete(paymentResponse);
-                }
-              }
-
-              if (isImps) {
-                // IMPS
-                final impsTx = ImpsTransaction(
-                  fromAccount: widget.debitAccount,
-                  toAccount: accountNumberController.text,
-                  amount: amountController.text,
-                  ifscCode: ifscController.text,
-                  remitterName: "Unknown",
-                  beneficiaryName: nameController.text,
-                  tpin: tpin,
-                  remarks: remarksController.text,
-                );
-                final impsService = getIt<ImpsService>();
-                final completer = Completer<PaymentResponse>();
-                if (!pinScreenContext.mounted) {
-                  return;
-                }
-
-                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 = e.response?.data['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) {
-                  final paymentResponse = PaymentResponse(
-                    isSuccess: false,
-                    errorMessage: e.toString(),
-                  );
-                  completer.complete(paymentResponse);
-                }
-              }
-
-              if (isRtgs) {
                 // RTGS
                 final rtgsTx = RtgsTransaction(
                   fromAccount: widget.debitAccount,
                   toAccount: accountNumberController.text,
                   amount: amountController.text,
                   ifscCode: ifscController.text,
-                  remitterName: "Unknown",
+                  remitterName: "Unknown", // TODO: Get actual remitter name
                   beneficiaryName: nameController.text,
                   tpin: tpin,
-                  remarks: remarksController.text,
                 );
                 final rtgsService = getIt<RtgsService>();
                 final completer = Completer<PaymentResponse>();
-                if (!pinScreenContext.mounted) {
-                  return;
-                }
+
                 Navigator.of(pinScreenContext).pushReplacement(
                   MaterialPageRoute(
                     builder: (_) => PaymentAnimationScreen(
@@ -366,22 +247,6 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                     utr: rtgsResponse.utr,
                   );
                   completer.complete(paymentResponse);
-                } on DioException catch (e) {
-                  log('dio exception');
-
-                  final error = e.response?.data['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) {
                   final paymentResponse = PaymentResponse(
                     isSuccess: false,
@@ -401,10 +266,33 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   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).quickPayOutsideBank,
+          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),
@@ -438,13 +326,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.outline),
+                  enabledBorder: const OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
                   ),
-                  focusedBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                  focusedBorder: const OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
                   ),
                 ),
                 controller: accountNumberController,
@@ -476,13 +362,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.outline),
+                  enabledBorder: const OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
                   ),
-                  focusedBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                  focusedBorder: const OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
                   ),
                 ),
                 keyboardType: TextInputType.number,
@@ -499,11 +383,9 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
               ),
               const SizedBox(height: 25),
               Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Expanded(
                     child: TextFormField(
-                      focusNode: _ifscFocusNode,
                       maxLength: 11,
                       inputFormatters: [
                         LengthLimitingTextInputFormatter(11),
@@ -514,27 +396,25 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                         isDense: true,
                         filled: true,
                         fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: OutlineInputBorder(
-                          borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.outline),
+                        enabledBorder: const OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black),
                         ),
-                        focusedBorder: OutlineInputBorder(
-                          borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.primary,
-                              width: 2),
+                        focusedBorder: const OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
                         ),
                       ),
                       controller: ifscController,
                       textInputAction: TextInputAction.next,
+                      onFieldSubmitted: (_) {
+                        _validateIFSC();
+                      },
                       onChanged: (value) {
-                         setState(() {
                         final trimmed = value.trim().toUpperCase();
                         if (trimmed.length < 11) {
                           // clear bank/branch if backspace or changed
                           bankNameController.clear();
                           branchNameController.clear();
                         }
-                      });
                       },
                       validator: (value) {
                         final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
@@ -551,9 +431,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                       },
                     ),
                   ),
-                  const SizedBox(
-                    width: 10,
-                  ),
+                  const SizedBox(width: 10),
                   Expanded(
                     child: DropdownButtonFormField<String>(
                       value: accountType,
@@ -563,19 +441,16 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                         isDense: true,
                         filled: true,
                         fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: OutlineInputBorder(
-                          borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.outline),
+                        enabledBorder: const OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black),
                         ),
-                        focusedBorder: OutlineInputBorder(
-                          borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.primary,
-                              width: 2),
+                        focusedBorder: const OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
                         ),
                       ),
                       items: [
-                        'Savings',
-                        'Current',
+                        AppLocalizations.of(context).savings,
+                        AppLocalizations.of(context).current,
                       ]
                           .map(
                             (e) => DropdownMenuItem(value: e, child: Text(e)),
@@ -598,13 +473,14 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).dialogBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.outline),
+                  enabledBorder: const OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
                     borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                      color: Colors.black,
+                      width: 2,
+                    ),
                   ),
                 ),
               ),
@@ -618,13 +494,12 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).dialogBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.outline),
+                  enabledBorder: const OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
                   ),
-                  focusedBorder: OutlineInputBorder(
+                  focusedBorder: const OutlineInputBorder(
                     borderSide: BorderSide(
-                      color: Theme.of(context).colorScheme.primary,
+                      color: Colors.black,
                       width: 2,
                     ),
                   ),
@@ -637,7 +512,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   child: SizedBox(
                     width: double.infinity,
                     child: ElevatedButton(
-                     onPressed: _isValidating || ifscController.text.length != 11
+                      onPressed: _isValidating
                           ? null
                           : () {
                               if (confirmAccountNumberController.text ==
@@ -667,8 +542,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   padding: const EdgeInsets.only(bottom: 24.0),
                   child: Text(
                     _validationError!,
-                    style:
-                        TextStyle(color: Theme.of(context).colorScheme.error),
+                    style: const TextStyle(color: Colors.red),
                   ),
                 ),
               TextFormField(
@@ -680,13 +554,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   isDense: true,
                   filled: true,
                   fillColor: Theme.of(context).dialogBackgroundColor,
-                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.outline),
+                  enabledBorder: const OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
                   ),
-                  focusedBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.primary, width: 2),
+                  focusedBorder: const OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
                   ),
                 ),
                 validator: (value) {
@@ -697,25 +569,6 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 },
               ),
               const SizedBox(height: 25),
-   TextFormField(
-     controller: remarksController,
-     decoration: InputDecoration(
-       labelText: AppLocalizations.of(context).remarks,
-       border: const OutlineInputBorder(),
-       isDense: true,
-       filled: true,
-       fillColor: Theme.of(context).scaffoldBackgroundColor,
-       enabledBorder: OutlineInputBorder(
-         borderSide: BorderSide(
-             color: Theme.of(context).colorScheme.outline),
-       ),
-       focusedBorder: OutlineInputBorder(
-         borderSide: BorderSide(
-             color: Theme.of(context).colorScheme.primary, width: 2),
-       ),
-     ),
-   ),
-              const SizedBox(height: 25),
               Row(
                 children: [
                   Expanded(
@@ -729,14 +582,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                         isDense: true,
                         filled: true,
                         fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: OutlineInputBorder(
-                          borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.outline),
+                        enabledBorder: const OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black),
                         ),
-                        focusedBorder: OutlineInputBorder(
-                          borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.primary,
-                              width: 2),
+                        focusedBorder: const OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
                         ),
                       ),
                       textInputAction: TextInputAction.next,
@@ -754,14 +604,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                         isDense: true,
                         filled: true,
                         fillColor: Theme.of(context).scaffoldBackgroundColor,
-                        enabledBorder: OutlineInputBorder(
-                          borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.outline),
+                        enabledBorder: const OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black),
                         ),
-                        focusedBorder: OutlineInputBorder(
-                          borderSide: BorderSide(
-                              color: Theme.of(context).colorScheme.primary,
-                              width: 2),
+                        focusedBorder: const OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
                         ),
                       ),
                       controller: amountController,
@@ -798,7 +645,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 child: SwipeButton.expand(
                   thumb: Icon(Icons.arrow_forward,
                       color: Theme.of(context).dialogBackgroundColor),
-                  activeThumbColor: Theme.of(context).colorScheme.primary,
+                  activeThumbColor: Theme.of(context).primaryColor,
                   activeTrackColor:
                       Theme.of(context).colorScheme.secondary.withAlpha(100),
                   borderRadius: BorderRadius.circular(30),
@@ -834,12 +681,12 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 padding: const EdgeInsets.symmetric(vertical: 5),
                 decoration: BoxDecoration(
                   color: isSelected
-                      ? Theme.of(context).colorScheme.primary
+                      ? Theme.of(context).primaryColor
                       : Theme.of(context).scaffoldBackgroundColor,
                   borderRadius: BorderRadius.circular(5),
                   border: Border.all(
                     color: isSelected
-                        ? Theme.of(context).colorScheme.primary
+                        ? Theme.of(context).primaryColor
                         : Theme.of(context).scaffoldBackgroundColor,
                     width: isSelected ? 0 : 1.2,
                   ),
@@ -847,8 +694,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 alignment: Alignment.center,
                 child: Text(
                   transactionModes(context)[index],
-                  style:
-                      TextStyle(color: Theme.of(context).colorScheme.onSurface),
+                  style: const TextStyle(color: Colors.black),
                 ),
               ),
             ),

lib/features/quick_pay/screens/quick_pay_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:kmobile/features/quick_pay/screens/quick_pay_outside_bank_screen.dart';
 import 'package:kmobile/features/quick_pay/screens/quick_pay_within_bank_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
@@ -17,9 +18,33 @@ class _QuickPayScreen extends State<QuickPayScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(
-          AppLocalizations.of(context).quickPay.replaceAll('\n', ''),
+        leading: IconButton(
+          icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },
         ),
+        title: Text(
+          AppLocalizations.of(context).quickPay.replaceAll('\n', ' '),
+          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: [