Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-02-03 19:56:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CAKE-305 | fixed transfer to wyre next btc address

Browse source
This commit is contained in:
OleksandrSobol 2021-03-31 20:02:44 +03:00
parent c0a12c6026
commit 0848ede37f
3 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/di.dart
View file

@ -534,13 +534,11 @@ Future setup(
getIt.registerFactory(() { getIt.registerFactory(() {
final wallet = getIt.get<AppStore>().wallet; final wallet = getIt.get<AppStore>().wallet;
return WyreService(walletType: wallet.type, walletAddress: wallet.address); return WyreService(wallet: wallet);
}); });
getIt.registerFactory(() { getIt.registerFactory(() {
final wallet = getIt.get<AppStore>().wallet;
return WyreViewModel(ordersSource, getIt.get<OrdersStore>(), return WyreViewModel(ordersSource, getIt.get<OrdersStore>(),
walletId: wallet.id, address: wallet.address, type: wallet.type,
wyreService: getIt.get<WyreService>()); wyreService: getIt.get<WyreService>());
}); });

15
lib/entities/wyre_service.dart
View file

@ -1,4 +1,5 @@
import 'dart:convert'; import 'dart:convert';
import 'package:cake_wallet/core/wallet_base.dart';
import 'package:cake_wallet/entities/wyre_exception.dart'; import 'package:cake_wallet/entities/wyre_exception.dart';
import 'package:cake_wallet/exchange/trade_state.dart'; import 'package:cake_wallet/exchange/trade_state.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
@ -9,8 +10,7 @@ import 'package:cake_wallet/entities/wallet_type.dart';
class WyreService { class WyreService {
WyreService({ WyreService({
@required this.walletType, @required this.wallet,
@required this.walletAddress,
this.isTestEnvironment = false}) { this.isTestEnvironment = false}) {
baseApiUrl = isTestEnvironment baseApiUrl = isTestEnvironment
? _baseTestApiUrl ? _baseTestApiUrl
@ -31,8 +31,11 @@ class WyreService {
static const _trackSuffix = '/track'; static const _trackSuffix = '/track';
final bool isTestEnvironment; final bool isTestEnvironment;
final WalletType walletType; final WalletBase wallet;
final String walletAddress;
WalletType get walletType => wallet.type;
String get walletAddress => wallet.address;
String get walletId => wallet.id;
String baseApiUrl; String baseApiUrl;
String trackUrl; String trackUrl;
@ -105,7 +108,9 @@ class WyreService {
to: to, to: to,
state: state, state: state,
createdAt: createdAt, createdAt: createdAt,
amount: amount.toString() amount: amount.toString(),
receiveAddress: walletAddress,
walletId: walletId
); );
} }
} }

10
lib/view_model/wyre_view_model.dart
View file

@ -2,7 +2,6 @@ import 'package:cake_wallet/entities/wyre_service.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:hive/hive.dart'; import 'package:hive/hive.dart';
import 'package:cake_wallet/entities/order.dart'; import 'package:cake_wallet/entities/order.dart';
import 'package:cake_wallet/entities/wallet_type.dart';
import 'package:cake_wallet/store/dashboard/orders_store.dart'; import 'package:cake_wallet/store/dashboard/orders_store.dart';
import 'package:mobx/mobx.dart'; import 'package:mobx/mobx.dart';
@ -12,8 +11,7 @@ class WyreViewModel = WyreViewModelBase with _$WyreViewModel;
abstract class WyreViewModelBase with Store { abstract class WyreViewModelBase with Store {
WyreViewModelBase(this.ordersSource, this.ordersStore, WyreViewModelBase(this.ordersSource, this.ordersStore,
{@required this.walletId, @required this.address, @required this.type, {@required this.wyreService});
@required this.wyreService});
Future<String> get wyreUrl => wyreService.getWyreUrl(); Future<String> get wyreUrl => wyreService.getWyreUrl();
@ -22,17 +20,11 @@ abstract class WyreViewModelBase with Store {
final Box<Order> ordersSource; final Box<Order> ordersSource;
final OrdersStore ordersStore; final OrdersStore ordersStore;
final String walletId;
final WalletType type;
final String address;
final WyreService wyreService; final WyreService wyreService;
Future<void> saveOrder(String orderId) async { Future<void> saveOrder(String orderId) async {
try { try {
final order = await wyreService.findOrderById(orderId); final order = await wyreService.findOrderById(orderId);
order.receiveAddress = address;
order.walletId = walletId;
await ordersSource.add(order); await ordersSource.add(order);
ordersStore.setOrder(order); ordersStore.setOrder(order);
} catch (e) { } catch (e) {