axiom-team
/
gecko
6
1
Fork 1
Code Issues Pull Requests Projects Releases 11 Wiki Activity

fix: good display of wallet names on transaction screen

This commit is contained in:
poka 2023-11-17 17:34:51 +01:00
parent a751b1ebf3
commit e47211f139
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/screens/transaction_in_progress.dart
View File

@ -12,11 +12,16 @@ import 'package:provider/provider.dart';
class TransactionInProgress extends StatelessWidget {
const TransactionInProgress(
{Key? key, this.transType = 'pay', this.fromAddress, this.toAddress})
{Key? key,
this.transType = 'pay',
this.fromAddress,
this.toAddress,
this.toUsername})
: super(key: key);
final String transType;
final String? fromAddress;
final String? toAddress;
final String? toUsername;
@override
Widget build(BuildContext context) {
@ -33,8 +38,15 @@ class TransactionInProgress extends StatelessWidget {
log.d(walletProfiles.address);
final from = fromAddress ?? myWalletProvider.getDefaultWallet().name!;
final to = toAddress ?? getShortPubkey(walletProfiles.address);
final from = fromAddress ??
g1WalletsBox
.get(myWalletProvider.getDefaultWallet().address)
?.username ??
myWalletProvider.getDefaultWallet().name!;
String to = toAddress ?? walletProfiles.address;
to =
myWalletProvider.getWalletDataByAddress(to)?.name ?? getShortPubkey(to);
final amount = walletProfiles.payAmount.text;
String actionName = '';
final bool isUdUnit = configBox.get('isUdUnit') ?? false;
@ -220,7 +232,7 @@ class TransactionInProgress extends StatelessWidget {
style: const TextStyle(fontSize: 18),
),
Text(
to,
toUsername ?? to,
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.w600),

14
lib/widgets/payment_popup.dart
View File

@ -29,6 +29,8 @@ void paymentPopup(BuildContext context, String toAddress, String username) {
final amountFocus = FocusNode();
final dropdownKey = GlobalKey();
walletViewProvider.payAmount.text = '';
Future executeTransfert() async {
String? pin;
if (myWalletProvider.pinCode == '') {
@ -56,7 +58,8 @@ void paymentPopup(BuildContext context, String toAddress, String username) {
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
return const TransactionInProgress();
return TransactionInProgress(
toAddress: toAddress, toUsername: username);
}),
);
}
@ -333,7 +336,11 @@ void paymentPopup(BuildContext context, String toAddress, String username) {
backgroundColor: orangeC, // foreground
),
onPressed: canValidate
? () async => await executeTransfert()
? () async {
// FocusScope.of(context).unfocus();
Navigator.pop(context);
await executeTransfert();
}
: null,
child: Text(
'executeTheTransfer'.tr(),
@ -348,8 +355,9 @@ void paymentPopup(BuildContext context, String toAddress, String username) {
),
);
});
}).then((value) => walletViewProvider.payAmount.text = '');
});
}
//).then((value) => walletViewProvider.payAmount.text = ''
Future<void> infoFeesPopup(BuildContext context) async {
return showDialog<void>(