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)
+     }
+ }

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) {
@@ -127,4 +126,4 @@ class BeneficiaryService {
       throw Exception('Unexpected error: ${e.toString()}');
     }
   }
-}
+}

lib/api/services/change_password_service.dart

@@ -10,10 +10,7 @@ class ChangePasswordService {
   }) async {
     final response = await _dio.post(
       '/api/otp/send',
-      data: {
-        'mobileNumber': mobileNumber,
-        'type': "CHANGE_LPWORD"
-      },
+      data: {'mobileNumber': mobileNumber, 'type': "CHANGE_LPWORD"},
     );
     if (response.statusCode != 200) {
       throw Exception("Invalid Mobile Number/Type");
@@ -22,15 +19,12 @@ class ChangePasswordService {
     return response.toString();
   }
 
-    Future getOtpTpin({
+  Future getOtpTpin({
     required String mobileNumber,
   }) async {
     final response = await _dio.post(
       '/api/otp/send',
-      data: {
-        'mobileNumber': mobileNumber,
-        'type': "CHANGE_TPIN"
-      },
+      data: {'mobileNumber': mobileNumber, 'type': "CHANGE_TPIN"},
     );
     if (response.statusCode != 200) {
       throw Exception("Invalid Mobile Number/Type");
@@ -39,15 +33,14 @@ class ChangePasswordService {
     return response.toString();
   }
 
- 
- Future validateOtp({
+  Future validateOtp({
     required String otp,
     required String mobileNumber,
   }) async {
     final response = await _dio.post(
       '/api/otp/verify?mobileNumber=$mobileNumber',
       data: {
-        'otp' : otp,
+        'otp': otp,
       },
     );
     if (response.statusCode != 200) {
@@ -56,22 +49,22 @@ class ChangePasswordService {
     return response.toString();
   }
 
- Future validateChangePwd({
-  required String OldLPsw,
-  required String newLPsw,
-  required String confirmLPsw,
- }) async {
-  final response = await _dio.post(
+  Future validateChangePwd({
+    required String OldLPsw,
+    required String newLPsw,
+    required String confirmLPsw,
+  }) async {
+    final response = await _dio.post(
       '/api/auth/change/login_password',
       data: {
-      'OldLPsw': OldLPsw,
-      'newLPsw': newLPsw,
-      'confirmLPsw': confirmLPsw,
+        'OldLPsw': OldLPsw,
+        'newLPsw': newLPsw,
+        'confirmLPsw': confirmLPsw,
       },
     );
     if (response.statusCode != 200) {
       throw Exception("Wrong OTP");
     }
     return response.toString();
- }
-}
+  }
+}

lib/api/services/send_sms_service.dart

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

lib/app.dart

@@ -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:
-              Theme.of(context).colorScheme.onSecondary,
+          unselectedItemColor: 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

@@ -15,7 +15,7 @@ class ImpsTransaction {
     required this.ifscCode,
     this.remitterName,
     required this.beneficiaryName,
-    required this.tpin, 
+    required this.tpin,
     this.remarks,
   });
 

lib/data/models/neft_transaction.dart

@@ -15,7 +15,7 @@ class NeftTransaction {
     required this.ifscCode,
     required this.remitterName,
     required this.beneficiaryName,
-    required this.tpin, 
+    required this.tpin,
     this.remarks,
   });
 

lib/data/models/transfer.dart

@@ -11,7 +11,7 @@ class Transfer {
     required this.toAccount,
     required this.toAccountType,
     required this.amount,
-    this.tpin, 
+    this.tpin,
     this.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(
@@ -66,8 +68,8 @@ Dio _createDioClient() {
     BaseOptions(
       baseUrl:
           'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
-          //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
-          //'https://kccbmbnk.net',
+      //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
+      //'https://kccbmbnk.net',
       connectTimeout: const Duration(seconds: 60),
       receiveTimeout: const Duration(seconds: 60),
       headers: {

lib/features/accounts/screens/account_statement_screen.dart

@@ -11,8 +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';
+import 'package:path_provider/path_provider.dart';
+import 'package:share_plus/share_plus.dart';
 
 class AccountStatementScreen extends StatefulWidget {
   final String accountNo;
@@ -295,20 +295,21 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                                     : '',
                                 style: const TextStyle(fontSize: 12),
                               ),
-                             trailing: Column(
-  crossAxisAlignment: CrossAxisAlignment.end,
-  mainAxisAlignment: MainAxisAlignment.center,
-  children: [
-    Text(
-      "₹${tx.amount}",
-      style: const TextStyle(fontSize: 17),
-    ),
-    Text(
-      "Bal: ₹${tx.balance}",
-      style: const TextStyle(fontSize: 12), // Style matches tx.name
-    ),
-  ],
-),                                                                   
+                              trailing: Column(
+                                crossAxisAlignment: CrossAxisAlignment.end,
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  Text(
+                                    "₹${tx.amount}",
+                                    style: const TextStyle(fontSize: 17),
+                                  ),
+                                  Text(
+                                    "Bal: ₹${tx.balance}",
+                                    style: const TextStyle(
+                                        fontSize: 12), // Style matches tx.name
+                                  ),
+                                ],
+                              ),
                               onTap: () {
                                 Navigator.push(
                                   context,
@@ -491,19 +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);
+      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)],
-  );
-}
-      
-      
+        // 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,
-                      transaction.name),
+                  _buildDetailRow(
+                      AppLocalizations.of(context).details, transaction.name),
                 ],
               ),
             ),

lib/features/auth/controllers/theme_state.dart

@@ -16,26 +16,23 @@ 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});
 
-    ThemeData getLightThemeData() {
-      return AppThemes.getLightTheme(themeType);
-    }
-
-    ThemeData getDarkThemeData() {
-      return AppThemes.getDarkTheme(themeType);
-    }
-
-    @override
-    List<Object?> get props => [themeType];
+  ThemeData getLightThemeData() {
+    return AppThemes.getLightTheme(themeType);
   }
 
+  ThemeData getDarkThemeData() {
+    return AppThemes.getDarkTheme(themeType);
+  }
 
-
+  @override
+  List<Object?> get props => [themeType];
+}

lib/features/auth/screens/set_password_screen.dart

@@ -140,9 +140,10 @@ class _SetPasswordScreenState extends State<SetPasswordScreen> {
                 if (_error != null) ...[
                   Text(
                     _error!,
-                    style: const TextStyle(color: Colors.red,
-                    fontWeight: FontWeight.bold,
-                    fontSize: 20),
+                    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',
@@ -51,8 +80,20 @@ class _SplashScreenState extends State<SplashScreen> {
             left: 0,
             right: 0,
             child: Center(
-              child: CircularProgressIndicator(
-                  color: Color(0xFFFFFFFF)),
+              child: CircularProgressIndicator(color: Color(0xFFFFFFFF)),
+            ),
+          ),
+          Positioned(
+            bottom: 90,
+            left: 0,
+            right: 0,
+            child: Text(
+              _version,
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                color: Color(0xFFFFFFFF),
+                fontSize: 14,
+              ),
             ),
           ),
         ],

lib/features/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 _ifscFieldKey = GlobalKey<FormFieldState>();
+  final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
+  final _ifscFieldKey = GlobalKey<FormFieldState>();
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
@@ -47,10 +47,10 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
   void initState() {
     super.initState();
     _ifscFocusNode.addListener(() {
-  if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
-    _validateIFSC();
-  }
-});
+      if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
+        _validateIFSC();
+      }
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
         accountType = 'Savings';
@@ -58,26 +58,26 @@ 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();
- }
+  @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;
+  void _validateIFSC() async {
+    var beneficiaryService = getIt<BeneficiaryService>();
+    final ifsc = ifscController.text.trim().toUpperCase();
+    if (ifsc.isEmpty) return;
 
-      try {
-      final result = await beneficiaryService.validateIFSC(ifsc); 
+    try {
+      final result = await beneficiaryService.validateIFSC(ifsc);
 
       if (mounted) {
         if (result.bankName.isEmpty) {
@@ -94,7 +94,8 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
     } catch (e) {
       if (mounted) {
         final errorMessage = e.toString().toUpperCase();
-        String snackbarMessage = AppLocalizations.of(context).somethingWentWrong;
+        String snackbarMessage =
+            AppLocalizations.of(context).somethingWentWrong;
 
         if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
           snackbarMessage = AppLocalizations.of(context).invalidIfsc;
@@ -107,7 +108,7 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
         branchNameController.clear();
       }
     }
- }
+  }
 
   void _validateBeneficiary() async {
     FocusScope.of(context).unfocus();
@@ -325,7 +326,9 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                               ).reenterAccountNumber;
                             }
                             if (value != accountNumberController.text) {
-                              return AppLocalizations.of(context,).accountMismatch;
+                              return AppLocalizations.of(
+                                context,
+                              ).accountMismatch;
                             }
                             return null;
                           },
@@ -346,16 +349,16 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                           ),
                           textCapitalization: TextCapitalization.characters,
                           textInputAction: TextInputAction.next,
-                           onChanged: (value) {
-   setState(() {
-     final trimmed = value.trim().toUpperCase();
-     if (trimmed.length < 11) {
-       // clear bank/branch if backspace or changed
-       bankNameController.clear();
-       branchNameController.clear();
-     }
-   });
- },
+                          onChanged: (value) {
+                            setState(() {
+                              final trimmed = value.trim().toUpperCase();
+                              if (trimmed.length < 11) {
+                                // clear bank/branch if backspace or changed
+                                bankNameController.clear();
+                                branchNameController.clear();
+                              }
+                            });
+                          },
                           validator: (value) {
                             final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
                             if (value == null || value.trim().isEmpty) {
@@ -429,20 +432,27 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                             child: SizedBox(
                               width: double.infinity,
                               child: ElevatedButton(
-onPressed: _isValidating || ifscController.text.length != 11
-? null
-: () {
-    final isAccountValid =
-        _accountNumberFieldKey.currentState!.validate();
-    final isConfirmAccountValid =
-        _confirmAccountNumberFieldKey.currentState!.validate();
-    final isIfscValid = _ifscFieldKey.currentState!.validate();
-
-    if (isAccountValid && isConfirmAccountValid && isIfscValid) {
-      _validateBeneficiary();
-    }
-  },
+                                onPressed: _isValidating ||
+                                        ifscController.text.length != 11
+                                    ? null
+                                    : () {
+                                        final isAccountValid =
+                                            _accountNumberFieldKey.currentState!
+                                                .validate();
+                                        final isConfirmAccountValid =
+                                            _confirmAccountNumberFieldKey
+                                                .currentState!
+                                                .validate();
+                                        final isIfscValid = _ifscFieldKey
+                                            .currentState!
+                                            .validate();
 
+                                        if (isAccountValid &&
+                                            isConfirmAccountValid &&
+                                            isIfscValid) {
+                                          _validateBeneficiary();
+                                        }
+                                      },
                                 child: _isValidating
                                     ? const SizedBox(
                                         width: 20,

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/card/screens/card_management_screen.dart

@@ -17,83 +17,83 @@ class CardManagementScreen extends StatefulWidget {
 class _CardManagementScreen extends State<CardManagementScreen> {
   @override
   Widget build(BuildContext context) {
-  return Scaffold(
-    appBar: AppBar(
-      automaticallyImplyLeading: false,
-      title: Text(
-        AppLocalizations.of(context).cardManagement,
-      ),
-      centerTitle: false,
-    ),
-    body: ListView(
-      children: [
-        CardManagementTile(
-          icon: Symbols.add,
-          label: AppLocalizations.of(context).applyDebitCard,
-          onTap: () {},
-          disabled: true, // Add this
+    return Scaffold(
+      appBar: AppBar(
+        automaticallyImplyLeading: false,
+        title: Text(
+          AppLocalizations.of(context).cardManagement,
         ),
-        const Divider(height: 1),
-        CardManagementTile(
-          icon: Symbols.remove_moderator,
-          label: AppLocalizations.of(context).blockUnblockCard,
-          onTap: () {
-            Navigator.push(
+        centerTitle: false,
+      ),
+      body: ListView(
+        children: [
+          CardManagementTile(
+            icon: Symbols.add,
+            label: AppLocalizations.of(context).applyDebitCard,
+            onTap: () {},
+            disabled: true, // Add this
+          ),
+          const Divider(height: 1),
+          CardManagementTile(
+            icon: Symbols.remove_moderator,
+            label: AppLocalizations.of(context).blockUnblockCard,
+            onTap: () {
+              Navigator.push(
                 context,
                 MaterialPageRoute(
                   builder: (context) => const BlockCardScreen(),
                 ),
               );
-          },
-          disabled: true, 
-        ),
-        const Divider(height: 1),
-        CardManagementTile(
-          icon: Symbols.password_2,
-          label: AppLocalizations.of(context).changeCardPin,
-          onTap: () {
-            Navigator.push(
+            },
+            disabled: true,
+          ),
+          const Divider(height: 1),
+          CardManagementTile(
+            icon: Symbols.password_2,
+            label: AppLocalizations.of(context).changeCardPin,
+            onTap: () {
+              Navigator.push(
                 context,
                 MaterialPageRoute(
                   builder: (context) => const CardPinChangeDetailsScreen(),
                 ),
               );
-          },
-          disabled: true, 
-        ),
-        const Divider(height: 1),
-        CardManagementTile(
-          icon: Symbols.payment_card,
-          label: AppLocalizations.of(context).viewCardDeatils,
-          onTap: () {
-                Navigator.push(
+            },
+            disabled: true,
+          ),
+          const Divider(height: 1),
+          CardManagementTile(
+            icon: Symbols.payment_card,
+            label: AppLocalizations.of(context).viewCardDeatils,
+            onTap: () {
+              Navigator.push(
                 context,
                 MaterialPageRoute(
                   builder: (context) => const CardDetailsScreen(),
                 ),
               );
-          },
-          disabled: true, 
-        ),
-        const Divider(height: 1),
-      ],
-    ),
-  );
- }  
+            },
+            disabled: true,
+          ),
+          const Divider(height: 1),
+        ],
+      ),
+    );
+  }
 }
 
 class CardManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
   final VoidCallback onTap;
-  final bool disabled; 
+  final bool disabled;
 
   const CardManagementTile({
     super.key,
     required this.icon,
     required this.label,
     required this.onTap,
-    this.disabled = false, 
+    this.disabled = false,
   });
 
   @override
@@ -102,20 +102,20 @@ class CardManagementTile extends StatelessWidget {
     return ListTile(
       leading: Icon(
         icon,
-        color: disabled ? theme.disabledColor : null, 
+        color: disabled ? theme.disabledColor : null,
       ),
       title: Text(
         label,
         style: TextStyle(
-          color: disabled ? theme.disabledColor : null, 
+          color: disabled ? theme.disabledColor : null,
         ),
       ),
       trailing: Icon(
         Symbols.arrow_right,
         size: 20,
-        color: disabled ? theme.disabledColor : null, 
+        color: disabled ? theme.disabledColor : null,
       ),
-      onTap: disabled ? null : onTap, 
+      onTap: disabled ? null : onTap,
     );
   }
-}
+}

lib/features/customer_info/screens/customer_info_screen.dart

@@ -13,14 +13,14 @@ 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;
- }
+
+  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) {
@@ -92,10 +92,10 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                     label: AppLocalizations.of(context).branchAddress,
                     value: user.address ?? 'N/A',
                   ), // Replace with Aadhar if available
-                InfoField(
-                  label: AppLocalizations.of(context).primaryId,
-                  value: _maskPrimaryId(user.primaryId),
-                ), // Replace with PAN if available
+                  InfoField(
+                    label: AppLocalizations.of(context).primaryId,
+                    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;
@@ -139,7 +140,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
       case 'sa':
         return AppLocalizations.of(context).savingsAccount;
       case 'sb':
-        return AppLocalizations.of(context).savingsAccount;  
+        return AppLocalizations.of(context).savingsAccount;
       case 'ln':
         return AppLocalizations.of(context).loanAccount;
       case 'td':
@@ -211,7 +212,42 @@ class _DashboardScreenState extends State<DashboardScreen> {
         backgroundColor: theme.scaffoldBackgroundColor,
         appBar: AppBar(
           backgroundColor: theme.scaffoldBackgroundColor,
-          automaticallyImplyLeading: false,
+          leading: Padding(
+            padding: const EdgeInsets.only(left: 10.0),
+            child: InkWell(
+              borderRadius: BorderRadius.circular(20),
+              onTap: () {
+                final authState = context.read<AuthCubit>().state;
+                String mobileNumberToPass = '';
+
+                if (authState is Authenticated) {
+                  if (selectedAccountIndex >= 0 &&
+                      selectedAccountIndex < authState.users.length) {
+                    mobileNumberToPass =
+                        authState.users[selectedAccountIndex].mobileNo ?? '';
+                  }
+                }
+
+                Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (context) =>
+                        ProfileScreen(mobileNumber: mobileNumberToPass),
+                  ),
+                );
+              },
+              child: CircleAvatar(
+                backgroundColor: Colors.grey[200],
+                radius: 20,
+                child: SvgPicture.asset(
+                  'assets/images/avatar_male.svg',
+                  width: 40,
+                  height: 40,
+                  fit: BoxFit.cover,
+                ),
+              ),
+            ),
+          ),
           title: Text(
             AppLocalizations.of(context).kccbMobile,
             textAlign: TextAlign.left,
@@ -221,41 +257,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
             ),
           ),
           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) => ProfileScreen(mobileNumber: mobileNumberToPass),
-                     ),
-                   );
-                },
-                child: CircleAvatar(
-                  backgroundColor: Colors.grey[200],
-                  radius: 20,
-                  child: SvgPicture.asset(
-                    'assets/images/avatar_male.svg',
-                    width: 40,
-                    height: 40,
-                    fit: BoxFit.cover,
-                  ),
-                ),
-              ),
-            ),
-          ],
         ),
         body: BlocBuilder<AuthCubit, AuthState>(
           builder: (context, state) {
@@ -533,8 +534,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                               .accountNo!,
                                           balance: users[selectedAccountIndex]
                                               .availableBalance!,
-                                          accountType: users[selectedAccountIndex]
-                                          .accountType!,
+                                          accountType:
+                                              users[selectedAccountIndex]
+                                                  .accountType!,
                                         )));
                           }),
                           _buildQuickLink(Symbols.checkbook,

lib/features/dashboard/widgets/account_card.dart

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

lib/features/enquiry/screens/enquiry_screen.dart

@@ -30,15 +30,15 @@ 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');
-   }
- }  
+  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(
@@ -75,29 +75,25 @@ class _EnquiryScreen extends State<EnquiryScreen> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-             const SizedBox(height: 20),
- GestureDetector(
-   onTap: () => _launchUrl("https://kccb.in/complaint-form"),
-   child:  Row(
-  mainAxisSize: MainAxisSize.min,
- children: [
-    Text("Complaint Form",
-     style: TextStyle(
-      fontSize: 17,
-       color: Theme.of(context).colorScheme.primary,
-       decorationColor: Theme.of(context).colorScheme.primary,
-     ),
-   ),
-    const SizedBox(width: 4), 
- Icon(
-   Icons.open_in_new, 
-   color: Theme.of(context).colorScheme.primary,
-   size: 16.0, 
- ),
- ]
-)
- ),
-
+            const SizedBox(height: 20),
+            GestureDetector(
+                onTap: () => _launchUrl("https://kccb.in/complaint-form"),
+                child: Row(mainAxisSize: MainAxisSize.min, children: [
+                  Text(
+                    "Complaint Form",
+                    style: TextStyle(
+                      fontSize: 17,
+                      color: Theme.of(context).colorScheme.primary,
+                      decorationColor: Theme.of(context).colorScheme.primary,
+                    ),
+                  ),
+                  const SizedBox(width: 4),
+                  Icon(
+                    Icons.open_in_new,
+                    color: Theme.of(context).colorScheme.primary,
+                    size: 16.0,
+                  ),
+                ])),
             const SizedBox(height: 40),
             Text(
               AppLocalizations.of(context).keyContacts,

lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart

@@ -402,14 +402,14 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   const SizedBox(height: 24),
                 ],
                 //Remarks
-                 TextFormField(
+                TextFormField(
                   controller: _remarksController,
                   decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).remarks,
-                  border: const OutlineInputBorder(),
-                    ),
+                    labelText: AppLocalizations.of(context).remarks,
+                    border: const OutlineInputBorder(),
                   ),
-                 const SizedBox(height: 24),
+                ),
+                const SizedBox(height: 24),
                 // Amount
                 TextFormField(
                   controller: _amountController,

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

@@ -18,8 +18,9 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
     6,
     (_) => TextEditingController(),
   );
-   bool _isLoading = false;
- final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
+  bool _isLoading = false;
+  final ChangePasswordService _changePasswordService =
+      getIt<ChangePasswordService>();
 
   @override
   void dispose() {
@@ -33,7 +34,7 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
   }
 
   void _onOtpChanged(int idx, String value) {
-    if (value.length == 1 && idx <5) {
+    if (value.length == 1 && idx < 5) {
       _focusNodes[idx + 1].requestFocus();
     }
     if (value.isEmpty && idx > 0) {
@@ -44,160 +45,160 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
 
   String get _enteredOtp => _controllers.map((c) => c.text).join();
 
-void _verifyOtp() async {
-  setState(() {
-    _isLoading = true;
-  });
+  void _verifyOtp() async {
+    setState(() {
+      _isLoading = true;
+    });
 
-  try {
-    await _changePasswordService.validateOtp(
-      otp: _enteredOtp,
-      mobileNumber: widget.mobileNumber, 
-    );
+    try {
+      await _changePasswordService.validateOtp(
+        otp: _enteredOtp,
+        mobileNumber: widget.mobileNumber,
+      );
 
-    if (mounted) {
-      Navigator.pushReplacement(
-        context,
-        MaterialPageRoute(builder: (_) => const TpinSetScreen()),
-      );
-    }
-  } catch (e) {
-    if (mounted) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
-      );
-    }
-  } finally {
-    if (mounted) {
-      setState(() {
-        _isLoading = false;
-      });
+      if (mounted) {
+        Navigator.pushReplacement(
+          context,
+          MaterialPageRoute(builder: (_) => const TpinSetScreen()),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
     }
   }
-}
 
   @override
- Widget build(BuildContext context) {
-   final theme = Theme.of(context);
-   return Scaffold(
-     appBar: AppBar(
-       title: Text(AppLocalizations.of(context).enterOtp),
-       centerTitle: true,
-       elevation: 0,
-     ),
-     body: Center(
-       child: SingleChildScrollView(
-         child: Column(
-           children: [
-             Icon(
-               Icons.lock_outline,
-               size: 48,
-               color: theme.colorScheme.primary,
-             ),
-             const SizedBox(height: 16),
-             Text(
-               AppLocalizations.of(context).otpVerification,
-               style: theme.textTheme.titleLarge?.copyWith(
-                 fontWeight: FontWeight.bold,
-                 color: theme.colorScheme.primary,
-               ),
-             ),
-             const SizedBox(height: 8),
-             Text(
-               AppLocalizations.of(context).otpSentMessage,
-               textAlign: TextAlign.center,
-               style: theme.textTheme.bodyMedium?.copyWith(
-                 color: Colors.grey[700],
-               ),
-             ),
-             const SizedBox(height: 32),
-             Row(
-               mainAxisAlignment: MainAxisAlignment.center,
-               children: List.generate(6, (i) {
-                 return Container(
-                   width: 32,
-                   margin: const EdgeInsets.symmetric(horizontal: 8),
-                   child: TextField(
-                     controller: _controllers[i],
-                     focusNode: _focusNodes[i],
-                     keyboardType: TextInputType.number,
-                     textAlign: TextAlign.center,
-                     maxLength: 1,
-                     obscureText: true,
-                     obscuringCharacter: '*',
-                     decoration: InputDecoration(
-                       counterText: '',
-                       filled: true,
-                       fillColor: Theme.of(context).primaryColorLight,
-                       border: OutlineInputBorder(
-                         borderRadius: BorderRadius.circular(12),
-                         borderSide: BorderSide(
-                           color: theme.colorScheme.primary,
-                           width: 2,
-                         ),
-                       ),
-                       focusedBorder: OutlineInputBorder(
-                         borderRadius: BorderRadius.circular(12),
-                         borderSide: BorderSide(
-                           color: theme.colorScheme.primary,
-                           width: 2.5,
-                         ),
-                       ),
-                     ),
-                     onChanged: (val) => _onOtpChanged(i, val),
-                   ),
-                 );
-               }),
-             ),
-             const SizedBox(height: 32),
-             ElevatedButton.icon(
-               icon: _isLoading
-                   ? const SizedBox(
-                       width: 20,
-                       height: 20,
-                       child: CircularProgressIndicator(
-                         color: Colors.white,
-                         strokeWidth: 2,
-                       ),
-                     )
-                   : const Icon(Icons.verified_user_rounded),
-               label: Text(
-                 AppLocalizations.of(context).verifyOtp,
-                 style: const TextStyle(
-                     fontSize: 18, fontWeight: FontWeight.w600),
-               ),
-               style: ElevatedButton.styleFrom(
-                 backgroundColor: theme.colorScheme.onPrimary,
-                 padding: const EdgeInsets.symmetric(
-                   vertical: 14,
-                   horizontal: 28,
-                 ),
-                 shape: RoundedRectangleBorder(
-                   borderRadius: BorderRadius.circular(30),
-                 ),
-               ),
-               // Update onPressed to handle loading state
-               onPressed: (_enteredOtp.length == 6 && !_isLoading)
-                   ? _verifyOtp
-                   : null,
-             ),
-             const SizedBox(height: 16),
-             TextButton(
-               onPressed: () {
-                 // You can also add a getOtp call here for resending
-                 ScaffoldMessenger.of(context).showSnackBar(
-                   SnackBar(
-                     content: Text(AppLocalizations.of(context).otpResent),
-                   ),
-                 );
-               },
-               child: Text(AppLocalizations.of(context).resendOtp),
-             ),
-             const SizedBox(height: 60),
-           ],
-         ),
-       ),
-     ),
-   );
- }
- }
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).enterOtp),
+        centerTitle: true,
+        elevation: 0,
+      ),
+      body: Center(
+        child: SingleChildScrollView(
+          child: Column(
+            children: [
+              Icon(
+                Icons.lock_outline,
+                size: 48,
+                color: theme.colorScheme.primary,
+              ),
+              const SizedBox(height: 16),
+              Text(
+                AppLocalizations.of(context).otpVerification,
+                style: theme.textTheme.titleLarge?.copyWith(
+                  fontWeight: FontWeight.bold,
+                  color: theme.colorScheme.primary,
+                ),
+              ),
+              const SizedBox(height: 8),
+              Text(
+                AppLocalizations.of(context).otpSentMessage,
+                textAlign: TextAlign.center,
+                style: theme.textTheme.bodyMedium?.copyWith(
+                  color: Colors.grey[700],
+                ),
+              ),
+              const SizedBox(height: 32),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: List.generate(6, (i) {
+                  return Container(
+                    width: 32,
+                    margin: const EdgeInsets.symmetric(horizontal: 8),
+                    child: TextField(
+                      controller: _controllers[i],
+                      focusNode: _focusNodes[i],
+                      keyboardType: TextInputType.number,
+                      textAlign: TextAlign.center,
+                      maxLength: 1,
+                      obscureText: true,
+                      obscuringCharacter: '*',
+                      decoration: InputDecoration(
+                        counterText: '',
+                        filled: true,
+                        fillColor: Theme.of(context).primaryColorLight,
+                        border: OutlineInputBorder(
+                          borderRadius: BorderRadius.circular(12),
+                          borderSide: BorderSide(
+                            color: theme.colorScheme.primary,
+                            width: 2,
+                          ),
+                        ),
+                        focusedBorder: OutlineInputBorder(
+                          borderRadius: BorderRadius.circular(12),
+                          borderSide: BorderSide(
+                            color: theme.colorScheme.primary,
+                            width: 2.5,
+                          ),
+                        ),
+                      ),
+                      onChanged: (val) => _onOtpChanged(i, val),
+                    ),
+                  );
+                }),
+              ),
+              const SizedBox(height: 32),
+              ElevatedButton.icon(
+                icon: _isLoading
+                    ? const SizedBox(
+                        width: 20,
+                        height: 20,
+                        child: CircularProgressIndicator(
+                          color: Colors.white,
+                          strokeWidth: 2,
+                        ),
+                      )
+                    : const Icon(Icons.verified_user_rounded),
+                label: Text(
+                  AppLocalizations.of(context).verifyOtp,
+                  style: const TextStyle(
+                      fontSize: 18, fontWeight: FontWeight.w600),
+                ),
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: theme.colorScheme.onPrimary,
+                  padding: const EdgeInsets.symmetric(
+                    vertical: 14,
+                    horizontal: 28,
+                  ),
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(30),
+                  ),
+                ),
+                // Update onPressed to handle loading state
+                onPressed: (_enteredOtp.length == 6 && !_isLoading)
+                    ? _verifyOtp
+                    : null,
+              ),
+              const SizedBox(height: 16),
+              TextButton(
+                onPressed: () {
+                  // You can also add a getOtp call here for resending
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text(AppLocalizations.of(context).otpResent),
+                    ),
+                  );
+                },
+                child: Text(AppLocalizations.of(context).resendOtp),
+              ),
+              const SizedBox(height: 60),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/fund_transfer/screens/tpin_prompt_screen.dart

@@ -15,44 +15,50 @@ class TpinSetupPromptScreen extends StatefulWidget {
   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;
-  });
+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;
-      });
+    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) {
@@ -86,33 +92,35 @@ class TpinSetupPromptScreen extends StatefulWidget {
               ),
             ),
             const SizedBox(height: 32),
-ElevatedButton.icon(
-  icon: _isLoading
-      ? const SizedBox(
-          width: 20,
-          height: 20,
-          child: CircularProgressIndicator(
-            color: Colors.white,
-            strokeWidth: 2,
-          ),
-        )
-      : const Icon(Icons.arrow_forward_rounded),
-  label: Text(
-    AppLocalizations.of(context).setTpin,
-    style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
-  ),
-  style: ElevatedButton.styleFrom(
-    backgroundColor: theme.colorScheme.onPrimary,
-    padding: const EdgeInsets.symmetric(
-      vertical: 14,
-      horizontal: 32,
-    ),
-    shape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.circular(10),
-    ),
-  ),
-  onPressed: _isLoading ? null : _getOtp, // <-- Use the new function
-),
+            ElevatedButton.icon(
+              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:
+                    const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
+              ),
+              style: ElevatedButton.styleFrom(
+                backgroundColor: theme.colorScheme.onPrimary,
+                padding: const EdgeInsets.symmetric(
+                  vertical: 14,
+                  horizontal: 32,
+                ),
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(10),
+                ),
+              ),
+              onPressed:
+                  _isLoading ? null : _getOtp, // <-- Use the new function
+            ),
             const SizedBox(height: 18),
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 18.0),
@@ -129,4 +137,4 @@ ElevatedButton.icon(
       ),
     );
   }
-}
+}

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,
-                        style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
+                        label: Text(
+                          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

@@ -14,12 +14,13 @@ class ChangePasswordOTPScreen extends StatefulWidget {
   const ChangePasswordOTPScreen({
     required this.currentPassword,
     required this.newPassword,
-    required this.confirmPassword, 
+    required this.confirmPassword,
     required this.mobileNumber,
   });
 
   @override
-  State<ChangePasswordOTPScreen> createState() => _ChangePasswordOTPScreenState();
+  State<ChangePasswordOTPScreen> createState() =>
+      _ChangePasswordOTPScreenState();
 }
 
 class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
@@ -36,33 +37,33 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
       });
     });
   }
+
   final changePasswordService = getIt<ChangePasswordService>();
   Future<void> _validateOTP() async {
-   try {
-  await changePasswordService.validateOtp(
-    otp: otpController.text,
-    mobileNumber: widget.mobileNumber,
-  );
+    try {
+      await changePasswordService.validateOtp(
+        otp: otpController.text,
+        mobileNumber: widget.mobileNumber,
+      );
 
-  // If OTP is valid, then change the password
-  await changePasswordService.validateChangePwd(
-    OldLPsw: widget.currentPassword,
-    newLPsw: widget.newPassword,
-    confirmLPsw: widget.confirmPassword,
-  );
-  
-  ScaffoldMessenger.of(context).showSnackBar(
-    SnackBar(content: Text(AppLocalizations.of(context).pwdchangeSuccess)),
-  );
+      // If OTP is valid, then change the password
+      await changePasswordService.validateChangePwd(
+        OldLPsw: widget.currentPassword,
+        newLPsw: widget.newPassword,
+        confirmLPsw: widget.confirmPassword,
+      );
 
-  // Navigate back to profile or login
-  Navigator.of(context).popUntil((route) => route.isFirst);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(AppLocalizations.of(context).pwdchangeSuccess)),
+      );
 
-} catch (e) {
-  ScaffoldMessenger.of(context).showSnackBar(
-    SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
-  );
-}
+      // Navigate back to profile or login
+      Navigator.of(context).popUntil((route) => route.isFirst);
+    } catch (e) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
+      );
+    }
   }
 
   @override
@@ -106,4 +107,4 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
       ),
     );
   }
-}
+}

lib/features/profile/change_password/change_password_screen.dart

@@ -56,38 +56,40 @@ class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
     }
     return null;
   }
-final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
-void _proceed() async {
-  if (_formKey.currentState!.validate()) {
 
+  final ChangePasswordService _changePasswordService =
+      getIt<ChangePasswordService>();
+  void _proceed() async {
+    if (_formKey.currentState!.validate()) {
+      try {
+        await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
 
-    try {
-      await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
-
-
-      Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => ChangePasswordOTPScreen(
-            currentPassword: currentPasswordController.text,
-            newPassword: newPasswordController.text,
-            confirmPassword: confirmPasswordController.text,
-            mobileNumber: widget.mobileNumber, 
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => ChangePasswordOTPScreen(
+              currentPassword: currentPasswordController.text,
+              newPassword: newPasswordController.text,
+              confirmPassword: confirmPasswordController.text,
+              mobileNumber: widget.mobileNumber,
+            ),
           ),
-        ),
-      );
-    } catch (e) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
-      );
+        );
+      } catch (e) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+              content:
+                  Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
+        );
+      }
     }
   }
-}
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
+      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: () =>
-                        setState(() => _showCurrentPassword = !_showCurrentPassword),
+                    onPressed: () => setState(
+                        () => _showCurrentPassword = !_showCurrentPassword),
                   ),
                 ),
                 validator: validateCurrentPassword,
@@ -135,8 +137,8 @@ void _proceed() async {
                     icon: Icon(_showConfirmPassword
                         ? Icons.visibility
                         : Icons.visibility_off),
-                    onPressed: () =>
-                        setState(() => _showConfirmPassword = !_showConfirmPassword),
+                    onPressed: () => setState(
+                        () => _showConfirmPassword = !_showConfirmPassword),
                   ),
                 ),
                 validator: validateConfirmPassword,
@@ -152,4 +154,4 @@ void _proceed() async {
       ),
     );
   }
-}
+}

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),
-      content: Text(AppLocalizations.of(context).logoutCheck),
+      title: Text(AppLocalizations.of(context).deregister),
+      content: Text(AppLocalizations.of(context).deregistercheck),
       actions: [
         TextButton(
           onPressed: () => Navigator.pop(context, false), // dismiss
@@ -22,4 +22,4 @@ class LogoutDialog extends StatelessWidget {
       ],
     );
   }
-}
+}

lib/features/profile/preferences/theme_mode_dialog.dart

@@ -17,13 +17,13 @@ String _getThemeModeText(ThemeMode mode, AppLocalizations l10n) {
 Future<void> showThemeModeDialog(BuildContext context) async {
   final cubit = context.read<ThemeModeCubit>();
   final currentMode = context.read<ThemeModeCubit>().state.mode;
-  final l10n = AppLocalizations.of(context); 
+  final l10n = AppLocalizations.of(context);
 
   await showDialog(
     context: context,
     builder: (context) {
       return AlertDialog(
-        title: Text(l10n.selectThemeMode), 
+        title: Text(l10n.selectThemeMode),
         content: Column(
           mainAxisSize: MainAxisSize.min,
           children: ThemeMode.values.map((mode) {
@@ -43,4 +43,4 @@ Future<void> showThemeModeDialog(BuildContext context) async {
       );
     },
   );
-}
+}

lib/features/profile/profile_screen.dart

@@ -1,7 +1,12 @@
+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';
@@ -16,7 +21,27 @@ class ProfileScreen extends StatefulWidget {
 }
 
 class _ProfileScreenState extends State<ProfileScreen> {
-    Future<void> _handleLogout(BuildContext context) async {
+  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>();
     final prefs = await SharedPreferences.getInstance();
     await prefs.clear(); // clear saved session/token
@@ -25,6 +50,90 @@ class _ProfileScreenState extends State<ProfileScreen> {
     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);
@@ -37,7 +146,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
         children: [
           ListTile(
             leading: const Icon(Icons.settings),
-            title: Text(loc.preferences), 
+            title: Text(loc.preferences),
             onTap: () {
               Navigator.push(
                 context,
@@ -46,33 +155,93 @@ class _ProfileScreenState extends State<ProfileScreen> {
               );
             },
           ),
+          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), 
+            title: Text(loc.changeLoginPassword),
             onTap: () {
-            Navigator.push(  
-              context,
-            MaterialPageRoute(builder: (context) => ChangePasswordScreen(
-              mobileNumber: widget.mobileNumber,
-            )),
-            );
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                    builder: (context) => ChangePasswordScreen(
+                          mobileNumber: widget.mobileNumber,
+                        )),
+              );
             },
           ),
           // ListTile(
           //   leading: const Icon(Icons.password),
-          //   title: const Text("Manage TPIN"), 
+          //   title: const Text("Manage TPIN"),
           //   onTap: () async {
           //   },
           // ),
           //           ListTile(
           //   leading: const Icon(Icons.password),
-          //   title: const Text("Change Login MPIN"), 
+          //   title: const Text("Change Login MPIN"),
           //   onTap: () async {
           //   },
           // ),
-            ListTile(
+          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,

lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart

@@ -51,10 +51,10 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   void initState() {
     super.initState();
     _ifscFocusNode.addListener(() {
-  if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
-    _validateIFSC();
-  }
-});
+      if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
+        _validateIFSC();
+      }
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
         accountType = 'Savings';
@@ -67,7 +67,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     if (ifsc.isEmpty) return;
 
     try {
-      final result = await service.validateIFSC(ifsc); 
+      final result = await service.validateIFSC(ifsc);
 
       if (mounted) {
         if (result.bankName.isEmpty) {
@@ -84,7 +84,8 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     } catch (e) {
       if (mounted) {
         final errorMessage = e.toString().toUpperCase();
-        String snackbarMessage = AppLocalizations.of(context).somethingWentWrong;
+        String snackbarMessage =
+            AppLocalizations.of(context).somethingWentWrong;
 
         if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
           snackbarMessage = AppLocalizations.of(context).invalidIfsc;
@@ -97,7 +98,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
         branchNameController.clear();
       }
     }
- }
+  }
 
   void _validateBeneficiary() async {
     FocusScope.of(context).unfocus();
@@ -527,15 +528,15 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                       controller: ifscController,
                       textInputAction: TextInputAction.next,
                       onChanged: (value) {
-                         setState(() {
-                        final trimmed = value.trim().toUpperCase();
-                        if (trimmed.length < 11) {
-                          // clear bank/branch if backspace or changed
-                          bankNameController.clear();
-                          branchNameController.clear();
-                        }
-                      });
-                    },
+                        setState(() {
+                          final trimmed = value.trim().toUpperCase();
+                          if (trimmed.length < 11) {
+                            // clear bank/branch if backspace or changed
+                            bankNameController.clear();
+                            branchNameController.clear();
+                          }
+                        });
+                      },
                       validator: (value) {
                         final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
                         if (value == null || value.trim().isEmpty) {
@@ -637,20 +638,21 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   child: SizedBox(
                     width: double.infinity,
                     child: ElevatedButton(
-                     onPressed: _isValidating || ifscController.text.length != 11
-    ? null
-    : () {
-        if (confirmAccountNumberController.text ==
-            accountNumberController.text) {
-          _validateBeneficiary();
-        } else {
-          setState(() {
-            _validationError =
-                AppLocalizations.of(context)
-                    .accountMismatch;
-          });
-                              }
-                            },
+                      onPressed:
+                          _isValidating || ifscController.text.length != 11
+                              ? null
+                              : () {
+                                  if (confirmAccountNumberController.text ==
+                                      accountNumberController.text) {
+                                    _validateBeneficiary();
+                                  } else {
+                                    setState(() {
+                                      _validationError =
+                                          AppLocalizations.of(context)
+                                              .accountMismatch;
+                                    });
+                                  }
+                                },
                       child: _isValidating
                           ? const SizedBox(
                               width: 20,
@@ -696,25 +698,25 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   return null;
                 },
               ),
-                 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(
+                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: [

lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart

@@ -58,7 +58,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
     accountNumberController.dispose();
     confirmAccountNumberController.dispose();
     amountController.dispose();
-    remarksController.dispose(); 
+    remarksController.dispose();
     super.dispose();
   }
 
@@ -278,24 +278,24 @@ 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),
-    ),
-  ),
-),
+              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(

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,3 +1,5 @@
+// ignore_for_file: unused_element
+
 import 'package:flutter/material.dart';
 import '../../../l10n/app_localizations.dart';
 
@@ -27,45 +29,45 @@ class BranchLocatorScreen extends StatefulWidget {
   State<BranchLocatorScreen> createState() => _BranchLocatorScreenState();
 }
 
- class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
-   final TextEditingController _searchController = TextEditingController();
+class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
+  final TextEditingController _searchController = TextEditingController();
 
-   final List<Location> _allLocations = [
-     Location(
-       name: "Dharamsala - Head Office",
-       code: "002",
-       ifsc: "KACE0000002",
-       address: "Civil Lines Dharmashala, Kangra, HP - 176215",
-       type: LocationType.branch,
-     ),
-     Location(
-       name: "Kangra",
-       code: "033",
-       ifsc: "KACE0000033",
-       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,
-     ),
-   ];
+  final List<Location> _allLocations = [
+    Location(
+      name: "Dharamsala - Head Office",
+      code: "002",
+      ifsc: "KACE0000002",
+      address: "Civil Lines Dharmashala, Kangra, HP - 176215",
+      type: LocationType.branch,
+    ),
+    Location(
+      name: "Kangra",
+      code: "033",
+      ifsc: "KACE0000033",
+      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<Location> _filteredLocations = [];
-   bool _isLoading = false; 
+  List<Location> _filteredLocations = [];
+  bool _isLoading = false;
 
-@override
-void initState() {
-  super.initState();
-  // _fetchAndSetLocations();
-  _filteredLocations = _allLocations;
-}
+  @override
+  void initState() {
+    super.initState();
+    // _fetchAndSetLocations();
+    _filteredLocations = _allLocations;
+  }
 
 // Example of a future API fetching function
 /*
@@ -88,99 +90,99 @@ Future<void> _fetchAndSetLocations() async {
   }
 }
 */
-void _filterLocations(String query) {
-  setState(() {
-    if (query.isEmpty) {
-      _filteredLocations = _allLocations;
-    } else {
-      _filteredLocations = _allLocations.where((location) {
-        final lowerQuery = query.toLowerCase();
-        return location.name.toLowerCase().contains(lowerQuery) ||
-            (location.code?.toLowerCase().contains(lowerQuery) ?? false) ||
-            (location.ifsc?.toLowerCase().contains(lowerQuery) ?? false) ||
-            location.address.toLowerCase().contains(lowerQuery);
-      }).toList();
-    }
-  });
-}
+  void _filterLocations(String query) {
+    setState(() {
+      if (query.isEmpty) {
+        _filteredLocations = _allLocations;
+      } else {
+        _filteredLocations = _allLocations.where((location) {
+          final lowerQuery = query.toLowerCase();
+          return location.name.toLowerCase().contains(lowerQuery) ||
+              (location.code?.toLowerCase().contains(lowerQuery) ?? false) ||
+              (location.ifsc?.toLowerCase().contains(lowerQuery) ?? false) ||
+              location.address.toLowerCase().contains(lowerQuery);
+        }).toList();
+      }
+    });
+  }
 
- @override
- Widget build(BuildContext context) {
-   return Scaffold(
-     appBar: AppBar(
-       title: Text(AppLocalizations.of(context).branchLocator),
-     ),
-     body: Column(
-       children: [
-         Padding(
-           padding: const EdgeInsets.all(12.0),
-           child: TextField(
-             controller: _searchController,
-             onChanged: _filterLocations,
-             decoration: InputDecoration(
-               hintText: AppLocalizations.of(context).searchbranchby,
-               prefixIcon: const Icon(Icons.search),
-               border: OutlineInputBorder(
-                 borderRadius: BorderRadius.circular(12),
-               ),
-             ),
-           ),
-         ),
-
-         // Content area
-Expanded(
-  child: _isLoading
-      ? const Center(child: CircularProgressIndicator())
-      : _filteredLocations.isEmpty
-          ? const Center(child: Text("No matching locations found"))
-          : ListView.builder(
-              itemCount: _filteredLocations.length,
-              itemBuilder: (context, index) {
-                final location = _filteredLocations[index];
-                return _buildLocationItem(location);
-              },
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(AppLocalizations.of(context).branchLocator),
+      ),
+      body: Column(
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(12.0),
+            child: TextField(
+              controller: _searchController,
+              onChanged: _filterLocations,
+              decoration: InputDecoration(
+                hintText: AppLocalizations.of(context).searchbranchby,
+                prefixIcon: const Icon(Icons.search),
+                border: OutlineInputBorder(
+                  borderRadius: BorderRadius.circular(12),
+                ),
+              ),
             ),
-),
-       ],
-     ),
-   );
- }
-
- 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,
           ),
-    ),
-  );
-}
+
+          // Content area
+          Expanded(
+            child: _isLoading
+                ? const Center(child: CircularProgressIndicator())
+                : _filteredLocations.isEmpty
+                    ? const Center(child: Text("No matching locations found"))
+                    : ListView.builder(
+                        itemCount: _filteredLocations.length,
+                        itemBuilder: (context, index) {
+                          final location = _filteredLocations[index];
+                          return _buildLocationItem(location);
+                        },
+                      ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  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),
+  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}")),
+          );
+        },
       ),
-      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

@@ -20,142 +20,142 @@ class _DailyLimitScreenState extends State<DailyLimitScreen> {
     _currentLimit = null;
   }
 
-   @override
- void dispose() {
-   _limitController.dispose();
-   super.dispose();
- }
+  @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+')),
+  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),
+            ),
           ],
-          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) {
+        );
+      },
+    );
+    if (newLimit != null) {
+      setState(() {
+        _currentLimit = newLimit;
+      });
+    }
+  }
+
+  void _removeLimit() {
     setState(() {
-      _currentLimit = newLimit;
+      _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,
+                      ),
+                    ),
+                  ],
+                ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
 }
-
- 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

@@ -1,47 +1,47 @@
- import 'package:flutter/material.dart';
+import 'package:flutter/material.dart';
 import 'package:kmobile/l10n/app_localizations.dart';
 
- class FaqsScreen extends StatefulWidget {
-   const FaqsScreen({super.key});
+class FaqsScreen extends StatefulWidget {
+  const FaqsScreen({super.key});
 
-   @override
-   State<FaqsScreen> createState() => _FaqsScreenState();
- }
+  @override
+  State<FaqsScreen> createState() => _FaqsScreenState();
+}
 
- class _FaqsScreenState extends State<FaqsScreen> {
-   @override
-   void initState() {
-     super.initState();
-     _getFaqs();
-   }
+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
-   }
+  // 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,
-               ),
-             ),
-           ],
-         ),
-       ),
-     );
-   }
- }
+  @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

@@ -31,4 +31,4 @@ class _QuickLinksScreenState extends State<QuickLinksScreen> {
       ),
     );
   }
-}
+}

lib/features/service/screens/service_screen.dart

@@ -5,6 +5,7 @@ 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,95 +14,97 @@ class ServiceScreen extends StatefulWidget {
 }
 
 class _ServiceScreen extends State<ServiceScreen> {
-@override
-Widget build(BuildContext context) {
-  return Scaffold(
-    appBar: AppBar(
-      automaticallyImplyLeading: false,
-      title: Text(
-        AppLocalizations.of(context).services,
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        automaticallyImplyLeading: false,
+        title: Text(
+          AppLocalizations.of(context).services,
+        ),
+        centerTitle: false,
       ),
-      centerTitle: false,
-    ),
-    body: ListView(
-      children: [
-        ServiceManagementTile(
-          icon: Symbols.add,
-          label: AppLocalizations.of(context).accountOpeningDeposit,
-          onTap: () {},
-          disabled: true, 
-        ),
-        const Divider(height: 1),
-        ServiceManagementTile(
-          icon: Symbols.add,
-          label: AppLocalizations.of(context).accountOpeningLoan,
-          onTap: () {},
-          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: () {
-            Navigator.of(context).push(
-            MaterialPageRoute(builder: (context) => const QuickLinksScreen()),
-          );
-          },
-          disabled: true, 
-        ),
-        const Divider(height: 1),
-        ServiceManagementTile(
-          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(
-                context,
+      body: ListView(
+        children: [
+          ServiceManagementTile(
+            icon: Symbols.add,
+            label: AppLocalizations.of(context).accountOpeningDeposit,
+            onTap: () {},
+            disabled: true,
+          ),
+          const Divider(height: 1),
+          ServiceManagementTile(
+            icon: Symbols.add,
+            label: AppLocalizations.of(context).accountOpeningLoan,
+            onTap: () {},
+            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 BranchLocatorScreen()));
-          },
-          disabled: true, 
-        ),
-        const Divider(height: 1),
-      ],
-    ),
-  );
-}
+                    builder: (context) => const DailyLimitScreen()),
+              );
+            },
+            disabled: true,
+          ),
+          const Divider(height: 1),
+          ServiceManagementTile(
+            icon: Symbols.captive_portal,
+            label: AppLocalizations.of(context).quickLinks,
+            onTap: () {
+              Navigator.of(context).push(
+                MaterialPageRoute(
+                    builder: (context) => const QuickLinksScreen()),
+              );
+            },
+            disabled: true,
+          ),
+          const Divider(height: 1),
+          ServiceManagementTile(
+            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(
+                  context,
+                  MaterialPageRoute(
+                      builder: (context) => const BranchLocatorScreen()));
+            },
+            disabled: true,
+          ),
+          const Divider(height: 1),
+        ],
+      ),
+    );
+  }
 }
 
 class ServiceManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
   final VoidCallback onTap;
-  final bool disabled; 
+  final bool disabled;
 
   const ServiceManagementTile({
     super.key,
     required this.icon,
     required this.label,
     required this.onTap,
-    this.disabled = false, 
+    this.disabled = false,
   });
 
   @override
@@ -110,20 +113,20 @@ class ServiceManagementTile extends StatelessWidget {
     return ListTile(
       leading: Icon(
         icon,
-        color: disabled ? theme.disabledColor : null, 
+        color: disabled ? theme.disabledColor : null,
       ),
       title: Text(
         label,
         style: TextStyle(
-          color: disabled ? theme.disabledColor : null, 
+          color: disabled ? theme.disabledColor : null,
         ),
       ),
       trailing: Icon(
         Symbols.arrow_right,
         size: 20,
-        color: disabled ? theme.disabledColor : null, 
+        color: disabled ? theme.disabledColor : null,
       ),
-      onTap: disabled ? null : onTap, 
+      onTap: disabled ? null : onTap,
     );
   }
-}
+}

lib/l10n/app_en.arb

@@ -326,5 +326,10 @@
  "editLimit": "Edit Limit",
  "removeLimit": "Remove Limit",
  "limitAmount": "Limit Amount",
- "save": "Save"
+ "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

@@ -327,5 +327,10 @@
  "editLimit": "सीमा संपादित करें",
  "removeLimit": "सीमा हटाएँ",
  "limitAmount": "सीमा राशि",
- "save": "जमा करें" 
+ "save": "जमा करें",
+ "deregister": "अपंजीकृत",
+ "deregistercheck": "क्या आप वाकई पंजीकरण रद्द करना चाहते हैं??", 
+ "biometricsNotAvailable": "इस डिवाइस पर बायोमेट्रिक्स उपलब्ध नहीं है",
+ "disableFingerprintLogin": "फ़िंगरप्रिंट लॉगिन अक्षम करें",
+ "disableFingerprintMessage": "क्या आप फ़िंगरप्रिंट लॉगिन अक्षम करना चाहते हैं?"  
 }

lib/main.dart

@@ -1,6 +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';
@@ -8,6 +9,7 @@ import 'app.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  Logger.info("App starting...");
 
   await SystemChrome.setPreferredOrientations([
     DeviceOrientation.portraitUp,
@@ -17,11 +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...");
   await setupDependencies();
+  Logger.info("Dependencies set up.");
   runApp(const KMobile());
 }

lib/widgets/bank_logos.dart

@@ -35,7 +35,7 @@ Widget getBankLogo(String? bankName, BuildContext context) {
       width: 40,
       height: 40,
     );
-  }  
+  }
   if (bankName != null &&
       bankName.toLowerCase().contains('punjab national bank')) {
     return Image.asset(
@@ -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

@@ -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,6 +341,14 @@ 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:
@@ -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:
@@ -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

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