Proceed or Swipe to pay disabled on over limit

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/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,6 +47,7 @@ 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>()));
@@ -69,12 +71,13 @@ Dio _createDioClient() {
       baseUrl:
           'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
       //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
-      //'https://kccbmbnk.net',
+      //'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/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();
@@ -429,6 +485,14 @@ 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(),
 
@@ -436,7 +500,7 @@ class _FundTransferAmountScreenState extends State<FundTransferAmountScreen> {
                 SizedBox(
   width: double.infinity,
   child: ElevatedButton(
-                    onPressed: _onProceed,
+    onPressed: _isAmountOverLimit ? null : _onProceed, 
     style: ElevatedButton.styleFrom(
       padding: const EdgeInsets.symmetric(vertical: 16),
     ),

lib/features/profile/daily_transaction_limit.dart

@@ -0,0 +1,228 @@
+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';
+
+class DailyLimitScreen extends StatefulWidget {
+  const DailyLimitScreen({super.key});
+  @override
+  State<DailyLimitScreen> createState() => _DailyLimitScreenState();
+}
+
+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();
+    _loadlimits();
+  }
+  
+  Future<void> _loadlimits() async {
+     setState(() {
+   _isLoading = true;
+ });
+    final limit_data = await service.getLimit();
+    setState(() {
+   limit = limit_data;
+   _isLoading = false;
+ });
+  }
+
+  @override
+  void dispose() {
+    _limitController.dispose();
+    super.dispose();
+  }
+
+Future<void> _showAddOrEditLimitDialog() async {
+  _limitController.text = _currentLimit?.toStringAsFixed(0) ?? '';
+  final newLimit = await showDialog<double>(
+    context: context,
+    builder: (dialogContext) {
+      final localizations = AppLocalizations.of(dialogContext);
+      final theme = Theme.of(dialogContext);
+      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(dialogContext).pop(),
+            child: Text(localizations.cancel),
+          ),
+          ElevatedButton(
+            onPressed: () {
+              final value = double.tryParse(_limitController.text);
+              if (value == null || value <= 0) return;
+
+              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),
+          ),
+        ],
+      );
+    },
+  );
+
+  if (newLimit != null) {
+    _loadlimits();
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      const SnackBar(
+        content: Text("Limit Updated"),
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
+  }
+}
+
+
+  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),
+     ),
+     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,
+               ),
+             ),
+             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(
+                 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/profile/profile_screen.dart

@@ -3,6 +3,7 @@ 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/security/secure_storage.dart';
 import 'package:local_auth/local_auth.dart';
@@ -155,6 +156,17 @@ 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,

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,6 +56,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
   @override
   void initState() {
     super.initState();
+     _loadLimit();
     _ifscFocusNode.addListener(() {
       if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
         _validateIFSC();
@@ -60,6 +67,49 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
         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 {
@@ -718,6 +768,9 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 ),
               ),
               const SizedBox(height: 25),
+              Column(
+  crossAxisAlignment: CrossAxisAlignment.start,
+  children: [
               Row(
                 children: [
                   Expanded(
@@ -782,6 +835,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(
@@ -799,13 +868,20 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                  alignment: Alignment.center,
                  child: SwipeButton.expand(
                    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
+                       ? Colors.grey.shade300
+                       : Theme.of(context).colorScheme.secondary.withAlpha(100),
                    borderRadius: BorderRadius.circular(30),
                    height: 56,
-                  onSwipe: _onProceedToPay,
+                   onSwipe: () {
+                     if (_isAmountOverLimit) {
+                       return; // Do nothing if amount is over the limit
+                     }
+                     _onProceedToPay();
+                   },
                    child: Text(
                      AppLocalizations.of(context).swipeToPay,
                      style: const TextStyle(

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,8 +40,52 @@ 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() {
@@ -53,6 +102,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
 
   @override
   void dispose() {
+    amountController.removeListener(_checkAmountLimit);
     accountNumberController.removeListener(_resetBeneficiaryValidation);
     confirmAccountNumberController.removeListener(_resetBeneficiaryValidation);
     accountNumberController.dispose();
@@ -102,6 +152,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
         padding: const EdgeInsets.all(16.0),
         child: Form(
           key: _formKey,
+          child: SingleChildScrollView(
   child: Column(
             children: [
               const SizedBox(height: 10),
@@ -297,6 +348,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                 ),
               ),
               const SizedBox(height: 25),
+              
               TextFormField(
                 decoration: InputDecoration(
                   labelText: AppLocalizations.of(context).amount,
@@ -326,15 +378,26 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                   }
                   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(
                  alignment: Alignment.center,
                  child: SwipeButton.expand(
                    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,
+                   activeTrackColor: _isAmountOverLimit
+                       ? Colors.grey.shade300
+                       : Theme.of(
                      context,
                    ).colorScheme.secondary.withAlpha(100),
                    borderRadius: BorderRadius.circular(30),
@@ -344,6 +407,9 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                      style: const TextStyle(fontSize: 16),
                    ),
                    onSwipe: () {
+                     if (_isAmountOverLimit) {
+                       return; // Do nothing if amount is over limit
+                     }
                      if (_formKey.currentState!.validate()) {
                        if (!_isBeneficiaryValidated) {
                          setState(() {
@@ -389,6 +455,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
           ),
           ),
         ),
+      ),
     );
   }
 

lib/features/service/screens/daily_transaction_limit.dart

@@ -1,161 +0,0 @@
-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/service_screen.dart

@@ -1,5 +1,5 @@
 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';
@@ -40,18 +40,6 @@ class _ServiceScreen extends State<ServiceScreen> {
             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,