Final bug fixed

(for migrated users)

analysis_options.yaml

@@ -10,6 +10,7 @@
 analyzer:
   errors:
     dead_code: ignore
+    non_constant_identifier_names: ignore
 include: package:flutter_lints/flutter.yaml
 
 linter:

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/auth_service.dart

@@ -25,7 +25,8 @@ class AuthService {
         print(e.toString());
       }
       if (e.response?.statusCode == 401) {
-        throw AuthException('Invalid credentials');
+        throw AuthException(
+            e.response?.data['error'] ?? 'SOMETHING WENT WRONG');
       }
       throw NetworkException('Network error during login');
     } catch (e) {
@@ -91,4 +92,53 @@ class AuthService {
           'Unexpected error during TPIN setup: ${e.toString()}');
     }
   }
+
+  Future<void> sendOtpForSettingPassword(String customerNo) async {
+    try {
+      final response =
+          await _dio.get('/api/otp/send/set-password', queryParameters: {
+        'customerNo': customerNo,
+      });
+      if (response.statusCode != 200) {
+        throw Exception(response.data['error'] ?? 'Failed to send OTP');
+      }
+      return;
+    } on DioException catch (e) {
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      throw Exception('Unexpected error: ${e.toString()}');
+    }
+  }
+
+  Future<String> verifyOtpForSettingPassword(
+      String customerNo, String otp) async {
+    try {
+      final response = await _dio.get(
+        '/api/otp/verify/set-password',
+        queryParameters: {'customerNo': customerNo, 'otp': otp},
+      );
+
+      if (response.statusCode == 200) {
+        return response.data['token'];
+      } else {
+        throw Exception(response.data['error'] ?? 'Failed to verify OTP');
+      }
+    } on DioException catch (e) {
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      throw Exception('Unexpected error: ${e.toString()}');
+    }
+  }
+
+  Future changePassword(String newPassword, String token) async {
+    final response = await _dio.post(
+      '/api/auth/login_password',
+      data: {'login_password': newPassword},
+      options: Options(headers: {'Authorization': 'Bearer $token'}),
+    );
+    if (response.statusCode != 200) {
+      throw Exception('Error setting password');
+    }
+    return;
+  }
 }

lib/api/services/beneficiary_service.dart

@@ -1,5 +1,6 @@
 import 'dart:developer';
 import 'package:dio/dio.dart';
+import 'package:kmobile/core/errors/exceptions.dart';
 import 'package:kmobile/data/models/ifsc.dart';
 import 'package:kmobile/data/models/beneficiary.dart';
 
@@ -40,8 +41,12 @@ class BeneficiaryService {
       if (e.response?.statusCode == 404) {
         throw Exception('INVALID IFSC CODE');
       }
+      else if (e.response?.statusCode == 401) {
+        throw Exception('INVALID IFSC CODE');
+      }
     } catch (e) {
-      rethrow;
+      throw UnexpectedException(
+          'Unexpected error during login: ${e.toString()}');
     }
     return Ifsc.fromJson({});
   }
@@ -59,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");
@@ -66,7 +75,7 @@ class BeneficiaryService {
     return response.data['name'];
   }
 
-  // Send Data for Validation
+  // Beneficiary Validate And ADD
   Future<bool> sendForValidation(Beneficiary beneficiary) async {
     try {
       final response = await _dio.post(

lib/api/services/change_password_service.dart

@@ -0,0 +1,77 @@
+import 'package:dio/dio.dart';
+
+class ChangePasswordService {
+  final Dio _dio;
+
+  ChangePasswordService(this._dio);
+
+  Future getOtp({
+    required String mobileNumber,
+  }) async {
+    final response = await _dio.post(
+      '/api/otp/send',
+      data: {
+        'mobileNumber': mobileNumber,
+        'type': "CHANGE_LPWORD"
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Invalid Mobile Number/Type");
+    }
+    print(response.toString());
+    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,
+    required String mobileNumber,
+  }) async {
+    final response = await _dio.post(
+      '/api/otp/verify?mobileNumber=$mobileNumber',
+      data: {
+        'otp' : otp,
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Wrong OTP");
+    }
+    return response.toString();
+  }
+
+ Future validateChangePwd({
+  required String OldLPsw,
+  required String newLPsw,
+  required String confirmLPsw,
+ }) async {
+  final response = await _dio.post(
+      '/api/auth/change/login_password',
+      data: {
+      'OldLPsw': OldLPsw,
+      'newLPsw': newLPsw,
+      'confirmLPsw': confirmLPsw,
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Wrong OTP");
+    }
+    return response.toString();
+ }
+}

lib/app.dart

@@ -342,10 +342,10 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
         bottomNavigationBar: BottomNavigationBar(
           currentIndex: _selectedIndex,
           type: BottomNavigationBarType.fixed,
-          backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+          backgroundColor: const Color(0XFF1E58AD),
-          selectedItemColor: Theme.of(context).colorScheme.primary,
+          selectedItemColor: Theme.of(context).colorScheme.onPrimary,
           unselectedItemColor:
-              Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
+              Theme.of(context).colorScheme.onSecondary,
           onTap: (index) {
             setState(() {
               _selectedIndex = index;

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/transaction.dart

@@ -4,8 +4,18 @@ class Transaction {
   final String? date;
   final String? amount;
   final String? type;
+  final String? balance;
+  final String? balanceType;
+
+  Transaction(
+      {this.id,
+      this.name,
+      this.date,
+      this.amount,
+      this.type,
+      this.balance,
+      this.balanceType});
 
-  Transaction({this.id, this.name, this.date, this.amount, this.type});
   Map<String, dynamic> toJson() {
     return {
       'id': id,
@@ -13,6 +23,8 @@ class Transaction {
       'date': date,
       'amount': amount,
       'type': type,
+      'balance': balance,
+      'balanceType': balanceType
     };
   }
 
@@ -23,6 +35,7 @@ class Transaction {
         date: json['date'] as String?,
         amount: json['amount'] as String?,
         type: json['type'] as String?,
-    );
+        balance: json['balance'] as String?,
+        balanceType: json['balanceType'] as String?);
   }
 }

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/data/repositories/transaction_repository.dart

@@ -1,4 +1,4 @@
-import 'dart:developer';
+
 
 import 'package:dio/dio.dart';
 import 'package:intl/intl.dart';
@@ -25,8 +25,6 @@ class TransactionRepositoryImpl implements TransactionRepository {
       queryParameters['toDate'] = DateFormat('ddMMyyyy').format(toDate);
     }
 
-    log('query params below');
-    log(queryParameters.toString());
     final resp = await _dio.get(
       '/api/transactions/account/$accountNo',
       queryParameters: queryParameters.isNotEmpty ? queryParameters : null,

lib/di/injection.dart

@@ -11,6 +11,7 @@ import 'package:kmobile/features/auth/controllers/theme_cubit.dart';
 import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
 import '../api/services/auth_service.dart';
 import '../api/interceptors/auth_interceptor.dart';
+import '../api/services/change_password_service.dart';
 import '../data/repositories/auth_repository.dart';
 import '../features/auth/controllers/auth_cubit.dart';
 import '../security/secure_storage.dart';
@@ -48,6 +49,7 @@ Future<void> setupDependencies() async {
   getIt.registerSingleton<NeftService>(NeftService(getIt<Dio>()));
   getIt.registerSingleton<RtgsService>(RtgsService(getIt<Dio>()));
   getIt.registerSingleton<ImpsService>(ImpsService(getIt<Dio>()));
+  getIt.registerLazySingleton<ChangePasswordService>(() => ChangePasswordService(getIt<Dio>()),);
 
   // Add auth interceptor after repository is available
   getIt<Dio>().interceptors.add(
@@ -63,10 +65,11 @@ Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
       baseUrl:
-          'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080',
+          //'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080', //test
-      //'http://localhost:8081',
+          //'http://lb-kccb-mobile-banking-app-848675342.ap-south-1.elb.amazonaws.com',  //prod
-      connectTimeout: const Duration(seconds: 5),
+          'https://kccbmbnk.net',
-      receiveTimeout: const Duration(seconds: 10),
+      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

@@ -1,4 +1,6 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import 'package:shimmer/shimmer.dart';
 import 'package:kmobile/data/models/transaction.dart';
@@ -6,14 +8,21 @@ import 'package:kmobile/data/repositories/transaction_repository.dart';
 import 'package:kmobile/di/injection.dart';
 import '../../../l10n/app_localizations.dart';
 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;
   final String balance;
+  final String accountType;
   const AccountStatementScreen({
     super.key,
     required this.accountNo,
     required this.balance,
+    required this.accountType,
   });
 
   @override
@@ -27,6 +36,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
   List<Transaction> _transactions = [];
   final _minAmountController = TextEditingController();
   final _maxAmountController = TextEditingController();
+  //Future<Map<String, dynamic>?>? accountStatementsFuture;
 
   @override
   void initState() {
@@ -279,15 +289,25 @@ 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!)
                                     : '',
                                 style: const TextStyle(fontSize: 12),
                               ),
-                              trailing: Text(
+                             trailing: Column(
+  crossAxisAlignment: CrossAxisAlignment.end,
+  mainAxisAlignment: MainAxisAlignment.center,
+  children: [
+    Text(
       "₹${tx.amount}",
       style: const TextStyle(fontSize: 17),
+    ),
+    Text(
+      "Bal: ₹${tx.balance}",
+      style: const TextStyle(fontSize: 12), // Style matches tx.name
+    ),
+  ],
 ),                                                                   
                               onTap: () {
                                 Navigator.push(
@@ -308,9 +328,193 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
           ],
         ),
       ),
+      floatingActionButton: FloatingActionButton(
+        onPressed: () {
+          _exportToPdf();
+        },
+        child: const Icon(Icons.download),
+      ),
     );
   }
 
+  Future<void> _exportToPdf() async {
+    // Step 1: Check if there are any transactions to export.
+    if (_transactions.isEmpty) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('No transactions to export.'),
+          ),
+        );
+      }
+      return;
+    }
+
+    var logo = await rootBundle.load('assets/images/logo.png');
+    var rubik = await rootBundle.load("assets/fonts/Rubik-Regular.ttf");
+    final pdf = pw.Document();
+
+    pdf.addPage(pw.MultiPage(
+        margin: const pw.EdgeInsets.all(20),
+        build: (pw.Context context) {
+          return [
+            pw.Row(
+                mainAxisAlignment: pw.MainAxisAlignment.start,
+                crossAxisAlignment: pw.CrossAxisAlignment.center,
+                children: [
+                  pw.Image(pw.MemoryImage(logo.buffer.asUint8List()),
+                      width: 50, height: 50),
+                  pw.SizedBox(width: 20),
+                  pw.Text('Account Statement - KCCB',
+                      style: pw.TextStyle(
+                          fontSize: 24, fontWeight: pw.FontWeight.bold)),
+                ]),
+            pw.SizedBox(height: 20),
+            pw.Row(
+                mainAxisAlignment: pw.MainAxisAlignment.spaceBetween,
+                children: [
+                  pw.Text('Account Number: ${widget.accountNo}',
+                      style:
+                          pw.TextStyle(font: pw.Font.ttf(rubik), fontSize: 15)),
+                  pw.Text('Account Type: ${widget.accountType}',
+                      style: pw.TextStyle(
+                        fontSize: 15,
+                        font: pw.Font.ttf(rubik),
+                      )),
+                ]),
+            pw.SizedBox(height: 20),
+            pw.Table(border: pw.TableBorder.all(), columnWidths: {
+              0: const pw.FractionColumnWidth(0.2),
+              1: const pw.FractionColumnWidth(0.45),
+              2: const pw.FractionColumnWidth(0.15),
+              3: const pw.FractionColumnWidth(0.20),
+            }, children: [
+              pw.TableRow(
+                children: [
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Date')),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Description', softWrap: true)),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Amount')),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(4),
+                      child: pw.Text('Balance')),
+                ],
+              ),
+              ..._transactions.map<pw.TableRow>((tx) {
+                return pw.TableRow(children: [
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text(tx.date ?? '',
+                          style: pw.TextStyle(
+                            fontSize: 12,
+                            font: pw.Font.ttf(rubik),
+                          ))),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text(tx.name ?? '',
+                          style: pw.TextStyle(
+                              fontSize: 12, font: pw.Font.ttf(rubik)))),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text("₹${tx.amount} ${tx.type}",
+                          style: pw.TextStyle(
+                            fontSize: 12,
+                            font: pw.Font.ttf(rubik),
+                          ))),
+                  pw.Padding(
+                      padding: const pw.EdgeInsets.all(10),
+                      child: pw.Text("₹${tx.balance} ${tx.balanceType}",
+                          style: pw.TextStyle(
+                            fontSize: 12,
+                            font: pw.Font.ttf(rubik),
+                          ))),
+                ]);
+              }),
+            ])
+          ];
+        },
+        footer: (pw.Context context) {
+          return pw.Container(
+            alignment: pw.Alignment.centerRight,
+            margin: const pw.EdgeInsets.only(top: 10),
+            child: pw.Text(
+              'Kangra Central Co-Operative Bank Pvt Ltd. ©. All rights reserved.',
+              style: pw.TextStyle(
+                font: pw.Font.ttf(rubik),
+                fontSize: 8,
+              ),
+            ),
+          );
+        }));
+
+    //Logic For all platforms
+    try {
+      final Uint8List pdfBytes = await pdf.save();
+      final String timestamp = DateTime.now().millisecondsSinceEpoch.toString();
+      final String fileName = 'account_statement_$timestamp.pdf';
+
+      // For Android
+      if (Platform.isAndroid) {
+        final androidInfo = await DeviceInfoPlugin().androidInfo;
+        if (androidInfo.version.sdkInt < 29) {
+          final status = await Permission.storage.status;
+          if (status.isDenied) {
+            final result = await Permission.storage.request();
+            if (result.isDenied) {
+              if (mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(
+                    content: Text('Storage permission is required to save PDF'),
+                  ),
+                );
+              }
+              return;
+            }
+          }
+        }
+
+        final directory = Directory('/storage/emulated/0/Download');
+        final file = File('${directory.path}/$fileName');
+        await file.writeAsBytes(pdfBytes);
+
+        if (mounted) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text('PDF saved to: ${file.path}'),
+            ),
+          );
+        }
+      }
+      // 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(
+          SnackBar(
+            content: Text('Error saving PDF: $e'),
+          ),
+        );
+      }
+    }
+  }
+
   Widget buildDateBox(String label, DateTime? date) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 16),

lib/features/accounts/screens/transaction_details_screen.dart

@@ -66,13 +66,15 @@ class TransactionDetailsScreen extends StatelessWidget {
                       transaction.type ?? ""),
                   _buildDetailRow(AppLocalizations.of(context).transferType,
                       transaction.name.split("/").first ?? ""),
-                  if (transaction.name.length > 12) ...[
+                  // if (transaction.name.length > 12) ...[
-                    _buildDetailRow(AppLocalizations.of(context).utrNo,
+                  //   _buildDetailRow(AppLocalizations.of(context).utrNo,
-                        transaction.name.split("= ")[1].split(" ")[0] ?? ""),
+                  //       transaction.name.split("= ")[1].split(" ")[0] ?? ""),
-                    _buildDetailRow(
+                  //   _buildDetailRow(
-                        AppLocalizations.of(context).beneficiaryAccountNo,
+                  //       AppLocalizations.of(context).beneficiaryAccountNo,
-                        transaction.name.split("A/C ").last ?? "")
+                  //       transaction.name.split("A/C ").last ?? "")
-                  ]
+                  // ]
+                   _buildDetailRow(AppLocalizations.of(context).details,
+                      transaction.name),
                 ],
               ),
             ),

lib/features/auth/screens/login_screen.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:kmobile/di/injection.dart';
 import 'package:kmobile/features/auth/screens/mpin_screen.dart';
+import 'package:kmobile/features/auth/screens/set_password_screen.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import '../../../app.dart';
 import '../controllers/auth_cubit.dart';
@@ -74,9 +75,15 @@ class LoginScreenState extends State<LoginScreen>
               );
             }
           } else if (state is AuthError) {
-            ScaffoldMessenger.of(
+            if (state.message == 'MIGRATED_USER_HAS_NO_PASSWORD') {
-              context,
+              Navigator.of(context).push(MaterialPageRoute(
-            ).showSnackBar(SnackBar(content: Text(state.message)));
+                  builder: (_) => SetPasswordScreen(
+                        customerNo: _customerNumberController.text.trim(),
+                      )));
+            } else {
+              ScaffoldMessenger.of(context)
+                  .showSnackBar(SnackBar(content: Text(state.message)));
+            }
           }
         },
         builder: (context, state) {
@@ -121,10 +128,13 @@ class LoginScreenState extends State<LoginScreen>
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
                       enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.outline),
                       ),
                       focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.primary,
+                            width: 2),
                       ),
                     ),
                     keyboardType: TextInputType.number,
@@ -150,10 +160,13 @@ class LoginScreenState extends State<LoginScreen>
                       filled: true,
                       fillColor: Theme.of(context).scaffoldBackgroundColor,
                       enabledBorder: OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.outline),
                       ),
                       focusedBorder: OutlineInputBorder(
-                        borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                        borderSide: BorderSide(
+                            color: Theme.of(context).colorScheme.primary,
+                            width: 2),
                       ),
                       suffixIcon: IconButton(
                         icon: Icon(
@@ -187,51 +200,56 @@ class LoginScreenState extends State<LoginScreen>
                         backgroundColor:
                             Theme.of(context).scaffoldBackgroundColor,
                         foregroundColor: Theme.of(context).primaryColorDark,
-                        side: BorderSide(color: Theme.of(context).colorScheme.outline, width: 1),
+                        side: BorderSide(
+                            color: Theme.of(context).colorScheme.outline,
+                            width: 1),
                         elevation: 0,
                       ),
                       child: state is AuthLoading
                           ? const CircularProgressIndicator()
                           : Text(
                               AppLocalizations.of(context).login,
-                              style: TextStyle(color: Theme.of(context).colorScheme.onPrimaryContainer),
+                              style: TextStyle(
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onPrimaryContainer),
                             ),
                     ),
                   ),
                   const SizedBox(height: 15),
 
-                  Padding(
+                  // Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 16),
+                  //   padding: const EdgeInsets.symmetric(vertical: 16),
-                    child: Row(
+                  //   child: Row(
-                      children: [
+                  //     children: [
-                        const Expanded(child: Divider()),
+                  //       const Expanded(child: Divider()),
-                        Padding(
+                  //       Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 8),
+                  //         padding: const EdgeInsets.symmetric(horizontal: 8),
-                          child: Text(AppLocalizations.of(context).or),
+                  //         child: Text(AppLocalizations.of(context).or),
-                        ),
+                  //       ),
-                        const Expanded(child: Divider()),
+                  //       //const Expanded(child: Divider()),
-                      ],
+                  //     ],
-                    ),
+                  //   ),
-                  ),
+                  // ),
 
                   const SizedBox(height: 25),
 
                   // Register Button
-                  SizedBox(
+                  // SizedBox(
-                    width: 250,
+                  //   width: 250,
-                    child: ElevatedButton(
+                  //   child: ElevatedButton(
-                      //disable until registration is implemented
+                  //     //disable until registration is implemented
-                      onPressed: null,
+                  //     onPressed: null,
-                      style: OutlinedButton.styleFrom(
+                  //     style: OutlinedButton.styleFrom(
-                        shape: const StadiumBorder(),
+                  //       shape: const StadiumBorder(),
-                        padding: const EdgeInsets.symmetric(vertical: 16),
+                  //       padding: const EdgeInsets.symmetric(vertical: 16),
-                        backgroundColor: Theme.of(context).colorScheme.primary,
+                  //       backgroundColor: Theme.of(context).colorScheme.primary,
-                        foregroundColor: Theme.of(context).colorScheme.onPrimary,
+                  //       foregroundColor: Theme.of(context).colorScheme.onPrimary,
-                      ),
+                  //     ),
-                      child: Text(AppLocalizations.of(context).register,
+                  //     child: Text(AppLocalizations.of(context).register,
-                     style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),),
+                  //    style: TextStyle(color: Theme.of(context).colorScheme.onPrimary),),
-                    ),
+                  //   ),
-                  ),
+                  // ),
                 ],
               ),
             ),

lib/features/auth/screens/set_password_screen.dart

@@ -0,0 +1,295 @@
+import 'package:flutter/material.dart';
+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});
+
+  @override
+  State<SetPasswordScreen> createState() => _SetPasswordScreenState();
+}
+
+enum SetPasswordStep { initial, otp, setPassword, success }
+
+class _SetPasswordScreenState extends State<SetPasswordScreen> {
+  final _authService = getIt<AuthService>();
+  SetPasswordStep _currentStep = SetPasswordStep.initial;
+  bool _isLoading = false;
+  String? _error;
+  String? _otpToken;
+
+  final _otpController = TextEditingController();
+  final _passwordController = TextEditingController();
+  final _confirmPasswordController = TextEditingController();
+
+  bool _obscurePassword = true;
+  bool _obscureConfirmPassword = true;
+
+  @override
+  void dispose() {
+    _otpController.dispose();
+    _passwordController.dispose();
+    _confirmPasswordController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _sendOtp() async {
+    setState(() {
+      _isLoading = true;
+      _error = null;
+    });
+    try {
+      await _authService.sendOtpForSettingPassword(widget.customerNo);
+      setState(() {
+        _currentStep = SetPasswordStep.otp;
+        _isLoading = false;
+      });
+    } catch (e) {
+      setState(() {
+        _error = e.toString();
+        _isLoading = false;
+      });
+    }
+  }
+
+  Future<void> _verifyOtp() async {
+    if (_otpController.text.isEmpty) {
+      setState(() {
+        _error = 'Please enter OTP';
+      });
+      return;
+    }
+    setState(() {
+      _isLoading = true;
+      _error = null;
+    });
+    try {
+      final token = await _authService.verifyOtpForSettingPassword(
+          widget.customerNo, _otpController.text);
+      setState(() {
+        _otpToken = token;
+        _currentStep = SetPasswordStep.setPassword;
+        _isLoading = false;
+      });
+    } catch (e) {
+      setState(() {
+        _error = AppLocalizations.of(context).invalidOtp;
+        _isLoading = false;
+      });
+    }
+  }
+
+  Future<void> _setPassword() async {
+    if (_passwordController.text.isEmpty ||
+        _confirmPasswordController.text.isEmpty) {
+      setState(() {
+        _error = 'Please fill both password fields';
+      });
+      return;
+    }
+    if (_passwordController.text != _confirmPasswordController.text) {
+      setState(() {
+        _error = 'Passwords do not match';
+      });
+      return;
+    }
+    if (_otpToken == null) {
+      setState(() {
+        _error = 'OTP token is missing. Please restart the process.';
+        _currentStep = SetPasswordStep.initial;
+      });
+      return;
+    }
+
+    setState(() {
+      _isLoading = true;
+      _error = null;
+    });
+
+    try {
+      await _authService.changePassword(_passwordController.text, _otpToken!);
+      setState(() {
+        _currentStep = SetPasswordStep.success;
+        _isLoading = false;
+      });
+    } catch (e) {
+      setState(() {
+        _error = e.toString();
+        _isLoading = false;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Set New Password'),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(24.0),
+        child: Center(
+          child: SingleChildScrollView(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                if (_error != null) ...[
+                  Text(
+                    _error!,
+                    style: const TextStyle(color: Colors.red,
+                    fontWeight: FontWeight.bold,
+                    fontSize: 20),
+                    textAlign: TextAlign.center,
+                  ),
+                  const SizedBox(height: 16),
+                ],
+                if (_isLoading)
+                  const CircularProgressIndicator()
+                else
+                  _buildStepContent(),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStepContent() {
+    switch (_currentStep) {
+      case SetPasswordStep.initial:
+        return _buildInitialStep();
+      case SetPasswordStep.otp:
+        return _buildOtpStep();
+      case SetPasswordStep.setPassword:
+        return _buildSetPasswordStep();
+      case SetPasswordStep.success:
+        return _buildSuccessStep();
+    }
+  }
+
+  Widget _buildInitialStep() {
+    return Column(
+      children: [
+        const Text(
+          'You need to set a new password to continue. We will send an OTP to your registered mobile number.',
+          textAlign: TextAlign.center,
+          style: TextStyle(fontSize: 16),
+        ),
+        const SizedBox(height: 24),
+        ElevatedButton(
+          onPressed: _sendOtp,
+          child: const Text('Proceed'),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildOtpStep() {
+    return Column(
+      children: [
+        const Text(
+          'An OTP has been sent to your registered mobile number. Please enter it below.',
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(height: 24),
+        TextField(
+          controller: _otpController,
+          decoration: const InputDecoration(
+            labelText: 'Enter OTP',
+            border: OutlineInputBorder(),
+          ),
+          keyboardType: TextInputType.number,
+        ),
+        const SizedBox(height: 24),
+        ElevatedButton(
+          onPressed: _verifyOtp,
+          child: const Text('Verify OTP'),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildSetPasswordStep() {
+    return Column(
+      children: [
+        TextFormField(
+          controller: _passwordController,
+          obscureText: _obscurePassword,
+          decoration: InputDecoration(
+            labelText: 'New Password',
+            border: const OutlineInputBorder(),
+            suffixIcon: IconButton(
+              icon: Icon(
+                _obscurePassword ? Icons.visibility : Icons.visibility_off,
+              ),
+              onPressed: () {
+                setState(() {
+                  _obscurePassword = !_obscurePassword;
+                });
+              },
+            ),
+          ),
+        ),
+        const SizedBox(height: 24),
+        TextFormField(
+          controller: _confirmPasswordController,
+          obscureText: _obscureConfirmPassword,
+          decoration: InputDecoration(
+            labelText: 'Confirm New Password',
+            border: const OutlineInputBorder(),
+            suffixIcon: IconButton(
+              icon: Icon(
+                _obscureConfirmPassword
+                    ? Icons.visibility
+                    : Icons.visibility_off,
+              ),
+              onPressed: () {
+                setState(() {
+                  _obscureConfirmPassword = !_obscureConfirmPassword;
+                });
+              },
+            ),
+          ),
+        ),
+        const SizedBox(height: 24),
+        ElevatedButton(
+          onPressed: _setPassword,
+          child: const Text('Set Password'),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildSuccessStep() {
+    return Column(
+      children: [
+        const Icon(Icons.check_circle, color: Colors.green, size: 80),
+        const SizedBox(height: 24),
+        const Text(
+          'Password set successfully!',
+          style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+        ),
+        const SizedBox(height: 8),
+        const Text(
+          'You can now log in with your new password.',
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(height: 24),
+        ElevatedButton(
+          onPressed: () {
+            Navigator.of(context).pushAndRemoveUntil(
+              MaterialPageRoute(builder: (_) => const LoginScreen()),
+              (route) => false,
+            );
+          },
+          child: const Text('Back to Login'),
+        ),
+      ],
+    );
+  }
+}

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

@@ -23,7 +23,9 @@ class AddBeneficiaryScreen extends StatefulWidget {
 
 class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final _formKey = GlobalKey<FormState>();
-
+  final _accountNumberFieldKey = GlobalKey<FormFieldState>();
+final _confirmAccountNumberFieldKey = GlobalKey<FormFieldState>();
+final _ifscFieldKey = GlobalKey<FormFieldState>();
   final TextEditingController accountNumberController = TextEditingController();
   final TextEditingController confirmAccountNumberController =
       TextEditingController();
@@ -32,6 +34,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   final TextEditingController branchNameController = TextEditingController();
   final TextEditingController ifscController = TextEditingController();
   final TextEditingController phoneController = TextEditingController();
+  final _ifscFocusNode = FocusNode();
   final service = getIt<BeneficiaryService>();
 
   bool _isValidating = false;
@@ -43,6 +46,11 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
   @override
   void initState() {
     super.initState();
+    _ifscFocusNode.addListener(() {
+  if (!_ifscFocusNode.hasFocus && ifscController.text.trim().length == 11) {
+    _validateIFSC();
+  }
+});
     WidgetsBinding.instance.addPostFrameCallback((_) {
       setState(() {
         accountType = 'Savings';
@@ -50,15 +58,29 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
     });
   }
 
+   @override
+ void dispose() {
+   accountNumberController.dispose();
+   confirmAccountNumberController.dispose();
+   nameController.dispose();
+   bankNameController.dispose();
+   branchNameController.dispose();
+   ifscController.dispose();
+   phoneController.dispose();
+   _ifscFocusNode.dispose(); 
+   super.dispose();
+ }
+
    void _validateIFSC() async {
      var beneficiaryService = getIt<BeneficiaryService>();
      final ifsc = ifscController.text.trim().toUpperCase();
      if (ifsc.isEmpty) return;
 
+      try {
       final result = await beneficiaryService.validateIFSC(ifsc); 
 
       if (mounted) {
-      if (result.bankName == '') {
+        if (result.bankName.isEmpty) {
           ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
           );
@@ -69,6 +91,22 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
           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;
+        }
+
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(snackbarMessage)),
+        );
+        bankNameController.clear();
+        branchNameController.clear();
+      }
+    }
  }
 
   void _validateBeneficiary() async {
@@ -237,6 +275,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                     child: Column(
                       children: [
                         TextFormField(
+                          key: _accountNumberFieldKey,
                           controller: accountNumberController,
                           decoration: InputDecoration(
                             labelText: AppLocalizations.of(
@@ -267,6 +306,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                         const SizedBox(height: 24),
                         // Confirm Account Number
                         TextFormField(
+                          key: _confirmAccountNumberFieldKey,
                           controller: confirmAccountNumberController,
                           decoration: InputDecoration(
                             labelText: AppLocalizations.of(
@@ -285,15 +325,15 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                               ).reenterAccountNumber;
                             }
                             if (value != accountNumberController.text) {
-                              return AppLocalizations.of(
+                              return AppLocalizations.of(context,).accountMismatch;
-                                context,
-                              ).accountMismatch;
                             }
                             return null;
                           },
                         ),
                         const SizedBox(height: 24),
                         TextFormField(
+                          focusNode: _ifscFocusNode,
+                          key: _ifscFieldKey,
                           controller: ifscController,
                           maxLength: 11,
                           inputFormatters: [
@@ -306,16 +346,15 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                           ),
                           textCapitalization: TextCapitalization.characters,
                           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}$');
@@ -332,7 +371,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                           },
                         ),
                         const SizedBox(height: 24),
-                        // 🔹 Bank Name (Disabled)
+                        //  Bank Name (Disabled)
                         TextFormField(
                           controller: bankNameController,
                           enabled: false, // changed from readOnly to disabled
@@ -390,20 +429,20 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                             child: SizedBox(
                               width: double.infinity,
                               child: ElevatedButton(
-                                onPressed: _isValidating
+onPressed: _isValidating || ifscController.text.length != 11
 ? null
 : () {
-                                        if (confirmAccountNumberController
+    final isAccountValid =
-                                                .text ==
+        _accountNumberFieldKey.currentState!.validate();
-                                            accountNumberController.text) {
+    final isConfirmAccountValid =
+        _confirmAccountNumberFieldKey.currentState!.validate();
+    final isIfscValid = _ifscFieldKey.currentState!.validate();
+
+    if (isAccountValid && isConfirmAccountValid && isIfscValid) {
       _validateBeneficiary();
-                                        } else {
-                                          setState(() {
-                                            _validationError =
-                                                'Please enter a valid and matching account number.';
-                                          });
     }
   },
+
                                 child: _isValidating
                                     ? const SizedBox(
                                         width: 20,

lib/features/card/screens/card_management_screen.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: unused_import
+
 import 'package:flutter/material.dart';
 import 'package:kmobile/features/card/screens/block_card_screen.dart';
 import 'package:kmobile/features/card/screens/card_details_screen.dart';
@@ -29,6 +31,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
           icon: Symbols.add,
           label: AppLocalizations.of(context).applyDebitCard,
           onTap: () {},
+          disabled: true, // Add this
         ),
         const Divider(height: 1),
         CardManagementTile(
@@ -42,6 +45,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 ),
               );
           },
+          disabled: true, 
         ),
         const Divider(height: 1),
         CardManagementTile(
@@ -55,6 +59,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 ),
               );
           },
+          disabled: true, 
         ),
         const Divider(height: 1),
         CardManagementTile(
@@ -68,6 +73,7 @@ class _CardManagementScreen extends State<CardManagementScreen> {
                 ),
               );
           },
+          disabled: true, 
         ),
         const Divider(height: 1),
       ],
@@ -80,21 +86,36 @@ class CardManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
   final VoidCallback onTap;
+  final bool disabled; 
 
   const CardManagementTile({
     super.key,
     required this.icon,
     required this.label,
     required this.onTap,
+    this.disabled = false, 
   });
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     return ListTile(
-      leading: Icon(icon),
+      leading: Icon(
-      title: Text(label),
+        icon,
-      trailing: const Icon(Symbols.arrow_right, size: 20),
+        color: disabled ? theme.disabledColor : null, 
-      onTap: onTap,
+      ),
+      title: Text(
+        label,
+        style: TextStyle(
+          color: disabled ? theme.disabledColor : null, 
+        ),
+      ),
+      trailing: Icon(
+        Symbols.arrow_right,
+        size: 20,
+        color: disabled ? theme.disabledColor : null, 
+      ),
+      onTap: disabled ? null : onTap, 
     );
   }
 }

lib/features/dashboard/screens/dashboard_screen.dart

@@ -138,6 +138,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
     switch (accountType.toLowerCase()) {
       case 'sa':
         return AppLocalizations.of(context).savingsAccount;
+      case 'sb':
+        return AppLocalizations.of(context).savingsAccount;  
       case 'ln':
         return AppLocalizations.of(context).loanAccount;
       case 'td':
@@ -211,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,
@@ -224,10 +227,19 @@ class _DashboardScreenState extends State<DashboardScreen> {
               child: InkWell(
                 borderRadius: BorderRadius.circular(20),
                 onTap: () {
+                   final authState = context.read<AuthCubit>().state; 
+                   String mobileNumberToPass = ''; 
+
+                   if (authState is Authenticated) {
+                     if (selectedAccountIndex >= 0 && selectedAccountIndex < authState.users.length) {
+                       mobileNumberToPass = authState.users[selectedAccountIndex].mobileNo ?? '';
+                     }
+                   }
+
                    Navigator.push(
                      context,
                      MaterialPageRoute(
-                      builder: (context) => const ProfileScreen(),
+                       builder: (context) => ProfileScreen(mobileNumber: mobileNumberToPass),
                      ),
                    );
                 },
@@ -289,7 +301,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                           vertical: 10,
                         ),
                         decoration: BoxDecoration(
-                          color: theme.colorScheme.primary,
+                          color: Color(0xFF01A04C),
                           borderRadius: BorderRadius.circular(16),
                         ),
                         child: Column(
@@ -521,6 +533,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                               .accountNo!,
                                           balance: users[selectedAccountIndex]
                                               .availableBalance!,
+                                          accountType: users[selectedAccountIndex]
+                                          .accountType!,
                                         )));
                           }),
                           _buildQuickLink(Symbols.checkbook,
@@ -573,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/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

@@ -40,8 +40,8 @@ class _FundTransferBeneficiaryScreenState
       _beneficiaries = data
           .where((b) => widget.isOwnBank
               ? b.bankName ==
-                  'THE KANGRA CENTRAL CO-OP BANK LIMITED' // Assuming 'KCCB' is your bank's name
+                  'THE KANGRA CENTRAL COOPERATIVE BANK LIMITED' 
-              : b.bankName != 'THE KANGRA CENTRAL CO-OP BANK LIMITED')
+              : b.bankName != 'THE KANGRA CENTRAL COOPERATIVE BANK LIMITED')
           .toList();
       _isLoading = false;
     });

lib/features/fund_transfer/screens/payment_animation.dart

@@ -209,26 +209,21 @@ class _PaymentAnimationScreenState extends State<PaymentAnimationScreen> {
                       onPressed: _shareScreenshot,
                       icon: Icon(
                         Icons.share_rounded,
-                        color: Theme.of(context).primaryColor,
+                        color: Theme.of(context).colorScheme.primary,
                       ),
                       label: Text(
                         AppLocalizations.of(context).share,
-                        style: TextStyle(color: Theme.of(context).primaryColor),
+                        style: TextStyle(color: Theme.of(context).colorScheme.primary),
                       ),
                       style: ElevatedButton.styleFrom(
-                        backgroundColor:
-                            Theme.of(context).scaffoldBackgroundColor,
                         padding: const EdgeInsets.symmetric(
-                            horizontal: 32, vertical: 12),
+                            horizontal: 45, vertical: 12),
                         shape: RoundedRectangleBorder(
-                          side: BorderSide(
-                              color: Theme.of(context).primaryColor, width: 1),
                           borderRadius: BorderRadius.circular(30),
                         ),
                         textStyle: const TextStyle(
                           fontSize: 18,
                           fontWeight: FontWeight.w600,
-                          color: Colors.black,
                         ),
                       ),
                     ),

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,17 +44,36 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
 
   String get _enteredOtp => _controllers.map((c) => c.text).join();
 
-  void _verifyOtp() {
+void _verifyOtp() async {
-    if (_enteredOtp == '0000') {
+  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)),
       );
     }
+  } finally {
+    if (mounted) {
+      setState(() {
+        _isLoading = false;
+      });
+    }
+  }
 }
 
   @override
@@ -64,7 +88,6 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
      body: Center(
        child: SingleChildScrollView(
          child: Column(
-            // mainAxisSize: MainAxisSize.min,
            children: [
              Icon(
                Icons.lock_outline,
@@ -90,9 +113,9 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
              const SizedBox(height: 32),
              Row(
                mainAxisAlignment: MainAxisAlignment.center,
-                children: List.generate(4, (i) {
+               children: List.generate(6, (i) {
                  return Container(
-                    width: 48,
+                   width: 32,
                    margin: const EdgeInsets.symmetric(horizontal: 8),
                    child: TextField(
                      controller: _controllers[i],
@@ -101,7 +124,7 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
                      textAlign: TextAlign.center,
                      maxLength: 1,
                      obscureText: true,
-                      obscuringCharacter: '⬤',
+                     obscuringCharacter: '*',
                      decoration: InputDecoration(
                        counterText: '',
                        filled: true,
@@ -128,14 +151,23 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
              ),
              const SizedBox(height: 32),
              ElevatedButton.icon(
-                icon: const Icon(Icons.verified_user_rounded),
+               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.primary,
+                 backgroundColor: theme.colorScheme.onPrimary,
                  padding: const EdgeInsets.symmetric(
                    vertical: 14,
                    horizontal: 28,
@@ -144,12 +176,15 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
                    borderRadius: BorderRadius.circular(30),
                  ),
                ),
-                onPressed: _enteredOtp.length == 4 ? _verifyOtp : null,
+               // Update onPressed to handle loading state
+               onPressed: (_enteredOtp.length == 6 && !_isLoading)
+                   ? _verifyOtp
+                   : null,
              ),
              const SizedBox(height: 16),
              TextButton(
                onPressed: () {
-                  // Resend OTP logic here
+                 // You can also add a getOtp call here for resending
                  ScaffoldMessenger.of(context).showSnackBar(
                    SnackBar(
                      content: Text(AppLocalizations.of(context).otpResent),

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);
@@ -38,14 +87,22 @@ class TpinSetupPromptScreen extends StatelessWidget {
             ),
             const SizedBox(height: 32),
 ElevatedButton.icon(
-              icon: const Icon(Icons.arrow_forward_rounded),
+  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:
+    style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
-                    const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
   ),
   style: ElevatedButton.styleFrom(
-                backgroundColor: theme.colorScheme.primary,
+    backgroundColor: theme.colorScheme.onPrimary,
     padding: const EdgeInsets.symmetric(
       vertical: 14,
       horizontal: 32,
@@ -54,12 +111,7 @@ class TpinSetupPromptScreen extends StatelessWidget {
       borderRadius: BorderRadius.circular(10),
     ),
   ),
-              onPressed: () {
+  onPressed: _isLoading ? null : _getOtp, // <-- Use the new function
-                Navigator.pushReplacement(
-                  context,
-                  MaterialPageRoute(builder: (_) => const TpinOtpScreen()),
-                );
-              },
 ),
             const SizedBox(height: 18),
             Padding(

lib/features/profile/change_password/change_password_otp_screen.dart

@@ -0,0 +1,109 @@
+import 'package:flutter/material.dart';
+
+import '../../../api/services/change_password_service.dart';
+import '../../../di/injection.dart';
+import '../../../l10n/app_localizations.dart';
+
+class ChangePasswordOTPScreen extends StatefulWidget {
+  final String currentPassword;
+  final String newPassword;
+  final String confirmPassword;
+  final String mobileNumber;
+
+  // ignore: use_key_in_widget_constructors
+  const ChangePasswordOTPScreen({
+    required this.currentPassword,
+    required this.newPassword,
+    required this.confirmPassword, 
+    required this.mobileNumber,
+  });
+
+  @override
+  State<ChangePasswordOTPScreen> createState() => _ChangePasswordOTPScreenState();
+}
+
+class _ChangePasswordOTPScreenState extends State<ChangePasswordOTPScreen> {
+  bool _isLoading = true;
+  final TextEditingController otpController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    // Simulate OTP sending delay
+    Future.delayed(const Duration(seconds: 2), () {
+      setState(() {
+        _isLoading = false;
+      });
+    });
+  }
+  final changePasswordService = getIt<ChangePasswordService>();
+  Future<void> _validateOTP() async {
+   try {
+  await changePasswordService.validateOtp(
+    otp: otpController.text,
+    mobileNumber: widget.mobileNumber,
+  );
+
+  // If OTP is valid, then change the password
+  await changePasswordService.validateChangePwd(
+    OldLPsw: widget.currentPassword,
+    newLPsw: widget.newPassword,
+    confirmLPsw: widget.confirmPassword,
+  );
+  
+  ScaffoldMessenger.of(context).showSnackBar(
+    SnackBar(content: Text(AppLocalizations.of(context).pwdchangeSuccess)),
+  );
+
+  // Navigate back to profile or login
+  Navigator.of(context).popUntil((route) => route.isFirst);
+
+} catch (e) {
+  ScaffoldMessenger.of(context).showSnackBar(
+    SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
+  );
+}
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text(AppLocalizations.of(context).otpVerification)),
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: _isLoading
+            ? const Center(child: CircularProgressIndicator())
+            : Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Text(
+                    AppLocalizations.of(context).otpSent,
+                    textAlign: TextAlign.center,
+                    style: const TextStyle(fontSize: 16),
+                  ),
+                  const SizedBox(height: 24),
+                  TextFormField(
+                    controller: otpController,
+                    keyboardType: TextInputType.number,
+                    decoration: InputDecoration(
+                      labelText: AppLocalizations.of(context).enterOTP,
+                      border: const OutlineInputBorder(),
+                    ),
+                  ),
+                  const SizedBox(height: 24),
+                  SizedBox(
+                    width: double.infinity,
+                    child: ElevatedButton(
+                      onPressed: _validateOTP,
+                      style: ElevatedButton.styleFrom(
+                        padding: const EdgeInsets.symmetric(vertical: 16),
+                      ),
+                      child: Text(AppLocalizations.of(context).validateOTP),
+                    ),
+                  ),
+                ],
+              ),
+      ),
+    );
+  }
+}

lib/features/profile/change_password/change_password_screen.dart

@@ -0,0 +1,155 @@
+// ignore_for_file: use_key_in_widget_constructors
+
+import 'package:flutter/material.dart';
+import '../../../api/services/change_password_service.dart';
+import '../../../di/injection.dart';
+import '../../../l10n/app_localizations.dart';
+import 'change_password_otp_screen.dart';
+
+class ChangePasswordScreen extends StatefulWidget {
+  final String mobileNumber;
+  const ChangePasswordScreen({super.key, required this.mobileNumber});
+
+  @override
+  State<ChangePasswordScreen> createState() => _ChangePasswordScreenState();
+}
+
+class _ChangePasswordScreenState extends State<ChangePasswordScreen> {
+  final _formKey = GlobalKey<FormState>();
+  final currentPasswordController = TextEditingController();
+  final newPasswordController = TextEditingController();
+  final confirmPasswordController = TextEditingController();
+
+  bool _showCurrentPassword = false;
+  bool _showNewPassword = false;
+  bool _showConfirmPassword = false;
+
+  final passwordRegex =
+      RegExp(r'^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).{8,}$');
+
+  String? validateCurrentPassword(String? value) {
+    if (value == null || value.isEmpty) {
+      return AppLocalizations.of(context).currentpwdrqd;
+    }
+    return null;
+  }
+
+  String? validateNewPassword(String? value) {
+    if (value == null || value.isEmpty) {
+      return AppLocalizations.of(context).newpwdrqd;
+    }
+    if (!passwordRegex.hasMatch(value)) {
+      return AppLocalizations.of(context).pwdFormat;
+    }
+    if (value == currentPasswordController.text) {
+      return AppLocalizations.of(context).newoldpwddiff;
+    }
+    return null;
+  }
+
+  String? validateConfirmPassword(String? value) {
+    if (value == null || value.isEmpty) {
+      return AppLocalizations.of(context).confirmpwdrqd;
+    }
+    if (value != newPasswordController.text) {
+      return AppLocalizations.of(context).pwdmismatch;
+    }
+    return null;
+  }
+final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
+void _proceed() async {
+  if (_formKey.currentState!.validate()) {
+
+
+    try {
+      await _changePasswordService.getOtp(mobileNumber: widget.mobileNumber);
+
+
+      Navigator.push(
+        context,
+        MaterialPageRoute(
+          builder: (context) => ChangePasswordOTPScreen(
+            currentPassword: currentPasswordController.text,
+            newPassword: newPasswordController.text,
+            confirmPassword: confirmPasswordController.text,
+            mobileNumber: widget.mobileNumber, 
+          ),
+        ),
+      );
+    } catch (e) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('${AppLocalizations.of(context).failedtosentOTP}: $e')),
+      );
+    }
+  }
+}
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text(AppLocalizations.of(context).changeLoginPassword)),
+      body: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Form(
+          key: _formKey,
+          child: Column(
+            children: [
+              TextFormField(
+                controller: currentPasswordController,
+                obscureText: !_showCurrentPassword,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).currentpwd,
+                  suffixIcon: IconButton(
+                    icon: Icon(_showCurrentPassword
+                        ? Icons.visibility
+                        : Icons.visibility_off),
+                    onPressed: () =>
+                        setState(() => _showCurrentPassword = !_showCurrentPassword),
+                  ),
+                ),
+                validator: validateCurrentPassword,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: newPasswordController,
+                obscureText: !_showNewPassword,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).newpwd,
+                  suffixIcon: IconButton(
+                    icon: Icon(_showNewPassword
+                        ? Icons.visibility
+                        : Icons.visibility_off),
+                    onPressed: () =>
+                        setState(() => _showNewPassword = !_showNewPassword),
+                  ),
+                ),
+                validator: validateNewPassword,
+              ),
+              const SizedBox(height: 16),
+              TextFormField(
+                controller: confirmPasswordController,
+                obscureText: !_showConfirmPassword,
+                decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).confirmpwd,
+                  suffixIcon: IconButton(
+                    icon: Icon(_showConfirmPassword
+                        ? Icons.visibility
+                        : Icons.visibility_off),
+                    onPressed: () =>
+                        setState(() => _showConfirmPassword = !_showConfirmPassword),
+                  ),
+                ),
+                validator: validateConfirmPassword,
+              ),
+              const SizedBox(height: 24),
+              ElevatedButton(
+                onPressed: _proceed,
+                child: Text(AppLocalizations.of(context).proceed),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/profile/logout_dialog.dart

@@ -1,21 +1,23 @@
 import 'package:flutter/material.dart';
 
+import '../../l10n/app_localizations.dart';
+
 class LogoutDialog extends StatelessWidget {
   const LogoutDialog({super.key});
 
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
-      title: const Text("Logout"),
+      title: Text(AppLocalizations.of(context).logout),
-      content: const Text("Are you sure you want to logout?"),
+      content: Text(AppLocalizations.of(context).logoutCheck),
       actions: [
         TextButton(
           onPressed: () => Navigator.pop(context, false), // dismiss
-          child: const Text("No"),
+          child: Text(AppLocalizations.of(context).no),
         ),
         TextButton(
           onPressed: () => Navigator.pop(context, true), // confirm
-          child: const Text("Yes"),
+          child: Text(AppLocalizations.of(context).yes),
         ),
       ],
     );

lib/features/profile/preferences/theme_mode_dialog.dart

@@ -1,21 +1,34 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:kmobile/features/auth/controllers/theme_mode_cubit.dart';
+import '../../../l10n/app_localizations.dart';
+
+String _getThemeModeText(ThemeMode mode, AppLocalizations l10n) {
+  switch (mode) {
+    case ThemeMode.system:
+      return l10n.themeModeSystem;
+    case ThemeMode.light:
+      return l10n.themeModeLight;
+    case ThemeMode.dark:
+      return l10n.themeModeDark;
+  }
+}
 
 Future<void> showThemeModeDialog(BuildContext context) async {
   final cubit = context.read<ThemeModeCubit>();
   final currentMode = context.read<ThemeModeCubit>().state.mode;
+  final l10n = AppLocalizations.of(context); 
 
   await showDialog(
     context: context,
     builder: (context) {
       return AlertDialog(
-        title: const Text("Select Theme Mode"),
+        title: Text(l10n.selectThemeMode), 
         content: Column(
           mainAxisSize: MainAxisSize.min,
           children: ThemeMode.values.map((mode) {
             return RadioListTile<ThemeMode>(
-              title: Text(mode.toString().split('.').last.toUpperCase()),
+              title: Text(_getThemeModeText(mode, l10n)),
               value: mode,
               groupValue: currentMode,
               onChanged: (value) {

lib/features/profile/profile_screen.dart

@@ -1,15 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:kmobile/data/repositories/auth_repository.dart';
-import 'package:kmobile/features/profile/preferences/logout_dialog.dart';
+import 'package:kmobile/features/profile/change_password/change_password_screen.dart';
+import 'package:kmobile/features/profile/logout_dialog.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../../di/injection.dart';
 import '../../l10n/app_localizations.dart';
 import 'package:kmobile/features/profile/preferences/preference_screen.dart';
 
-class ProfileScreen extends StatelessWidget {
+class ProfileScreen extends StatefulWidget {
-  const ProfileScreen({super.key});
+  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();
@@ -40,10 +46,21 @@ class ProfileScreen extends StatelessWidget {
               );
             },
           ),
-          // You can add more profile options here later
+          ListTile(
+            leading: const Icon(Icons.password),
+            title: Text(loc.changeLoginPassword), 
+            onTap: () {
+            Navigator.push(  
+              context,
+            MaterialPageRoute(builder: (context) => ChangePasswordScreen(
+              mobileNumber: widget.mobileNumber,
+            )),
+            );
+            },
+          ),
           ListTile(
             leading: const Icon(Icons.logout),
-            title: const Text("Logout"), 
+            title: Text(AppLocalizations.of(context).logout), 
             onTap: () async {
               final shouldLogout = await showDialog<bool>(
                 context: context,
@@ -55,6 +72,7 @@ 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,10 +66,11 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     final ifsc = ifscController.text.trim().toUpperCase();
     if (ifsc.isEmpty) return;
 
+    try {
       final result = await service.validateIFSC(ifsc); 
 
       if (mounted) {
-      if (result.bankName == '') {
+        if (result.bankName.isEmpty) {
           ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(content: Text(AppLocalizations.of(context).invalidIfsc)),
           );
@@ -73,6 +81,22 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
           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;
+        }
+
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(snackbarMessage)),
+        );
+        bankNameController.clear();
+        branchNameController.clear();
+      }
+    }
  }
 
   void _validateBeneficiary() async {
@@ -86,7 +110,6 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
 
     final String accountNo = accountNumberController.text.trim();
     final String ifsc = ifscController.text.trim();
-    // ignore: prefer_const_declarations
     final String remitter = "Unknown";
 
     final service = getIt<BeneficiaryService>();
@@ -137,7 +160,9 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
     ifscController.dispose();
     phoneController.dispose();
     amountController.dispose();
+    remarksController.dispose();
     super.dispose();
+    _ifscFocusNode.dispose();
   }
 
   void _onProceedToPay() {
@@ -189,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>();
@@ -254,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>();
@@ -313,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>();
@@ -475,6 +503,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 children: [
                   Expanded(
                     child: TextFormField(
+                      focusNode: _ifscFocusNode,
                       maxLength: 11,
                       inputFormatters: [
                         LengthLimitingTextInputFormatter(11),
@@ -497,16 +526,15 @@ 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}$');
@@ -609,7 +637,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                   child: SizedBox(
                     width: double.infinity,
                     child: ElevatedButton(
-                      onPressed: _isValidating
+                     onPressed: _isValidating || ifscController.text.length != 11
     ? null
     : () {
         if (confirmAccountNumberController.text ==
@@ -669,6 +697,25 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                 },
               ),
                  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: [
                   Expanded(

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

@@ -25,7 +25,7 @@ class BranchLocatorScreen extends StatefulWidget {
 class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
   final TextEditingController _searchController = TextEditingController();
 
-// Static list of 5 branches
+// Static list of 2 branches
   final List<Branch> _branches = [
     Branch(
         name: "Dharamsala - Head Office",
@@ -36,7 +36,7 @@ class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
         name: "Kangra",
         code: "033",
         ifsc: "KACE0000033",
-        address: "Rajput Bhawankangrapo Kangra, Kangra, HP "),
+        address: "Rajput Bhawankangrapo, Kangra, HP "),
   ];
 
   List<Branch> _filteredBranches = [];
@@ -63,45 +63,6 @@ class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
     });
   }
 
-//   @override
-//   Widget build(BuildContext context) {
-//     return Scaffold(
-//       appBar: AppBar(
-//         title: Text(AppLocalizations.of(context).branchLocator),
-//       ),
-//       body: Center(
-//         child: Column(
-//           mainAxisAlignment: MainAxisAlignment.center,
-//           children: [
-//             Icon(
-//               Icons.location_on,
-//               size: 80,
-//               color: Theme.of(context).primaryColor,
-//             ),
-//             const SizedBox(height: 16),
-//             Text(
-//               AppLocalizations.of(context).findnearbybranched,
-//               style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
-//             ),
-//             const SizedBox(height: 24),
-//             ElevatedButton.icon(
-//               icon: const Icon(Icons.search),
-//               label: Text( AppLocalizations.of(context).searchbranch),
-//               onPressed: () {
-//                 // Place API here
-
-//                 // ScaffoldMessenger.of(context).showSnackBar(
-//                 //   SnackBar(content: Text( AppLocalizations.of(context).branchsearchsoon)),
-//                 // );
-//               },
-//             ),
-//           ],
-//         ),
-//       ),
-//     );
-//   }
-// }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -139,7 +100,7 @@ class _BranchLocatorScreenState extends State<BranchLocatorScreen> {
                             horizontal: 12, vertical: 6),
                         child: ListTile(
                           leading: Icon(Icons.location_city,
-                              color: Theme.of(context).primaryColor),
+                              color: Theme.of(context).colorScheme.primary),
                           title: Text(branch.name,
                               style:
                                   const TextStyle(fontWeight: FontWeight.bold)),

lib/features/service/screens/service_screen.dart

@@ -29,18 +29,21 @@ class _ServiceScreen extends State<ServiceScreen> {
           icon: Symbols.add,
           label: AppLocalizations.of(context).accountOpeningDeposit,
           onTap: () {},
+          disabled: true, // Add this
         ),
         const Divider(height: 1),
         ServiceManagementTile(
           icon: Symbols.add,
           label: AppLocalizations.of(context).accountOpeningLoan,
           onTap: () {},
+          disabled: true, // Add this
         ),
         const Divider(height: 1),
         ServiceManagementTile(
           icon: Symbols.captive_portal,
           label: AppLocalizations.of(context).quickLinks,
           onTap: () {},
+          disabled: true, // Add this
         ),
         const Divider(height: 1),
         ServiceManagementTile(
@@ -52,6 +55,7 @@ class _ServiceScreen extends State<ServiceScreen> {
                 MaterialPageRoute(
                     builder: (context) => const BranchLocatorScreen()));
           },
+          disabled: true, // Add this
         ),
         const Divider(height: 1),
       ],
@@ -64,21 +68,36 @@ class ServiceManagementTile extends StatelessWidget {
   final IconData icon;
   final String label;
   final VoidCallback onTap;
+  final bool disabled; // Add this line
 
   const ServiceManagementTile({
     super.key,
     required this.icon,
     required this.label,
     required this.onTap,
+    this.disabled = false, // Add this line
   });
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     return ListTile(
-      leading: Icon(icon),
+      leading: Icon(
-      title: Text(label),
+        icon,
-      trailing: const Icon(Symbols.arrow_right, size: 20),
+        color: disabled ? theme.disabledColor : null, // Change color when disabled
-      onTap: onTap,
+      ),
+      title: Text(
+        label,
+        style: TextStyle(
+          color: disabled ? theme.disabledColor : null, // Change color when disabled
+        ),
+      ),
+      trailing: Icon(
+        Symbols.arrow_right,
+        size: 20,
+        color: disabled ? theme.disabledColor : null, // Change color when disabled
+      ),
+      onTap: disabled ? null : onTap, // Disable onTap when disabled
     );
   }
 }

lib/l10n/app_en.arb

@@ -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",
@@ -289,5 +289,31 @@
 "beneficiarydetails": "Beneficiary Details",
 "delete": "Delete",
 "search": "Search",
-"viewCardDeatils": "View Card Details"
+"viewCardDeatils": "View Card Details",
+"logout": "Logout",
+"logoutCheck": "Are you sure you want to logout?",
+"changeLoginPassword": "Change Login Password",
+"currentpwdrqd": "Current password is required",
+"newpwdrqd": "New password is required",
+"pwdFormat": "At least 8 characters(upper & lower case), digit, special char",
+"newoldpwddiff": "New password must differ from current",
+"confirmpwdrqd": "Confirm password is required",
+"pwdmismatch": "Passwords do not match",
+"failedtosentOTP": "Failed to send OTP",
+"currentpwd": "Current Password",
+"newpwd": "New Password",
+"confirmpwd": "Confirm New Password",
+"pwdchangeSuccess": "Password changed successfully!",
+"failedToValidate": "Failed to Validate",
+"otpVerification": "OTP Verification",
+"otpSent": "An OTP has been sent to your registered mobile number.",
+"enterOTP": "Enter OTP",
+"validateOTP": "Validate OTP",
+ "selectThemeMode": "Select Theme Mode",
+ "themeModeSystem": "System",
+ "themeModeLight": "Light",
+ "themeModeDark": "Dark",
+ "details": "Details",
+ "remarks": "Remarks (Optional)",
+ "kccbMobile": "KCCB Mobile"
 }

lib/l10n/app_hi.arb

@@ -170,7 +170,7 @@
 "invalidOtp": "अमान्य ओटीपी",
 "enterOtp": "ओटीपी दर्ज करें",
 "otpVerification": "ओटीपी सत्यापन",
-"otpSentMessage": "अपने मोबाइल नंबर पर भेजा गया 4-अंकों का ओटीपी दर्ज करें",
+"otpSentMessage": "अपने मोबाइल नंबर पर भेजा गया 6-अंकों का ओटीपी दर्ज करें",
 "verifyOtp": "ओटीपी सत्यापित करें",
 "otpResent": "ओटीपी पुनः भेजा गया",
 "resendOtp": "ओटीपी पुनः भेजें",
@@ -290,5 +290,31 @@
 "beneficiarydetails": "लाभार्थी विवरण",
 "delete": "मिटाओ",
 "search": "खोजें",
-"viewCardDeatils": "कार्ड विवरण देखें"
+"viewCardDeatils": "कार्ड विवरण देखें",
+"logout": "लॉग आउट",
+"logoutCheck": "क्या आप लॉग आउट करना चाहते हैं?",
+"changeLoginPassword": "लॉगिन पासवर्ड बदलें",
+"currentpwdrqd": "वर्तमान पासवर्ड आवश्यक है",
+"newpwdrqd": "नया पासवर्ड आवश्यक है",
+"pwdFormat": "कम से कम 8 अक्षर (बड़े और छोटे अक्षर), अंक, विशेष अक्षर",
+"newoldpwddiff": "नया पासवर्ड वर्तमान पासवर्ड से भिन्न होना चाहिए",
+"confirmpwdrqd": "पुष्टि पासवर्ड आवश्यक है",
+"pwdmismatch": "सांकेतिक शब्द मेल नहीं खाते",
+"failedtosentOTP": "ओटीपी भेजने में विफल",
+"currentpwd": "वर्तमान पासवर्ड",
+"newpwd": "नया पासवर्ड",
+"confirmpwd": "नए पासवर्ड की पुष्टि करें",
+"pwdchangeSuccess": "पासवर्ड सफलतापूर्वक बदला गया!",
+"failedToValidate": "सत्यापित करने में विफल",
+"otpVerification": "ओटीपी सत्यापन",
+"otpSent": "आपके पंजीकृत मोबाइल नंबर पर एक ओटीपी भेजा गया है।",
+"enterOTP": "ओटीपी दर्ज करें",
+"validateOTP": "ओटीपी सत्यापित करें",
+ "selectThemeMode": "थीम मोड चुनें",
+ "themeModeSystem": "सिस्टम",
+ "themeModeLight": "लाईट",
+ "themeModeDark": "डार्क",
+"details": "विवरण",
+ "remarks": "विचार (अनिवार्य नहीं)",
+ "kccbMobile": "केसीसीबी मोबाइल"
 }

lib/main.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: unused_import
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:kmobile/features/security/security_error_screen.dart';
@@ -16,12 +18,12 @@ void main() async {
 
   // Check for device compromise
   final compromisedMessage = await SecurityService.deviceCompromisedMessage;
-  // if (compromisedMessage != null) {
+  if (compromisedMessage != null) {
-  //   runApp(MaterialApp(
+    runApp(MaterialApp(
-  //     home: SecurityErrorScreen(message: compromisedMessage),
+      home: SecurityErrorScreen(message: compromisedMessage),
-  //   ));
+    ));
-  //   return;
+    return;
-  // }
+  }
 
   // Initialize dependencies
   await setupDependencies();

lib/widgets/bank_logos.dart

@@ -15,7 +15,7 @@ Widget getBankLogo(String? bankName, BuildContext context) {
       height: 40,
     );
   }
-  if (bankName != null && bankName.toLowerCase().contains('hdfc bank ltd')) {
+  if (bankName != null && bankName.toLowerCase().contains('hdfc')) {
     return Image.asset(
       'assets/images/hdfc_logo.png',
       width: 40,
@@ -29,6 +29,13 @@ Widget getBankLogo(String? bankName, BuildContext context) {
       height: 40,
     );
   }
+  if (bankName != null && bankName.toLowerCase().contains('uco')) {
+    return Image.asset(
+      'assets/images/uco_logo.png',
+      width: 40,
+      height: 40,
+    );
+  }  
   if (bankName != null &&
       bankName.toLowerCase().contains('punjab national bank')) {
     return Image.asset(
@@ -71,7 +78,22 @@ Widget getBankLogo(String? bankName, BuildContext context) {
       width: 40,
       height: 40,
     );
-  } else {
+  }
+  if (bankName != null && bankName.toLowerCase().contains('yes')) {
+    return Image.asset(
+      'assets/images/yes_bank_logo.png',
+      width: 40,
+      height: 40,
+    );
+  }
+  if (bankName != null && bankName.toLowerCase().contains('ipsbank') || bankName != null && bankName.toLowerCase().contains('india post') ) {
+    return Image.asset(
+      'assets/images/ipos_logo.png',
+      width: 40,
+      height: 40,
+    );
+  }
+  else {
     return Icon(
       Icons.account_balance,
       size: 40,

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,6 +5,7 @@
 import FlutterMacOS
 import Foundation
 
+import device_info_plus
 import flutter_secure_storage_macos
 import local_auth_darwin
 import path_provider_foundation
@@ -13,6 +14,7 @@ import shared_preferences_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))

pubspec.lock

@@ -25,6 +25,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
+  barcode:
+    dependency: transitive
+    description:
+      name: barcode
+      sha256: "7b6729c37e3b7f34233e2318d866e8c48ddb46c1f7ad01ff7bb2a8de1da2b9f4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.9"
+  bidi:
+    dependency: transitive
+    description:
+      name: bidi
+      sha256: "77f475165e94b261745cf1032c751e2032b8ed92ccb2bf5716036db79320637d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.13"
   bloc:
     dependency: "direct main"
     description:
@@ -53,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -77,18 +93,18 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.1"
   confetti:
     dependency: "direct main"
     description:
@@ -121,14 +137,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.8"
+  device_info_plus:
+    dependency: "direct main"
+    description:
+      name: device_info_plus
+      sha256: "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.3.0"
+  device_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: device_info_plus_platform_interface
+      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.2"
   dio:
     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:
@@ -149,10 +181,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -305,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:
@@ -321,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:
@@ -353,10 +385,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.19.0"
+    version: "0.20.2"
   jailbreak_root_detection:
     dependency: "direct main"
     description:
@@ -385,26 +417,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "11.0.2"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -465,10 +497,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
@@ -481,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: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   mime:
     dependency: transitive
     description:
@@ -513,10 +545,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path_parsing:
     dependency: transitive
     description:
@@ -573,6 +605,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  pdf:
+    dependency: "direct main"
+    description:
+      name: pdf
+      sha256: "28eacad99bffcce2e05bba24e50153890ad0255294f4dd78a17075a2ba5c8416"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.11.3"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      sha256: bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.0.1"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.1"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.4.7"
+  permission_handler_html:
+    dependency: transitive
+    description:
+      name: permission_handler_html
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3+5"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
   petitparser:
     dependency: transitive
     description:
@@ -601,10 +689,18 @@ 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:
+      name: qr
+      sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
   screenshot:
     dependency: "direct main"
     description:
@@ -697,7 +793,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
@@ -718,18 +814,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   string_scanner:
     dependency: transitive
     description:
@@ -750,10 +846,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.6"
   typed_data:
     dependency: transitive
     description:
@@ -862,10 +958,10 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
@@ -890,6 +986,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.10.1"
+  win32_registry:
+    dependency: transitive
+    description:
+      name: win32_registry
+      sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.5"
   xdg_directories:
     dependency: transitive
     description:
@@ -915,5 +1019,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"
   flutter: ">=3.24.0"

pubspec.yaml

@@ -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:
@@ -60,6 +60,11 @@ dependencies:
   lottie: ^2.6.0
   share_plus: ^7.2.1
   confetti: ^0.7.0
+  pdf: ^3.11.3
+  permission_handler: ^12.0.1
+  device_info_plus: ^11.3.0
+ # jailbreak_root_detection: "^1.1.6"
+
 
 
 
@@ -108,6 +113,9 @@ flutter:
     - assets/images/icici_logo.png
     - assets/images/hdfc_logo.png
     - assets/images/pnb_logo.png
+    - assets/images/yes_bank_logo.png
+    - assets/images/uco_logo.png
+    - assets/images/ipos_logo.png
     - assets/animations/rupee.json
     - assets/animations/error.json
     - assets/animations/done.json
@@ -137,5 +145,5 @@ flutter:
 
 flutter_icons:
   android: true
-  ios: false
+  ios: true
   image_path: assets/images/icon.png

windows/flutter/generated_plugin_registrant.cc

@@ -8,6 +8,7 @@
 
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <local_auth_windows/local_auth_plugin.h>
+#include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
@@ -16,6 +17,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
   LocalAuthPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("LocalAuthPlugin"));
+  PermissionHandlerWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -5,6 +5,7 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   flutter_secure_storage_windows
   local_auth_windows
+  permission_handler_windows
   share_plus
   url_launcher_windows
 )