From 23f73df391e936b4da799c6837be113ec11427ae Mon Sep 17 00:00:00 2001
From: M <m@cakewallet.com>
Date: Mon, 22 Mar 2021 19:38:55 +0200
Subject: [PATCH] Whatever.

---
 lib/entities/find_order_by_id.dart            |  4 ++--
 lib/src/screens/dashboard/dashboard_page.dart | 24 ++++++++++++-------
 lib/view_model/order_details_view_model.dart  |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/lib/entities/find_order_by_id.dart b/lib/entities/find_order_by_id.dart
index 6837feb72..d97c30593 100644
--- a/lib/entities/find_order_by_id.dart
+++ b/lib/entities/find_order_by_id.dart
@@ -4,7 +4,7 @@ import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:http/http.dart';
 
 Future<Order> findOrderById(String id) async {
-  final orderUrl = 'https://api.testwyre.com/v3/orders/' + id;
+  final orderUrl = 'https://api.sendwyre.com/v3/orders/' + id;
 
   final orderResponse = await get(orderUrl);
 
@@ -20,7 +20,7 @@ Future<Order> findOrderById(String id) async {
   DateTime.fromMillisecondsSinceEpoch(createdAtRaw).toLocal();
 
   final transferUrl =
-      'https://api.testwyre.com/v2/transfer/' + transferId + '/track';
+      'https://api.sendwyre.com/v2/transfer/' + transferId + '/track';
 
   final transferResponse = await get(transferUrl);
 
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index 3925abb63..7d285e6a5 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -144,19 +144,25 @@ class DashboardPage extends BasePage {
                           onClick: walletViewModel.isRunningWebView
                               ? null
                               : () async {
-                            walletViewModel.isRunningWebView = true;
-                            final url = await walletViewModel.getWyreUrl();
-                            if (url.isNotEmpty) {
-                              await Navigator.of(context)
-                                  .pushNamed(Routes.wyre, arguments: url);
+                            try {
+                              walletViewModel.isRunningWebView = true;
+                              final url = await walletViewModel.getWyreUrl();
+                              if (url.isNotEmpty) {
+                                await Navigator.of(context)
+                                    .pushNamed(Routes.wyre, arguments: url);
 
-                              final orderId = walletViewModel.ordersStore.orderId;
+                                final orderId = walletViewModel.ordersStore
+                                    .orderId;
 
-                              if (orderId.isNotEmpty) {
-                                await walletViewModel.saveOrder(orderId);
+                                if (orderId.isNotEmpty) {
+                                  await walletViewModel.saveOrder(orderId);
+                                }
                               }
+                              walletViewModel.isRunningWebView = false;
+                            } catch(e) {
+                              print(e.toString());
+                              walletViewModel.isRunningWebView = false;
                             }
-                            walletViewModel.isRunningWebView = false;
                           })
                     ],
                   )),
diff --git a/lib/view_model/order_details_view_model.dart b/lib/view_model/order_details_view_model.dart
index 1f5fd01cd..9a3ec63e0 100644
--- a/lib/view_model/order_details_view_model.dart
+++ b/lib/view_model/order_details_view_model.dart
@@ -52,7 +52,7 @@ abstract class OrderDetailsViewModelBase with Store {
   void _updateItems() {
     final dateFormat = DateFormatter.withCurrentLocal();
     final buildURL =
-        'https://dashboard-test.testwyre.com/track/${order.transferId}';
+        'https://api.sendwyre.com/v2/transfer/${order.transferId}/track';
 
     items?.clear();