diff --git a/lib/screens/transaction_in_progress.dart b/lib/screens/transaction_in_progress.dart
index 7fa084e..09cdb26 100644
--- a/lib/screens/transaction_in_progress.dart
+++ b/lib/screens/transaction_in_progress.dart
@@ -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),
diff --git a/lib/widgets/payment_popup.dart b/lib/widgets/payment_popup.dart
index 915c1c3..7a24abc 100644
--- a/lib/widgets/payment_popup.dart
+++ b/lib/widgets/payment_popup.dart
@@ -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>(