Whatever.
M committed
Mar 22, 2021 at 19:38 UTC
23f73df391e936b4da799c6837be113ec11427ae
3 files changed
+20
-14
lib/entities/find_order_by_id.dart
+2
-2
@@ -4,7 +4,7 @@ import 'package:cake_wallet/exchange/trade_state.dart';
4
import 'package:http/http.dart';
5
6
Future<Order> findOrderById(String id) async {
7
- final orderUrl = 'https://api.testwyre.com/v3/orders/' + id;
7
+ final orderUrl = 'https://api.sendwyre.com/v3/orders/' + id;
8
9
final orderResponse = await get(orderUrl);
10
@@ -20,7 +20,7 @@ Future<Order> findOrderById(String id) async {
20
DateTime.fromMillisecondsSinceEpoch(createdAtRaw).toLocal();
21
22
final transferUrl =
23
- 'https://api.testwyre.com/v2/transfer/' + transferId + '/track';
23
+ 'https://api.sendwyre.com/v2/transfer/' + transferId + '/track';
24
25
final transferResponse = await get(transferUrl);
26
lib/src/screens/dashboard/dashboard_page.dart
+17
-11
@@ -144,19 +144,25 @@ class DashboardPage extends BasePage {
144
onClick: walletViewModel.isRunningWebView
145
? null
146
: () async {
147
- walletViewModel.isRunningWebView = true;
148
- final url = await walletViewModel.getWyreUrl();
149
- if (url.isNotEmpty) {
150
- await Navigator.of(context)
151
- .pushNamed(Routes.wyre, arguments: url);
152
-
153
- final orderId = walletViewModel.ordersStore.orderId;
154
-
155
- if (orderId.isNotEmpty) {
156
- await walletViewModel.saveOrder(orderId);
147
+ try {
148
+ walletViewModel.isRunningWebView = true;
149
+ final url = await walletViewModel.getWyreUrl();
150
+ if (url.isNotEmpty) {
151
+ await Navigator.of(context)
152
+ .pushNamed(Routes.wyre, arguments: url);
153
+
154
+ final orderId = walletViewModel.ordersStore
155
+ .orderId;
156
+
157
+ if (orderId.isNotEmpty) {
158
+ await walletViewModel.saveOrder(orderId);
159
+ }
160
}
161
+ walletViewModel.isRunningWebView = false;
162
+ } catch(e) {
163
+ print(e.toString());
164
+ walletViewModel.isRunningWebView = false;
165
}
159
- walletViewModel.isRunningWebView = false;
166
})
167
],
168
)),
lib/view_model/order_details_view_model.dart
+1
-1
@@ -52,7 +52,7 @@ abstract class OrderDetailsViewModelBase with Store {
52
void _updateItems() {
53
final dateFormat = DateFormatter.withCurrentLocal();
54
final buildURL =
55
- 'https://dashboard-test.testwyre.com/track/${order.transferId}';
55
+ 'https://api.sendwyre.com/v2/transfer/${order.transferId}/track';
56
57
items?.clear();
58