CAKE-305 | fixed transfer to wyre next btc address
OleksandrSobol committed
Mar 31, 2021 at 20:02 UTC
0848ede37f8062478afa30ff8417ef5d54320b50
3 files changed
+12
-17
lib/di.dart
+1
-3
@@ -534,13 +534,11 @@ Future setup(
534
535
getIt.registerFactory(() {
536
final wallet = getIt.get<AppStore>().wallet;
537
- return WyreService(walletType: wallet.type, walletAddress: wallet.address);
537
+ return WyreService(wallet: wallet);
538
});
539
540
getIt.registerFactory(() {
541
- final wallet = getIt.get<AppStore>().wallet;
541
return WyreViewModel(ordersSource, getIt.get<OrdersStore>(),
543
- walletId: wallet.id, address: wallet.address, type: wallet.type,
542
wyreService: getIt.get<WyreService>());
543
});
544
lib/entities/wyre_service.dart
+10
-5
@@ -1,4 +1,5 @@
1
import 'dart:convert';
2
+import 'package:cake_wallet/core/wallet_base.dart';
3
import 'package:cake_wallet/entities/wyre_exception.dart';
4
import 'package:cake_wallet/exchange/trade_state.dart';
5
import 'package:flutter/foundation.dart';
@@ -9,8 +10,7 @@ import 'package:cake_wallet/entities/wallet_type.dart';
10
11
class WyreService {
12
WyreService({
12
- @required this.walletType,
13
- @required this.walletAddress,
13
+ @required this.wallet,
14
this.isTestEnvironment = false}) {
15
baseApiUrl = isTestEnvironment
16
? _baseTestApiUrl
@@ -31,8 +31,11 @@ class WyreService {
31
static const _trackSuffix = '/track';
32
33
final bool isTestEnvironment;
34
- final WalletType walletType;
35
- final String walletAddress;
34
+ final WalletBase wallet;
35
+
36
+ WalletType get walletType => wallet.type;
37
+ String get walletAddress => wallet.address;
38
+ String get walletId => wallet.id;
39
40
String baseApiUrl;
41
String trackUrl;
@@ -105,7 +108,9 @@ class WyreService {
108
to: to,
109
state: state,
110
createdAt: createdAt,
108
- amount: amount.toString()
111
+ amount: amount.toString(),
112
+ receiveAddress: walletAddress,
113
+ walletId: walletId
114
);
115
}
116
}
\ No newline at end of file
lib/view_model/wyre_view_model.dart
+1
-9
@@ -2,7 +2,6 @@ import 'package:cake_wallet/entities/wyre_service.dart';
2
import 'package:flutter/foundation.dart';
3
import 'package:hive/hive.dart';
4
import 'package:cake_wallet/entities/order.dart';
5
-import 'package:cake_wallet/entities/wallet_type.dart';
5
import 'package:cake_wallet/store/dashboard/orders_store.dart';
6
import 'package:mobx/mobx.dart';
7
@@ -12,8 +11,7 @@ class WyreViewModel = WyreViewModelBase with _$WyreViewModel;
11
12
abstract class WyreViewModelBase with Store {
13
WyreViewModelBase(this.ordersSource, this.ordersStore,
15
- {@required this.walletId, @required this.address, @required this.type,
16
- @required this.wyreService});
14
+ {@required this.wyreService});
15
16
Future<String> get wyreUrl => wyreService.getWyreUrl();
17
@@ -22,17 +20,11 @@ abstract class WyreViewModelBase with Store {
20
final Box<Order> ordersSource;
21
final OrdersStore ordersStore;
22
25
- final String walletId;
26
- final WalletType type;
27
- final String address;
28
-
23
final WyreService wyreService;
24
25
Future<void> saveOrder(String orderId) async {
26
try {
27
final order = await wyreService.findOrderById(orderId);
34
- order.receiveAddress = address;
35
- order.walletId = walletId;
28
await ordersSource.add(order);
29
ordersStore.setOrder(order);
30
} catch (e) {