Change TPIn #5

lib/api/services/change_password_service.dart

@@ -67,4 +67,21 @@ class ChangePasswordService {
     }
     return response.toString();
   }
+
+  Future validateChangeTpin({
+    required String oldTpin,
+    required String newTpin,
+  }) async {
+    final response = await _dio.post(
+      '/api/auth/change/tpin',
+      data: {
+        'oldTpin': oldTpin,
+        'newTpin': newTpin,
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Wrong OTP");
+    }
+    return response.toString();
+  }
 }

lib/di/injection.dart

@@ -69,9 +69,9 @@ Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-         // 'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
+         'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
       //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
-      'https://kccbmbnk.net', //prod small
+      //'https://kccbmbnk.net', //prod small
       connectTimeout: const Duration(seconds: 60),
       receiveTimeout: const Duration(seconds: 60),
       headers: {

lib/features/dashboard/screens/dashboard_screen.dart

@@ -138,7 +138,7 @@ class _DashboardScreenState extends State<DashboardScreen>
     // Convert to title case
     switch (accountType.toLowerCase()) {
       case 'sa':
-        return AppLocalizations.of(context).savingsAccount;
+        return AppLocalizations.of(context).savingsAccount;        
       case 'sb':
         return AppLocalizations.of(context).savingsAccount;
       case 'ln':
@@ -147,6 +147,8 @@ class _DashboardScreenState extends State<DashboardScreen>
         return AppLocalizations.of(context).termDeposit;
       case 'rd':
         return AppLocalizations.of(context).recurringDeposit;
+      case 'ca':
+        return "Current Account";
       default:
         return AppLocalizations.of(context).unknownAccount;
     }
@@ -266,6 +268,8 @@ class _DashboardScreenState extends State<DashboardScreen>
             if (state is Authenticated) {
               final users = state.users;
               final currAccount = users[selectedAccountIndex];
+              final accountType = currAccount.accountType?.toLowerCase();
+              final isPaymentDisabled = accountType != 'sa' && accountType != 'sb' && accountType != 'ca';
               // first‐time load
               if (!_txInitialized) {
                 _txInitialized = true;
@@ -480,33 +484,36 @@ class _DashboardScreenState extends State<DashboardScreen>
                               );
                             },
                           ),
-                          _buildQuickLink(
-                            Symbols.currency_rupee,
-                            AppLocalizations.of(context).quickPay,
-                            () {
-                              Navigator.push(
-                                context,
-                                MaterialPageRoute(
-                                  builder: (context) => QuickPayScreen(
-                                    debitAccount: currAccount.accountNo!,
-                                  ),
-                                ),
-                              );
-                            },
-                          ),
+                             _buildQuickLink(
+     Symbols.currency_rupee,
+     AppLocalizations.of(context).quickPay,
+     () {
+       Navigator.push(
+         context,
+         MaterialPageRoute(
+           builder: (context) => QuickPayScreen(
+             debitAccount: currAccount.accountNo!,
+           ),
+         ),
+       );
+     },
+     disable: isPaymentDisabled,
+   ),
                           _buildQuickLink(Symbols.send_money,
-                              AppLocalizations.of(context).fundTransfer, () {
-                            Navigator.push(
-                                context,
-                                MaterialPageRoute(
-                                    builder: (context) => FundTransferScreen(
-                                        creditAccountNo:
-                                            users[selectedAccountIndex]
-                                                .accountNo!,
-                                        remitterName:
-                                            users[selectedAccountIndex]
-                                                .name!)));
-                          }, disable: false),
+     AppLocalizations.of(context).fundTransfer, () {
+   Navigator.push(
+       context,
+       MaterialPageRoute(
+           builder: (context) => FundTransferScreen(
+               creditAccountNo:
+                   users[selectedAccountIndex]
+                       .accountNo!,
+               remitterName:
+                   users[selectedAccountIndex]
+                       .name!,
+               // Pass the full list of accounts
+               accounts: users)));
+ }, disable: isPaymentDisabled),
                           _buildQuickLink(
                             Symbols.server_person,
                             AppLocalizations.of(context).accountInfo,

lib/features/fund_transfer/screens/fund_transfer_screen.dart

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

lib/features/fund_transfer/screens/fund_transfer_self_accounts_screen.dart

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

lib/features/fund_transfer/screens/fund_transfer_self_amount_screen.dart

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

lib/features/profile/profile_screen.dart

@@ -5,6 +5,7 @@ import 'package:kmobile/data/repositories/auth_repository.dart';
 import 'package:kmobile/features/profile/change_password/change_password_screen.dart';
 import 'package:kmobile/features/profile/daily_transaction_limit.dart';
 import 'package:kmobile/features/profile/logout_dialog.dart';
+import 'package:kmobile/features/profile/tpin/change_tpin_screen.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -12,6 +13,9 @@ import 'package:shared_preferences/shared_preferences.dart';
 import '../../di/injection.dart';
 import '../../l10n/app_localizations.dart';
 import 'package:kmobile/features/profile/preferences/preference_screen.dart';
+import 'package:kmobile/api/services/auth_service.dart';
+import 'package:kmobile/features/fund_transfer/screens/tpin_set_screen.dart';
+
 
 class ProfileScreen extends StatefulWidget {
   final String mobileNumber;
@@ -34,13 +38,12 @@ class _ProfileScreenState extends State<ProfileScreen> {
     return 'Version ${info.version} (${info.buildNumber})';
   }
 
-  Future<void> _loadBiometricStatus() async {
-    final storage = getIt<SecureStorage>();
-    final isEnabled = await storage.read('biometric_enabled');
-    setState(() {
-      _isBiometricEnabled = isEnabled == 'true';
-    });
-  }
+   Future<void> _loadBiometricStatus() async {
+   final prefs = await SharedPreferences.getInstance();
+   setState(() {
+     _isBiometricEnabled = prefs.getBool('biometric_enabled') ?? false;
+   });
+ }
 
   Future<void> _handleLogout(BuildContext context) async {
     final auth = getIt<AuthRepository>();
@@ -51,89 +54,90 @@ class _ProfileScreenState extends State<ProfileScreen> {
     Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false);
   }
 
-  Future<void> _handleBiometricToggle(bool enable) async {
-    final localAuth = LocalAuthentication();
-    final storage = getIt<SecureStorage>();
-    final canCheck = await localAuth.canCheckBiometrics;
+    Future<void> _handleBiometricToggle(bool enable) async {
+   final localAuth = LocalAuthentication();
+   final prefs = await SharedPreferences.getInstance();
+   final canCheck = await localAuth.canCheckBiometrics;
 
-    if (!canCheck) {
-      // Optional: Show a snackbar or dialog if biometrics are not available
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-            content: Text(AppLocalizations.of(context).biometricsNotAvailable)),
-      );
-      return;
-    }
+   if (!canCheck) {
+     ScaffoldMessenger.of(context).showSnackBar(
+       SnackBar(
+           content: Text(AppLocalizations.of(context).biometricsNotAvailable)),
+     );
+     return;
+   }
 
-    if (enable) {
-      // Show "Enable" dialog
-      final optIn = await showDialog<bool>(
-        context: context,
-        barrierDismissible: false,
-        builder: (ctx) => AlertDialog(
-          title: Text(AppLocalizations.of(context).enableFingerprintLogin),
-          content: Text(AppLocalizations.of(context).enableFingerprintMessage),
-          actions: [
-            TextButton(
-              onPressed: () => Navigator.of(ctx).pop(false),
-              child: Text(AppLocalizations.of(context).no),
-            ),
-            TextButton(
-              onPressed: () => Navigator.of(ctx).pop(true),
-              child: Text(AppLocalizations.of(context).yes),
-            ),
-          ],
-        ),
-      );
+   if (enable) {
+     final optIn = await showDialog<bool>(
+       context: context,
+       barrierDismissible: false,
+       builder: (ctx) => AlertDialog(
+         title: Text(AppLocalizations.of(context).enableFingerprintLogin),
+         content: Text(AppLocalizations.of(context).enableFingerprintMessage),
+         actions: [
+           TextButton(
+             onPressed: () => Navigator.of(ctx).pop(false),
+             child: Text(AppLocalizations.of(context).no),
+           ),
+           TextButton(
+             onPressed: () => Navigator.of(ctx).pop(true),
+             child: Text(AppLocalizations.of(context).yes),
+           ),
+         ],
+       ),
+     );
 
-      if (optIn == true) {
-        try {
-          final didAuth = await localAuth.authenticate(
-            localizedReason: AppLocalizations.of(context).authenticateToEnable,
-            options: const AuthenticationOptions(
-              stickyAuth: true,
-              biometricOnly: true,
-            ),
-          );
-          if (didAuth) {
-            await storage.write('biometric_enabled', 'true');
-            setState(() {
-              _isBiometricEnabled = true;
-            });
-          }
-        } catch (e) {
-          // Handle authentication errors
-        }
-      }
-    } else {
-      // Show "Disable" dialog
-      final optOut = await showDialog<bool>(
-        context: context,
-        barrierDismissible: false,
-        builder: (ctx) => AlertDialog(
-          title: Text(AppLocalizations.of(context).disableFingerprintLogin),
-          content: Text(AppLocalizations.of(context).disableFingerprintMessage),
-          actions: [
-            TextButton(
-              onPressed: () => Navigator.of(ctx).pop(false),
-              child: Text(AppLocalizations.of(context).no),
-            ),
-            TextButton(
-              onPressed: () => Navigator.of(ctx).pop(true),
-              child: Text(AppLocalizations.of(context).yes),
-            ),
-          ],
-        ),
-      );
+     if (optIn == true) {
+       try {
+         final didAuth = await localAuth.authenticate(
+           localizedReason: AppLocalizations.of(context).authenticateToEnable,
+           options: const AuthenticationOptions(
+             stickyAuth: true,
+             biometricOnly: true,
+           ),
+         );
+         if (didAuth) {
+           await prefs.setBool('biometric_enabled', true);
+           if (mounted) {
+             setState(() {
+               _isBiometricEnabled = true;
+             });
+           }
+         }
+       } catch (e) {
+         // Handle exceptions, state remains unchanged.
+       }
+     }
+   } else {
+     final optOut = await showDialog<bool>(
+       context: context,
+       barrierDismissible: false,
+       builder: (ctx) => AlertDialog(
+         title: Text(AppLocalizations.of(context).disableFingerprintLogin),
+         content: Text(AppLocalizations.of(context).disableFingerprintMessage),
+         actions: [
+           TextButton(
+             onPressed: () => Navigator.of(ctx).pop(false),
+             child: Text(AppLocalizations.of(context).no),
+           ),
+           TextButton(
+             onPressed: () => Navigator.of(ctx).pop(true),
+             child: Text(AppLocalizations.of(context).yes),
+           ),
+         ],
+       ),
+     );
 
-      if (optOut == true) {
-        await storage.write('biometric_enabled', 'false');
-        setState(() {
-          _isBiometricEnabled = false;
-        });
-      }
-    }
-  }
+     if (optOut == true) {
+       await prefs.setBool('biometric_enabled', false);
+       if (mounted) {
+         setState(() {
+           _isBiometricEnabled = false;
+         });
+       }
+     }
+   }
+ }
 
   @override
   Widget build(BuildContext context) {
@@ -168,13 +172,14 @@ class _ProfileScreenState extends State<ProfileScreen> {
             },
           ),
           SwitchListTile(
-            title: Text(AppLocalizations.of(context).enableFingerprintLogin),
-            value: _isBiometricEnabled,
-            onChanged: (bool value) {
-              _handleBiometricToggle(value);
-            },
-            secondary: const Icon(Icons.fingerprint),
-          ),
+   title: Text(AppLocalizations.of(context).enableFingerprintLogin),
+   value: _isBiometricEnabled,
+   onChanged: (bool value) {
+     // The state is now managed within _handleBiometricToggle
+     _handleBiometricToggle(value);
+   },
+   secondary: const Icon(Icons.fingerprint),
+ ),
           ListTile(
             leading: const Icon(Icons.password),
             title: Text(loc.changeLoginPassword),
@@ -188,12 +193,57 @@ class _ProfileScreenState extends State<ProfileScreen> {
               );
             },
           ),
-          // ListTile(
-          //   leading: const Icon(Icons.password),
-          //   title: const Text("Manage TPIN"),
-          //   onTap: () async {
-          //   },
-          // ),
+          ListTile(
+            leading: const Icon(Icons.password),
+  title: Text('Change TPIN'),
+  onTap: () async {
+    // 1. Get the AuthService instance
+    final authService = getIt<AuthService>();
+
+    // 2. Call checkTpin() to see if TPIN is set
+    final isTpinSet = await authService.checkTpin();
+
+    // 3. If TPIN is not set, show the dialog
+    if (!isTpinSet) {
+      showDialog(
+        context: context,
+        builder: (BuildContext context) {
+          return AlertDialog(
+            title: Text('TPIN Not Set'),
+            content: Text('You have not set a TPIN yet. Please set a TPIN to proceed.'),
+            actions: <Widget>[
+              TextButton(
+                child: Text('Back'),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+              TextButton(
+                child: Text('Proceed'),
+                onPressed: () {
+                  Navigator.of(context).pop(); // Dismiss the dialog
+                  // Navigate to the TPIN set screen
+                  Navigator.of(context).push(
+                    MaterialPageRoute(
+                      builder: (context) => TpinSetScreen(),
+                    ),
+                  );
+                },
+              ),
+            ],
+          );
+        },
+      );
+    } else {
+      // Case 2: TPIN is set
+Navigator.of(context).push(
+  MaterialPageRoute(
+    builder: (context) => ChangeTpinScreen(mobileNumber: widget.mobileNumber),
+  ),
+);
+    }
+  },
+),
           //           ListTile(
           //   leading: const Icon(Icons.password),
           //   title: const Text("Change Login MPIN"),

lib/features/profile/tpin/change_tpin_otp_screen.dart

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

lib/features/profile/tpin/change_tpin_screen.dart

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

lib/widgets/pin_input_field.dart

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