Transaction Details Bug Fixed

removed unwanted log generations

analysis_options.yaml

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

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({});
   }
@@ -66,7 +71,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,60 @@
+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 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/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/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(
@@ -65,6 +67,7 @@ Dio _createDioClient() {
       baseUrl:
           'http://lb-test-mobile-banking-app-192209417.ap-south-1.elb.amazonaws.com:8080',
       //'http://localhost:8081',
+      // 'http://localhost:8082',
       connectTimeout: const Duration(seconds: 5),
       receiveTimeout: const Duration(seconds: 10),
       headers: {

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,19 @@ 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';
 
 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 +34,7 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
   List<Transaction> _transactions = [];
   final _minAmountController = TextEditingController();
   final _maxAmountController = TextEditingController();
+  //Future<Map<String, dynamic>?>? accountStatementsFuture;
 
   @override
   void initState() {
@@ -285,9 +293,19 @@ class _AccountStatementScreen extends State<AccountStatementScreen> {
                                     : '',
                                 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 +326,180 @@ 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
+    } 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

@@ -200,38 +200,38 @@ class LoginScreenState extends State<LoginScreen>
                   ),
                   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/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();
@@ -237,6 +239,7 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
                     child: Column(
                       children: [
                         TextFormField(
+                          key: _accountNumberFieldKey,
                           controller: accountNumberController,
                           decoration: InputDecoration(
                             labelText: AppLocalizations.of(
@@ -267,6 +270,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 +289,14 @@ 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(
+                          key: _ifscFieldKey,
                           controller: ifscController,
                           maxLength: 11,
                           inputFormatters: [
@@ -393,17 +396,17 @@ class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen> {
 onPressed: _isValidating
     ? 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':
@@ -289,7 +291,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 +523,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                               .accountNo!,
                                           balance: users[selectedAccountIndex]
                                               .availableBalance!,
+                                          accountType: users[selectedAccountIndex]
+                                          .accountType!,
                                         )));
                           }),
                           _buildQuickLink(Symbols.checkbook,

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/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).failedToValidate}: $e')),
+  );
+}
+  }
+
+  @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 {
+  const ChangePasswordScreen();
+
+  @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 {
+      const mobileNumber = "8981274001"; // Replace with actual mobile number
+      await _changePasswordService.getOtp(mobileNumber: mobileNumber);
+
+
+      Navigator.push(
+        context,
+        MaterialPageRoute(
+          builder: (context) => ChangePasswordOTPScreen(
+            currentPassword: currentPasswordController.text,
+            newPassword: newPasswordController.text,
+            confirmPassword: confirmPasswordController.text,
+            mobileNumber: 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,6 +1,7 @@
 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';
@@ -40,10 +41,19 @@ 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) => const ChangePasswordScreen()),
+            );
+            },
+          ),
           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 +65,7 @@ class ProfileScreen extends StatelessWidget {
               }
             },
           ),
+          // You can add more profile options here later
         ],
       ),
     );

lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart

@@ -86,7 +86,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>();

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

@@ -289,5 +289,29 @@
 "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"
 }

lib/l10n/app_hi.arb

@@ -290,5 +290,29 @@
 "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": "विवरण"
 }

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:
@@ -121,6 +137,22 @@ 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:
@@ -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:
@@ -605,6 +693,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.5"
+  qr:
+    dependency: transitive
+    description:
+      name: qr
+      sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
   screenshot:
     dependency: "direct main"
     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:

pubspec.yaml

@@ -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

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
 )