CAKE-306 | fixed moonpay_buy_provider.dart, buy_view_model.dart and order_details_view_model.dart
OleksandrSobol committed
Apr 30, 2021 at 13:12 UTC
ae7ccacf29f6e25d73290c2e734ef4f1e44ae922
4 files changed
+6
-26
lib/buy/moonpay/moonpay_buy_provider.dart
+1
-17
@@ -1,6 +1,5 @@
1
import 'dart:convert';
2
import 'package:cake_wallet/buy/buy_exception.dart';
3
-import 'package:hive/hive.dart';
3
import 'package:http/http.dart';
4
import 'package:cake_wallet/buy/buy_amount.dart';
5
import 'package:cake_wallet/buy/buy_provider.dart';
@@ -12,8 +11,7 @@ import 'package:cake_wallet/exchange/trade_state.dart';
11
import 'package:cake_wallet/.secrets.g.dart' as secrets;
12
13
class MoonPayBuyProvider extends BuyProvider {
15
- MoonPayBuyProvider({WalletBase wallet, this.ordersSource,
16
- bool isTestEnvironment = false})
14
+ MoonPayBuyProvider({WalletBase wallet, bool isTestEnvironment = false})
15
: super(wallet: wallet, isTestEnvironment: isTestEnvironment) {
16
baseApiUrl = isTestEnvironment
17
? _baseTestApiUrl
@@ -39,7 +37,6 @@ class MoonPayBuyProvider extends BuyProvider {
37
@override
38
String get trackUrl => baseApiUrl + '/transaction_receipt?transactionId=';
39
42
- final Box<Order> ordersSource;
40
String baseApiUrl;
41
42
@override
@@ -100,23 +97,10 @@ class MoonPayBuyProvider extends BuyProvider {
97
final createdAt = DateTime.parse(createdAtRaw).toLocal();
98
final amount = responseJSON['quoteCurrencyAmount'] as double;
99
103
- var from = '';
104
- var to = '';
105
-
106
- for (final order in ordersSource.values) {
107
- if (order.id == id) {
108
- from = order.from;
109
- to = order.to;
110
- break;
111
- }
112
- }
113
-
100
return Order(
101
id: id,
102
provider: description,
103
transferId: id,
118
- from: from,
119
- to: to,
104
state: state,
105
createdAt: createdAt,
106
amount: amount.toString(),
lib/di.dart
-1
@@ -558,7 +558,6 @@ Future setup(
558
559
return OrderDetailsViewModel(
560
wallet: wallet,
561
- ordersSource: _ordersSource,
561
orderForDetails: order);
562
});
563
lib/view_model/buy/buy_view_model.dart
+1
-1
@@ -22,7 +22,7 @@ abstract class BuyViewModelBase with Store {
22
{@required this.wallet}) {
23
providerList = [
24
WyreBuyProvider(wallet: wallet),
25
- MoonPayBuyProvider(wallet: wallet, ordersSource: ordersSource)
25
+ MoonPayBuyProvider(wallet: wallet)
26
];
27
items = providerList.map((provider) =>
28
BuyItem(provider: provider, buyAmountViewModel: buyAmountViewModel))
lib/view_model/order_details_view_model.dart
+4
-7
@@ -3,7 +3,6 @@ import 'package:cake_wallet/buy/buy_provider.dart';
3
import 'package:cake_wallet/buy/buy_provider_description.dart';
4
import 'package:cake_wallet/buy/order.dart';
5
import 'package:cake_wallet/utils/date_formatter.dart';
6
-import 'package:hive/hive.dart';
6
import 'package:mobx/mobx.dart';
7
import 'package:cake_wallet/generated/i18n.dart';
8
import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
@@ -19,8 +18,7 @@ class OrderDetailsViewModel = OrderDetailsViewModelBase
18
with _$OrderDetailsViewModel;
19
20
abstract class OrderDetailsViewModelBase with Store {
22
- OrderDetailsViewModelBase({WalletBase wallet, this.ordersSource,
23
- Order orderForDetails}) {
21
+ OrderDetailsViewModelBase({WalletBase wallet, Order orderForDetails}) {
22
order = orderForDetails;
23
24
if (order.provider != null) {
@@ -29,8 +27,7 @@ abstract class OrderDetailsViewModelBase with Store {
27
_provider = WyreBuyProvider(wallet: wallet);
28
break;
29
case BuyProviderDescription.moonPay:
32
- _provider =
33
- MoonPayBuyProvider(wallet: wallet, ordersSource: ordersSource);
30
+ _provider = MoonPayBuyProvider(wallet: wallet);
31
break;
32
}
33
}
@@ -44,8 +41,6 @@ abstract class OrderDetailsViewModelBase with Store {
41
timer = Timer.periodic(Duration(seconds: 20), (_) async => _updateOrder());
42
}
43
47
- final Box<Order> ordersSource;
48
-
44
@observable
45
Order order;
46
@@ -61,6 +56,8 @@ abstract class OrderDetailsViewModelBase with Store {
56
try {
57
if (_provider != null) {
58
final updatedOrder = await _provider.findOrderById(order.id);
59
+ updatedOrder.from = order.from;
60
+ updatedOrder.to = order.to;
61
updatedOrder.receiveAddress = order.receiveAddress;
62
updatedOrder.walletId = order.walletId;
63
if (order.provider != null) {