Merge pull request #104 from MXCzkEVM/send_crypto_changes

Send crypto changes
MXCzkEVM · Oct 24, 2023 · 4137110 · 4137110
2 parents 14b3068 + 381819a
commit 4137110
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_presenter.dart b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_presenter.dart
@@ -191,7 +191,12 @@ class SendCryptoPresenter extends CompletePresenter<SendCryptoState> {
       }
       return res;
     } else if (TransactionProcessType.done == type) {
-      BottomFlowDialog.of(context!).close();
+      navigator!.pop();
+      Future.delayed(const Duration(milliseconds: 200), () {
+        navigator?.popUntil((route) {
+          return route.settings.name?.contains('WalletPage') ?? false;
+        });
+      });
     }
   }
 

diff --git a/...features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_info.dart b/...features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_info.dart
@@ -148,7 +148,6 @@ class _TransactionInfoState extends State<TransactionInfo> {
           }
         } else {
           widget.onTap(processType);
-          Navigator.of(context).pop(true);
         }
       },
     );

diff --git a/lib/features/portfolio/subfeatures/tokens_balance_list/tokens_balance_list.dart b/lib/features/portfolio/subfeatures/tokens_balance_list/tokens_balance_list.dart
@@ -2,6 +2,7 @@ import 'package:datadashwallet/common/common.dart';
 import 'package:datadashwallet/core/core.dart';
 import 'package:datadashwallet/features/portfolio/portfolio.dart';
 import 'package:datadashwallet/features/portfolio/subfeatures/token/add_token/add_token_page.dart';
+import '../token/send_token/send_crypto/send_crypto_page.dart';
 import './utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -43,6 +44,14 @@ class TokensBalanceList extends HookConsumerWidget {
                                 ...TokensBalanceListUtils
                                     .generateTokensBalanceList(
                                   portfolioState.tokensList!,
+                                  onSelected: (token) =>
+                                      Navigator.of(context).push(
+                                    route.featureDialog(
+                                      SendCryptoPage(
+                                        token: token,
+                                      ),
+                                    ),
+                                  ),
                                 )
                               ],
                             )),
-Original file line number
+Diff line change
@@ Expand Up @@
               }
             } else {
               widget.onTap(processType);
-              Navigator.of(context).pop(true);
             }
           },
         );
@@ Expand Down @@