Change TPIn #5

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) {

lib/api/services/change_password_service.dart

@@ -10,10 +10,7 @@ class ChangePasswordService {
   }) async {
     final response = await _dio.post(
       '/api/otp/send',
-      data: {
+      data: {'mobileNumber': mobileNumber, 'type': "CHANGE_LPWORD"},
-        'mobileNumber': mobileNumber,
-        'type': "CHANGE_LPWORD"
-      },
     );
     if (response.statusCode != 200) {
       throw Exception("Invalid Mobile Number/Type");
@@ -22,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: {
+      data: {'mobileNumber': mobileNumber, 'type': "CHANGE_TPIN"},
-        '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,39 @@ class ChangePasswordService {
     return response.toString();
   }
 
- Future validateChangePwd({
+  Future validateChangePwd({
-  required String OldLPsw,
+    required String OldLPsw,
-  required String newLPsw,
+    required String newLPsw,
-  required String confirmLPsw,
+    required String confirmLPsw,
- }) async {
+  }) async {
-  final response = await _dio.post(
+    final response = await _dio.post(
       '/api/auth/change/login_password',
       data: {
-      'OldLPsw': OldLPsw,
+        'OldLPsw': OldLPsw,
-      'newLPsw': newLPsw,
+        'newLPsw': newLPsw,
-      'confirmLPsw': confirmLPsw,
+        'confirmLPsw': confirmLPsw,
       },
     );
     if (response.statusCode != 200) {
       throw Exception("Wrong OTP");
     }
     return response.toString();
- }
+  }
+
+  Future validateChangeTpin({
+    required String oldTpin,
+    required String newTpin,
+  }) async {
+    final response = await _dio.post(
+      '/api/auth/change/tpin',
+      data: {
+        'oldTpin': oldTpin,
+        'newTpin': newTpin,
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Wrong OTP");
+    }
+    return response.toString();
+  }
 }

lib/api/services/limit_service.dart

@@ -0,0 +1,57 @@
+// ignore_for_file: collection_methods_unrelated_type
+import 'dart:developer';
+import 'package:dio/dio.dart';
+
+class Limit {
+  final double dailyLimit;
+  final double usedLimit;
+
+  Limit({
+    required this.dailyLimit,
+    required this.usedLimit,
+  });
+
+  factory Limit.fromJson(Map<String, dynamic> json) {
+    return Limit(
+      dailyLimit: json['dailyLimit']!,
+      usedLimit: json['usedLimit']!,
+    );
+  }
+}
+
+class LimitService {
+  final Dio _dio;
+  LimitService(this._dio);
+
+  Future<Limit> getLimit() async {
+    try {
+      final response = await _dio.get('/api/customer/daily-limit');
+      if (response.statusCode == 200) {
+        log('Response: ${response.data}');
+        return Limit.fromJson(response.data);
+      } else {
+        throw Exception('Failed to load');
+      }
+    } on DioException catch (e) {
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      throw Exception('Unexpected error: ${e.toString()}');
+    }
+  }
+
+  void editLimit( double newLimit) async {
+    try {
+      final response = await _dio.post('/api/customer/daily-limit',
+      data: '{"amount": $newLimit}');
+      if (response.statusCode == 200) {
+        log('Response: ${response.data}');
+      } else {
+        throw Exception('Failed to load');
+      }
+    } on DioException catch (e) {
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      throw Exception('Unexpected error: ${e.toString()}');
+    }
+  }
+}

lib/api/services/user_service.dart

@@ -10,7 +10,7 @@ class UserService {
 
   Future<List<User>> getUserDetails() async {
     try {
-      final response = await _dio.get('/api/customer/details');
+      final response = await _dio.get('/api/customer');
       if (response.statusCode == 200) {
         log('Response: ${response.data}');
         return (response.data as List)

lib/app.dart

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

lib/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

@@ -1,3 +1,4 @@
+import 'package:kmobile/api/services/limit_service.dart';
 import 'package:kmobile/api/services/rtgs_service.dart';
 import 'package:kmobile/api/services/neft_service.dart';
 import 'package:kmobile/api/services/imps_service.dart';
@@ -46,10 +47,13 @@ Future<void> setupDependencies() async {
 
   getIt.registerSingleton<PaymentService>(PaymentService(getIt<Dio>()));
   getIt.registerSingleton<BeneficiaryService>(BeneficiaryService(getIt<Dio>()));
+  getIt.registerSingleton<LimitService>(LimitService(getIt<Dio>()));
   getIt.registerSingleton<NeftService>(NeftService(getIt<Dio>()));
   getIt.registerSingleton<RtgsService>(RtgsService(getIt<Dio>()));
   getIt.registerSingleton<ImpsService>(ImpsService(getIt<Dio>()));
-  getIt.registerLazySingleton<ChangePasswordService>(() => ChangePasswordService(getIt<Dio>()),);
+  getIt.registerLazySingleton<ChangePasswordService>(
+    () => ChangePasswordService(getIt<Dio>()),
+  );
 
   // Add auth interceptor after repository is available
   getIt<Dio>().interceptors.add(
@@ -65,14 +69,15 @@ Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
+         '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
+      //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
-          //'https://kccbmbnk.net',
+      //'https://kccbmbnk.net', //prod small
       connectTimeout: const Duration(seconds: 60),
       receiveTimeout: const Duration(seconds: 60),
       headers: {
         'Content-Type': 'application/json',
         'Accept': 'application/json',
+        'X-Login-Type': 'MB',
       },
     ),
   );

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:path_provider/path_provider.dart';
- import 'package:share_plus/share_plus.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(
+                              trailing: Column(
-  crossAxisAlignment: CrossAxisAlignment.end,
+                                crossAxisAlignment: CrossAxisAlignment.end,
-  mainAxisAlignment: MainAxisAlignment.center,
+                                mainAxisAlignment: MainAxisAlignment.center,
-  children: [
+                                children: [
-    Text(
+                                  Text(
-      "₹${tx.amount}",
+                                    "₹${tx.amount}",
-      style: const TextStyle(fontSize: 17),
+                                    style: const TextStyle(fontSize: 17),
-    ),
+                                  ),
-    Text(
+                                  Text(
-      "Bal: ₹${tx.balance}",
+                                    "Bal: ₹${tx.balance}",
-      style: const TextStyle(fontSize: 12), // Style matches tx.name
+                                    style: const TextStyle(
-    ),
+                                        fontSize: 12), // Style matches tx.name
-  ],
+                                  ),
-),                                                                   
+                                ],
+                              ),
                               onTap: () {
                                 Navigator.push(
                                   context,
@@ -491,19 +492,17 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
         }
       }
       // Add for IOS
-else if (Platform.isIOS) {
+      else if (Platform.isIOS) {
-  // On iOS, we save to a temporary directory and then open the share sheet.
+        // On iOS, we save to a temporary directory and then open the share sheet.
-  final tempDir = await getTemporaryDirectory();
+        final tempDir = await getTemporaryDirectory();
-  final file = await File('${tempDir.path}/$fileName').create();
+        final file = await File('${tempDir.path}/$fileName').create();
-  await file.writeAsBytes(pdfBytes);
+        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,
+                  _buildDetailRow(
-                      transaction.name),
+                      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() {
+  ThemeData getLightThemeData() {
-      return AppThemes.getLightTheme(themeType);
+    return AppThemes.getLightTheme(themeType);
-    }
-
-    ThemeData getDarkThemeData() {
-      return AppThemes.getDarkTheme(themeType);
-    }
-
-    @override
-    List<Object?> get props => [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,
+                    style: const TextStyle(
-                    fontWeight: FontWeight.bold,
+                        color: Colors.red,
-                    fontSize: 20),
+                        fontWeight: FontWeight.bold,
+                        fontSize: 20),
                     textAlign: TextAlign.center,
                   ),
                   const SizedBox(height: 16),

lib/features/auth/screens/splash_screen.dart

@@ -1,3 +1,5 @@
+import 'package:package_info_plus/package_info_plus.dart';
+
 import '../../../l10n/app_localizations.dart';
 
 import 'package:flutter/material.dart';
@@ -10,11 +12,29 @@ class SplashScreen extends StatefulWidget {
 }
 
 class _SplashScreenState extends State<SplashScreen> {
+  String _version = '';
+  @override
+  void initState() {
+    super.initState();
+    _loadVersion();
+  }
+
+  Future<void> _loadVersion() async {
+    final PackageInfo info = await PackageInfo.fromPlatform();
+    if (mounted) {
+      // Check if the widget is still in the tree
+      setState(() {
+        _version = 'Version ${info.version} (${info.buildNumber})';
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       body: Stack(
-        children: [
+        fit: StackFit.expand,
+        children: <Widget>[
           Positioned.fill(
             child: Image.asset(
               'assets/images/kconnect2.webp',
@@ -51,8 +71,20 @@ class _SplashScreenState extends State<SplashScreen> {
             left: 0,
             right: 0,
             child: Center(
-              child: CircularProgressIndicator(
+              child: CircularProgressIndicator(color: Color(0xFFFFFFFF)),
-                  color: Color(0xFFFFFFFF)),
+            ),
+          ),
+          Positioned(
+            bottom: 90,
+            left: 0,
+            right: 0,
+            child: Text(
+              _version,
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                color: Color(0xFFFFFFFF),
+                fontSize: 14,
+              ),
             ),
           ),
         ],

lib/features/beneficiaries/screens/add_beneficiary_screen.dart

@@ -24,8 +24,8 @@ class AddBeneficiaryScreen extends StatefulWidget {
 class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final _formKey = GlobalKey<FormState>();
   final _accountNumberFieldKey = GlobalKey<FormFieldState>();
-final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
+  final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
-final _ifscFieldKey = GlobalKey<FormFieldState>();
+  final _ifscFieldKey = GlobalKey<FormFieldState>();
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
@@ -47,10 +47,10 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
   void initState() {
     super.initState();
     _ifscFocusNode.addListener(() {
-  if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
+      if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
-    _validateIFSC();
+        _validateIFSC();
-  }
+      }
-});
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
         accountType = 'Savings';
@@ -58,25 +58,25 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
     });
   }
 
-   @override
+  @override
- void dispose() {
+  void dispose() {
-   accountNumberController.dispose();
+    accountNumberController.dispose();
-   confirmAccountNumberController.dispose();
+    confirmAccountNumberController.dispose();
-   nameController.dispose();
+    nameController.dispose();
-   bankNameController.dispose();
+    bankNameController.dispose();
-   branchNameController.dispose();
+    branchNameController.dispose();
-   ifscController.dispose();
+    ifscController.dispose();
-   phoneController.dispose();
+    phoneController.dispose();
-   _ifscFocusNode.dispose(); 
+    _ifscFocusNode.dispose();
-   super.dispose();
+    super.dispose();
- }
+  }
 
-   void _validateIFSC() async {
+  void _validateIFSC() async {
-     var beneficiaryService = getIt<BeneficiaryService>();
+    var beneficiaryService = getIt<BeneficiaryService>();
-     final ifsc = ifscController.text.trim().toUpperCase();
+    final ifsc = ifscController.text.trim().toUpperCase();
-     if (ifsc.isEmpty) return;
+    if (ifsc.isEmpty) return;
 
-      try {
+    try {
       final result = await beneficiaryService.validateIFSC(ifsc);
 
       if (mounted) {
@@ -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) {
+                          onChanged: (value) {
-   setState(() {
+                            setState(() {
-     final trimmed = value.trim().toUpperCase();
+                              final trimmed = value.trim().toUpperCase();
-     if (trimmed.length < 11) {
+                              if (trimmed.length < 11) {
-       // clear bank/branch if backspace or changed
+                                // clear bank/branch if backspace or changed
-       bankNameController.clear();
+                                bankNameController.clear();
-       branchNameController.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
+                                onPressed: _isValidating ||
-? null
+                                        ifscController.text.length != 11
-: () {
+                                    ? null
-    final isAccountValid =
+                                    : () {
-        _accountNumberFieldKey.currentState!.validate();
+                                        final isAccountValid =
-    final isConfirmAccountValid =
+                                            _accountNumberFieldKey.currentState!
-        _confirmAccountNumberFieldKey.currentState!.validate();
+                                                .validate();
-    final isIfscValid = _ifscFieldKey.currentState!.validate();
+                                        final isConfirmAccountValid =
-
+                                            _confirmAccountNumberFieldKey
-    if (isAccountValid && isConfirmAccountValid && isIfscValid) {
+                                                .currentState!
-      _validateBeneficiary();
+                                                .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,69 +17,69 @@ class CardManagementScreen extends StatefulWidget {
 class _CardManagementScreen extends State<CardManagementScreen> {
   @override
   Widget build(BuildContext context) {
-  return Scaffold(
+    return Scaffold(
-    appBar: AppBar(
+      appBar: AppBar(
-      automaticallyImplyLeading: false,
+        automaticallyImplyLeading: false,
-      title: Text(
+        title: Text(
-        AppLocalizations.of(context).cardManagement,
+          AppLocalizations.of(context).cardManagement,
-      ),
-      centerTitle: false,
-    ),
-    body: ListView(
-      children: [
-        CardManagementTile(
-          icon: Symbols.add,
-          label: AppLocalizations.of(context).applyDebitCard,
-          onTap: () {},
-          disabled: true, // Add this
         ),
-        const Divider(height: 1),
+        centerTitle: false,
-        CardManagementTile(
+      ),
-          icon: Symbols.remove_moderator,
+      body: ListView(
-          label: AppLocalizations.of(context).blockUnblockCard,
+        children: [
-          onTap: () {
+          CardManagementTile(
-            Navigator.push(
+            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, 
+            disabled: true,
-        ),
+          ),
-        const Divider(height: 1),
+          const Divider(height: 1),
-        CardManagementTile(
+          CardManagementTile(
-          icon: Symbols.password_2,
+            icon: Symbols.password_2,
-          label: AppLocalizations.of(context).changeCardPin,
+            label: AppLocalizations.of(context).changeCardPin,
-          onTap: () {
+            onTap: () {
-            Navigator.push(
+              Navigator.push(
                 context,
                 MaterialPageRoute(
                   builder: (context) => const CardPinChangeDetailsScreen(),
                 ),
               );
-          },
+            },
-          disabled: true, 
+            disabled: true,
-        ),
+          ),
-        const Divider(height: 1),
+          const Divider(height: 1),
-        CardManagementTile(
+          CardManagementTile(
-          icon: Symbols.payment_card,
+            icon: Symbols.payment_card,
-          label: AppLocalizations.of(context).viewCardDeatils,
+            label: AppLocalizations.of(context).viewCardDeatils,
-          onTap: () {
+            onTap: () {
-                Navigator.push(
+              Navigator.push(
                 context,
                 MaterialPageRoute(
                   builder: (context) => const CardDetailsScreen(),
                 ),
               );
-          },
+            },
-          disabled: true, 
+            disabled: true,
-        ),
+          ),
-        const Divider(height: 1),
+          const Divider(height: 1),
-      ],
+        ],
-    ),
+      ),
-  );
+    );
- }  
+  }
 }
 
 class CardManagementTile extends StatelessWidget {

lib/features/customer_info/screens/customer_info_screen.dart

@@ -14,13 +14,13 @@ class CustomerInfoScreen extends StatefulWidget {
 class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
   late final User user = widget.user;
 
-   String _maskPrimaryId(String? primaryId) {
+  String _maskPrimaryId(String? primaryId) {
-   if (primaryId == null || primaryId.length <= 4) {
+    if (primaryId == null || primaryId.length <= 4) {
-     return primaryId ?? 'N/A';
+      return primaryId ?? 'N/A';
-   }
+    }
-   final lastFour = primaryId.substring(primaryId.length - 4);
+    final lastFour = primaryId.substring(primaryId.length - 4);
-   return '*' * (primaryId.length - 4) + lastFour;
+    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(
+                  InfoField(
-                  label: AppLocalizations.of(context).primaryId,
+                    label: AppLocalizations.of(context).primaryId,
-                  value: _maskPrimaryId(user.primaryId),
+                    value: _maskPrimaryId(user.primaryId),
-                ), // Replace with PAN if available
+                  ), // 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;
@@ -146,6 +147,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
         return AppLocalizations.of(context).termDeposit;
       case 'rd':
         return AppLocalizations.of(context).recurringDeposit;
+      case 'ca':
+        return "Current Account";
       default:
         return AppLocalizations.of(context).unknownAccount;
     }
@@ -211,7 +214,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 +259,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) {
@@ -265,6 +268,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
             if (state is Authenticated) {
               final users = state.users;
               final currAccount = users[selectedAccountIndex];
+              final accountType = currAccount.accountType?.toLowerCase();
+              final isPaymentDisabled = accountType != 'sa' && accountType != 'sb' && accountType != 'ca';
               // first‐time load
               if (!_txInitialized) {
                 _txInitialized = true;
@@ -479,33 +484,36 @@ class _DashboardScreenState extends State<DashboardScreen> {
                               );
                             },
                           ),
-                          _buildQuickLink(
+                             _buildQuickLink(
-                            Symbols.currency_rupee,
+     Symbols.currency_rupee,
-                            AppLocalizations.of(context).quickPay,
+     AppLocalizations.of(context).quickPay,
-                            () {
+     () {
-                              Navigator.push(
+       Navigator.push(
-                                context,
+         context,
-                                MaterialPageRoute(
+         MaterialPageRoute(
-                                  builder: (context) => QuickPayScreen(
+           builder: (context) => QuickPayScreen(
-                                    debitAccount: currAccount.accountNo!,
+             debitAccount: currAccount.accountNo!,
-                                  ),
+           ),
-                                ),
+         ),
-                              );
+       );
-                            },
+     },
-                          ),
+     disable: isPaymentDisabled,
+   ),
                           _buildQuickLink(Symbols.send_money,
-                              AppLocalizations.of(context).fundTransfer, () {
+     AppLocalizations.of(context).fundTransfer, () {
-                            Navigator.push(
+   Navigator.push(
-                                context,
+       context,
-                                MaterialPageRoute(
+       MaterialPageRoute(
-                                    builder: (context) => FundTransferScreen(
+           builder: (context) => FundTransferScreen(
-                                        creditAccountNo:
+               creditAccountNo:
-                                            users[selectedAccountIndex]
+                   users[selectedAccountIndex]
-                                                .accountNo!,
+                       .accountNo!,
-                                        remitterName:
+               remitterName:
-                                            users[selectedAccountIndex]
+                   users[selectedAccountIndex]
-                                                .name!)));
+                       .name!,
-                          }, disable: false),
+               // Pass the full list of accounts
+               accounts: users)));
+ }, disable: isPaymentDisabled),
                           _buildQuickLink(
                             Symbols.server_person,
                             AppLocalizations.of(context).accountInfo,
@@ -533,8 +541,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 {
+  Future<void> _launchUrl(String url) async {
-   final Uri uri = Uri.parse(url);
+    final Uri uri = Uri.parse(url);
-   if (await canLaunchUrl(uri)) {
+    if (await canLaunchUrl(uri)) {
-     await launchUrl(uri);
+      await launchUrl(uri);
-   } else {
+    } else {
-     // Consider adding a 'urlLaunchError' key to your AppLocalizations
+      // Consider adding a 'urlLaunchError' key to your AppLocalizations
-     debugPrint('Could not launch $url');
+      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),
+            const SizedBox(height: 20),
- GestureDetector(
+            GestureDetector(
-   onTap: () => _launchUrl("https://kccb.in/complaint-form"),
+                onTap: () => _launchUrl("https://kccb.in/complaint-form"),
-   child:  Row(
+                child: Row(mainAxisSize: MainAxisSize.min, children: [
-  mainAxisSize: MainAxisSize.min,
+                  Text(
- children: [
+                    "Complaint Form",
-    Text("Complaint Form",
+                    style: TextStyle(
-     style: TextStyle(
+                      fontSize: 17,
-      fontSize: 17,
+                      color: Theme.of(context).colorScheme.primary,
-       color: Theme.of(context).colorScheme.primary,
+                      decorationColor: Theme.of(context).colorScheme.primary,
-       decorationColor: Theme.of(context).colorScheme.primary,
+                    ),
-     ),
+                  ),
-   ),
+                  const SizedBox(width: 4),
-    const SizedBox(width: 4), 
+                  Icon(
- Icon(
+                    Icons.open_in_new,
-   Icons.open_in_new, 
+                    color: Theme.of(context).colorScheme.primary,
-   color: Theme.of(context).colorScheme.primary,
+                    size: 16.0,
-   size: 16.0, 
+                  ),
- ),
+                ])),
- ]
-)
- ),
-
             const SizedBox(height: 40),
             Text(
               AppLocalizations.of(context).keyContacts,

lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart

@@ -2,6 +2,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:kmobile/api/services/limit_service.dart';
 import 'package:kmobile/api/services/neft_service.dart';
 import 'package:kmobile/api/services/rtgs_service.dart';
 import 'package:kmobile/api/services/imps_service.dart';
@@ -40,13 +42,67 @@ class FundTransferAmountScreen extends StatefulWidget {
 }
 
 class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
+  final _limitService = getIt<LimitService>();
+Limit? _limit;
+bool _isLoadingLimit = true;
+bool _isAmountOverLimit = false;
+final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
   final _amountController = TextEditingController();
   final _remarksController = TextEditingController();
   final _formKey = GlobalKey<FormState>();
   TransactionMode _selectedMode = TransactionMode.neft;
 
+@override
+void initState() {
+  super.initState();
+  _loadLimit(); // Call the new method
+  _amountController.addListener(_checkAmountLimit);
+}
+   Future<void> _loadLimit() async {
+   setState(() {
+     _isLoadingLimit = true;
+   });
+   try {
+     final limitData = await _limitService.getLimit();
+     setState(() {
+       _limit = limitData;
+       _isLoadingLimit = false;
+     });
+   } catch (e) {
+     // Handle error if needed
+     setState(() {
+       _isLoadingLimit = false;
+     });
+   }
+ }
+
+ // Add this method to check the amount against the limit
+void _checkAmountLimit() {
+  if (_limit == null) return;
+
+  final amount = double.tryParse(_amountController.text) ?? 0;
+  final remainingLimit = _limit!.dailyLimit - _limit!.usedLimit;
+  final bool isOverLimit = amount > remainingLimit;
+
+  if (isOverLimit) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text('Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
+        backgroundColor: Colors.red,
+      ),
+    );
+  }
+
+  if (_isAmountOverLimit != isOverLimit) {
+    setState(() {
+      _isAmountOverLimit = isOverLimit;
+    });
+  }
+}
+
   @override
   void dispose() {
+    _amountController.removeListener(_checkAmountLimit);
     _amountController.dispose();
     _remarksController.dispose();
     super.dispose();
@@ -402,14 +458,14 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   const SizedBox(height: 24),
                 ],
                 //Remarks
-                 TextFormField(
+                TextFormField(
                   controller: _remarksController,
                   decoration: InputDecoration(
-                  labelText: AppLocalizations.of(context).remarks,
+                    labelText: AppLocalizations.of(context).remarks,
-                  border: const OutlineInputBorder(),
+                    border: const OutlineInputBorder(),
-                    ),
                   ),
-                 const SizedBox(height: 24),
+                ),
+                const SizedBox(height: 24),
                 // Amount
                 TextFormField(
                   controller: _amountController,
@@ -430,19 +486,27 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     return null;
                   },
                 ),
+                 const SizedBox(height: 8),
+ if (_isLoadingLimit)
+   const Text('Fetching daily limit...'),
+ if (!_isLoadingLimit && _limit != null)
+   Text(
+     'Remaining Daily Limit: ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}',
+     style: Theme.of(context).textTheme.bodySmall,
+   ),
                 const Spacer(),
 
                 // Proceed Button
                 SizedBox(
-                  width: double.infinity,
+  width: double.infinity,
-                  child: ElevatedButton(
+  child: ElevatedButton(
-                    onPressed: _onProceed,
+    onPressed: _isAmountOverLimit ? null : _onProceed, 
-                    style: ElevatedButton.styleFrom(
+    style: ElevatedButton.styleFrom(
-                      padding: const EdgeInsets.symmetric(vertical: 16),
+      padding: const EdgeInsets.symmetric(vertical: 16),
-                    ),
+    ),
-                    child: Text(AppLocalizations.of(context).proceed),
+    child: Text(AppLocalizations.of(context).proceed),
-                  ),
+  ),
-                ),
+),
                 const SizedBox(height: 10),
               ],
             ),

lib/features/fund_transfer/screens/fund_transfer_screen.dart

@@ -1,90 +1,126 @@
-import 'package:flutter/material.dart';
+ import 'package:flutter/material.dart';
-import 'package:kmobile/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart';
+ import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:material_symbols_icons/symbols.dart';
+ import 'package:kmobile/data/models/user.dart';
-import '../../../l10n/app_localizations.dart';
+ import 'package:kmobile/features/auth/controllers/auth_cubit.dart';
+ import 'package:kmobile/features/auth/controllers/auth_state.dart';
+ import 'package:kmobile/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart';
+ import 'package:kmobile/features/fund_transfer/screens/fund_transfer_self_accounts_screen.dart';
+ import 'package:material_symbols_icons/symbols.dart';
+ import '../../../l10n/app_localizations.dart'; // Keep localizations
 
-class FundTransferScreen extends StatelessWidget {
+ class FundTransferScreen extends StatelessWidget {
-  final String creditAccountNo;
+   final String creditAccountNo;
-  final String remitterName;
+   final String remitterName;
+   final List<User> accounts; // Continue to accept the list of accounts
 
-  const FundTransferScreen({
+   const FundTransferScreen({
-    super.key,
+     super.key,
-    required this.creditAccountNo,
+     required this.creditAccountNo,
-    required this.remitterName,
+     required this.remitterName,
-  });
+     required this.accounts, // It is passed from the dashboard
+   });
 
-  @override
+   @override
-  Widget build(BuildContext context) {
+   Widget build(BuildContext context) {
-    return Scaffold(
+     return Scaffold(
-      appBar: AppBar(
+       appBar: AppBar(
-        title: Text(AppLocalizations.of(context)
+         // Restore localization for the title
-            .fundTransfer
+         title: Text(AppLocalizations.of(context)
-            .replaceFirst(RegExp('\n'), '')),
+             .fundTransfer
-      ),
+             .replaceFirst(RegExp('\n'), '')),
-      body: ListView(
+       ),
-        children: [
+       // Wrap with BlocBuilder to check the authentication state
-          FundTransferManagementTile(
+       body: BlocBuilder<AuthCubit, AuthState>(
-            icon: Symbols.input_circle,
+         builder: (context, state) {
-            label: AppLocalizations.of(context).ownBank,
+           return ListView(
-            onTap: () {
+             children: [
-              Navigator.push(
+               FundTransferManagementTile(
-                context,
+                 icon: Symbols.person,
-                MaterialPageRoute(
+                 // Restore localization for the label
-                  builder: (context) => FundTransferBeneficiaryScreen(
+                 label: "Self Pay",
-                    creditAccountNo: creditAccountNo,
+                 onTap: () {
-                    remitterName: remitterName,
+                   // The accounts list is passed directly from the constructor
-                    isOwnBank: true,
+                   Navigator.push(
-                  ),
+                     context,
-                ),
+                     MaterialPageRoute(
-              );
+                       builder: (context) => FundTransferSelfAccountsScreen(
-            },
+                         debitAccountNo: creditAccountNo,
-          ),
+                         remitterName: remitterName,
-          const Divider(height: 1),
+                         accounts: accounts,
-          FundTransferManagementTile(
+                       ),
-            icon: Symbols.output_circle,
+                     ),
-            label: AppLocalizations.of(context).outsideBank,
+                   );
-            onTap: () {
+                 },
-              Navigator.push(
+                 // Disable the tile if the state is not Authenticated
-                context,
+                 disable: state is! Authenticated,
-                MaterialPageRoute(
+               ),
-                  builder: (context) => FundTransferBeneficiaryScreen(
+               const Divider(height: 1),
-                    creditAccountNo: creditAccountNo,
+               FundTransferManagementTile(
-                    remitterName: remitterName,
+                 icon: Symbols.input_circle,
-                    isOwnBank: false,
+                 // Restore localization for the label
-                  ),
+                 label: AppLocalizations.of(context).ownBank,
-                ),
+                 onTap: () {
-              );
+                   Navigator.push(
-            },
+                     context,
-          ),
+                     MaterialPageRoute(
-          const Divider(height: 1),
+                       builder: (context) => FundTransferBeneficiaryScreen(
-        ],
+                         creditAccountNo: creditAccountNo,
-      ),
+                         remitterName: remitterName,
-    );
+                         isOwnBank: true,
-  }
+                       ),
-}
+                     ),
+                   );
+                 },
+               ),
+               const Divider(height: 1),
+               FundTransferManagementTile(
+                 icon: Symbols.output_circle,
+                 // Restore localization for the label
+                 label: AppLocalizations.of(context).outsideBank,
+                 onTap: () {
+                   Navigator.push(
+                     context,
+                     MaterialPageRoute(
+                       builder: (context) => FundTransferBeneficiaryScreen(
+                         creditAccountNo: creditAccountNo,
+                         remitterName: remitterName,
+                         isOwnBank: false,
+                       ),
+                     ),
+                   );
+                 },
+               ),
+               const Divider(height: 1),
+             ],
+           );
+         },
+       ),
+     );
+   }
+ }
 
-class FundTransferManagementTile extends StatelessWidget {
+ class FundTransferManagementTile extends StatelessWidget {
-  final IconData icon;
+   final IconData icon;
-  final String label;
+   final String label;
-  final VoidCallback onTap;
+   final VoidCallback onTap;
-  final bool disable;
+   final bool disable;
 
-  const FundTransferManagementTile({
+   const FundTransferManagementTile({
-    super.key,
+     super.key,
-    required this.icon,
+     required this.icon,
-    required this.label,
+     required this.label,
-    required this.onTap,
+     required this.onTap,
-    this.disable = false,
+     this.disable = false,
-  });
+   });
 
-  @override
+   @override
-  Widget build(BuildContext context) {
+   Widget build(BuildContext context) {
-    return ListTile(
+     return ListTile(
-      leading: Icon(icon),
+       leading: Icon(icon),
-      title: Text(label),
+       title: Text(label),
-      trailing: const Icon(Symbols.arrow_right, size: 20),
+       trailing: const Icon(Symbols.arrow_right, size: 20),
-      onTap: onTap,
+       onTap: onTap,
-      enabled: !disable,
+       enabled: !disable,
-    );
+     );
-  }
+   }
-}
+ }

lib/features/fund_transfer/screens/fund_transfer_self_accounts_screen.dart

@@ -0,0 +1,94 @@
+ import 'package:flutter/material.dart';
+ import 'package:kmobile/data/models/user.dart';
+ import 'package:kmobile/features/fund_transfer/screens/fund_transfer_self_amount_screen.dart';
+ import 'package:kmobile/widgets/bank_logos.dart';
+
+ class FundTransferSelfAccountsScreen extends StatelessWidget {
+   final String debitAccountNo;
+   final String remitterName;
+   final List<User> accounts;
+
+   const FundTransferSelfAccountsScreen({
+     super.key,
+     required this.debitAccountNo,
+     required this.remitterName,
+     required this.accounts,
+   });
+
+   // Helper function to get the full account type name from the short code
+   String _getFullAccountType(String? accountType) {
+     if (accountType == null || accountType.isEmpty) return 'N/A';
+     switch (accountType.toLowerCase()) {
+       case 'sa':
+       case 'sb':
+         return "Savings Account";
+       case 'ln':
+         return "Loan Account";
+       case 'td':
+         return "Term Deposit";
+       case 'rd':
+         return "Recurring Deposit";
+       case 'ca':
+         return "Current Account";
+       default:
+         return "Unknown Account";
+     }
+   }
+
+   @override
+   Widget build(BuildContext context) {
+     // Filter out the account from which the transfer is being made
+     final filteredAccounts =
+         accounts.where((acc) => acc.accountNo != debitAccountNo).toList();
+
+     return Scaffold(
+       appBar: AppBar(
+         title: const Text("Select Account"),
+       ),
+       body: filteredAccounts.isEmpty
+           ? const Center(
+               child: Text("No other accounts found"),
+             )
+           : ListView.builder(
+               itemCount: filteredAccounts.length,
+               itemBuilder: (context, index) {
+                 final account = filteredAccounts[index];
+                 return ListTile(
+                   leading: CircleAvatar(
+                     radius: 24,
+                     backgroundColor: Colors.transparent,
+                     child:
+                         getBankLogo('Kangra Central Co-operative Bank', context),
+                   ),
+                   title: Text(account.name ?? 'N/A'),
+                   subtitle: Column(
+                     crossAxisAlignment: CrossAxisAlignment.start,
+                     children: [
+                       Text(account.accountNo ?? 'N/A'),
+                       Text(
+                         _getFullAccountType(account.accountType),
+                         style:
+                             TextStyle(fontSize: 12, color: Colors.grey[600]),
+                       ),
+                     ],
+                   ),
+                   onTap: () {
+                     // Navigate to the amount screen, passing the selected User object directly.
+                     // No Beneficiary object is created.
+                     Navigator.push(
+                       context,
+                       MaterialPageRoute(
+                         builder: (context) => FundTransferSelfAmountScreen(
+                           debitAccountNo: debitAccountNo,
+                           creditAccount: account, // Pass the User object
+                           remitterName: remitterName,
+                         ),
+                       ),
+                     );
+                   },
+                 );
+               },
+             ),
+     );
+   }
+ }

lib/features/fund_transfer/screens/fund_transfer_self_amount_screen.dart

@@ -0,0 +1,245 @@
+ import 'package:flutter/material.dart';
+ import 'package:intl/intl.dart';
+ import 'package:kmobile/api/services/limit_service.dart';
+ import 'package:kmobile/api/services/payment_service.dart';
+ import 'package:kmobile/data/models/transfer.dart';
+ import 'package:kmobile/data/models/user.dart';
+ import 'package:kmobile/di/injection.dart';
+ import 'package:kmobile/features/fund_transfer/screens/payment_animation.dart';
+ import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart';
+import 'package:kmobile/widgets/bank_logos.dart';
+
+ class FundTransferSelfAmountScreen extends StatefulWidget {
+   final String debitAccountNo;
+   final User creditAccount;
+   final String remitterName;
+
+   const FundTransferSelfAmountScreen({
+     super.key,
+     required this.debitAccountNo,
+     required this.creditAccount,
+     required this.remitterName,
+   });
+
+   @override
+   State<FundTransferSelfAmountScreen> createState() =>
+       _FundTransferSelfAmountScreenState();
+ }
+
+  class _FundTransferSelfAmountScreenState
+     extends State<FundTransferSelfAmountScreen> {
+   final _formKey = GlobalKey<FormState>();
+   final _amountController = TextEditingController();
+   final _remarksController = TextEditingController();
+
+   // --- Limit Checking Variables ---
+   final _limitService = getIt<LimitService>();
+   Limit? _limit;
+   bool _isLoadingLimit = true;
+   bool _isAmountOverLimit = false;
+   final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
+
+
+   @override
+   void initState() {
+     super.initState();
+     _loadLimit(); // Fetch the daily limit
+     _amountController.addListener(_checkAmountLimit); // Listen for amount changes
+   }
+
+   @override
+   void dispose() {
+     _amountController.removeListener(_checkAmountLimit);
+     _amountController.dispose();
+     _remarksController.dispose();
+     super.dispose();
+   }
+
+   Future<void> _loadLimit() async {
+     setState(() {
+       _isLoadingLimit = true;
+     });
+     try {
+       final limitData = await _limitService.getLimit();
+       setState(() {
+         _limit = limitData;
+         _isLoadingLimit = false;
+       });
+     } catch (e) {
+       setState(() {
+         _isLoadingLimit = false;
+       });
+     }
+   }
+
+   void _checkAmountLimit() {
+     if (_limit == null) return;
+
+     final amount = double.tryParse(_amountController.text) ?? 0;
+     final remainingLimit = _limit!.dailyLimit - _limit!.usedLimit;
+     final bool isOverLimit = amount > remainingLimit;
+
+     if (isOverLimit) {
+       WidgetsBinding.instance.addPostFrameCallback((_) {
+         ScaffoldMessenger.of(context).showSnackBar(
+           SnackBar(
+             content: Text(
+                 'Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
+             backgroundColor: Colors.red,
+           ),
+         );
+       });
+     }
+
+     if (_isAmountOverLimit != isOverLimit) {
+       setState(() {
+         _isAmountOverLimit = isOverLimit;
+       });
+     }
+   }
+
+      void _onProceed() {
+     if (_formKey.currentState!.validate()) {
+       Navigator.push(
+         context,
+         MaterialPageRoute(
+           builder: (context) => TransactionPinScreen(
+             onPinCompleted: (pinScreenContext, tpin) async {
+               final transfer = Transfer(
+                 fromAccount: widget.debitAccountNo,
+                 toAccount: widget.creditAccount.accountNo!,
+                 toAccountType: 'Savings', // Assuming 'SB' for savings
+                 amount: _amountController.text,
+                 tpin: tpin,
+               );
+
+               final paymentService = getIt<PaymentService>();
+               final paymentResponseFuture =
+                   paymentService.processQuickPayWithinBank(transfer);
+
+               Navigator.of(pinScreenContext).pushReplacement(
+                 MaterialPageRoute(
+                   builder: (_) =>
+                       PaymentAnimationScreen(paymentResponse: paymentResponseFuture),
+                 ),
+               );
+             },
+           ),
+         ),
+       );
+     }
+   }
+
+   @override
+ Widget build(BuildContext context) {
+   return Scaffold(
+     appBar: AppBar(
+       title: const Text("Fund Transfer"),
+     ),
+     body: SafeArea(
+       child: Padding(
+         padding: const EdgeInsets.all(16.0),
+         child: Form(
+           key: _formKey,
+           child: Column(
+             crossAxisAlignment: CrossAxisAlignment.start,
+             children: [
+               // Debit Account (User)
+               Text(
+                 "Debit From",
+                 style: Theme.of(context).textTheme.titleSmall,
+               ),
+               Card(
+                 elevation: 0,
+                 margin: const EdgeInsets.symmetric(vertical: 8.0),
+                 child: ListTile(
+                   leading: Image.asset(
+                     'assets/images/logo.png',
+                     width: 40,
+                     height: 40,
+                   ),
+                   title: Text(widget.remitterName),
+                   subtitle: Text(widget.debitAccountNo),
+                 ),
+               ),
+               const SizedBox(height: 24),
+
+               // Credit Account (Self)
+               Text(
+                 "Credited To",
+                 style: Theme.of(context).textTheme.titleSmall,
+               ),
+               Card(
+                 elevation: 0,
+                 margin: const EdgeInsets.symmetric(vertical: 8.0),
+                 child: ListTile(
+                   leading:
+                       getBankLogo('Kangra Central Co-operative Bank', context),
+                   title: Text(widget.creditAccount.name ?? 'N/A'),
+                   subtitle: Text(widget.creditAccount.accountNo ?? 'N/A'),
+                 ),
+               ),
+               const SizedBox(height: 24),
+
+               // Remarks
+               TextFormField(
+                 controller: _remarksController,
+                 decoration: const InputDecoration(
+                   labelText: "Remarks (Optional)",
+                   border: OutlineInputBorder(),
+                 ),
+               ),
+               const SizedBox(height: 24),
+
+               // Amount
+               TextFormField(
+                 controller: _amountController,
+                 keyboardType: TextInputType.number,
+                 decoration: const InputDecoration(
+                   labelText: "Amount",
+                   border: OutlineInputBorder(),
+                   prefixIcon: Icon(Icons.currency_rupee),
+                 ),
+                 validator: (value) {
+                   if (value == null || value.isEmpty) {
+                     return "Amount is required";
+                   }
+                   if (double.tryParse(value) == null ||
+                       double.parse(value) <= 0) {
+                     return "Please enter a valid amount";
+                   }
+                   return null;
+                 },
+               ),
+               const SizedBox(height: 8),
+
+               // Daily Limit Display
+               if (_isLoadingLimit)
+                 const Text('Fetching daily limit...'),
+               if (!_isLoadingLimit && _limit != null)
+                 Text(
+                   'Remaining Daily Limit: ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}',
+                   style: Theme.of(context).textTheme.bodySmall,
+                 ),
+               const Spacer(),
+
+               // Proceed Button
+               SizedBox(
+                 width: double.infinity,
+                 child: ElevatedButton(
+                   onPressed: _isAmountOverLimit ? null : _onProceed,
+                   style: ElevatedButton.styleFrom(
+                     padding: const EdgeInsets.symmetric(vertical: 16),
+                   ),
+                   child: const Text("Proceed"),
+                 ),
+               ),
+               const SizedBox(height: 10),
+             ],
+           ),
+         ),
+       ),
+     ),
+   );
+ }
+  }

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

lib/features/fund_transfer/screens/transaction_pin_screen.dart

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

lib/features/fund_transfer/screens/transaction_success_screen.dart

@@ -67,13 +67,23 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
                   const SizedBox(height: 6),
                   Text(
                     "On $transactionDate",
-                    style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6)),
+                    style: TextStyle(
+                        fontSize: 14,
+                        color: Theme.of(context)
+                            .colorScheme
+                            .onSurface
+                            .withOpacity(0.6)),
                     textAlign: TextAlign.center,
                   ),
                   const SizedBox(height: 16),
                   Text(
                     "${AppLocalizations.of(context).toAccountNumber}: $creditAccount",
-                     style: TextStyle(fontSize: 12, color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8)),
+                    style: TextStyle(
+                        fontSize: 12,
+                        color: Theme.of(context)
+                            .colorScheme
+                            .onSurface
+                            .withOpacity(0.8)),
                     textAlign: TextAlign.center,
                   ),
                 ],
@@ -91,8 +101,12 @@ class _TransactionSuccessScreen extends State<TransactionSuccessScreen> {
                       child: OutlinedButton.icon(
                         onPressed: _shareScreenshot,
                         icon: const Icon(Icons.share, size: 18),
-                        label: Text(AppLocalizations.of(context).share,
+                        label: Text(
-                        style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
+                          AppLocalizations.of(context).share,
+                          style: TextStyle(
+                              color: Theme.of(context)
+                                  .colorScheme
+                                  .onPrimaryContainer),
                         ),
                         style: ElevatedButton.styleFrom(
                           shape: const StadiumBorder(),

lib/features/profile/change_password/change_password_otp_screen.dart

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

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 {
+        Navigator.push(
-      await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
+          context,
-
+          MaterialPageRoute(
-
+            builder: (context) => ChangePasswordOTPScreen(
-      Navigator.push(
+              currentPassword: currentPasswordController.text,
-        context,
+              newPassword: newPasswordController.text,
-        MaterialPageRoute(
+              confirmPassword: confirmPasswordController.text,
-          builder: (context) => ChangePasswordOTPScreen(
+              mobileNumber: widget.mobileNumber,
-            currentPassword: currentPasswordController.text,
+            ),
-            newPassword: newPasswordController.text,
-            confirmPassword: confirmPasswordController.text,
-            mobileNumber: widget.mobileNumber, 
           ),
-        ),
+        );
-      );
+      } catch (e) {
-    } catch (e) {
+        ScaffoldMessenger.of(context).showSnackBar(
-      ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
-        SnackBar(content: Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
+              content:
-      );
+                  Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
+        );
+      }
     }
   }
-}
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
+      appBar:
+          AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
       body: Padding(
         padding: const EdgeInsets.all(16),
         child: Form(
@@ -103,8 +105,8 @@ void _proceed() async {
                     icon: Icon(_showCurrentPassword
                         ? Icons.visibility
                         : Icons.visibility_off),
-                    onPressed: () =>
+                    onPressed: () => setState(
-                        setState(() => _showCurrentPassword = !_showCurrentPassword),
+                        () => _showCurrentPassword = !_showCurrentPassword),
                   ),
                 ),
                 validator: validateCurrentPassword,
@@ -135,8 +137,8 @@ void _proceed() async {
                     icon: Icon(_showConfirmPassword
                         ? Icons.visibility
                         : Icons.visibility_off),
-                    onPressed: () =>
+                    onPressed: () => setState(
-                        setState(() => _showConfirmPassword = !_showConfirmPassword),
+                        () => _showConfirmPassword = !_showConfirmPassword),
                   ),
                 ),
                 validator: validateConfirmPassword,

lib/features/profile/daily_transaction_limit.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:kmobile/api/services/limit_service.dart';
+import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/l10n/app_localizations.dart';
 import 'package:intl/intl.dart';
 
@@ -11,27 +13,42 @@ class DailyLimitScreen extends StatefulWidget {
 
 class _DailyLimitScreenState extends State<DailyLimitScreen> {
   double? _currentLimit;
+  double? _spentAmount = 0.0;
   final _limitController = TextEditingController();
+  var service = getIt<LimitService>();
+ Limit? limit;
+ bool _isLoading = true;
 
   @override
   void initState() {
     super.initState();
-    // Now just taking null, but for real time limit will be fetched using API call
+    _loadlimits();
-    _currentLimit = null;
   }
   
-   @override
+  Future<void> _loadlimits() async {
- void dispose() {
+     setState(() {
-   _limitController.dispose();
+   _isLoading = true;
-   super.dispose();
+ });
- }
+    final limit_data = await service.getLimit();
+    setState(() {
+   limit = limit_data;
+   _isLoading = false;
+ });
+  }
 
- Future<void> _showAddOrEditLimitDialog() async {
+  @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) {
+    builder: (dialogContext) {
-      final localizations = AppLocalizations.of(context);
+      final localizations = AppLocalizations.of(dialogContext);
+      final theme = Theme.of(dialogContext);
       return AlertDialog(
         title: Text(
           _currentLimit == null
@@ -53,14 +70,25 @@ class _DailyLimitScreenState extends State<DailyLimitScreen> {
         ),
         actions: [
           TextButton(
-            onPressed: () => Navigator.of(context).pop(),
+            onPressed: () => Navigator.of(dialogContext).pop(),
             child: Text(localizations.cancel),
           ),
           ElevatedButton(
             onPressed: () {
               final value = double.tryParse(_limitController.text);
-              if (value != null && value > 0) {
+              if (value == null || value <= 0) return;
-                Navigator.of(context).pop(value);
+
+              if (value > 200000) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: const Text("Limit To be Set must be less than 200000"),
+                    behavior: SnackBarBehavior.floating,
+                    backgroundColor: theme.colorScheme.error,
+                  ),
+                );
+              } else {
+                service.editLimit(value);
+                Navigator.of(dialogContext).pop(value);
               }
             },
             child: Text(localizations.save),
@@ -69,24 +97,46 @@ class _DailyLimitScreenState extends State<DailyLimitScreen> {
       );
     },
   );
+
   if (newLimit != null) {
-    setState(() {
+    _loadlimits();
-      _currentLimit = newLimit;
+    if (!mounted) return;
-    });
+    ScaffoldMessenger.of(context).showSnackBar(
+      const SnackBar(
+        content: Text("Limit Updated"),
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
   }
 }
 
- void _removeLimit() {
-   setState(() {
-     _currentLimit = null;
-   });
- }
 
- @override
+  void _removeLimit() {
+    setState(() {
+      _currentLimit = null;
+    });
+  }
+
+   @override
  Widget build(BuildContext context) {
+  if (_isLoading) {
+  final localizations = AppLocalizations.of(context);
+  return Scaffold(
+    appBar: AppBar(
+      title: Text(localizations.dailylimit),
+    ),
+    body: const Center(
+      child: CircularProgressIndicator(),
+    ),
+  );
+}
+    _currentLimit = limit?.dailyLimit;
+    _spentAmount = limit?.usedLimit;
    final localizations = AppLocalizations.of(context);
    final theme = Theme.of(context);
    final formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
+   final remainingLimit = _currentLimit != null ? _currentLimit! - _spentAmount! : 0.0;
+
    return Scaffold(
      appBar: AppBar(
        title: Text(localizations.dailylimit),
@@ -116,6 +166,23 @@ class _DailyLimitScreenState extends State<DailyLimitScreen> {
                      : theme.colorScheme.primary,
                ),
              ),
+             if (_currentLimit != null) ...[
+               const SizedBox(height: 24),
+               Text(
+                 "Remaining Limit Today", // This should be localized
+                 style: theme.textTheme.titleMedium,
+               ),
+               const SizedBox(height: 4),
+               Text(
+                 formatCurrency.format(remainingLimit),
+                 style: theme.textTheme.headlineSmall?.copyWith(
+                   fontWeight: FontWeight.bold,
+                   color: remainingLimit > 0
+                       ? Colors.green
+                       : theme.colorScheme.error,
+                 ),
+               ),
+             ],
              const SizedBox(height: 48),
              if (_currentLimit == null)
                ElevatedButton.icon(
@@ -142,14 +209,14 @@ class _DailyLimitScreenState extends State<DailyLimitScreen> {
                      ),
                    ),
                    const SizedBox(height: 16),
-                   TextButton.icon(
+                  //  TextButton.icon(
-                     onPressed: _removeLimit,
+                  //    onPressed: _removeLimit,
-                     icon: const Icon(Icons.remove_circle_outline),
+                  //    icon: const Icon(Icons.remove_circle_outline),
-                     label: Text(localizations.removeLimit),
+                  //    label: Text(localizations.removeLimit),
-                     style: TextButton.styleFrom(
+                  //    style: TextButton.styleFrom(
-                       foregroundColor: theme.colorScheme.error,
+                  //      foregroundColor: theme.colorScheme.error,
-                     ),
+                  //    ),
-                   ),
+                  //  ),
                  ],
                ),
            ],

lib/features/profile/logout_dialog.dart

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

lib/features/profile/profile_screen.dart

@@ -1,11 +1,21 @@
+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/daily_transaction_limit.dart';
 import 'package:kmobile/features/profile/logout_dialog.dart';
+import 'package:kmobile/features/profile/tpin/change_tpin_screen.dart';
+import 'package:kmobile/security/secure_storage.dart';
+import 'package:local_auth/local_auth.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../../di/injection.dart';
 import '../../l10n/app_localizations.dart';
 import 'package:kmobile/features/profile/preferences/preference_screen.dart';
+import 'package:kmobile/api/services/auth_service.dart';
+import 'package:kmobile/features/fund_transfer/screens/tpin_set_screen.dart';
+
 
 class ProfileScreen extends StatefulWidget {
   final String mobileNumber;
@@ -16,7 +26,26 @@ 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 prefs = await SharedPreferences.getInstance();
+   setState(() {
+     _isBiometricEnabled = prefs.getBool('biometric_enabled') ?? false;
+   });
+ }
+
+  Future<void> _handleLogout(BuildContext context) async {
     final auth = getIt<AuthRepository>();
     final prefs = await SharedPreferences.getInstance();
     await prefs.clear(); // clear saved session/token
@@ -25,6 +54,91 @@ class _ProfileScreenState extends State<ProfileScreen> {
     Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false);
   }
 
+    Future<void> _handleBiometricToggle(bool enable) async {
+   final localAuth = LocalAuthentication();
+   final prefs = await SharedPreferences.getInstance();
+   final canCheck = await localAuth.canCheckBiometrics;
+
+   if (!canCheck) {
+     ScaffoldMessenger.of(context).showSnackBar(
+       SnackBar(
+           content: Text(AppLocalizations.of(context).biometricsNotAvailable)),
+     );
+     return;
+   }
+
+   if (enable) {
+     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 prefs.setBool('biometric_enabled', true);
+           if (mounted) {
+             setState(() {
+               _isBiometricEnabled = true;
+             });
+           }
+         }
+       } catch (e) {
+         // Handle exceptions, state remains unchanged.
+       }
+     }
+   } else {
+     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 prefs.setBool('biometric_enabled', false);
+       if (mounted) {
+         setState(() {
+           _isBiometricEnabled = false;
+         });
+       }
+     }
+   }
+ }
+
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
@@ -46,33 +160,150 @@ class _ProfileScreenState extends State<ProfileScreen> {
               );
             },
           ),
+          ListTile(
+            leading: const Icon(Icons.currency_rupee),
+            title: Text(AppLocalizations.of(context).dailylimit),
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                    builder: (context) => const DailyLimitScreen()),
+              );
+            },
+          ),
+          SwitchListTile(
+   title: Text(AppLocalizations.of(context).enableFingerprintLogin),
+   value: _isBiometricEnabled,
+   onChanged: (bool value) {
+     // The state is now managed within _handleBiometricToggle
+     _handleBiometricToggle(value);
+   },
+   secondary: const Icon(Icons.fingerprint),
+ ),
           ListTile(
             leading: const Icon(Icons.password),
             title: Text(loc.changeLoginPassword),
             onTap: () {
-            Navigator.push(  
+              Navigator.push(
-              context,
+                context,
-            MaterialPageRoute(builder: (context) => ChangePasswordScreen(
+                MaterialPageRoute(
-              mobileNumber: widget.mobileNumber,
+                    builder: (context) => ChangePasswordScreen(
-            )),
+                          mobileNumber: widget.mobileNumber,
-            );
+                        )),
+              );
             },
           ),
-          // ListTile(
+          ListTile(
-          //   leading: const Icon(Icons.password),
+            leading: const Icon(Icons.password),
-          //   title: const Text("Manage TPIN"), 
+  title: Text('Change TPIN'),
-          //   onTap: () async {
+  onTap: () async {
-          //   },
+    // 1. Get the AuthService instance
-          // ),
+    final authService = getIt<AuthService>();
+
+    // 2. Call checkTpin() to see if TPIN is set
+    final isTpinSet = await authService.checkTpin();
+
+    // 3. If TPIN is not set, show the dialog
+    if (!isTpinSet) {
+      showDialog(
+        context: context,
+        builder: (BuildContext context) {
+          return AlertDialog(
+            title: Text('TPIN Not Set'),
+            content: Text('You have not set a TPIN yet. Please set a TPIN to proceed.'),
+            actions: <Widget>[
+              TextButton(
+                child: Text('Back'),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+              TextButton(
+                child: Text('Proceed'),
+                onPressed: () {
+                  Navigator.of(context).pop(); // Dismiss the dialog
+                  // Navigate to the TPIN set screen
+                  Navigator.of(context).push(
+                    MaterialPageRoute(
+                      builder: (context) => TpinSetScreen(),
+                    ),
+                  );
+                },
+              ),
+            ],
+          );
+        },
+      );
+    } else {
+      // Case 2: TPIN is set
+Navigator.of(context).push(
+  MaterialPageRoute(
+    builder: (context) => ChangeTpinScreen(mobileNumber: widget.mobileNumber),
+  ),
+);
+    }
+  },
+),
           //           ListTile(
           //   leading: const Icon(Icons.password),
           //   title: const Text("Change Login MPIN"),
           //   onTap: () async {
           //   },
           // ),
-            ListTile(
+          ListTile(
-            leading: const Icon(Icons.logout),
+            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).deregister),
             onTap: () async {
               final shouldLogout = await showDialog<bool>(
                 context: context,

lib/features/profile/tpin/change_tpin_otp_screen.dart

@@ -0,0 +1,125 @@
+ import 'package:flutter/material.dart';
+ import 'package:kmobile/di/injection.dart';
+ import 'package:kmobile/widgets/pin_input_field.dart';
+ import '../../../api/services/change_password_service.dart';
+
+ class ChangeTpinOtpScreen extends StatefulWidget {
+   final String oldTpin;
+   final String newTpin;
+   final String mobileNumber;
+
+   const ChangeTpinOtpScreen({
+     super.key,
+     required this.oldTpin,
+     required this.newTpin,
+     required this.mobileNumber,
+   });
+
+   @override
+   State<ChangeTpinOtpScreen> createState() => _ChangeTpinOtpScreenState();
+ }
+
+ class _ChangeTpinOtpScreenState extends State<ChangeTpinOtpScreen> {
+   final _otpController = TextEditingController();
+   final ChangePasswordService _changePasswordService =
+       getIt<ChangePasswordService>();
+   bool _isLoading = false;
+
+   void _handleVerifyOtp() async {
+     if (_otpController.text.length != 6) {
+       ScaffoldMessenger.of(context).showSnackBar(
+         const SnackBar(content: Text('Please enter a valid 6-digit OTP')),
+       );
+       return;
+     }
+
+     setState(() {
+       _isLoading = true;
+     });
+
+     try {
+       // 1. Validate the OTP first.
+       await _changePasswordService.validateOtp(
+         otp: _otpController.text,
+         mobileNumber: widget.mobileNumber,
+       );
+
+       // 2. If OTP is valid, then call validateChangeTpin.
+       await _changePasswordService.validateChangeTpin(
+         oldTpin: widget.oldTpin,
+         newTpin: widget.newTpin,
+       );
+
+       // 3. Show success message.
+       if (mounted) {
+         ScaffoldMessenger.of(context).showSnackBar(
+           const SnackBar(
+             content: Text('TPIN changed successfully!'),
+             backgroundColor: Colors.green,
+           ),
+         );
+         // 4. Navigate back to the profile screen or home.
+         Navigator.of(context).popUntil((route) => route.isFirst);
+       }
+     } catch (e) {
+       if (mounted) {
+         ScaffoldMessenger.of(context).showSnackBar(
+           SnackBar(
+             content: Text('An error occurred: $e'),
+             backgroundColor: Colors.red,
+           ),
+         );
+       }
+     } finally {
+       if (mounted) {
+         setState(() {
+           _isLoading = false;
+         });
+       }
+     }
+   }
+
+   @override
+   Widget build(BuildContext context) {
+     return Scaffold(
+       appBar: AppBar(
+         title: const Text('Verify OTP'),
+       ),
+       body: SingleChildScrollView(
+         padding: const EdgeInsets.all(16.0),
+         child: Column(
+           crossAxisAlignment: CrossAxisAlignment.center,
+           children: [
+             const SizedBox(height: 24),
+             const Text(
+               'Enter the OTP sent to your registered mobile number.',
+               textAlign: TextAlign.center,
+               style: TextStyle(fontSize: 16),
+             ),
+             const SizedBox(height: 32),
+             PinInputField(
+               controller: _otpController,
+             ),
+             const SizedBox(height: 32),
+             SizedBox(
+               width: double.infinity,
+               child: ElevatedButton(
+                 onPressed: _isLoading ? null : _handleVerifyOtp,
+                 child: _isLoading
+                     ? const SizedBox(
+                         height: 24,
+                         width: 24,
+                         child: CircularProgressIndicator(
+                           color: Colors.white,
+                           strokeWidth: 2.5,
+                         ),
+                       )
+                     : const Text('Verify & Change TPIN'),
+               ),
+             ),
+           ],
+         ),
+       ),
+     );
+   }
+ }

lib/features/profile/tpin/change_tpin_screen.dart

@@ -0,0 +1,146 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/di/injection.dart';
+import 'package:kmobile/features/profile/tpin/change_tpin_otp_screen.dart';
+import 'package:kmobile/widgets/pin_input_field.dart';
+import '../../../api/services/change_password_service.dart';
+
+class ChangeTpinScreen extends StatefulWidget {
+  final String mobileNumber;
+  const ChangeTpinScreen({super.key, required this.mobileNumber});
+
+  @override
+  State<ChangeTpinScreen> createState() => _ChangeTpinScreenState();
+}
+
+class _ChangeTpinScreenState extends State<ChangeTpinScreen> {
+  final _formKey = GlobalKey<FormState>();
+  final _oldTpinController = TextEditingController();
+  final _newTpinController = TextEditingController();
+  final _confirmTpinController = TextEditingController();
+  final ChangePasswordService _changePasswordService =
+      getIt<ChangePasswordService>();
+  bool _isLoading = false;
+
+  @override
+  void dispose() {
+    _oldTpinController.dispose();
+    _newTpinController.dispose();
+    _confirmTpinController.dispose();
+    super.dispose();
+  }
+
+  void _handleChangeTpin() async {
+    if (_formKey.currentState!.validate()) {
+      setState(() {
+        _isLoading = true;
+      });
+      try {
+        // 1. Get OTP for TPIN change.
+        await _changePasswordService.getOtpTpin(mobileNumber: widget.mobileNumber);
+
+        // 2. Navigate to the OTP screen on success.
+        if (mounted) {
+          Navigator.of(context).push(
+            MaterialPageRoute(
+              builder: (context) => ChangeTpinOtpScreen(
+                oldTpin: _oldTpinController.text,
+                newTpin: _newTpinController.text,
+                mobileNumber: widget.mobileNumber,
+              ),
+            ),
+          );
+        }
+      } catch (e) {
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text('Failed to send OTP: $e')),
+          );
+        }
+      } finally {
+        if (mounted) {
+          setState(() {
+            _isLoading = false;
+          });
+        }
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Change TPIN'),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16.0),
+        child: Form(
+          key: _formKey,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const Text('Current TPIN'),
+              const SizedBox(height: 8),
+              PinInputField(
+                controller: _oldTpinController,
+                validator: (value) {
+                  if (value == null || value.length != 6) {
+                    return 'Please enter your 6-digit old TPIN';
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 24),
+              const Text('New TPIN'),
+              const SizedBox(height: 8),
+              PinInputField(
+                controller: _newTpinController,
+                validator: (value) {
+                  if (value == null || value.length != 6) {
+                    return 'Please enter a 6-digit new TPIN';
+                  }
+                  if (value == _oldTpinController.text) {
+                    return 'New TPIN must be different from the old one.';
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 24),
+              const Text('Confirm New TPIN'),
+              const SizedBox(height: 8),
+              PinInputField(
+                controller: _confirmTpinController,
+                validator: (value) {
+                  if (value == null || value.length != 6) {
+                    return 'Please confirm your new TPIN';
+                  }
+                  if (value != _newTpinController.text) {
+                    return 'TPINs do not match';
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 32),
+              SizedBox(
+                width: double.infinity,
+                child: ElevatedButton(
+                  onPressed: _isLoading ? null : _handleChangeTpin,
+                  child: _isLoading
+                      ? const SizedBox(
+                          height: 24,
+                          width: 24,
+                          child: CircularProgressIndicator(
+                            color: Colors.white,
+                            strokeWidth: 2.5,
+                          ),
+                        )
+                      : const Text('Proceed'),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart

@@ -2,7 +2,9 @@ import 'dart:async';
 import 'dart:developer';
 import 'package:dio/dio.dart';
 import 'package:flutter/services.dart';
+import 'package:intl/intl.dart';
 import 'package:kmobile/api/services/imps_service.dart';
+import 'package:kmobile/api/services/limit_service.dart';
 import 'package:kmobile/api/services/neft_service.dart';
 import 'package:kmobile/api/services/rtgs_service.dart';
 import 'package:kmobile/data/models/imps_transaction.dart';
@@ -28,7 +30,10 @@ class QuickPayOutsideBankScreen extends StatefulWidget {
 
 class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   final _formKey = GlobalKey<FormState>();
-
+  final _limitService = getIt<LimitService>();
+Limit? _limit;
+bool _isLoadingLimit = true;
+final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
   // Controllers
   final accountNumberController = TextEditingController();
   final confirmAccountNumberController = TextEditingController();
@@ -41,6 +46,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   final remarksController = TextEditingController();
   final _ifscFocusNode = FocusNode();
   final service = getIt<BeneficiaryService>();
+  bool _isAmountOverLimit = false;
 
   late String accountType;
   bool _isValidating = false;
@@ -50,18 +56,62 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   @override
   void initState() {
     super.initState();
+     _loadLimit();
     _ifscFocusNode.addListener(() {
-  if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
+      if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
-    _validateIFSC();
+        _validateIFSC();
-  }
+      }
-});
+    });
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
         accountType = 'Savings';
       });
     });
+    amountController.addListener(_checkAmountLimit);
   }
 
+Future<void> _loadLimit() async {
+  setState(() {
+    _isLoadingLimit = true;
+  });
+  try {
+    final limitData = await _limitService.getLimit();
+    setState(() {
+      _limit = limitData;
+      _isLoadingLimit = false;
+    });
+  } catch (e) {
+    // Handle error if needed
+    setState(() {
+      _isLoadingLimit = false;
+    });
+  }
+}
+
+// Add this method to check the amount against the limit
+ void _checkAmountLimit() {
+   if (_limit == null) return;
+
+   final amount = double.tryParse(amountController.text) ?? 0;
+   final remainingLimit = _limit!.dailyLimit - _limit!.usedLimit;
+   final bool isOverLimit = amount > remainingLimit;
+
+   if (isOverLimit) {
+     ScaffoldMessenger.of(context).showSnackBar(
+       SnackBar(
+         content: Text('Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
+         backgroundColor: Colors.red,
+       ),
+     );
+   }
+
+   if (_isAmountOverLimit != isOverLimit) {
+     setState(() {
+       _isAmountOverLimit = isOverLimit;
+     });
+   }
+ }
+
   void _validateIFSC() async {
     final ifsc = ifscController.text.trim().toUpperCase();
     if (ifsc.isEmpty) return;
@@ -84,7 +134,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 +148,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
         branchNameController.clear();
       }
     }
- }
+  }
 
   void _validateBeneficiary() async {
     FocusScope.of(context).unfocus();
@@ -527,15 +578,15 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                       controller: ifscController,
                       textInputAction: TextInputAction.next,
                       onChanged: (value) {
-                         setState(() {
+                        setState(() {
-                        final trimmed = value.trim().toUpperCase();
+                          final trimmed = value.trim().toUpperCase();
-                        if (trimmed.length < 11) {
+                          if (trimmed.length < 11) {
-                          // clear bank/branch if backspace or changed
+                            // clear bank/branch if backspace or changed
-                          bankNameController.clear();
+                            bankNameController.clear();
-                          branchNameController.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 +688,21 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   child: SizedBox(
                     width: double.infinity,
                     child: ElevatedButton(
-                     onPressed: _isValidating || ifscController.text.length != 11
+                      onPressed:
-    ? null
+                          _isValidating || ifscController.text.length != 11
-    : () {
+                              ? null
-        if (confirmAccountNumberController.text ==
+                              : () {
-            accountNumberController.text) {
+                                  if (confirmAccountNumberController.text ==
-          _validateBeneficiary();
+                                      accountNumberController.text) {
-        } else {
+                                    _validateBeneficiary();
-          setState(() {
+                                  } else {
-            _validationError =
+                                    setState(() {
-                AppLocalizations.of(context)
+                                      _validationError =
-                    .accountMismatch;
+                                          AppLocalizations.of(context)
-          });
+                                              .accountMismatch;
-                              }
+                                    });
-                            },
+                                  }
+                                },
                       child: _isValidating
                           ? const SizedBox(
                               width: 20,
@@ -696,26 +748,29 @@ 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),
+              Column(
+  crossAxisAlignment: CrossAxisAlignment.start,
+  children: [
               Row(
                 children: [
                   Expanded(
@@ -781,6 +836,22 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   ),
                 ],
               ),
+               ],
+              ),
+              const SizedBox(height: 8),
+if (_isLoadingLimit)
+  const Padding(
+    padding: EdgeInsets.only(left: 8.0),
+    child: Text('Fetching daily limit...'),
+  ),
+if (!_isLoadingLimit && _limit != null)
+  Padding(
+    padding: const EdgeInsets.only(left: 8.0),
+    child: Text(
+      'Remaining Daily Limit: ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}',
+      style: Theme.of(context).textTheme.bodySmall,
+    ),
+  ),
               const SizedBox(height: 30),
               Row(
                 children: [
@@ -793,24 +864,31 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 ],
               ),
               const SizedBox(height: 45),
-              Align(
+                             Align(
-                alignment: Alignment.center,
+                 alignment: Alignment.center,
-                child: SwipeButton.expand(
+                 child: SwipeButton.expand(
-                  thumb: Icon(Icons.arrow_forward,
+                   thumb: Icon(Icons.arrow_forward,
-                      color: Theme.of(context).dialogBackgroundColor),
+                       color: _isAmountOverLimit ? Colors.grey : Theme.of(context).dialogBackgroundColor),
-                  activeThumbColor: Theme.of(context).colorScheme.primary,
+                   activeThumbColor: _isAmountOverLimit ? Colors.grey.shade700 :
-                  activeTrackColor:
+ Theme.of(context).colorScheme.primary,
-                      Theme.of(context).colorScheme.secondary.withAlpha(100),
+                   activeTrackColor: _isAmountOverLimit
-                  borderRadius: BorderRadius.circular(30),
+                       ? Colors.grey.shade300
-                  height: 56,
+                       : Theme.of(context).colorScheme.secondary.withAlpha(100),
-                  onSwipe: _onProceedToPay,
+                   borderRadius: BorderRadius.circular(30),
-                  child: Text(
+                   height: 56,
-                    AppLocalizations.of(context).swipeToPay,
+                   onSwipe: () {
-                    style: const TextStyle(
+                     if (_isAmountOverLimit) {
-                        fontSize: 16, fontWeight: FontWeight.bold),
+                       return; // Do nothing if amount is over the limit
-                  ),
+                     }
-                ),
+                     _onProceedToPay();
-              ),
+                   },
+                   child: Text(
+                     AppLocalizations.of(context).swipeToPay,
+                     style: const TextStyle(
+                         fontSize: 16, fontWeight: FontWeight.bold),
+                   ),
+                 ),
+               ),
             ],
           ),
         ),

lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart

@@ -1,7 +1,9 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_swipe_button/flutter_swipe_button.dart';
+import 'package:intl/intl.dart';
 import 'package:kmobile/api/services/beneficiary_service.dart';
+import 'package:kmobile/api/services/limit_service.dart';
 import 'package:kmobile/api/services/payment_service.dart';
 import 'package:kmobile/data/models/transfer.dart';
 import 'package:kmobile/di/injection.dart';
@@ -19,14 +21,17 @@ class QuickPayWithinBankScreen extends StatefulWidget {
 
 class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
   final _formKey = GlobalKey<FormState>();
-
+  final _limitService = getIt<LimitService>();
+Limit? _limit;
+bool _isLoadingLimit = true;
+final _formatCurrency = NumberFormat.currency(locale: 'en_IN', symbol: '₹');
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
   final TextEditingController amountController = TextEditingController();
   final TextEditingController remarksController = TextEditingController();
   String? _selectedAccountType;
-
+  bool _isAmountOverLimit = false;
   String? _beneficiaryName;
   bool _isValidating = false;
   bool _isBeneficiaryValidated = false;
@@ -35,10 +40,54 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
   @override
   void initState() {
     super.initState();
+    _loadLimit();
     accountNumberController.addListener(_resetBeneficiaryValidation);
     confirmAccountNumberController.addListener(_resetBeneficiaryValidation);
+    amountController.addListener(_checkAmountLimit);
   }
 
+Future<void> _loadLimit() async {
+  setState(() {
+    _isLoadingLimit = true;
+  });
+  try {
+    final limitData = await _limitService.getLimit();
+    setState(() {
+      _limit = limitData;
+      _isLoadingLimit = false;
+    });
+  } catch (e) {
+    // Handle error if needed
+    setState(() {
+      _isLoadingLimit = false;
+    });
+  }
+}
+
+void _checkAmountLimit() {
+  if (_limit == null) return;
+
+  final amount = double.tryParse(amountController.text) ?? 0;
+  final remainingLimit = _limit!.dailyLimit - _limit!.usedLimit;
+  final bool isOverLimit = amount > remainingLimit;
+
+  if (isOverLimit) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text('Amount exceeds remaining daily limit of ${_formatCurrency.format(remainingLimit)}'),
+        backgroundColor: Colors.red,
+      ),
+    );
+  }
+
+  // Update state only if it changes to avoid unnecessary rebuilds
+  if (_isAmountOverLimit != isOverLimit) {
+    setState(() {
+      _isAmountOverLimit = isOverLimit;
+    });
+  }
+}
+
   void _resetBeneficiaryValidation() {
     if (_isBeneficiaryValidated ||
         _beneficiaryName != null ||
@@ -53,6 +102,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
 
   @override
   void dispose() {
+    amountController.removeListener(_checkAmountLimit);
     accountNumberController.removeListener(_resetBeneficiaryValidation);
     confirmAccountNumberController.removeListener(_resetBeneficiaryValidation);
     accountNumberController.dispose();
@@ -102,7 +152,8 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
         padding: const EdgeInsets.all(16.0),
         child: Form(
           key: _formKey,
-          child: Column(
+          child: SingleChildScrollView(
+  child: Column(
             children: [
               const SizedBox(height: 10),
               TextFormField(
@@ -278,25 +329,26 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                 },
               ),
               const SizedBox(height: 25),
-TextFormField(
+              TextFormField(
-  controller: remarksController,
+                controller: remarksController,
-  decoration: InputDecoration(
+                decoration: InputDecoration(
-    labelText: AppLocalizations.of(context).remarks,
+                  labelText: AppLocalizations.of(context).remarks,
-    border: const OutlineInputBorder(),
+                  border: const OutlineInputBorder(),
-    isDense: true,
+                  isDense: true,
-    filled: true,
+                  filled: true,
-    fillColor: Theme.of(context).scaffoldBackgroundColor,
+                  fillColor: Theme.of(context).scaffoldBackgroundColor,
-    enabledBorder: OutlineInputBorder(
+                  enabledBorder: OutlineInputBorder(
-      borderSide: BorderSide(
+                    borderSide: BorderSide(
-          color: Theme.of(context).colorScheme.outline),
+                        color: Theme.of(context).colorScheme.outline),
-    ),
+                  ),
-    focusedBorder: OutlineInputBorder(
+                  focusedBorder: OutlineInputBorder(
-      borderSide: BorderSide(
+                    borderSide: BorderSide(
-          color: Theme.of(context).colorScheme.primary, width: 2),
+                        color: Theme.of(context).colorScheme.primary, width: 2),
-    ),
+                  ),
-  ),
+                ),
-),
+              ),
               const SizedBox(height: 25),
+              
               TextFormField(
                 decoration: InputDecoration(
                   labelText: AppLocalizations.of(context).amount,
@@ -327,66 +379,81 @@ TextFormField(
                   return null;
                 },
               ),
+              const SizedBox(height: 8),
+if (_isLoadingLimit)
+  const Text('Fetching daily limit...'),
+if (!_isLoadingLimit && _limit != null)
+  Text(
+    'Remaining Daily Limit: ${_formatCurrency.format(_limit!.dailyLimit - _limit!.usedLimit)}',
+    style: Theme.of(context).textTheme.bodySmall,
+  ),
               const SizedBox(height: 45),
-              Align(
+                             Align(
-                alignment: Alignment.center,
+                 alignment: Alignment.center,
-                child: SwipeButton.expand(
+                 child: SwipeButton.expand(
-                  thumb: Icon(Icons.arrow_forward,
+                   thumb: Icon(Icons.arrow_forward,
-                      color: Theme.of(context).dialogBackgroundColor),
+                       color: _isAmountOverLimit ? Colors.grey : Theme.of(context).dialogBackgroundColor),
-                  activeThumbColor: Theme.of(context).colorScheme.primary,
+                   activeThumbColor: _isAmountOverLimit ? Colors.grey.shade700 :
-                  activeTrackColor: Theme.of(
+ Theme.of(context).colorScheme.primary,
-                    context,
+                   activeTrackColor: _isAmountOverLimit
-                  ).colorScheme.secondary.withAlpha(100),
+                       ? Colors.grey.shade300
-                  borderRadius: BorderRadius.circular(30),
+                       : Theme.of(
-                  height: 56,
+                     context,
-                  child: Text(
+                   ).colorScheme.secondary.withAlpha(100),
-                    AppLocalizations.of(context).swipeToPay,
+                   borderRadius: BorderRadius.circular(30),
-                    style: const TextStyle(fontSize: 16),
+                   height: 56,
-                  ),
+                   child: Text(
-                  onSwipe: () {
+                     AppLocalizations.of(context).swipeToPay,
-                    if (_formKey.currentState!.validate()) {
+                     style: const TextStyle(fontSize: 16),
-                      if (!_isBeneficiaryValidated) {
+                   ),
-                        setState(() {
+                   onSwipe: () {
-                          _validationError = AppLocalizations.of(context)
+                     if (_isAmountOverLimit) {
-                              .validateBeneficiaryproceeding;
+                       return; // Do nothing if amount is over limit
-                        });
+                     }
-                        return;
+                     if (_formKey.currentState!.validate()) {
-                      }
+                       if (!_isBeneficiaryValidated) {
-                      // Perform payment logic
+                         setState(() {
-                      Navigator.push(
+                           _validationError = AppLocalizations.of(context)
-                        context,
+                               .validateBeneficiaryproceeding;
-                        MaterialPageRoute(
+                         });
-                          builder: (context) => TransactionPinScreen(
+                         return;
-                            onPinCompleted: (pinScreenContext, tpin) async {
+                       }
-                              final transfer = Transfer(
+                       // Perform payment logic
-                                fromAccount: widget.debitAccount,
+                       Navigator.push(
-                                toAccount: accountNumberController.text,
+                         context,
-                                toAccountType: _selectedAccountType!,
+                         MaterialPageRoute(
-                                amount: amountController.text,
+                           builder: (context) => TransactionPinScreen(
-                                tpin: tpin,
+                             onPinCompleted: (pinScreenContext, tpin) async {
-                                remarks: remarksController.text,
+                               final transfer = Transfer(
-                              );
+                                 fromAccount: widget.debitAccount,
+                                 toAccount: accountNumberController.text,
+                                 toAccountType: _selectedAccountType!,
+                                 amount: amountController.text,
+                                 tpin: tpin,
+                                 remarks: remarksController.text,
+                               );
 
-                              final paymentService = getIt<PaymentService>();
+                               final paymentService = getIt<PaymentService>();
-                              final paymentResponseFuture = paymentService
+                               final paymentResponseFuture = paymentService
-                                  .processQuickPayWithinBank(transfer);
+                                   .processQuickPayWithinBank(transfer);
 
-                              Navigator.of(pinScreenContext).pushReplacement(
+                               Navigator.of(pinScreenContext).pushReplacement(
-                                MaterialPageRoute(
+                                 MaterialPageRoute(
-                                  builder: (_) => PaymentAnimationScreen(
+                                   builder: (_) => PaymentAnimationScreen(
-                                      paymentResponse: paymentResponseFuture),
+                                       paymentResponse: paymentResponseFuture),
-                                ),
+                                 ),
-                              );
+                               );
-                            },
+                             },
-                          ),
+                           ),
-                        ),
+                         ),
-                      );
+                       );
-                    }
+                     }
-                  },
+                   },
-                ),
+                 ),
-              ),
+               ),
             ],
           ),
+          ),
         ),
       ),
     );

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> {
+class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
-   final TextEditingController _searchController = TextEditingController();
+  final TextEditingController _searchController = TextEditingController();
 
-   final List<Location> _allLocations = [
+  final List<Location> _allLocations = [
-     Location(
+    Location(
-       name: "Dharamsala - Head Office",
+      name: "Dharamsala - Head Office",
-       code: "002",
+      code: "002",
-       ifsc: "KACE0000002",
+      ifsc: "KACE0000002",
-       address: "Civil Lines Dharmashala, Kangra, HP - 176215",
+      address: "Civil Lines Dharmashala, Kangra, HP - 176215",
-       type: LocationType.branch,
+      type: LocationType.branch,
-     ),
+    ),
-     Location(
+    Location(
-       name: "Kangra",
+      name: "Kangra",
-       code: "033",
+      code: "033",
-       ifsc: "KACE0000033",
+      ifsc: "KACE0000033",
-       address: "Rajput Bhawankangrapo, Kangra, HP ",
+      address: "Rajput Bhawankangrapo, Kangra, HP ",
-       type: LocationType.branch,
+      type: LocationType.branch,
-     ),
+    ),
-     Location(
+    Location(
-       name: "Dharamsala ATM",
+      name: "Dharamsala ATM",
-       address: "Near Main Square, Dharamsala",
+      address: "Near Main Square, Dharamsala",
-       type: LocationType.atm,
+      type: LocationType.atm,
-     ),
+    ),
-     Location(
+    Location(
-       name: "Kangra ATM",
+      name: "Kangra ATM",
-       address: "Opposite Bus Stand, Kangra",
+      address: "Opposite Bus Stand, Kangra",
-       type: LocationType.atm,
+      type: LocationType.atm,
-     ),
+    ),
-   ];
+  ];
 
-   List<Location> _filteredLocations = [];
+  List<Location> _filteredLocations = [];
-   bool _isLoading = false; 
+  bool _isLoading = false;
 
-@override
+  @override
-void initState() {
+  void initState() {
-  super.initState();
+    super.initState();
-  // _fetchAndSetLocations();
+    // _fetchAndSetLocations();
-  _filteredLocations = _allLocations;
+    _filteredLocations = _allLocations;
-}
+  }
 
 // Example of a future API fetching function
 /*
@@ -88,99 +90,99 @@ Future<void> _fetchAndSetLocations() async {
   }
 }
 */
-void _filterLocations(String query) {
+  void _filterLocations(String query) {
-  setState(() {
+    setState(() {
-    if (query.isEmpty) {
+      if (query.isEmpty) {
-      _filteredLocations = _allLocations;
+        _filteredLocations = _allLocations;
-    } else {
+      } else {
-      _filteredLocations = _allLocations.where((location) {
+        _filteredLocations = _allLocations.where((location) {
-        final lowerQuery = query.toLowerCase();
+          final lowerQuery = query.toLowerCase();
-        return location.name.toLowerCase().contains(lowerQuery) ||
+          return location.name.toLowerCase().contains(lowerQuery) ||
-            (location.code?.toLowerCase().contains(lowerQuery) ?? false) ||
+              (location.code?.toLowerCase().contains(lowerQuery) ?? false) ||
-            (location.ifsc?.toLowerCase().contains(lowerQuery) ?? false) ||
+              (location.ifsc?.toLowerCase().contains(lowerQuery) ?? false) ||
-            location.address.toLowerCase().contains(lowerQuery);
+              location.address.toLowerCase().contains(lowerQuery);
-      }).toList();
+        }).toList();
-    }
+      }
-  });
+    });
-}
+  }
 
- @override
+  @override
- Widget build(BuildContext context) {
+  Widget build(BuildContext context) {
-   return Scaffold(
+    return Scaffold(
-     appBar: AppBar(
+      appBar: AppBar(
-       title: Text(AppLocalizations.of(context).branchLocator),
+        title: Text(AppLocalizations.of(context).branchLocator),
-     ),
+      ),
-     body: Column(
+      body: Column(
-       children: [
+        children: [
-         Padding(
+          Padding(
-           padding: const EdgeInsets.all(12.0),
+            padding: const EdgeInsets.all(12.0),
-           child: TextField(
+            child: TextField(
-             controller: _searchController,
+              controller: _searchController,
-             onChanged: _filterLocations,
+              onChanged: _filterLocations,
-             decoration: InputDecoration(
+              decoration: InputDecoration(
-               hintText: AppLocalizations.of(context).searchbranchby,
+                hintText: AppLocalizations.of(context).searchbranchby,
-               prefixIcon: const Icon(Icons.search),
+                prefixIcon: const Icon(Icons.search),
-               border: OutlineInputBorder(
+                border: OutlineInputBorder(
-                 borderRadius: BorderRadius.circular(12),
+                  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);
-              },
             ),
-),
-       ],
-     ),
-   );
- }
-
- 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) {
+  Widget _buildLocationItem(Location location) {
-  final isBranch = location.type == LocationType.branch;
+    final isBranch = location.type == LocationType.branch;
-  return Card(
+    return Card(
-    margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
-    child: ListTile(
+      child: ListTile(
-      leading: CircleAvatar(
+        leading: CircleAvatar(
-        child: Icon(isBranch ? Icons.location_city : Icons.currency_rupee),
+          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/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 {
+class FaqsScreen extends StatefulWidget {
-   const FaqsScreen({super.key});
+  const FaqsScreen({super.key});
 
-   @override
+  @override
-   State<FaqsScreen> createState() => _FaqsScreenState();
+  State<FaqsScreen> createState() => _FaqsScreenState();
- }
+}
 
- class _FaqsScreenState extends State<FaqsScreen> {
+class _FaqsScreenState extends State<FaqsScreen> {
-   @override
+  @override
-   void initState() {
+  void initState() {
-     super.initState();
+    super.initState();
-     _getFaqs();
+    _getFaqs();
-   }
+  }
 
-   // A placeholder for your future API call
+  // A placeholder for your future API call
-   Future<void> _getFaqs() async {
+  Future<void> _getFaqs() async {
-     // TODO: Implement API call to fetch FAQs data
+    // TODO: Implement API call to fetch FAQs data
-     // For now, simulating a network call with a delay
+    // For now, simulating a network call with a delay
-     await Future.delayed(const Duration(seconds: 1));
+    await Future.delayed(const Duration(seconds: 1));
-     // In a real implementation, you would process the API response here
+    // In a real implementation, you would process the API response here
-   }
+  }
 
-   @override
+  @override
-   Widget build(BuildContext context) {
+  Widget build(BuildContext context) {
-     return Scaffold(
+    return Scaffold(
-       appBar: AppBar(
+      appBar: AppBar(
-         title: Row(
+        title: Row(
-           children: [
+          children: [
-             Flexible(
+            Flexible(
-               child: Text(
+              child: Text(
-                 AppLocalizations.of(context).faq,
+                AppLocalizations.of(context).faq,
-                 softWrap: true,
+                softWrap: true,
-                 style: const TextStyle(
+                style: const TextStyle(
-             fontSize: 16.5,
+                  fontSize: 16.5,
-                 ),
+                ),
-                 textAlign: TextAlign.left,
+                textAlign: TextAlign.left,
-               ),
+              ),
-             ),
+            ),
-           ],
+          ],
-         ),
+        ),
-       ),
+      ),
-     );
+    );
-   }
+  }
- }
+}

lib/features/service/screens/service_screen.dart

@@ -1,10 +1,11 @@
 import 'package:kmobile/features/service/screens/branch_locator_screen.dart';
-import 'package:kmobile/features/service/screens/daily_transaction_limit.dart';
+
 import '../../../l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:kmobile/features/service/screens/quick_links_screen.dart';
 import 'package:kmobile/features/service/screens/faqs_screen.dart';
+
 class ServiceScreen extends StatefulWidget {
   const ServiceScreen({super.key});
 
@@ -13,81 +14,71 @@ class ServiceScreen extends StatefulWidget {
 }
 
 class _ServiceScreen extends State<ServiceScreen> {
-@override
+  @override
-Widget build(BuildContext context) {
+  Widget build(BuildContext context) {
-  return Scaffold(
+    return Scaffold(
-    appBar: AppBar(
+      appBar: AppBar(
-      automaticallyImplyLeading: false,
+        automaticallyImplyLeading: false,
-      title: Text(
+        title: Text(
-        AppLocalizations.of(context).services,
+          AppLocalizations.of(context).services,
+        ),
+        centerTitle: false,
       ),
-      centerTitle: false,
+      body: ListView(
-    ),
+        children: [
-    body: ListView(
+          ServiceManagementTile(
-      children: [
+            icon: Symbols.add,
-        ServiceManagementTile(
+            label: AppLocalizations.of(context).accountOpeningDeposit,
-          icon: Symbols.add,
+            onTap: () {},
-          label: AppLocalizations.of(context).accountOpeningDeposit,
+            disabled: true,
-          onTap: () {},
+          ),
-          disabled: true, 
+          const Divider(height: 1),
-        ),
+          ServiceManagementTile(
-        const Divider(height: 1),
+            icon: Symbols.add,
-        ServiceManagementTile(
+            label: AppLocalizations.of(context).accountOpeningLoan,
-          icon: Symbols.add,
+            onTap: () {},
-          label: AppLocalizations.of(context).accountOpeningLoan,
+            disabled: true,
-          onTap: () {},
+          ),
-          disabled: true, 
+          const Divider(height: 1),
-        ),
+          ServiceManagementTile(
-        const Divider(height: 1),
+            icon: Symbols.captive_portal,
-        ServiceManagementTile(
+            label: AppLocalizations.of(context).quickLinks,
-          icon: Symbols.currency_rupee,
+            onTap: () {
-          label: AppLocalizations.of(context).dailylimit,
+              Navigator.of(context).push(
-          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,
                 MaterialPageRoute(
-                    builder: (context) => const BranchLocatorScreen()));
+                    builder: (context) => const QuickLinksScreen()),
-          },
+              );
-          disabled: true, 
+            },
-        ),
+            disabled: true,
-        const Divider(height: 1),
+          ),
-      ],
+          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 {

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/widgets/bank_logos.dart

@@ -22,7 +22,7 @@ Widget getBankLogo(String? bankName, BuildContext context) {
       height: 40,
     );
   }
-  if (bankName != null && bankName.toLowerCase().contains('icici bank ltd')) {
+  if (bankName != null && bankName.toLowerCase().contains('icici')) {
     return Image.asset(
       'assets/images/icici_logo.png',
       width: 40,
@@ -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,

lib/widgets/pin_input_field.dart

@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+class PinInputField extends StatelessWidget {
+  final TextEditingController controller;
+  final int length;
+  final FormFieldValidator<String>? validator;
+
+  const PinInputField({
+    super.key,
+    required this.controller,
+    this.length = 6,
+    this.validator,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return FormField<String>(
+      validator: validator,
+      builder: (FormFieldState<String> state) {
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            TextField(
+              controller: controller,
+              keyboardType: TextInputType.number,
+              inputFormatters: [
+                FilteringTextInputFormatter.digitsOnly,
+                LengthLimitingTextInputFormatter(length),
+              ],
+              obscureText: true,
+              obscuringCharacter: '*',
+              decoration: InputDecoration(
+                border: const OutlineInputBorder(),
+                labelText: 'Enter $length-digit PIN',
+                counterText: '', // Hide the counter
+              ),
+              onChanged: (value) {
+                state.didChange(value);
+              },
+            ),
+            if (state.hasError)
+              Padding(
+                padding: const EdgeInsets.only(top: 8.0, left: 12.0),
+                child: Text(
+                  state.errorText!,
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.error,
+                    fontSize: 12,
+                  ),
+                ),
+              ),
+          ],
+        );
+      },
+    );
+  }
+}

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

@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -93,18 +93,18 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.1"
   confetti:
     dependency: "direct main"
     description:
@@ -181,10 +181,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -385,10 +385,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
+    version: "0.20.2"
   jailbreak_root_detection:
     dependency: "direct main"
     description:
@@ -417,26 +417,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "11.0.2"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -497,10 +497,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
@@ -521,10 +521,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   mime:
     dependency: transitive
     description:
@@ -541,14 +541,30 @@ 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:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path_parsing:
     dependency: transitive
     description:
@@ -789,11 +805,19 @@ 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"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
@@ -814,18 +838,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   string_scanner:
     dependency: transitive
     description:
@@ -846,10 +870,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.6"
   typed_data:
     dependency: transitive
     description:
@@ -958,10 +982,10 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
@@ -1019,5 +1043,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"
   flutter: ">=3.24.0"

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,8 @@ 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
  # jailbreak_root_detection: "^1.1.6"