diff --git a/lib/models/exchange/exchange_form_state.dart b/lib/models/exchange/estimated_rate_exchange_form_state.dart
similarity index 100%
rename from lib/models/exchange/exchange_form_state.dart
rename to lib/models/exchange/estimated_rate_exchange_form_state.dart
diff --git a/lib/pages/send_view/send_view.dart b/lib/pages/send_view/send_view.dart
index 89a3b7c7b..191f12a15 100644
--- a/lib/pages/send_view/send_view.dart
+++ b/lib/pages/send_view/send_view.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:decimal/decimal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -1175,7 +1177,7 @@ class _SendViewState extends ConsumerState<SendView> {
                                   try {
                                     bool wasCancelled = false;
 
-                                    showDialog<dynamic>(
+                                    unawaited(showDialog<dynamic>(
                                       context: context,
                                       useSafeArea: false,
                                       barrierDismissible: false,
@@ -1188,7 +1190,7 @@ class _SendViewState extends ConsumerState<SendView> {
                                           },
                                         );
                                       },
-                                    );
+                                    ));
 
                                     final txData = await manager.prepareSend(
                                       address: _address!,
@@ -1205,7 +1207,7 @@ class _SendViewState extends ConsumerState<SendView> {
                                       txData["note"] = noteController.text;
                                       txData["address"] = _address;
 
-                                      Navigator.of(context).push(
+                                      unawaited(Navigator.of(context).push(
                                         RouteGenerator.getRoute(
                                           shouldUseMaterialRoute: RouteGenerator
                                               .useMaterialPageRoute,
@@ -1219,14 +1221,14 @@ class _SendViewState extends ConsumerState<SendView> {
                                                 .routeName,
                                           ),
                                         ),
-                                      );
+                                      ));
                                     }
                                   } catch (e) {
                                     if (mounted) {
                                       // pop building dialog
                                       Navigator.of(context).pop();
 
-                                      showDialog<dynamic>(
+                                      unawaited(showDialog<dynamic>(
                                         context: context,
                                         useSafeArea: false,
                                         barrierDismissible: true,
@@ -1258,7 +1260,7 @@ class _SendViewState extends ConsumerState<SendView> {
                                             ),
                                           );
                                         },
-                                      );
+                                      ));
                                     }
                                   }
                                 }
diff --git a/lib/providers/exchange/estimate_rate_exchange_form_provider.dart b/lib/providers/exchange/estimate_rate_exchange_form_provider.dart
index e6f0a92b2..9a59cb734 100644
--- a/lib/providers/exchange/estimate_rate_exchange_form_provider.dart
+++ b/lib/providers/exchange/estimate_rate_exchange_form_provider.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:stackwallet/models/exchange/exchange_form_state.dart';
+import 'package:stackwallet/models/exchange/estimated_rate_exchange_form_state.dart';
 
 final estimatedRateExchangeFormProvider =
     ChangeNotifierProvider((ref) => EstimatedRateExchangeFormState());
diff --git a/lib/services/coins/epiccash/epiccash_wallet.dart b/lib/services/coins/epiccash/epiccash_wallet.dart
index 53a320666..ee0d0aa2a 100644
--- a/lib/services/coins/epiccash/epiccash_wallet.dart
+++ b/lib/services/coins/epiccash/epiccash_wallet.dart
@@ -754,7 +754,6 @@ class EpicCashWallet extends CoinServiceAPI {
 
       String receiverAddress = txData['addresss'] as String;
       await m.protect(() async {
-
         if (receiverAddress.startsWith("http://") || receiverAddress.startsWith("https://")) {
           const int selectionStrategyIsAll = 0;
           ReceivePort receivePort = await getIsolate({