From 90f4a6bb81388cd723857d3b2f812e105813173d Mon Sep 17 00:00:00 2001 From: Nilanjan Chakrabarti Date: Mon, 1 Sep 2025 12:32:17 +0530 Subject: [PATCH] Removed bugs and duplicates --- .../accounts/screens/account_info_screen.dart | 2 - .../screens/customer_info_screen.dart | 3 +- .../screens/fund_transfer_amount_screen.dart | 94 +------------------ .../quick_pay/screens/quick_pay_screen.dart | 1 - 4 files changed, 5 insertions(+), 95 deletions(-) diff --git a/lib/features/accounts/screens/account_info_screen.dart b/lib/features/accounts/screens/account_info_screen.dart index db88654..7a9d06e 100644 --- a/lib/features/accounts/screens/account_info_screen.dart +++ b/lib/features/accounts/screens/account_info_screen.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:kmobile/data/models/user.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; import '../../../l10n/app_localizations.dart'; class AccountInfoScreen extends StatefulWidget { diff --git a/lib/features/customer_info/screens/customer_info_screen.dart b/lib/features/customer_info/screens/customer_info_screen.dart index 2fc261f..ebb7aa7 100644 --- a/lib/features/customer_info/screens/customer_info_screen.dart +++ b/lib/features/customer_info/screens/customer_info_screen.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:kmobile/data/models/user.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; import '../../../l10n/app_localizations.dart'; class CustomerInfoScreen extends StatefulWidget { @@ -20,7 +19,7 @@ class _CustomerInfoScreenState extends State { return Scaffold( appBar: AppBar( title: Text( - AppLocalizations.of(context).customer, + AppLocalizations.of(context).customerInfo, ), ), body: SingleChildScrollView( diff --git a/lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart b/lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart index ee12d86..5ef88cd 100644 --- a/lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart +++ b/lib/features/fund_transfer/screens/fund_transfer_amount_screen.dart @@ -17,9 +17,6 @@ import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.da import '../../../l10n/app_localizations.dart'; import 'package:kmobile/api/services/payment_service.dart'; import 'package:kmobile/data/models/transfer.dart'; -import 'package:kmobile/api/services/payment_service.dart'; -import 'package:kmobile/data/models/transfer.dart'; - enum TransactionMode { neft, rtgs, imps } class FundTransferAmountScreen extends StatefulWidget { @@ -27,7 +24,6 @@ class FundTransferAmountScreen extends StatefulWidget { final Beneficiary creditBeneficiary; final String remitterName; final bool isOwnBank; - final bool isOwnBank; const FundTransferAmountScreen({ super.key, @@ -35,7 +31,6 @@ class FundTransferAmountScreen extends StatefulWidget { required this.creditBeneficiary, required this.remitterName, this.isOwnBank = false, - this.isOwnBank = false, }); @override @@ -43,7 +38,7 @@ class FundTransferAmountScreen extends StatefulWidget { _FundTransferAmountScreenState(); } -class _FundTransferAmountScreenState extends State { +class _FundTransferAmountScreenState extends State { final _amountController = TextEditingController(); final _formKey = GlobalKey(); TransactionMode _selectedMode = TransactionMode.neft; @@ -102,51 +97,6 @@ class _FundTransferAmountScreenState extends State { ); return; // Stop further execution } - if (widget.isOwnBank) { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => TransactionPinScreen( - onPinCompleted: (pinScreenContext, tpin) async { - final transfer = Transfer( - fromAccount: widget.debitAccountNo, - toAccount: widget.creditBeneficiary.accountNo, - toAccountType: 'Savings', // Assuming 'SB' for savings - amount: _amountController.text, - tpin: tpin, - ); - - final paymentService = getIt(); - final paymentResponseFuture = - paymentService.processQuickPayWithinBank(transfer); - - Navigator.of(pinScreenContext).pushReplacement( - MaterialPageRoute( - builder: (_) => PaymentAnimationScreen( - paymentResponse: paymentResponseFuture), - ), - ); - }, - ), - ), - ); - } else { - if (_selectedMode == TransactionMode.rtgs && amount < 200000) { - showDialog( - context: context, - builder: (ctx) => AlertDialog( - title: Text(AppLocalizations.of(context).invalidRtgs), - content: Text(AppLocalizations.of(context).invalidRtgsPopUp), - actions: [ - TextButton( - onPressed: () => Navigator.of(ctx).pop(), - child: Text(AppLocalizations.of(context).ok), - ), - ], - ), - ); - return; // Stop further execution - } Navigator.push( context, @@ -164,32 +114,8 @@ class _FundTransferAmountScreenState extends State { tpin: tpin, ); final neftService = getIt(); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => TransactionPinScreen( - onPinCompleted: (pinScreenContext, tpin) async { - if (_selectedMode == TransactionMode.neft) { - final neftTx = NeftTransaction( - fromAccount: widget.debitAccountNo, - toAccount: widget.creditBeneficiary.accountNo, - amount: _amountController.text, - ifscCode: widget.creditBeneficiary.ifscCode, - remitterName: widget.remitterName, - beneficiaryName: widget.creditBeneficiary.name, - tpin: tpin, - ); - final neftService = getIt(); - - final completer = Completer(); final completer = Completer(); - Navigator.of(pinScreenContext).pushReplacement( - MaterialPageRoute( - builder: (_) => PaymentAnimationScreen( - paymentResponse: completer.future), - ), - ); Navigator.of(pinScreenContext).pushReplacement( MaterialPageRoute( builder: (_) => PaymentAnimationScreen( @@ -257,12 +183,6 @@ class _FundTransferAmountScreenState extends State { final impsService = getIt(); final completer = Completer(); - Navigator.of(pinScreenContext).pushReplacement( - MaterialPageRoute( - builder: (_) => PaymentAnimationScreen( - paymentResponse: completer.future), - ), - ); Navigator.of(pinScreenContext).pushReplacement( MaterialPageRoute( builder: (_) => PaymentAnimationScreen( @@ -319,12 +239,6 @@ class _FundTransferAmountScreenState extends State { final rtgsService = getIt(); final completer = Completer(); - Navigator.of(pinScreenContext).pushReplacement( - MaterialPageRoute( - builder: (_) => PaymentAnimationScreen( - paymentResponse: completer.future), - ), - ); Navigator.of(pinScreenContext).pushReplacement( MaterialPageRoute( builder: (_) => PaymentAnimationScreen( @@ -457,9 +371,9 @@ class _FundTransferAmountScreenState extends State { borderColor: Colors.transparent, selectedBorderColor: Colors.transparent, splashColor: - Theme.of(context).primaryColor.withValues(alpha: 0.1), + Theme.of(context).primaryColor, highlightColor: - Theme.of(context).primaryColor.withValues(alpha: 0.1), + Theme.of(context).primaryColor, children: [ Padding( padding: const EdgeInsets.symmetric( @@ -520,4 +434,4 @@ class _FundTransferAmountScreenState extends State { ), ); } -} +} \ No newline at end of file diff --git a/lib/features/quick_pay/screens/quick_pay_screen.dart b/lib/features/quick_pay/screens/quick_pay_screen.dart index 1910f69..871598c 100644 --- a/lib/features/quick_pay/screens/quick_pay_screen.dart +++ b/lib/features/quick_pay/screens/quick_pay_screen.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:kmobile/features/quick_pay/screens/quick_pay_outside_bank_screen.dart'; import 'package:kmobile/features/quick_pay/screens/quick_pay_within_bank_screen.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart';