APK Build Pre_versioning

ios/Runner.xcodeproj/project.pbxproj

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

ios/Runner/Info.plist

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

lib/api/services/beneficiary_service.dart

@@ -64,6 +64,10 @@ class BeneficiaryService {
         'ifscCode': ifscCode,
         'remitterName': remitterName,
       },
+      options: Options(
+        sendTimeout: const Duration(seconds: 60),
+        receiveTimeout: const Duration(seconds: 60),
+      ),
     );
     if (response.statusCode != 200) {
       throw Exception("Invalid Beneficiary Details");

lib/api/services/change_password_service.dart

@@ -22,6 +22,23 @@ class ChangePasswordService {
     return response.toString();
   }
 
+    Future getOtpTpin({
+    required String mobileNumber,
+  }) async {
+    final response = await _dio.post(
+      '/api/otp/send',
+      data: {
+        'mobileNumber': mobileNumber,
+        'type': "CHANGE_TPIN"
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Invalid Mobile Number/Type");
+    }
+    print(response.toString());
+    return response.toString();
+  }
+
  
  Future validateOtp({
     required String otp,

lib/data/models/imps_transaction.dart

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

lib/data/models/neft_transaction.dart

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

lib/data/models/rtgs_transaction.dart

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

lib/data/models/transfer.dart

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

lib/di/injection.dart

@@ -65,11 +65,11 @@ Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080',
-      //'http://localhost:8081',
-      // 'http://localhost:8082',
-      connectTimeout: const Duration(seconds: 5),
-      receiveTimeout: const Duration(seconds: 10),
+          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
+          //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
+          //'https://kccbmbnk.net',
+      connectTimeout: const Duration(seconds: 60),
+      receiveTimeout: const Duration(seconds: 60),
       headers: {
         'Content-Type': 'application/json',
         'Accept': 'application/json',

lib/features/accounts/screens/account_statement_screen.dart

@@ -11,6 +11,8 @@ import 'transaction_details_screen.dart';
 import 'package:pdf/widgets.dart' as pw;
 import 'package:permission_handler/permission_handler.dart';
 import 'package:device_info_plus/device_info_plus.dart';
+ import 'package:path_provider/path_provider.dart';
+ import 'package:share_plus/share_plus.dart';
 
 class AccountStatementScreen extends StatefulWidget {
   final String accountNo;
@@ -287,7 +289,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                               ),
                               subtitle: Text(
                                 tx.name != null
-                                    ? (tx.name!.length > 18
+                                    ? (tx.name!.length > 22
                                         ? tx.name!.substring(0, 22)
                                         : tx.name!)
                                     : '',
@@ -489,6 +491,19 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
         }
       }
       // Add for IOS
+else if (Platform.isIOS) {
+  // On iOS, we save to a temporary directory and then open the share sheet.
+  final tempDir = await getTemporaryDirectory();
+  final file = await File('${tempDir.path}/$fileName').create();
+  await file.writeAsBytes(pdfBytes);
+
+  // Use share_plus to open the iOS share dialog
+  await Share.shareXFiles(
+    [XFile(file.path)],
+  );
+}
+      
+      
     } catch (e) {
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(

lib/features/auth/screens/set_password_screen.dart

@@ -3,6 +3,8 @@ import 'package:kmobile/api/services/auth_service.dart';
 import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/features/auth/screens/login_screen.dart';
 
+import '../../../l10n/app_localizations.dart';
+
 class SetPasswordScreen extends StatefulWidget {
   final String customerNo;
   const SetPasswordScreen({super.key, required this.customerNo});
@@ -75,7 +77,7 @@ class _SetPasswordScreenState extends State<SetPasswordScreen> {
       });
     } catch (e) {
       setState(() {
-        _error = e.toString();
+        _error = AppLocalizations.of(context).invalidOtp;
         _isLoading = false;
       });
     }
@@ -138,7 +140,9 @@ class _SetPasswordScreenState extends State<SetPasswordScreen> {
                 if (_error != null) ...[
                   Text(
                     _error!,
-                    style: const TextStyle(color: Colors.red),
+                    style: const TextStyle(color: Colors.red,
+                    fontWeight: FontWeight.bold,
+                    fontSize: 20),
                     textAlign: TextAlign.center,
                   ),
                   const SizedBox(height: 16),

lib/features/auth/screens/splash_screen.dart

@@ -26,7 +26,7 @@ class _SplashScreenState extends State<SplashScreen> {
               mainAxisSize: MainAxisSize.min,
               children: [
                 Text(
-                  AppLocalizations.of(context).kconnect,
+                  AppLocalizations.of(context).kccbMobile,
                   style: const TextStyle(
                     fontSize: 36,
                     fontWeight: FontWeight.bold,

lib/features/beneficiaries/screens/add_beneficiary_screen.dart

@@ -34,6 +34,7 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
   final TextEditingController branchNameController = TextEditingController();
   final TextEditingController ifscController = TextEditingController();
   final TextEditingController phoneController = TextEditingController();
+  final _ifscFocusNode = FocusNode();
   final service = getIt<BeneficiaryService>();
 
   bool _isValidating = false;
@@ -45,6 +46,11 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
   @override
   void initState() {
     super.initState();
+    _ifscFocusNode.addListener(() {
+  if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
+    _validateIFSC();
+  }
+});
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
         accountType = 'Savings';
@@ -52,26 +58,56 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
     });
   }
 
-  void _validateIFSC() async {
-    var beneficiaryService = getIt<BeneficiaryService>();
-    final ifsc = ifscController.text.trim().toUpperCase();
-    if (ifsc.isEmpty) return;
+   @override
+ void dispose() {
+   accountNumberController.dispose();
+   confirmAccountNumberController.dispose();
+   nameController.dispose();
+   bankNameController.dispose();
+   branchNameController.dispose();
+   ifscController.dispose();
+   phoneController.dispose();
+   _ifscFocusNode.dispose(); 
+   super.dispose();
+ }
 
-    final result = await beneficiaryService.validateIFSC(ifsc);
+   void _validateIFSC() async {
+     var beneficiaryService = getIt<BeneficiaryService>();
+     final ifsc = ifscController.text.trim().toUpperCase();
+     if (ifsc.isEmpty) return;
+
+      try {
+      final result = await beneficiaryService.validateIFSC(ifsc); 
+
+      if (mounted) {
+        if (result.bankName.isEmpty) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          );
+          bankNameController.clear();
+          branchNameController.clear();
+        } else {
+          bankNameController.text = result.bankName;
+          branchNameController.text = result.branchName;
+        }
+      }
+    } catch (e) {
+      if (mounted) {
+        final errorMessage = e.toString().toUpperCase();
+        String snackbarMessage = AppLocalizations.of(context).somethingWentWrong;
+
+        if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
+          snackbarMessage = AppLocalizations.of(context).invalidIfsc;
+        }
 
-    if (mounted) {
-      if (result.bankName == '') {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          SnackBar(content: Text(snackbarMessage)),
         );
         bankNameController.clear();
         branchNameController.clear();
-      } else {
-        bankNameController.text = result.bankName;
-        branchNameController.text = result.branchName;
       }
     }
-  }
+ }
 
   void _validateBeneficiary() async {
     FocusScope.of(context).unfocus();
@@ -296,6 +332,7 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                         ),
                         const SizedBox(height: 24),
                         TextFormField(
+                          focusNode: _ifscFocusNode,
                           key: _ifscFieldKey,
                           controller: ifscController,
                           maxLength: 11,
@@ -309,17 +346,16 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                           ),
                           textCapitalization: TextCapitalization.characters,
                           textInputAction: TextInputAction.next,
-                          onFieldSubmitted: (_) {
-                            _validateIFSC();
-                          },
-                          onChanged: (value) {
-                            final trimmed = value.trim().toUpperCase();
-                            if (trimmed.length < 11) {
-                              // clear bank/branch if backspace or changed
-                              bankNameController.clear();
-                              branchNameController.clear();
-                            }
-                          },
+                           onChanged: (value) {
+   setState(() {
+     final trimmed = value.trim().toUpperCase();
+     if (trimmed.length < 11) {
+       // clear bank/branch if backspace or changed
+       bankNameController.clear();
+       branchNameController.clear();
+     }
+   });
+ },
                           validator: (value) {
                             final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
                             if (value == null || value.trim().isEmpty) {
@@ -335,7 +371,7 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                           },
                         ),
                         const SizedBox(height: 24),
-                        // 🔹 Bank Name (Disabled)
+                        //  Bank Name (Disabled)
                         TextFormField(
                           controller: bankNameController,
                           enabled: false, // changed from readOnly to disabled
@@ -393,19 +429,19 @@ final _ifscFieldKey = GlobalKey<FormFieldState>();
                             child: SizedBox(
                               width: double.infinity,
                               child: ElevatedButton(
-onPressed: _isValidating
-    ? null
-    : () {
-        final isAccountValid =
-            _accountNumberFieldKey.currentState!.validate();
-        final isConfirmAccountValid =
-            _confirmAccountNumberFieldKey.currentState!.validate();
-        final isIfscValid = _ifscFieldKey.currentState!.validate();
+onPressed: _isValidating || ifscController.text.length != 11
+? null
+: () {
+    final isAccountValid =
+        _accountNumberFieldKey.currentState!.validate();
+    final isConfirmAccountValid =
+        _confirmAccountNumberFieldKey.currentState!.validate();
+    final isIfscValid = _ifscFieldKey.currentState!.validate();
 
-        if (isAccountValid && isConfirmAccountValid && isIfscValid) {
-          _validateBeneficiary();
-        }
-      },
+    if (isAccountValid && isConfirmAccountValid && isIfscValid) {
+      _validateBeneficiary();
+    }
+  },
 
                                 child: _isValidating
                                     ? const SizedBox(

lib/features/beneficiaries/screens/beneficiary_details_screen.dart

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

lib/features/customer_info/screens/customer_info_screen.dart

@@ -13,6 +13,15 @@ class CustomerInfoScreen extends StatefulWidget {
 
 class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
   late final User user = widget.user;
+  
+   String _maskPrimaryId(String? primaryId) {
+   if (primaryId == null || primaryId.length <= 4) {
+     return primaryId ?? 'N/A';
+   }
+   final lastFour = primaryId.substring(primaryId.length - 4);
+   return '*' * (primaryId.length - 4) + lastFour;
+ }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -83,10 +92,10 @@ class _CustomerInfoScreenState extends State<CustomerInfoScreen> {
                     label: AppLocalizations.of(context).branchAddress,
                     value: user.address ?? 'N/A',
                   ), // Replace with Aadhar if available
-                  InfoField(
-                    label: AppLocalizations.of(context).primaryId,
-                    value: user.primaryId ?? 'N/A',
-                  ), // Replace with PAN if available
+                InfoField(
+                  label: AppLocalizations.of(context).primaryId,
+                  value: _maskPrimaryId(user.primaryId),
+                ), // Replace with PAN if available
                 ],
               ),
             ),

lib/features/dashboard/screens/dashboard_screen.dart

@@ -213,7 +213,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
           backgroundColor: theme.scaffoldBackgroundColor,
           automaticallyImplyLeading: false,
           title: Text(
-            AppLocalizations.of(context).kconnect,
+            AppLocalizations.of(context).kccbMobile,
+            textAlign: TextAlign.left,
             style: TextStyle(
               color: theme.colorScheme.primary,
               fontWeight: FontWeight.w700,
@@ -226,12 +227,21 @@ class _DashboardScreenState extends State<DashboardScreen> {
               child: InkWell(
                 borderRadius: BorderRadius.circular(20),
                 onTap: () {
-                  Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                      builder: (context) => const ProfileScreen(),
-                    ),
-                  );
+                   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],
@@ -577,7 +587,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                             ),
                             subtitle: Text(
                               tx.name != null
-                                  ? (tx.name!.length > 18
+                                  ? (tx.name!.length > 22
                                       ? tx.name!.substring(0, 22)
                                       : tx.name!)
                                   : '',

lib/features/enquiry/screens/enquiry_screen.dart

@@ -30,6 +30,16 @@ class _EnquiryScreen extends State<EnquiryScreen> {
     }
   }
 
+   Future<void> _launchUrl(String url) async {
+   final Uri uri = Uri.parse(url);
+   if (await canLaunchUrl(uri)) {
+     await launchUrl(uri);
+   } else {
+     // Consider adding a 'urlLaunchError' key to your AppLocalizations
+     debugPrint('Could not launch $url');
+   }
+ }  
+
   Widget _buildContactItem(String role, String email, String phone) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -65,18 +75,30 @@ class _EnquiryScreen extends State<EnquiryScreen> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            // … existing Mail us / Call us / Write to us …
-            const SizedBox(height: 20),
-            Text(
-              AppLocalizations.of(context).writeToUs,
-            ),
-            const SizedBox(height: 4),
-            Text(
-              "complaint@kccb.in",
-              style: TextStyle(color: Theme.of(context).colorScheme.primary),
-            ),
+             const SizedBox(height: 20),
+ GestureDetector(
+   onTap: () => _launchUrl("https://kccb.in/complaint-form"),
+   child:  Row(
+  mainAxisSize: MainAxisSize.min,
+ children: [
+    Text("Complaint Form",
+     style: TextStyle(
+      fontSize: 17,
+       color: Theme.of(context).colorScheme.primary,
+       decorationColor: Theme.of(context).colorScheme.primary,
+     ),
+   ),
+    const SizedBox(width: 4), 
+ Icon(
+   Icons.open_in_new, 
+   color: Theme.of(context).colorScheme.primary,
+   size: 16.0, 
+ ),
+ ]
+)
+ ),
 
-            const SizedBox(height: 20),
+            const SizedBox(height: 40),
             Text(
               AppLocalizations.of(context).keyContacts,
               style: TextStyle(

lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart

@@ -41,12 +41,14 @@ class FundTransferAmountScreen extends StatefulWidget {
 
 class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
   final _amountController = TextEditingController();
+  final _remarksController = TextEditingController();
   final _formKey = GlobalKey<FormState>();
   TransactionMode _selectedMode = TransactionMode.neft;
 
   @override
   void dispose() {
     _amountController.dispose();
+    _remarksController.dispose();
     super.dispose();
   }
 
@@ -113,6 +115,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final neftService = getIt<NeftService>();
                   final completer = Completer<PaymentResponse>();
@@ -180,6 +183,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final impsService = getIt<ImpsService>();
                   final completer = Completer<PaymentResponse>();
@@ -236,6 +240,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                     remitterName: widget.remitterName,
                     beneficiaryName: widget.creditBeneficiary.name,
                     tpin: tpin,
+                    remarks: _remarksController.text,
                   );
                   final rtgsService = getIt<RtgsService>();
                   final completer = Completer<PaymentResponse>();
@@ -396,6 +401,15 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                   ),
                   const SizedBox(height: 24),
                 ],
+                //Remarks
+                 TextFormField(
+                  controller: _remarksController,
+                  decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).remarks,
+                  border: const OutlineInputBorder(),
+                    ),
+                  ),
+                 const SizedBox(height: 24),
                 // Amount
                 TextFormField(
                   controller: _amountController,

lib/features/fund_transfer/screens/fund_transfer_beneficiary_screen.dart

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

lib/features/fund_transfer/screens/tpin_otp_screen.dart

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

lib/features/fund_transfer/screens/tpin_prompt_screen.dart

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

lib/features/profile/change_password/change_password_otp_screen.dart

@@ -60,7 +60,7 @@ class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
 
 } catch (e) {
   ScaffoldMessenger.of(context).showSnackBar(
-    SnackBar(content: Text('${AppLocalizations.of(context).failedToValidate}: $e')),
+    SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
   );
 }
   }

lib/features/profile/change_password/change_password_screen.dart

@@ -7,7 +7,8 @@ import '../../../l10n/app_localizations.dart';
 import 'change_password_otp_screen.dart';
 
 class ChangePasswordScreen extends StatefulWidget {
-  const ChangePasswordScreen();
+  final String mobileNumber;
+  const ChangePasswordScreen({super.key, required this.mobileNumber});
 
   @override
   State<ChangePasswordScreen> createState() => _ChangePasswordScreenState();
@@ -61,8 +62,7 @@ void _proceed() async {
 
 
     try {
-      const mobileNumber = "8981274001"; // Replace with actual mobile number
-      await _changePasswordService.getOtp(mobileNumber: mobileNumber);
+      await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
 
 
       Navigator.push(
@@ -72,7 +72,7 @@ void _proceed() async {
             currentPassword: currentPasswordController.text,
             newPassword: newPasswordController.text,
             confirmPassword: confirmPasswordController.text,
-            mobileNumber: mobileNumber, 
+            mobileNumber: widget.mobileNumber, 
           ),
         ),
       );

lib/features/profile/preferences/preference_screen.dart

@@ -22,6 +22,12 @@ class PreferenceScreen extends StatelessWidget {
         builder: (context, state) {
           return ListView(
             children: [
+              //Set Prefered Username
+              //  ListTile(
+              //     leading: const Icon(Icons.person),
+              //     title: const Text("Set Prefered Username"),
+              //     onTap: () {
+              //     }),
               // Language Selection
               ListTile(
                 leading: const Icon(Icons.language),

lib/features/profile/profile_screen.dart

@@ -7,10 +7,15 @@ import '../../di/injection.dart';
 import '../../l10n/app_localizations.dart';
 import 'package:kmobile/features/profile/preferences/preference_screen.dart';
 
-class ProfileScreen extends StatelessWidget {
-  const ProfileScreen({super.key});
+class ProfileScreen extends StatefulWidget {
+  final String mobileNumber;
+  const ProfileScreen({super.key, required this.mobileNumber});
 
+  @override
+  State<ProfileScreen> createState() => _ProfileScreenState();
+}
 
+class _ProfileScreenState extends State<ProfileScreen> {
     Future<void> _handleLogout(BuildContext context) async {
     final auth = getIt<AuthRepository>();
     final prefs = await SharedPreferences.getInstance();
@@ -47,11 +52,25 @@ class ProfileScreen extends StatelessWidget {
             onTap: () {
             Navigator.push(  
               context,
-            MaterialPageRoute(builder: (context) => const ChangePasswordScreen()),
+            MaterialPageRoute(builder: (context) => ChangePasswordScreen(
+              mobileNumber: widget.mobileNumber,
+            )),
             );
             },
           ),
-          ListTile(
+          // ListTile(
+          //   leading: const Icon(Icons.password),
+          //   title: const Text("Manage TPIN"), 
+          //   onTap: () async {
+          //   },
+          // ),
+          //           ListTile(
+          //   leading: const Icon(Icons.password),
+          //   title: const Text("Change Login MPIN"), 
+          //   onTap: () async {
+          //   },
+          // ),
+            ListTile(
             leading: const Icon(Icons.logout),
             title: Text(AppLocalizations.of(context).logout), 
             onTap: () async {
@@ -65,7 +84,6 @@ class ProfileScreen extends StatelessWidget {
               }
             },
           ),
-          // You can add more profile options here later
         ],
       ),
     );

lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart

@@ -38,6 +38,8 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   final ifscController = TextEditingController();
   final phoneController = TextEditingController();
   final amountController = TextEditingController();
+  final remarksController = TextEditingController();
+  final _ifscFocusNode = FocusNode();
   final service = getIt<BeneficiaryService>();
 
   late String accountType;
@@ -48,6 +50,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   @override
   void initState() {
     super.initState();
+    _ifscFocusNode.addListener(() {
+  if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
+    _validateIFSC();
+  }
+});
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
         accountType = 'Savings';
@@ -59,21 +66,38 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     final ifsc = ifscController.text.trim().toUpperCase();
     if (ifsc.isEmpty) return;
 
-    final result = await service.validateIFSC(ifsc);
+    try {
+      final result = await service.validateIFSC(ifsc); 
+
+      if (mounted) {
+        if (result.bankName.isEmpty) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          );
+          bankNameController.clear();
+          branchNameController.clear();
+        } else {
+          bankNameController.text = result.bankName;
+          branchNameController.text = result.branchName;
+        }
+      }
+    } catch (e) {
+      if (mounted) {
+        final errorMessage = e.toString().toUpperCase();
+        String snackbarMessage = AppLocalizations.of(context).somethingWentWrong;
+
+        if (errorMessage.contains('INVALID') && errorMessage.contains('IFSC')) {
+          snackbarMessage = AppLocalizations.of(context).invalidIfsc;
+        }
 
-    if (mounted) {
-      if (result.bankName == '') {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
+          SnackBar(content: Text(snackbarMessage)),
         );
         bankNameController.clear();
         branchNameController.clear();
-      } else {
-        bankNameController.text = result.bankName;
-        branchNameController.text = result.branchName;
       }
     }
-  }
+ }
 
   void _validateBeneficiary() async {
     FocusScope.of(context).unfocus();
@@ -136,7 +160,9 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     ifscController.dispose();
     phoneController.dispose();
     amountController.dispose();
+    remarksController.dispose();
     super.dispose();
+    _ifscFocusNode.dispose();
   }
 
   void _onProceedToPay() {
@@ -188,6 +214,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   remitterName: "Unknown",
                   beneficiaryName: nameController.text,
                   tpin: tpin,
+                  remarks: remarksController.text,
                 );
                 final neftService = getIt<NeftService>();
                 final completer = Completer<PaymentResponse>();
@@ -253,6 +280,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   remitterName: "Unknown",
                   beneficiaryName: nameController.text,
                   tpin: tpin,
+                  remarks: remarksController.text,
                 );
                 final impsService = getIt<ImpsService>();
                 final completer = Completer<PaymentResponse>();
@@ -312,6 +340,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   remitterName: "Unknown",
                   beneficiaryName: nameController.text,
                   tpin: tpin,
+                  remarks: remarksController.text,
                 );
                 final rtgsService = getIt<RtgsService>();
                 final completer = Completer<PaymentResponse>();
@@ -474,6 +503,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 children: [
                   Expanded(
                     child: TextFormField(
+                      focusNode: _ifscFocusNode,
                       maxLength: 11,
                       inputFormatters: [
                         LengthLimitingTextInputFormatter(11),
@@ -496,17 +526,16 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                       ),
                       controller: ifscController,
                       textInputAction: TextInputAction.next,
-                      onFieldSubmitted: (_) {
-                        _validateIFSC();
-                      },
                       onChanged: (value) {
+                         setState(() {
                         final trimmed = value.trim().toUpperCase();
                         if (trimmed.length < 11) {
                           // clear bank/branch if backspace or changed
                           bankNameController.clear();
                           branchNameController.clear();
                         }
-                      },
+                      });
+                    },
                       validator: (value) {
                         final pattern = RegExp(r'^[A-Z]{4}0[A-Z0-9]{6}$');
                         if (value == null || value.trim().isEmpty) {
@@ -608,18 +637,18 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   child: SizedBox(
                     width: double.infinity,
                     child: ElevatedButton(
-                      onPressed: _isValidating
-                          ? null
-                          : () {
-                              if (confirmAccountNumberController.text ==
-                                  accountNumberController.text) {
-                                _validateBeneficiary();
-                              } else {
-                                setState(() {
-                                  _validationError =
-                                      AppLocalizations.of(context)
-                                          .accountMismatch;
-                                });
+                     onPressed: _isValidating || ifscController.text.length != 11
+    ? null
+    : () {
+        if (confirmAccountNumberController.text ==
+            accountNumberController.text) {
+          _validateBeneficiary();
+        } else {
+          setState(() {
+            _validationError =
+                AppLocalizations.of(context)
+                    .accountMismatch;
+          });
                               }
                             },
                       child: _isValidating
@@ -667,6 +696,25 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   return null;
                 },
               ),
+                 const SizedBox(height: 25),
+   TextFormField(
+     controller: remarksController,
+     decoration: InputDecoration(
+       labelText: AppLocalizations.of(context).remarks,
+       border: const OutlineInputBorder(),
+       isDense: true,
+       filled: true,
+       fillColor: Theme.of(context).scaffoldBackgroundColor,
+       enabledBorder: OutlineInputBorder(
+         borderSide: BorderSide(
+             color: Theme.of(context).colorScheme.outline),
+       ),
+       focusedBorder: OutlineInputBorder(
+         borderSide: BorderSide(
+             color: Theme.of(context).colorScheme.primary, width: 2),
+       ),
+     ),
+   ),
               const SizedBox(height: 25),
               Row(
                 children: [

lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart

@@ -24,6 +24,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
   final TextEditingController amountController = TextEditingController();
+  final TextEditingController remarksController = TextEditingController();
   String? _selectedAccountType;
 
   String? _beneficiaryName;
@@ -57,6 +58,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
     accountNumberController.dispose();
     confirmAccountNumberController.dispose();
     amountController.dispose();
+    remarksController.dispose(); 
     super.dispose();
   }
 
@@ -276,6 +278,25 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                 },
               ),
               const SizedBox(height: 25),
+TextFormField(
+  controller: remarksController,
+  decoration: InputDecoration(
+    labelText: AppLocalizations.of(context).remarks,
+    border: const OutlineInputBorder(),
+    isDense: true,
+    filled: true,
+    fillColor: Theme.of(context).scaffoldBackgroundColor,
+    enabledBorder: OutlineInputBorder(
+      borderSide: BorderSide(
+          color: Theme.of(context).colorScheme.outline),
+    ),
+    focusedBorder: OutlineInputBorder(
+      borderSide: BorderSide(
+          color: Theme.of(context).colorScheme.primary, width: 2),
+    ),
+  ),
+),
+              const SizedBox(height: 25),
               TextFormField(
                 decoration: InputDecoration(
                   labelText: AppLocalizations.of(context).amount,
@@ -343,6 +364,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                                 toAccountType: _selectedAccountType!,
                                 amount: amountController.text,
                                 tpin: tpin,
+                                remarks: remarksController.text,
                               );
 
                               final paymentService = getIt<PaymentService>();

lib/features/service/screens/branch_locator_screen.dart

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

lib/features/service/screens/daily_transaction_limit.dart

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

lib/features/service/screens/faqs_screen.dart

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

lib/features/service/screens/quick_links_screen.dart

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

lib/features/service/screens/service_screen.dart

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

lib/l10n/app_en.arb

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

lib/l10n/app_hi.arb

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

lib/main.dart

@@ -1,5 +1,4 @@
 // ignore_for_file: unused_import
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:kmobile/features/security/security_error_screen.dart';
@@ -10,22 +9,19 @@ import 'app.dart';
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  // Set preferred orientations
   await SystemChrome.setPreferredOrientations([
     DeviceOrientation.portraitUp,
     DeviceOrientation.portraitDown,
   ]);
 
   // Check for device compromise
-  final compromisedMessage = await SecurityService.deviceCompromisedMessage;
-  if (compromisedMessage != null) {
-    runApp(MaterialApp(
-      home: SecurityErrorScreen(message: compromisedMessage),
-    ));
-    return;
-  }
-
-  // Initialize dependencies
+  // final compromisedMessage = await SecurityService.deviceCompromisedMessage;
+  // if (compromisedMessage != null) {
+  //   runApp(MaterialApp(
+  //     home: SecurityErrorScreen(message: compromisedMessage),
+  //   ));
+  //   return;
+  // }
   await setupDependencies();
   runApp(const KMobile());
 }

pubspec.lock

@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.13.0"
+    version: "2.11.0"
   barcode:
     dependency: transitive
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   chalkdart:
     dependency: transitive
     description:
@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.3.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -93,18 +93,18 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.1"
+    version: "1.18.0"
   confetti:
     dependency: "direct main"
     description:
@@ -157,10 +157,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
+      sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
       url: "https://pub.dev"
     source: hosted
-    version: "5.8.0+1"
+    version: "5.9.0"
   dio_web_adapter:
     dependency: transitive
     description:
@@ -181,10 +181,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.3"
+    version: "1.3.1"
   ffi:
     dependency: transitive
     description:
@@ -337,10 +337,10 @@ packages:
     dependency: "direct main"
     description:
       name: get_it
-      sha256: e87cd1d108e472a0580348a543a0c49ed3d70c8a5c809c6d418583e595d0a389
+      sha256: a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.2.0"
   glob:
     dependency: transitive
     description:
@@ -353,18 +353,18 @@ packages:
     dependency: "direct main"
     description:
       name: google_fonts
-      sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
+      sha256: df9763500dadba0155373e9cb44e202ce21bd9ed5de6bdbd05c5854e86839cb8
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "6.3.0"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   http_parser:
     dependency: transitive
     description:
@@ -385,10 +385,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.20.2"
+    version: "0.19.0"
   jailbreak_root_detection:
     dependency: "direct main"
     description:
@@ -417,18 +417,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.9"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.9"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -497,10 +497,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.17"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
@@ -513,18 +513,18 @@ packages:
     dependency: "direct main"
     description:
       name: material_symbols_icons
-      sha256: ef20d86fb34c2b59eb7553c4d795bb8a7ec8c890c53ffd3148c64f7adc46ae50
+      sha256: "52b8a84922464027c9d69100307f654a8f2356c818401a5415c08243883925d8"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2858.1"
+    version: "4.2872.2"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
@@ -545,10 +545,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.9.0"
   path_parsing:
     dependency: transitive
     description:
@@ -689,10 +689,10 @@ packages:
     dependency: "direct main"
     description:
       name: provider
-      sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
+      sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.5+1"
   qr:
     dependency: transitive
     description:
@@ -793,15 +793,15 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.0"
+    version: "0.0.99"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.1"
+    version: "1.10.0"
   sprintf:
     dependency: transitive
     description:
@@ -814,42 +814,42 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.1"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.2"
   typed_data:
     dependency: transitive
     description:
@@ -966,10 +966,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "15.0.0"
+    version: "14.2.5"
   web:
     dependency: transitive
     description:
@@ -1019,5 +1019,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.7.0-0 <4.0.0"
+  dart: ">=3.5.0 <4.0.0"
   flutter: ">=3.24.0"

pubspec.yaml

@@ -25,7 +25,7 @@ environment:
 # To automatically upgrade your package dependencies to the latest versions
 # consider running `flutter pub upgrade --major-versions`. Alternatively,
 # dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
+# the latest version availabwhle on pub.dev. To see which dependencies have newer
 # versions available, run `flutter pub outdated`.
 dependencies:
   flutter:
@@ -145,5 +145,5 @@ flutter:
 
 flutter_icons:
   android: true
-  ios: false
+  ios: true
   image_path: assets/images/icon.png