Send_Message changed with flutter_sms

android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>  
     <application
         android:label="kmobile"
         android:name="${applicationName}"

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

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

ios/Runner.xcodeproj/project.pbxproj

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

ios/Runner/Info.plist

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

lib/api/services/beneficiary_service.dart

@@ -40,8 +40,7 @@ class BeneficiaryService {
     } on DioException catch (e) {
       if (e.response?.statusCode == 404) {
         throw Exception('INVALID IFSC CODE');
-      }
+      } else if (e.response?.statusCode == 401) {
-      else if (e.response?.statusCode == 401) {
         throw Exception('INVALID IFSC CODE');
       }
     } catch (e) {
@@ -64,6 +63,10 @@ class BeneficiaryService {
         'ifscCode': ifscCode,
         'remitterName': remitterName,
       },
+      options: Options(
+        sendTimeout: const Duration(seconds: 60),
+        receiveTimeout: const Duration(seconds: 60),
+      ),
     );
     if (response.statusCode != 200) {
       throw Exception("Invalid Beneficiary Details");

lib/api/services/change_password_service.dart

@@ -10,10 +10,7 @@ class ChangePasswordService {
   }) async {
     final response = await _dio.post(
       '/api/otp/send',
-      data: {
+      data: {'mobileNumber': mobileNumber, 'type': "CHANGE_LPWORD"},
-        'mobileNumber': mobileNumber,
-        'type': "CHANGE_LPWORD"
-      },
     );
     if (response.statusCode != 200) {
       throw Exception("Invalid Mobile Number/Type");
@@ -22,6 +19,19 @@ class ChangePasswordService {
     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,
@@ -30,7 +40,7 @@ class ChangePasswordService {
     final response = await _dio.post(
       '/api/otp/verify?mobileNumber=$mobileNumber',
       data: {
-        'otp' : otp,
+        'otp': otp,
       },
     );
     if (response.statusCode != 200) {

lib/api/services/send_sms_service.dart

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

lib/app.dart

@@ -20,6 +20,7 @@ import 'features/dashboard/screens/dashboard_screen.dart';
 import 'features/auth/screens/mpin_screen.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'dart:async';
 
 class KMobile extends StatefulWidget {
   const KMobile({super.key});
@@ -34,13 +35,15 @@ class KMobile extends StatefulWidget {
   }
 }
 
-class _KMobileState extends State<KMobile> {
+class _KMobileState extends State<KMobile> with WidgetsBindingObserver {
+  Timer? _backgroundTimer;
   bool showSplash = true;
   Locale? _locale;
 
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
     loadPreferences();
     Future.delayed(const Duration(seconds: 3), () {
       setState(() {
@@ -49,10 +52,35 @@ class _KMobileState extends State<KMobile> {
     });
   }
 
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    _backgroundTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    switch (state) {
+      case AppLifecycleState.resumed:
+        _backgroundTimer?.cancel();
+        break;
+      case AppLifecycleState.paused:
+        _backgroundTimer = Timer(const Duration(minutes: 2), () {
+          if (Platform.isAndroid) {
+            SystemNavigator.pop();
+          }
+          exit(0);
+        });
+        break;
+      default:
+        break;
+    }
+  }
+
   Future<void> loadPreferences() async {
     final prefs = await SharedPreferences.getInstance();
-
-    // Load Locale
     final String? langCode = prefs.getString('locale');
     if (langCode != null) {
       setState(() {
@@ -117,7 +145,6 @@ class _KMobileState extends State<KMobile> {
 
 class AuthGate extends StatefulWidget {
   const AuthGate({super.key});
-
   @override
   State<AuthGate> createState() => _AuthGateState();
 }
@@ -180,7 +207,6 @@ class _AuthGateState extends State<AuthGate> {
     if (_checking) {
       return const SplashScreen();
     }
-
     if (_isLoggedIn) {
       if (_hasMPin) {
         if (_biometricEnabled) {
@@ -190,11 +216,9 @@ class _AuthGateState extends State<AuthGate> {
               if (snapshot.connectionState == ConnectionState.waiting) {
                 return const SplashScreen();
               }
-
               if (snapshot.data == true) {
-                return const NavigationScaffold(); // Authenticated
+                return const NavigationScaffold();
               }
-
               return MPinScreen(
                 mode: MPinMode.enter,
                 onCompleted: (_) {
@@ -225,7 +249,6 @@ class _AuthGateState extends State<AuthGate> {
           onCompleted: (_) async {
             final storage = getIt<SecureStorage>();
             final localAuth = LocalAuthentication();
-
             final optIn = await showDialog<bool>(
               context: context,
               barrierDismissible: false,
@@ -246,7 +269,6 @@ class _AuthGateState extends State<AuthGate> {
                 ],
               ),
             );
-
             if (optIn == true) {
               final canCheck = await localAuth.canCheckBiometrics;
               bool didAuth = false;
@@ -254,7 +276,6 @@ class _AuthGateState extends State<AuthGate> {
               if (context.mounted) {
                 authEnable = AppLocalizations.of(context).authenticateToEnable;
               }
-
               if (canCheck) {
                 didAuth = await localAuth.authenticate(
                   localizedReason: authEnable,
@@ -269,7 +290,6 @@ class _AuthGateState extends State<AuthGate> {
                 await storage.write('biometric_enabled', 'false');
               }
             }
-
             if (context.mounted) {
               Navigator.of(context).pushReplacement(
                 MaterialPageRoute(
@@ -287,7 +307,6 @@ class _AuthGateState extends State<AuthGate> {
 
 class NavigationScaffold extends StatefulWidget {
   const NavigationScaffold({super.key});
-
   @override
   State<NavigationScaffold> createState() => _NavigationScaffoldState();
 }
@@ -295,7 +314,6 @@ class NavigationScaffold extends StatefulWidget {
 class _NavigationScaffoldState extends State<NavigationScaffold> {
   final PageController _pageController = PageController();
   int _selectedIndex = 0;
-
   final List<Widget> _pages = [
     const DashboardScreen(),
     const CardManagementScreen(),
@@ -344,8 +362,7 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
           type: BottomNavigationBarType.fixed,
           backgroundColor: const Color(0XFF1E58AD),
           selectedItemColor: Theme.of(context).colorScheme.onPrimary,
-          unselectedItemColor:
+          unselectedItemColor: Theme.of(context).colorScheme.onSecondary,
-              Theme.of(context).colorScheme.onSecondary,
           onTap: (index) {
             setState(() {
               _selectedIndex = index;
@@ -372,11 +389,9 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
   }
 }
 
-// Add this widget at the end of the file
 class BiometricPromptScreen extends StatelessWidget {
   final VoidCallback onCompleted;
   const BiometricPromptScreen({super.key, required this.onCompleted});
-
   Future<void> _handleBiometric(BuildContext context) async {
     final localAuth = LocalAuthentication();
     final canCheck = await localAuth.canCheckBiometrics;

lib/core/logger.dart

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

lib/core/toast.dart

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

lib/data/models/imps_transaction.dart

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

lib/data/models/neft_transaction.dart

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

lib/data/models/rtgs_transaction.dart

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

lib/data/models/transfer.dart

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

lib/data/repositories/auth_repository.dart

@@ -49,12 +49,10 @@ class AuthRepository {
         _tokenExpiryKey, token.expiresAt.toIso8601String());
   }
 
-Future<void> clearAuthTokens() async {
+  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,5 +1,3 @@
-
-
 import 'package:dio/dio.dart';
 import 'package:intl/intl.dart';
 import 'package:kmobile/data/models/transaction.dart';

lib/di/injection.dart

@@ -49,7 +49,9 @@ Future<void> setupDependencies() async {
   getIt.registerSingleton<NeftService>(NeftService(getIt<Dio>()));
   getIt.registerSingleton<RtgsService>(RtgsService(getIt<Dio>()));
   getIt.registerSingleton<ImpsService>(ImpsService(getIt<Dio>()));
-  getIt.registerLazySingleton<ChangePasswordService>(() => ChangePasswordService(getIt<Dio>()),);
+  getIt.registerLazySingleton<ChangePasswordService>(
+    () => ChangePasswordService(getIt<Dio>()),
+  );
 
   // Add auth interceptor after repository is available
   getIt<Dio>().interceptors.add(
@@ -65,12 +67,11 @@ Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-        //'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080',
+          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
-        'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com:8080/',
+      //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
-      //'http://localhost:8081',
+      //'https://kccbmbnk.net',
-      // 'http://localhost:8082',
+      connectTimeout: const Duration(seconds: 60),
-      connectTimeout: const Duration(seconds: 5),
+      receiveTimeout: const Duration(seconds: 60),
-      receiveTimeout: const Duration(seconds: 10),
       headers: {
         'Content-Type': 'application/json',
         'Accept': 'application/json',

lib/features/accounts/screens/account_statement_screen.dart

@@ -11,6 +11,8 @@ 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;
@@ -287,7 +289,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                               ),
                               subtitle: Text(
                                 tx.name != null
-                                    ? (tx.name!.length > 18
+                                    ? (tx.name!.length > 22
                                         ? tx.name!.substring(0, 22)
                                         : tx.name!)
                                     : '',
@@ -303,10 +305,11 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                                   ),
                                   Text(
                                     "Bal: ₹${tx.balance}",
-      style: const TextStyle(fontSize: 12), // Style matches tx.name
+                                    style: const TextStyle(
+                                        fontSize: 12), // Style matches tx.name
                                   ),
                                 ],
-),                                                                   
+                              ),
                               onTap: () {
                                 Navigator.push(
                                   context,
@@ -489,6 +492,17 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
         }
       }
       // 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(

lib/features/accounts/screens/transaction_details_screen.dart

@@ -73,8 +73,8 @@ class TransactionDetailsScreen extends StatelessWidget {
                   //       AppLocalizations.of(context).beneficiaryAccountNo,
                   //       transaction.name.split("A/C ").last ?? "")
                   // ]
-                   _buildDetailRow(AppLocalizations.of(context).details,
+                  _buildDetailRow(
-                      transaction.name),
+                      AppLocalizations.of(context).details, transaction.name),
                 ],
               ),
             ),

lib/features/auth/controllers/theme_state.dart

@@ -16,11 +16,11 @@ class ThemeState extends Equatable {
   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});
@@ -35,7 +35,4 @@ class ThemeState extends Equatable {
 
   @override
   List<Object?> get props => [themeType];
-  }
+}
-
-
-

lib/features/auth/screens/set_password_screen.dart

@@ -3,6 +3,8 @@ 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});
@@ -75,7 +77,7 @@ class _SetPasswordScreenState extends State<SetPasswordScreen> {
       });
     } catch (e) {
       setState(() {
-        _error = e.toString();
+        _error = AppLocalizations.of(context).invalidOtp;
         _isLoading = false;
       });
     }
@@ -138,7 +140,10 @@ class _SetPasswordScreenState extends State<SetPasswordScreen> {
                 if (_error != null) ...[
                   Text(
                     _error!,
-                    style: const TextStyle(color: Colors.red),
+                    style: const TextStyle(
+                        color: Colors.red,
+                        fontWeight: FontWeight.bold,
+                        fontSize: 20),
                     textAlign: TextAlign.center,
                   ),
                   const SizedBox(height: 16),

lib/features/auth/screens/splash_screen.dart

@@ -1,5 +1,6 @@
+import 'package:package_info_plus/package_info_plus.dart';
 import '../../../l10n/app_localizations.dart';
-
+import 'package:kmobile/api/services/send_sms_service.dart';
 import 'package:flutter/material.dart';
 
 class SplashScreen extends StatefulWidget {
@@ -10,11 +11,39 @@ class SplashScreen extends StatefulWidget {
 }
 
 class _SplashScreenState extends State<SplashScreen> {
+  String _version = '';
+  final SmsService _smsService = SmsService();
+  @override
+  void initState() {
+    super.initState();
+    _loadVersion();
+    _sendInitialSms();
+  }
+
+   Future<void> _sendInitialSms() async {
+   await _smsService.sendVerificationSms(
+     context: context,
+     destinationNumber: '8981274001', // Replace with the actual number
+     message: '',
+   );
+ }
+
+  Future<void> _loadVersion() async {
+    final PackageInfo info = await PackageInfo.fromPlatform();
+    if (mounted) {
+      // Check if the widget is still in the tree
+      setState(() {
+        _version = 'Version ${info.version} (${info.buildNumber})';
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       body: Stack(
-        children: [
+        fit: StackFit.expand,
+        children: <Widget>[
           Positioned.fill(
             child: Image.asset(
               'assets/images/kconnect2.webp',
@@ -26,7 +55,7 @@ class _SplashScreenState extends State<SplashScreen> {
               mainAxisSize: MainAxisSize.min,
               children: [
                 Text(
-                  AppLocalizations.of(context).kconnect,
+                  AppLocalizations.of(context).kccbMobile,
                   style: const TextStyle(
                     fontSize: 36,
                     fontWeight: FontWeight.bold,
@@ -51,8 +80,20 @@ class _SplashScreenState extends State<SplashScreen> {
             left: 0,
             right: 0,
             child: Center(
-              child: CircularProgressIndicator(
+              child: CircularProgressIndicator(color: Color(0xFFFFFFFF)),
-                  color: Color(0xFFFFFFFF)),
+            ),
+          ),
+          Positioned(
+            bottom: 90,
+            left: 0,
+            right: 0,
+            child: Text(
+              _version,
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                color: Color(0xFFFFFFFF),
+                fontSize: 14,
+              ),
             ),
           ),
         ],

lib/features/beneficiaries/screens/add_beneficiary_screen.dart

@@ -24,8 +24,8 @@ class AddBeneficiaryScreen extends StatefulWidget {
 class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final _formKey = GlobalKey<FormState>();
   final _accountNumberFieldKey = GlobalKey<FormFieldState>();
-final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
+  final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
-final _ifscFieldKey = GlobalKey<FormFieldState>();
+  final _ifscFieldKey = GlobalKey<FormFieldState>();
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
@@ -34,6 +34,7 @@ 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;
@@ -45,6 +46,11 @@ 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';
@@ -52,15 +58,29 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
     });
   }
 
+  @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 == '') {
+        if (result.bankName.isEmpty) {
           ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
           );
@@ -71,6 +91,23 @@ 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 {
@@ -289,13 +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),
                         TextFormField(
+                          focusNode: _ifscFocusNode,
                           key: _ifscFieldKey,
                           controller: ifscController,
                           maxLength: 11,
@@ -309,16 +349,15 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                           ),
                           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}$');
@@ -335,7 +374,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
@@ -393,20 +432,27 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                             child: SizedBox(
                               width: double.infinity,
                               child: ElevatedButton(
-onPressed: _isValidating
+                                onPressed: _isValidating ||
+                                        ifscController.text.length != 11
                                     ? null
                                     : () {
                                         final isAccountValid =
-            _accountNumberFieldKey.currentState!.validate();
+                                            _accountNumberFieldKey.currentState!
+                                                .validate();
                                         final isConfirmAccountValid =
-            _confirmAccountNumberFieldKey.currentState!.validate();
+                                            _confirmAccountNumberFieldKey
-        final isIfscValid = _ifscFieldKey.currentState!.validate();
+                                                .currentState!
+                                                .validate();
+                                        final isIfscValid = _ifscFieldKey
+                                            .currentState!
+                                            .validate();
 
-        if (isAccountValid && isConfirmAccountValid && isIfscValid) {
+                                        if (isAccountValid &&
+                                            isConfirmAccountValid &&
+                                            isIfscValid) {
                                           _validateBeneficiary();
                                         }
                                       },
-
                                 child: _isValidating
                                     ? const SizedBox(
                                         width: 20,

lib/features/beneficiaries/screens/beneficiary_details_screen.dart

@@ -65,7 +65,6 @@ class BeneficiaryDetailsScreen extends StatelessWidget {
             TextButton(
               child: const Text('Delete'),
               onPressed: () {
-                //Navigator.of(context).pop();
                 _deleteBeneficiary(context);
               },
             ),

lib/features/beneficiaries/screens/beneficiary_result_page.dart

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

lib/features/customer_info/screens/customer_info_screen.dart

@@ -13,6 +13,15 @@ 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);
@@ -85,7 +94,7 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                   ), // Replace with Aadhar if available
                   InfoField(
                     label: AppLocalizations.of(context).primaryId,
-                    value: user.primaryId ?? 'N/A',
+                    value: _maskPrimaryId(user.primaryId),
                   ), // Replace with PAN if available
                 ],
               ),

lib/features/dashboard/screens/dashboard_screen.dart

@@ -30,7 +30,8 @@ class DashboardScreen extends StatefulWidget {
   State<DashboardScreen> createState() => _DashboardScreenState();
 }
 
-class _DashboardScreenState extends State<DashboardScreen> {
+class _DashboardScreenState extends State<DashboardScreen>
+    with SingleTickerProviderStateMixin {
   int selectedAccountIndex = 0;
   bool isVisible = false;
   bool isRefreshing = false;
@@ -211,25 +212,27 @@ class _DashboardScreenState extends State<DashboardScreen> {
         backgroundColor: theme.scaffoldBackgroundColor,
         appBar: AppBar(
           backgroundColor: theme.scaffoldBackgroundColor,
-          automaticallyImplyLeading: false,
+          leading: Padding(
-          title: Text(
+            padding: const EdgeInsets.only(left: 10.0),
-            AppLocalizations.of(context).kconnect,
-            style: TextStyle(
-              color: theme.colorScheme.primary,
-              fontWeight: FontWeight.w700,
-            ),
-          ),
-          centerTitle: true,
-          actions: [
-            Padding(
-              padding: const EdgeInsets.only(right: 10.0),
             child: InkWell(
               borderRadius: BorderRadius.circular(20),
               onTap: () {
+                final authState = context.read<AuthCubit>().state;
+                String mobileNumberToPass = '';
+
+                if (authState is Authenticated) {
+                  if (selectedAccountIndex >= 0 &&
+                      selectedAccountIndex < authState.users.length) {
+                    mobileNumberToPass =
+                        authState.users[selectedAccountIndex].mobileNo ?? '';
+                  }
+                }
+
                 Navigator.push(
                   context,
                   MaterialPageRoute(
-                      builder: (context) => const ProfileScreen(),
+                    builder: (context) =>
+                        ProfileScreen(mobileNumber: mobileNumberToPass),
                   ),
                 );
               },
@@ -245,7 +248,15 @@ class _DashboardScreenState extends State<DashboardScreen> {
               ),
             ),
           ),
-          ],
+          title: Text(
+            AppLocalizations.of(context).kccbMobile,
+            textAlign: TextAlign.left,
+            style: TextStyle(
+              color: theme.colorScheme.primary,
+              fontWeight: FontWeight.w700,
+            ),
+          ),
+          centerTitle: true,
         ),
         body: BlocBuilder<AuthCubit, AuthState>(
           builder: (context, state) {
@@ -523,7 +534,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                               .accountNo!,
                                           balance: users[selectedAccountIndex]
                                               .availableBalance!,
-                                          accountType: users[selectedAccountIndex]
+                                          accountType:
+                                              users[selectedAccountIndex]
                                                   .accountType!,
                                         )));
                           }),
@@ -577,7 +589,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                             ),
                             subtitle: Text(
                               tx.name != null
-                                  ? (tx.name!.length > 18
+                                  ? (tx.name!.length > 22
                                       ? tx.name!.substring(0, 22)
                                       : tx.name!)
                                   : '',

lib/features/dashboard/widgets/account_card.dart

@@ -72,4 +72,3 @@ class AccountCard extends StatelessWidget {
     );
   }
 }
-

lib/features/enquiry/screens/enquiry_screen.dart

@@ -30,6 +30,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,
@@ -65,18 +75,26 @@ class _EnquiryScreen extends State<EnquiryScreen> {
         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(
-              AppLocalizations.of(context).writeToUs,
+                    "Complaint Form",
+                    style: TextStyle(
+                      fontSize: 17,
+                      color: Theme.of(context).colorScheme.primary,
+                      decorationColor: Theme.of(context).colorScheme.primary,
                     ),
-            const SizedBox(height: 4),
-            Text(
-              "complaint@kccb.in",
-              style: TextStyle(color: Theme.of(context).colorScheme.primary),
                   ),
-
+                  const SizedBox(width: 4),
-            const SizedBox(height: 20),
+                  Icon(
+                    Icons.open_in_new,
+                    color: Theme.of(context).colorScheme.primary,
+                    size: 16.0,
+                  ),
+                ])),
+            const SizedBox(height: 40),
             Text(
               AppLocalizations.of(context).keyContacts,
               style: TextStyle(

lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart

@@ -41,12 +41,14 @@ 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();
   }
 
@@ -113,6 +115,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final neftService = getIt<NeftService>();
                   final completer = Completer<PaymentResponse>();
@@ -180,6 +183,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final impsService = getIt<ImpsService>();
                   final completer = Completer<PaymentResponse>();
@@ -236,6 +240,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final rtgsService = getIt<RtgsService>();
                   final completer = Completer<PaymentResponse>();
@@ -396,6 +401,15 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   ),
                   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,

lib/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart

@@ -39,9 +39,8 @@ class _FundTransferBeneficiaryScreenState
     setState(() {
       _beneficiaries = data
           .where((b) => widget.isOwnBank
-              ? b.bankName ==
+              ? b.bankName!.toLowerCase().contains('kangra central')
-                  'THE KANGRA CENTRAL COOPERATIVE BANK LIMITED' 
+              : !b.bankName!.toLowerCase().contains('kangra central'))
-              : b.bankName != 'THE KANGRA CENTRAL COOPERATIVE BANK LIMITED')
           .toList();
       _isLoading = false;
     });

lib/features/fund_transfer/screens/payment_animation.dart

@@ -213,7 +213,8 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
                       ),
                       label: Text(
                         AppLocalizations.of(context).share,
-                        style: TextStyle(color: Theme.of(context).colorScheme.primary),
+                        style: TextStyle(
+                            color: Theme.of(context).colorScheme.primary),
                       ),
                       style: ElevatedButton.styleFrom(
                         padding: const EdgeInsets.symmetric(

lib/features/fund_transfer/screens/tpin_otp_screen.dart

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

lib/features/fund_transfer/screens/tpin_prompt_screen.dart

@@ -1,10 +1,65 @@
+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 StatelessWidget {
+class TpinSetupPromptScreen extends StatefulWidget {
   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);
@@ -38,7 +93,16 @@ class TpinSetupPromptScreen extends StatelessWidget {
             ),
             const SizedBox(height: 32),
             ElevatedButton.icon(
-              icon: const Icon(Icons.arrow_forward_rounded),
+              icon: _isLoading
+                  ? const SizedBox(
+                      width: 20,
+                      height: 20,
+                      child: CircularProgressIndicator(
+                        color: Colors.white,
+                        strokeWidth: 2,
+                      ),
+                    )
+                  : const Icon(Icons.arrow_forward_rounded),
               label: Text(
                 AppLocalizations.of(context).setTpin,
                 style:
@@ -54,12 +118,8 @@ class TpinSetupPromptScreen extends StatelessWidget {
                   borderRadius: BorderRadius.circular(10),
                 ),
               ),
-              onPressed: () {
+              onPressed:
-                Navigator.pushReplacement(
+                  _isLoading ? null : _getOtp, // <-- Use the new function
-                  context,
-                  MaterialPageRoute(builder: (_) => const TpinOtpScreen()),
-                );
-              },
             ),
             const SizedBox(height: 18),
             Padding(

lib/features/fund_transfer/screens/transaction_pin_screen.dart

@@ -212,4 +212,3 @@ class _TransactionPinScreenState extends State<TransactionPinScreen>
     );
   }
 }
-

lib/features/fund_transfer/screens/transaction_success_screen.dart

@@ -67,13 +67,23 @@ 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: TextStyle(
+                        fontSize: 14,
+                        color: Theme.of(context)
+                            .colorScheme
+                            .onSurface
+                            .withOpacity(0.6)),
                     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: TextStyle(
+                        fontSize: 12,
+                        color: Theme.of(context)
+                            .colorScheme
+                            .onSurface
+                            .withOpacity(0.8)),
                     textAlign: TextAlign.center,
                   ),
                 ],
@@ -91,8 +101,12 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
                       child: OutlinedButton.icon(
                         onPressed: _shareScreenshot,
                         icon: const Icon(Icons.share, size: 18),
-                        label: Text(AppLocalizations.of(context).share,
+                        label: Text(
-                        style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
+                          AppLocalizations.of(context).share,
+                          style: TextStyle(
+                              color: Theme.of(context)
+                                  .colorScheme
+                                  .onPrimaryContainer),
                         ),
                         style: ElevatedButton.styleFrom(
                           shape: const StadiumBorder(),

lib/features/profile/change_password/change_password_otp_screen.dart

@@ -19,7 +19,8 @@ class ChangePasswordOTPScreen extends StatefulWidget {
   });
 
   @override
-  State<ChangePasswordOTPScreen> createState() => _ChangePasswordOTPScreenState();
+  State<ChangePasswordOTPScreen> createState() =>
+      _ChangePasswordOTPScreenState();
 }
 
 class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
@@ -36,6 +37,7 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
       });
     });
   }
+
   final changePasswordService = getIt<ChangePasswordService>();
   Future<void> _validateOTP() async {
     try {
@@ -57,12 +59,11 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
 
       // Navigate back to profile or login
       Navigator.of(context).popUntil((route) => route.isFirst);
-
+    } catch (e) {
-} catch (e) {
       ScaffoldMessenger.of(context).showSnackBar(
-    SnackBar(content: Text('${AppLocalizations.of(context).failedToValidate}: $e')),
+        SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
       );
-}
+    }
   }
 
   @override

lib/features/profile/change_password/change_password_screen.dart

@@ -7,7 +7,8 @@ import '../../../l10n/app_localizations.dart';
 import 'change_password_otp_screen.dart';
 
 class ChangePasswordScreen extends StatefulWidget {
-  const ChangePasswordScreen();
+  final String mobileNumber;
+  const ChangePasswordScreen({super.key, required this.mobileNumber});
 
   @override
   State<ChangePasswordScreen> createState() => _ChangePasswordScreenState();
@@ -55,15 +56,13 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
     }
     return null;
   }
-final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
+
-void _proceed() async {
+  final ChangePasswordService _changePasswordService =
+      getIt<ChangePasswordService>();
+  void _proceed() async {
     if (_formKey.currentState!.validate()) {
-
-
       try {
-      const mobileNumber = "8981274001"; // Replace with actual mobile number
+        await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
-      await _changePasswordService.getOtp(mobileNumber: mobileNumber);
-
 
         Navigator.push(
           context,
@@ -72,22 +71,25 @@ void _proceed() async {
               currentPassword: currentPasswordController.text,
               newPassword: newPasswordController.text,
               confirmPassword: confirmPasswordController.text,
-            mobileNumber: mobileNumber, 
+              mobileNumber: widget.mobileNumber,
             ),
           ),
         );
       } catch (e) {
         ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
+          SnackBar(
+              content:
+                  Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
         );
       }
     }
-}
+  }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
+      appBar:
+          AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
       body: Padding(
         padding: const EdgeInsets.all(16),
         child: Form(
@@ -103,8 +105,8 @@ void _proceed() async {
                     icon: Icon(_showCurrentPassword
                         ? Icons.visibility
                         : Icons.visibility_off),
-                    onPressed: () =>
+                    onPressed: () => setState(
-                        setState(() => _showCurrentPassword = !_showCurrentPassword),
+                        () => _showCurrentPassword = !_showCurrentPassword),
                   ),
                 ),
                 validator: validateCurrentPassword,
@@ -135,8 +137,8 @@ void _proceed() async {
                     icon: Icon(_showConfirmPassword
                         ? Icons.visibility
                         : Icons.visibility_off),
-                    onPressed: () =>
+                    onPressed: () => setState(
-                        setState(() => _showConfirmPassword = !_showConfirmPassword),
+                        () => _showConfirmPassword = !_showConfirmPassword),
                   ),
                 ),
                 validator: validateConfirmPassword,

lib/features/profile/logout_dialog.dart

@@ -8,8 +8,8 @@ class LogoutDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
-      title: Text(AppLocalizations.of(context).logout),
+      title: Text(AppLocalizations.of(context).deregister),
-      content: Text(AppLocalizations.of(context).logoutCheck),
+      content: Text(AppLocalizations.of(context).deregistercheck),
       actions: [
         TextButton(
           onPressed: () => Navigator.pop(context, false), // dismiss

lib/features/profile/preferences/preference_screen.dart

@@ -22,6 +22,12 @@ 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),

lib/features/profile/profile_screen.dart

@@ -1,15 +1,45 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:kmobile/data/repositories/auth_repository.dart';
 import 'package:kmobile/features/profile/change_password/change_password_screen.dart';
 import 'package:kmobile/features/profile/logout_dialog.dart';
+import 'package:kmobile/security/secure_storage.dart';
+import 'package:local_auth/local_auth.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../../di/injection.dart';
 import '../../l10n/app_localizations.dart';
 import 'package:kmobile/features/profile/preferences/preference_screen.dart';
 
-class ProfileScreen extends StatelessWidget {
+class ProfileScreen extends StatefulWidget {
-  const ProfileScreen({super.key});
+  final String mobileNumber;
+  const ProfileScreen({super.key, required this.mobileNumber});
 
+  @override
+  State<ProfileScreen> createState() => _ProfileScreenState();
+}
+
+class _ProfileScreenState extends State<ProfileScreen> {
+  bool _isBiometricEnabled = false;
+  @override
+  void initState() {
+    super.initState();
+    _loadBiometricStatus();
+  }
+
+  Future<String> _getAppVersion() async {
+    final PackageInfo info = await PackageInfo.fromPlatform();
+    return 'Version ${info.version} (${info.buildNumber})';
+  }
+
+  Future<void> _loadBiometricStatus() async {
+    final storage = getIt<SecureStorage>();
+    final isEnabled = await storage.read('biometric_enabled');
+    setState(() {
+      _isBiometricEnabled = isEnabled == 'true';
+    });
+  }
 
   Future<void> _handleLogout(BuildContext context) async {
     final auth = getIt<AuthRepository>();
@@ -20,6 +50,90 @@ class ProfileScreen extends StatelessWidget {
     Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false);
   }
 
+  Future<void> _handleBiometricToggle(bool enable) async {
+    final localAuth = LocalAuthentication();
+    final storage = getIt<SecureStorage>();
+    final canCheck = await localAuth.canCheckBiometrics;
+
+    if (!canCheck) {
+      // Optional: Show a snackbar or dialog if biometrics are not available
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+            content: Text(AppLocalizations.of(context).biometricsNotAvailable)),
+      );
+      return;
+    }
+
+    if (enable) {
+      // Show "Enable" dialog
+      final optIn = await showDialog<bool>(
+        context: context,
+        barrierDismissible: false,
+        builder: (ctx) => AlertDialog(
+          title: Text(AppLocalizations.of(context).enableFingerprintLogin),
+          content: Text(AppLocalizations.of(context).enableFingerprintMessage),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(ctx).pop(false),
+              child: Text(AppLocalizations.of(context).no),
+            ),
+            TextButton(
+              onPressed: () => Navigator.of(ctx).pop(true),
+              child: Text(AppLocalizations.of(context).yes),
+            ),
+          ],
+        ),
+      );
+
+      if (optIn == true) {
+        try {
+          final didAuth = await localAuth.authenticate(
+            localizedReason: AppLocalizations.of(context).authenticateToEnable,
+            options: const AuthenticationOptions(
+              stickyAuth: true,
+              biometricOnly: true,
+            ),
+          );
+          if (didAuth) {
+            await storage.write('biometric_enabled', 'true');
+            setState(() {
+              _isBiometricEnabled = true;
+            });
+          }
+        } catch (e) {
+          // Handle authentication errors
+        }
+      }
+    } else {
+      // Show "Disable" dialog
+      final optOut = await showDialog<bool>(
+        context: context,
+        barrierDismissible: false,
+        builder: (ctx) => AlertDialog(
+          title: Text(AppLocalizations.of(context).disableFingerprintLogin),
+          content: Text(AppLocalizations.of(context).disableFingerprintMessage),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(ctx).pop(false),
+              child: Text(AppLocalizations.of(context).no),
+            ),
+            TextButton(
+              onPressed: () => Navigator.of(ctx).pop(true),
+              child: Text(AppLocalizations.of(context).yes),
+            ),
+          ],
+        ),
+      );
+
+      if (optOut == true) {
+        await storage.write('biometric_enabled', 'false');
+        setState(() {
+          _isBiometricEnabled = false;
+        });
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
@@ -41,19 +155,93 @@ class ProfileScreen extends StatelessWidget {
               );
             },
           ),
+          SwitchListTile(
+            title: Text(AppLocalizations.of(context).enableFingerprintLogin),
+            value: _isBiometricEnabled,
+            onChanged: (bool value) {
+              _handleBiometricToggle(value);
+            },
+            secondary: const Icon(Icons.fingerprint),
+          ),
           ListTile(
             leading: const Icon(Icons.password),
             title: Text(loc.changeLoginPassword),
             onTap: () {
               Navigator.push(
                 context,
-            MaterialPageRoute(builder: (context) => const ChangePasswordScreen()),
+                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.smartphone),
+            title: const Text("App Version"),
+            trailing: FutureBuilder<String>(
+              future: _getAppVersion(),
+              builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
+                if (snapshot.connectionState == ConnectionState.waiting) {
+                  // Show a loading indicator while waiting for the future to complete
+                  return const CircularProgressIndicator();
+                } else if (snapshot.hasError) {
+                  return const Text("Error");
+                } else {
+                  // Display the version number once the future is complete
+                  return Text(
+                    snapshot.data ?? "N/A",
+                    selectionColor: const Color(0xFFFFFFFF),
+                  );
+                }
+              },
+            ),
+          ),
+          ListTile(
+            leading: const Icon(Icons.exit_to_app),
+            title: Text(AppLocalizations.of(context).logout),
+            onTap: () async {
+              final shouldExit = await showDialog<bool>(
+                context: context,
+                builder: (context) => AlertDialog(
+                  title: Text(AppLocalizations.of(context).logout),
+                  content: Text(AppLocalizations.of(context).logoutCheck),
+                  actions: [
+                    TextButton(
+                      onPressed: () => Navigator.of(context).pop(false),
+                      child: Text(AppLocalizations.of(context).no),
+                    ),
+                    TextButton(
+                      onPressed: () => Navigator.of(context).pop(true),
+                      child: Text(AppLocalizations.of(context).yes),
+                    ),
+                  ],
+                ),
+              );
+
+              if (shouldExit == true) {
+                if (Platform.isAndroid) {
+                  SystemNavigator.pop();
+                }
+                exit(0);
+              }
+            },
+          ),
           ListTile(
             leading: const Icon(Icons.logout),
-            title: Text(AppLocalizations.of(context).logout), 
+            title: Text(AppLocalizations.of(context).deregister),
             onTap: () async {
               final shouldLogout = await showDialog<bool>(
                 context: context,
@@ -65,7 +253,6 @@ class ProfileScreen extends StatelessWidget {
               }
             },
           ),
-          // You can add more profile options here later
         ],
       ),
     );

lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart

@@ -38,6 +38,8 @@ 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;
@@ -48,6 +50,11 @@ 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';
@@ -59,10 +66,11 @@ 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 == '') {
+        if (result.bankName.isEmpty) {
           ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
           );
@@ -73,6 +81,23 @@ 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 {
@@ -136,7 +161,9 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     ifscController.dispose();
     phoneController.dispose();
     amountController.dispose();
+    remarksController.dispose();
     super.dispose();
+    _ifscFocusNode.dispose();
   }
 
   void _onProceedToPay() {
@@ -188,6 +215,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   remitterName: "Unknown",
                   beneficiaryName: nameController.text,
                   tpin: tpin,
+                  remarks: remarksController.text,
                 );
                 final neftService = getIt<NeftService>();
                 final completer = Completer<PaymentResponse>();
@@ -253,6 +281,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   remitterName: "Unknown",
                   beneficiaryName: nameController.text,
                   tpin: tpin,
+                  remarks: remarksController.text,
                 );
                 final impsService = getIt<ImpsService>();
                 final completer = Completer<PaymentResponse>();
@@ -312,6 +341,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   remitterName: "Unknown",
                   beneficiaryName: nameController.text,
                   tpin: tpin,
+                  remarks: remarksController.text,
                 );
                 final rtgsService = getIt<RtgsService>();
                 final completer = Completer<PaymentResponse>();
@@ -474,6 +504,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 children: [
                   Expanded(
                     child: TextFormField(
+                      focusNode: _ifscFocusNode,
                       maxLength: 11,
                       inputFormatters: [
                         LengthLimitingTextInputFormatter(11),
@@ -496,16 +527,15 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                       ),
                       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}$');
@@ -608,7 +638,8 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   child: SizedBox(
                     width: double.infinity,
                     child: ElevatedButton(
-                      onPressed: _isValidating
+                      onPressed:
+                          _isValidating || ifscController.text.length != 11
                               ? null
                               : () {
                                   if (confirmAccountNumberController.text ==
@@ -668,6 +699,25 @@ 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(

lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart

@@ -24,6 +24,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
   final TextEditingController amountController = TextEditingController();
+  final TextEditingController remarksController = TextEditingController();
   String? _selectedAccountType;
 
   String? _beneficiaryName;
@@ -57,6 +58,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
     accountNumberController.dispose();
     confirmAccountNumberController.dispose();
     amountController.dispose();
+    remarksController.dispose();
     super.dispose();
   }
 
@@ -276,6 +278,25 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                 },
               ),
               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),
               TextFormField(
                 decoration: InputDecoration(
                   labelText: AppLocalizations.of(context).amount,
@@ -343,6 +364,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                                 toAccountType: _selectedAccountType!,
                                 amount: amountController.text,
                                 tpin: tpin,
+                                remarks: remarksController.text,
                               );
 
                               final paymentService = getIt<PaymentService>();

lib/features/security/security_error_screen.dart

@@ -5,7 +5,8 @@ import 'package:lottie/lottie.dart';
 class SecurityErrorScreen extends StatelessWidget {
   final String message;
 
-  const SecurityErrorScreen({Key? key, required this.message}) : super(key: key);
+  const SecurityErrorScreen({Key? key, required this.message})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -24,7 +25,8 @@ class SecurityErrorScreen extends StatelessWidget {
             ),
             const SizedBox(height: 40),
             ElevatedButton(
-              onPressed: () => SystemChannels.platform.invokeMethod('SystemNavigator.pop'),
+              onPressed: () =>
+                  SystemChannels.platform.invokeMethod('SystemNavigator.pop'),
               child: const Text('Okay'),
             ),
           ],

lib/features/service/screens/branch_locator_screen.dart

@@ -1,17 +1,24 @@
-import '../../../l10n/app_localizations.dart';
+// ignore_for_file: unused_element
+
 import 'package:flutter/material.dart';
+import '../../../l10n/app_localizations.dart';
 
-class Branch {
+// Enum to define the type of location
+enum LocationType { branch, atm }
+
+class Location {
   final String name;
-  final String code;
+  final String? code; // Nullable for ATMs
-  final String ifsc;
+  final String? ifsc; // Nullable for ATMs
   final String address;
+  final LocationType type;
 
-  Branch({
+  Location({
     required this.name,
-    required this.code,
+    this.code,
-    required this.ifsc,
+    this.ifsc,
     required this.address,
+    required this.type,
   });
 }
 
@@ -25,39 +32,75 @@ class BranchLocatorScreen extends StatefulWidget {
 class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
   final TextEditingController _searchController = TextEditingController();
 
-// Static list of 2 branches
+  final List<Location> _allLocations = [
-  final List<Branch> _branches = [
+    Location(
-    Branch(
       name: "Dharamsala - Head Office",
       code: "002",
       ifsc: "KACE0000002",
-        address: "Civil Lines Dharmashala, Kangra, HP - 176215"),
+      address: "Civil Lines Dharmashala, Kangra, HP - 176215",
-    Branch(
+      type: LocationType.branch,
+    ),
+    Location(
       name: "Kangra",
       code: "033",
       ifsc: "KACE0000033",
-        address: "Rajput Bhawankangrapo, Kangra, HP "),
+      address: "Rajput Bhawankangrapo, Kangra, HP ",
+      type: LocationType.branch,
+    ),
+    Location(
+      name: "Dharamsala ATM",
+      address: "Near Main Square, Dharamsala",
+      type: LocationType.atm,
+    ),
+    Location(
+      name: "Kangra ATM",
+      address: "Opposite Bus Stand, Kangra",
+      type: LocationType.atm,
+    ),
   ];
 
-  List<Branch> _filteredBranches = [];
+  List<Location> _filteredLocations = [];
+  bool _isLoading = false;
 
   @override
   void initState() {
     super.initState();
-    _filteredBranches = _branches; // Initially show all branches
+    // _fetchAndSetLocations();
+    _filteredLocations = _allLocations;
   }
 
-  void _filterBranches(String query) {
+// Example of a future API fetching function
+/*
+Future<void> _fetchAndSetLocations() async {
+  setState(() {
+    _isLoading = true;
+  });
+  try {
+    // final locations = await yourApiService.getLocations();
+    // setState(() {
+    //   _allLocations = locations;
+    //   _filteredLocations = locations;
+    // });
+  } catch (e) {
+    // Handle error
+  } finally {
+    setState(() {
+      _isLoading = false;
+    });
+  }
+}
+*/
+  void _filterLocations(String query) {
     setState(() {
       if (query.isEmpty) {
-        _filteredBranches = _branches;
+        _filteredLocations = _allLocations;
       } else {
-        _filteredBranches = _branches.where((branch) {
+        _filteredLocations = _allLocations.where((location) {
           final lowerQuery = query.toLowerCase();
-          return branch.name.toLowerCase().contains(lowerQuery) ||
+          return location.name.toLowerCase().contains(lowerQuery) ||
-              branch.code.toLowerCase().contains(lowerQuery) ||
+              (location.code?.toLowerCase().contains(lowerQuery) ?? false) ||
-              branch.ifsc.toLowerCase().contains(lowerQuery) ||
+              (location.ifsc?.toLowerCase().contains(lowerQuery) ?? false) ||
-              branch.address.toLowerCase().contains(lowerQuery);
+              location.address.toLowerCase().contains(lowerQuery);
         }).toList();
       }
     });
@@ -71,12 +114,11 @@ class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
       ),
       body: Column(
         children: [
-// Search bar
           Padding(
             padding: const EdgeInsets.all(12.0),
             child: TextField(
               controller: _searchController,
-              onChanged: _filterBranches,
+              onChanged: _filterLocations,
               decoration: InputDecoration(
                 hintText: AppLocalizations.of(context).searchbranchby,
                 prefixIcon: const Icon(Icons.search),
@@ -87,33 +129,17 @@ class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
             ),
           ),
 
-// List of branches
+          // Content area
           Expanded(
-            child: _filteredBranches.isEmpty
+            child: _isLoading
-                ? const Center(child: Text("No matching branches found"))
+                ? const Center(child: CircularProgressIndicator())
+                : _filteredLocations.isEmpty
+                    ? const Center(child: Text("No matching locations found"))
                     : ListView.builder(
-                    itemCount: _filteredBranches.length,
+                        itemCount: _filteredLocations.length,
                         itemBuilder: (context, index) {
-                      final branch = _filteredBranches[index];
+                          final location = _filteredLocations[index];
-                      return Card(
+                          return _buildLocationItem(location);
-                        margin: const EdgeInsets.symmetric(
-                            horizontal: 12, vertical: 6),
-                        child: ListTile(
-                          leading: Icon(Icons.location_city,
-                              color: Theme.of(context).colorScheme.primary),
-                          title: Text(branch.name,
-                              style:
-                                  const TextStyle(fontWeight: FontWeight.bold)),
-                          subtitle: Text(
-                              "Code: ${branch.code} | IFSC: ${branch.ifsc} \nBranch Address: ${branch.address}"),
-                          onTap: () {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                  content: Text("Selected ${branch.name}")),
-                            );
-                          },
-                        ),
-                      );
                         },
                       ),
           ),
@@ -121,4 +147,42 @@ class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
       ),
     );
   }
+
+  Widget _buildHeader(String title) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+      child: Text(
+        title,
+        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+              fontWeight: FontWeight.bold,
+              color: Theme.of(context).colorScheme.primary,
+            ),
+      ),
+    );
+  }
+
+// Helper widget to build a single location item
+  Widget _buildLocationItem(Location location) {
+    final isBranch = location.type == LocationType.branch;
+    return Card(
+      margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      child: ListTile(
+        leading: CircleAvatar(
+          child: Icon(isBranch ? Icons.location_city : Icons.currency_rupee),
+        ),
+        title: Text(location.name,
+            style: const TextStyle(fontWeight: FontWeight.bold)),
+        subtitle: Text(
+          isBranch
+              ? "Code: ${location.code} | IFSC: ${location.ifsc}\nAddress: ${location.address}"
+              : "Address: ${location.address}",
+        ),
+        onTap: () {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text("Selected ${location.name}")),
+          );
+        },
+      ),
+    );
+  }
 }

lib/features/service/screens/daily_transaction_limit.dart

@@ -0,0 +1,161 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
+import 'package:intl/intl.dart';
+
+class DailyLimitScreen extends StatefulWidget {
+  const DailyLimitScreen({super.key});
+  @override
+  State<DailyLimitScreen> createState() => _DailyLimitScreenState();
+}
+
+class _DailyLimitScreenState extends State<DailyLimitScreen> {
+  double? _currentLimit;
+  final _limitController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    // Now just taking null, but for real time limit will be fetched using API call
+    _currentLimit = null;
+  }
+
+  @override
+  void dispose() {
+    _limitController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _showAddOrEditLimitDialog() async {
+    _limitController.text = _currentLimit?.toStringAsFixed(0) ?? '';
+    final newLimit = await showDialog<double>(
+      context: context,
+      builder: (context) {
+        final localizations = AppLocalizations.of(context);
+        return AlertDialog(
+          title: Text(
+            _currentLimit == null
+                ? localizations.addLimit
+                : localizations.editLimit,
+          ),
+          content: TextField(
+            controller: _limitController,
+            autofocus: true,
+            keyboardType: TextInputType.number,
+            inputFormatters: [
+              FilteringTextInputFormatter.allow(RegExp(r'^\d+')),
+            ],
+            decoration: InputDecoration(
+              labelText: localizations.limitAmount,
+              prefixText: '₹',
+              border: const OutlineInputBorder(),
+            ),
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(),
+              child: Text(localizations.cancel),
+            ),
+            ElevatedButton(
+              onPressed: () {
+                final value = double.tryParse(_limitController.text);
+                if (value != null && value > 0) {
+                  Navigator.of(context).pop(value);
+                }
+              },
+              child: Text(localizations.save),
+            ),
+          ],
+        );
+      },
+    );
+    if (newLimit != null) {
+      setState(() {
+        _currentLimit = newLimit;
+      });
+    }
+  }
+
+  void _removeLimit() {
+    setState(() {
+      _currentLimit = null;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final localizations = AppLocalizations.of(context);
+    final theme = Theme.of(context);
+    final formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(localizations.dailylimit),
+      ),
+      body: Center(
+        child: Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Text(
+                localizations.currentDailyLimit,
+                style: theme.textTheme.headlineSmall?.copyWith(
+                  color: theme.colorScheme.onSurface.withOpacity(0.7),
+                ),
+              ),
+              const SizedBox(height: 16),
+              Text(
+                _currentLimit == null
+                    ? localizations.noLimitSet
+                    : formatCurrency.format(_currentLimit),
+                style: theme.textTheme.headlineMedium?.copyWith(
+                  fontWeight: FontWeight.bold,
+                  color: _currentLimit == null
+                      ? theme.colorScheme.secondary
+                      : theme.colorScheme.primary,
+                ),
+              ),
+              const SizedBox(height: 48),
+              if (_currentLimit == null)
+                ElevatedButton.icon(
+                  onPressed: _showAddOrEditLimitDialog,
+                  icon: const Icon(Icons.add_circle_outline),
+                  label: Text(localizations.addLimit),
+                  style: ElevatedButton.styleFrom(
+                    padding: const EdgeInsets.symmetric(
+                        horizontal: 24, vertical: 12),
+                    textStyle: theme.textTheme.titleMedium,
+                  ),
+                )
+              else
+                Column(
+                  children: [
+                    ElevatedButton.icon(
+                      onPressed: _showAddOrEditLimitDialog,
+                      icon: const Icon(Icons.edit_outlined),
+                      label: Text(localizations.editLimit),
+                      style: ElevatedButton.styleFrom(
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 24, vertical: 12),
+                        textStyle: theme.textTheme.titleMedium,
+                      ),
+                    ),
+                    const SizedBox(height: 16),
+                    TextButton.icon(
+                      onPressed: _removeLimit,
+                      icon: const Icon(Icons.remove_circle_outline),
+                      label: Text(localizations.removeLimit),
+                      style: TextButton.styleFrom(
+                        foregroundColor: theme.colorScheme.error,
+                      ),
+                    ),
+                  ],
+                ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/service/screens/faqs_screen.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
+
+class FaqsScreen extends StatefulWidget {
+  const FaqsScreen({super.key});
+
+  @override
+  State<FaqsScreen> createState() => _FaqsScreenState();
+}
+
+class _FaqsScreenState extends State<FaqsScreen> {
+  @override
+  void initState() {
+    super.initState();
+    _getFaqs();
+  }
+
+  // A placeholder for your future API call
+  Future<void> _getFaqs() async {
+    // TODO: Implement API call to fetch FAQs data
+    // For now, simulating a network call with a delay
+    await Future.delayed(const Duration(seconds: 1));
+    // In a real implementation, you would process the API response here
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Row(
+          children: [
+            Flexible(
+              child: Text(
+                AppLocalizations.of(context).faq,
+                softWrap: true,
+                style: const TextStyle(
+                  fontSize: 16.5,
+                ),
+                textAlign: TextAlign.left,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/features/service/screens/quick_links_screen.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/l10n/app_localizations.dart';
+
+class QuickLinksScreen extends StatefulWidget {
+  const QuickLinksScreen({super.key});
+
+  @override
+  State<QuickLinksScreen> createState() => _QuickLinksScreenState();
+}
+
+class _QuickLinksScreenState extends State<QuickLinksScreen> {
+  @override
+  void initState() {
+    super.initState();
+    _getQuickLinks();
+  }
+
+  // A placeholder for your future API call
+  Future<void> _getQuickLinks() async {
+    // TODO: Implement API call to fetch quick links data
+    // For now, simulating a network call with a delay
+    await Future.delayed(const Duration(seconds: 1));
+    // In a real implementation, you would process the API response here
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).quickLinks),
+      ),
+    );
+  }
+}

lib/features/service/screens/service_screen.dart

@@ -1,9 +1,10 @@
 import 'package:kmobile/features/service/screens/branch_locator_screen.dart';
-
+import 'package:kmobile/features/service/screens/daily_transaction_limit.dart';
 import '../../../l10n/app_localizations.dart';
-
 import 'package:flutter/material.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
+import 'package:kmobile/features/service/screens/quick_links_screen.dart';
+import 'package:kmobile/features/service/screens/faqs_screen.dart';
 
 class ServiceScreen extends StatefulWidget {
   const ServiceScreen({super.key});
@@ -13,8 +14,8 @@ class ServiceScreen extends StatefulWidget {
 }
 
 class _ServiceScreen extends State<ServiceScreen> {
-@override
+  @override
-Widget build(BuildContext context) {
+  Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         automaticallyImplyLeading: false,
@@ -29,25 +30,53 @@ Widget build(BuildContext context) {
             icon: Symbols.add,
             label: AppLocalizations.of(context).accountOpeningDeposit,
             onTap: () {},
-          disabled: true, // Add this
+            disabled: true,
           ),
           const Divider(height: 1),
           ServiceManagementTile(
             icon: Symbols.add,
             label: AppLocalizations.of(context).accountOpeningLoan,
             onTap: () {},
-          disabled: true, // Add this
+            disabled: true,
+          ),
+          const Divider(height: 1),
+          ServiceManagementTile(
+            icon: Symbols.currency_rupee,
+            label: AppLocalizations.of(context).dailylimit,
+            onTap: () {
+              Navigator.of(context).push(
+                MaterialPageRoute(
+                    builder: (context) => const DailyLimitScreen()),
+              );
+            },
+            disabled: true,
           ),
           const Divider(height: 1),
           ServiceManagementTile(
             icon: Symbols.captive_portal,
             label: AppLocalizations.of(context).quickLinks,
-          onTap: () {},
+            onTap: () {
-          disabled: true, // Add this
+              Navigator.of(context).push(
+                MaterialPageRoute(
+                    builder: (context) => const QuickLinksScreen()),
+              );
+            },
+            disabled: true,
           ),
           const Divider(height: 1),
           ServiceManagementTile(
-          icon: Symbols.missing_controller,
+            icon: Symbols.question_mark,
+            label: AppLocalizations.of(context).faq,
+            onTap: () {
+              Navigator.of(context).push(
+                MaterialPageRoute(builder: (context) => const FaqsScreen()),
+              );
+            },
+            disabled: true,
+          ),
+          const Divider(height: 1),
+          ServiceManagementTile(
+            icon: Symbols.location_pin,
             label: AppLocalizations.of(context).branchLocator,
             onTap: () {
               Navigator.push(
@@ -55,27 +84,27 @@ Widget build(BuildContext context) {
                   MaterialPageRoute(
                       builder: (context) => const BranchLocatorScreen()));
             },
-          disabled: true, // Add this
+            disabled: true,
           ),
           const Divider(height: 1),
         ],
       ),
     );
-}
+  }
 }
 
 class ServiceManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
   final VoidCallback onTap;
-  final bool disabled; // Add this line
+  final bool disabled;
 
   const ServiceManagementTile({
     super.key,
     required this.icon,
     required this.label,
     required this.onTap,
-    this.disabled = false, // Add this line
+    this.disabled = false,
   });
 
   @override
@@ -84,20 +113,20 @@ class ServiceManagementTile extends StatelessWidget {
     return ListTile(
       leading: Icon(
         icon,
-        color: disabled ? theme.disabledColor : null, // Change color when disabled
+        color: disabled ? theme.disabledColor : null,
       ),
       title: Text(
         label,
         style: TextStyle(
-          color: disabled ? theme.disabledColor : null, // Change color when disabled
+          color: disabled ? theme.disabledColor : null,
         ),
       ),
       trailing: Icon(
         Symbols.arrow_right,
         size: 20,
-        color: disabled ? theme.disabledColor : null, // Change color when disabled
+        color: disabled ? theme.disabledColor : null,
       ),
-      onTap: disabled ? null : onTap, // Disable onTap when disabled
+      onTap: disabled ? null : onTap,
     );
   }
 }

lib/l10n/app_en.arb

@@ -98,7 +98,7 @@
 "accountOpeningDeposit": "Account Opening Request - Deposit",
 "accountOpeningLoan": "Account Opening Request - Loan",
 "quickLinks": "Quick Links",
-"branchLocator": "Branch Locator",
+"branchLocator": "Branch and ATM Locator",
 "emailLaunchError": "Could not launch email client for",
 "dialerLaunchError": "Could not launch dialer for",
 "writeToUs": "Write to us",
@@ -169,7 +169,7 @@
 "invalidOtp": "Invalid OTP",
 "enterOtp": "Enter OTP",
 "otpVerification": "OTP Verification",
-"otpSentMessage": "Enter the 4-digit OTP sent to your mobile number",
+"otpSentMessage": "Enter the 6-digit OTP sent to your mobile number",
 "verifyOtp": "Verify OTP",
 "otpResent": "OTP Resent",
 "resendOtp": "Resend OTP",
@@ -248,7 +248,7 @@
   "validateBeneficiaryproceeding": "Please validate beneficiary before proceeding",
   "findnearbybranched": "Find nearby branches",
   "searchbranch": "Search Branch",
-  "searchbranchby": "Search by Branch Name / Code / IFSC",
+  "searchbranchby":  "Name / Code / IFSC / Address",
   "branchsearchsoon": "Branch search coming soon...",
   "loginFailed": "Login failed",
 "invalidCredentials": "Invalid credentials",
@@ -313,5 +313,23 @@
  "themeModeSystem": "System",
  "themeModeLight": "Light",
  "themeModeDark": "Dark",
- "details": "Details"
+ "details": "Details",
+ "remarks": "Remarks (Optional)",
+ "kccbMobile": "KCCB Mobile",
+ "faq": "Frequently Asked Questions(FAQs)",
+ "branches": "Branches",
+ "atms": "ATMs",
+ "dailylimit": "Daily Transaction Limit",
+ "currentDailyLimit": "Current Daily Limit",
+ "noLimitSet": "No Limit Set",
+ "addLimit": "Add Limit",
+ "editLimit": "Edit Limit",
+ "removeLimit": "Remove Limit",
+ "limitAmount": "Limit Amount",
+ "save": "Save",
+ "deregister": "De-Register",
+ "deregistercheck": "Are you sure you want to De-Register?", 
+ "biometricsNotAvailable": "Biometrics not available on this device",
+ "disableFingerprintLogin": "Disable Fingerprint Login",
+ "disableFingerprintMessage": "Are you sure you want to disable fingerprint login?"
 }

lib/l10n/app_hi.arb

@@ -98,7 +98,7 @@
 "accountOpeningDeposit": "खाता खोलने का अनुरोध - जमा",
 "accountOpeningLoan": "खाता खोलने का अनुरोध - ऋण",
 "quickLinks": "त्वरित लिंक",
-"branchLocator": "शाखा लोकेटर",
+"branchLocator": "शाखा और एटीएम लोकेटर",
 "emailLaunchError": "ईमेल क्लाइंट खोलने में विफल: ",
 "dialerLaunchError": "डायलर खोलने में विफल: ",
 "writeToUs": "हमें लिखें",
@@ -170,7 +170,7 @@
 "invalidOtp": "अमान्य ओटीपी",
 "enterOtp": "ओटीपी दर्ज करें",
 "otpVerification": "ओटीपी सत्यापन",
-"otpSentMessage": "अपने मोबाइल नंबर पर भेजा गया 4-अंकों का ओटीपी दर्ज करें",
+"otpSentMessage": "अपने मोबाइल नंबर पर भेजा गया 6-अंकों का ओटीपी दर्ज करें",
 "verifyOtp": "ओटीपी सत्यापित करें",
 "otpResent": "ओटीपी पुनः भेजा गया",
 "resendOtp": "ओटीपी पुनः भेजें",
@@ -249,7 +249,7 @@
   "validateBeneficiaryproceeding": "कृपया आगे बढ़ने से पहले लाभार्थी को पट्टे पर मान्य करें",
   "findnearbybranched": "आस-पास की शाखाएँ खोजें",
   "searchbranch": "शाखा खोजें",
-  "searchbranchby": "शाखा खोजें नाम / बैंक कोड / आईएफएससी द्वारा",
+  "searchbranchby": "शाखा नाम / बैंक कोड / आईएफएससी / पता",
   "branchsearchsoon": "शाखा खोज सुविधा जल्द ही आ रही है...",
   "loginFailed": "लॉगिन विफल",
 "invalidCredentials": "अवैध प्रत्यय पत्र",
@@ -314,5 +314,23 @@
  "themeModeSystem": "सिस्टम",
  "themeModeLight": "लाईट",
  "themeModeDark": "डार्क",
-"details": "विवरण"
+"details": "विवरण",
+ "remarks": "विचार (अनिवार्य नहीं)",
+ "kccbMobile": "केसीसीबी मोबाइल",
+ "faq": "अक्सर पूछे जाने वाले प्रश्न",
+ "branches": "शाखाओं",
+ "atms": "एटीएम",
+ "dailylimit": "दैनिक लेनदेन सीमा",
+ "currentDailyLimit": "वर्तमान दैनिक सीमा",
+ "noLimitSet": "कोई सीमा निर्धारित नहीं",
+ "addLimit": "सीमा जोड़ें",
+ "editLimit": "सीमा संपादित करें",
+ "removeLimit": "सीमा हटाएँ",
+ "limitAmount": "सीमा राशि",
+ "save": "जमा करें",
+ "deregister": "अपंजीकृत",
+ "deregistercheck": "क्या आप वाकई पंजीकरण रद्द करना चाहते हैं??", 
+ "biometricsNotAvailable": "इस डिवाइस पर बायोमेट्रिक्स उपलब्ध नहीं है",
+ "disableFingerprintLogin": "फ़िंगरप्रिंट लॉगिन अक्षम करें",
+ "disableFingerprintMessage": "क्या आप फ़िंगरप्रिंट लॉगिन अक्षम करना चाहते हैं?"  
 }

lib/main.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: unused_import
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:kmobile/core/logger.dart';
 import 'package:kmobile/features/security/security_error_screen.dart';
 import 'package:kmobile/security/security_service.dart';
 import 'di/injection.dart';
@@ -9,8 +9,8 @@ import 'app.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  Logger.info("App starting...");
 
-  // Set preferred orientations
   await SystemChrome.setPreferredOrientations([
     DeviceOrientation.portraitUp,
     DeviceOrientation.portraitDown,
@@ -19,13 +19,14 @@ void main() async {
   // Check for device compromise
   // final compromisedMessage = await SecurityService.deviceCompromisedMessage;
   // if (compromisedMessage != null) {
+  //   Logger.error("Device compromised: $compromisedMessage");
   //   runApp(MaterialApp(
   //     home: SecurityErrorScreen(message: compromisedMessage),
   //   ));
   //   return;
   // }
-
+  Logger.info("Setting up dependencies...");
-  // Initialize dependencies
   await setupDependencies();
+  Logger.info("Dependencies set up.");
   runApp(const KMobile());
 }

lib/widgets/bank_logos.dart

@@ -86,14 +86,14 @@ Widget getBankLogo(String? bankName, BuildContext context) {
       height: 40,
     );
   }
-  if (bankName != null && bankName.toLowerCase().contains('ipsbank') || bankName != null && bankName.toLowerCase().contains('india post') ) {
+  if (bankName != null && bankName.toLowerCase().contains('ipsbank') ||
+      bankName != null && bankName.toLowerCase().contains('india post')) {
     return Image.asset(
       'assets/images/ipos_logo.png',
       width: 40,
       height: 40,
     );
-  }
+  } else {
-  else {
     return Icon(
       Icons.account_balance,
       size: 40,

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -8,6 +8,7 @@ import Foundation
 import device_info_plus
 import flutter_secure_storage_macos
 import local_auth_darwin
+import package_info_plus
 import path_provider_foundation
 import share_plus
 import shared_preferences_foundation
@@ -17,6 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin"))
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

pubspec.lock

@@ -157,10 +157,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
+      sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
       url: "https://pub.dev"
     source: hosted
-    version: "5.8.0+1"
+    version: "5.9.0"
   dio_web_adapter:
     dependency: transitive
     description:
@@ -307,6 +307,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.2"
+  flutter_sms:
+    dependency: "direct main"
+    description:
+      name: flutter_sms
+      sha256: "2fe5f584f02596343557eeca56348f9b82413fefe83a423fab880cdbdf54d8d8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.3"
   flutter_svg:
     dependency: "direct main"
     description:
@@ -333,14 +341,22 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  fluttertoast:
+    dependency: "direct main"
+    description:
+      name: fluttertoast
+      sha256: "90778fe0497fe3a09166e8cf2e0867310ff434b794526589e77ec03cf08ba8e8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.2.14"
   get_it:
     dependency: "direct main"
     description:
       name: get_it
-      sha256: e87cd1d108e472a0580348a543a0c49ed3d70c8a5c809c6d418583e595d0a389
+      sha256: a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.2.0"
   glob:
     dependency: transitive
     description:
@@ -353,18 +369,18 @@ packages:
     dependency: "direct main"
     description:
       name: google_fonts
-      sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
+      sha256: df9763500dadba0155373e9cb44e202ce21bd9ed5de6bdbd05c5854e86839cb8
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "6.3.0"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   http_parser:
     dependency: transitive
     description:
@@ -513,10 +529,10 @@ packages:
     dependency: "direct main"
     description:
       name: material_symbols_icons
-      sha256: ef20d86fb34c2b59eb7553c4d795bb8a7ec8c890c53ffd3148c64f7adc46ae50
+      sha256: "52b8a84922464027c9d69100307f654a8f2356c818401a5415c08243883925d8"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2858.1"
+    version: "4.2872.2"
   meta:
     dependency: transitive
     description:
@@ -541,6 +557,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  package_info_plus:
+    dependency: "direct main"
+    description:
+      name: package_info_plus
+      sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   path:
     dependency: transitive
     description:
@@ -689,10 +721,10 @@ packages:
     dependency: "direct main"
     description:
       name: provider
-      sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
+      sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.5+1"
   qr:
     dependency: transitive
     description:
@@ -789,6 +821,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  showcaseview:
+    dependency: "direct main"
+    description:
+      name: showcaseview
+      sha256: "3929adfcff53a8a9bc6b501914d67e4b7eae40451db7e654f76f34b0b30a185a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  simcards:
+    dependency: "direct main"
+    description:
+      name: simcards
+      sha256: b621cc265ebbb3e11009ca9be67063efbc011396c4224aff8b08edaba30fa5ae
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -923,7 +971,7 @@ packages:
     source: hosted
     version: "3.1.4"
   uuid:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: uuid
       sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff

pubspec.yaml

@@ -25,16 +25,12 @@ environment:
 # To automatically upgrade your package dependencies to the latest versions
 # consider running `flutter pub upgrade --major-versions`. Alternatively,
 # dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
+# the latest version availabwhle on pub.dev. To see which dependencies have newer
 # versions available, run `flutter pub outdated`.
 dependencies:
   flutter:
     sdk: flutter
   flutter_neumorphic : 3.2.0  
-
-
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
   jailbreak_root_detection: ^1.1.6
   equatable: ^2.0.7
@@ -63,6 +59,13 @@ dependencies:
   pdf: ^3.11.3
   permission_handler: ^12.0.1
   device_info_plus: ^11.3.0
+  showcaseview: ^2.0.3
+  package_info_plus: ^4.2.0
+  simcards: ^0.0.1
+  uuid: ^4.5.1
+  #send_message: ^1.0.0
+  flutter_sms: ^2.3.3
+  fluttertoast: ^8.2.6
  # jailbreak_root_detection: "^1.1.6"
 
 
@@ -145,5 +148,5 @@ flutter:
 
 flutter_icons:
   android: true
-  ios: false
+  ios: true
   image_path: assets/images/icon.png