mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-23 06:38:35 +02:00
v4.10.0 & v1.7.0 (#1113)
* New versions
* update the new version text after macos [skip ci]
* add cake-wallet headers
* add nano/banano to getAddressFromStringPattern
* Revert "Exolix integration (#1080)"
This reverts commit 9eb6867ab9.
* fix: Bug in conditions check and clean up of repeated code in switch cases (#1117)
* update build numbers [skip ci]
---------
Co-authored-by: fosse <matt.cfosse@gmail.com>
Co-authored-by: Adegoke David <64401859+Blazebrain@users.noreply.github.com>
This commit is contained in:
co-authored by
fosse
Adegoke David
parent
5a20d342ad
commit
e5408a388e
@@ -1,5 +1,8 @@
|
||||
import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
|
||||
import 'package:cake_wallet/di.dart';
|
||||
import 'package:cake_wallet/utils/exception_handler.dart';
|
||||
import 'package:cw_core/transaction_info.dart';
|
||||
import 'package:cw_core/wallet_type.dart';
|
||||
import 'package:mobx/mobx.dart';
|
||||
import 'package:cw_core/balance.dart';
|
||||
import 'package:cw_core/wallet_base.dart';
|
||||
@@ -40,5 +43,9 @@ abstract class AppStoreBase with Store {
|
||||
this.wallet?.close();
|
||||
this.wallet = wallet;
|
||||
this.wallet!.setExceptionHandler(ExceptionHandler.onError);
|
||||
|
||||
if (wallet.type == WalletType.ethereum) {
|
||||
getIt.get<Web3WalletService>().init();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,8 +13,7 @@ abstract class TradeFilterStoreBase with Store {
|
||||
displaySideShift = true,
|
||||
displayMorphToken = true,
|
||||
displaySimpleSwap = true,
|
||||
displayTrocador = true,
|
||||
displayExolix = true;
|
||||
displayTrocador = true;
|
||||
|
||||
@observable
|
||||
bool displayXMRTO;
|
||||
@@ -34,11 +33,8 @@ abstract class TradeFilterStoreBase with Store {
|
||||
@observable
|
||||
bool displayTrocador;
|
||||
|
||||
@observable
|
||||
bool displayExolix;
|
||||
|
||||
@computed
|
||||
bool get displayAllTrades => displayChangeNow && displaySideShift && displaySimpleSwap && displayTrocador && displayExolix;
|
||||
bool get displayAllTrades => displayChangeNow && displaySideShift && displaySimpleSwap && displayTrocador;
|
||||
|
||||
@action
|
||||
void toggleDisplayExchange(ExchangeProviderDescription provider) {
|
||||
@@ -60,10 +56,7 @@ abstract class TradeFilterStoreBase with Store {
|
||||
break;
|
||||
case ExchangeProviderDescription.trocador:
|
||||
displayTrocador = !displayTrocador;
|
||||
break;
|
||||
case ExchangeProviderDescription.exolix:
|
||||
displayExolix = !displayExolix;
|
||||
break;
|
||||
break;
|
||||
case ExchangeProviderDescription.all:
|
||||
if (displayAllTrades) {
|
||||
displayChangeNow = false;
|
||||
@@ -72,7 +65,6 @@ abstract class TradeFilterStoreBase with Store {
|
||||
displayMorphToken = false;
|
||||
displaySimpleSwap = false;
|
||||
displayTrocador = false;
|
||||
displayExolix = false;
|
||||
} else {
|
||||
displayChangeNow = true;
|
||||
displaySideShift = true;
|
||||
@@ -80,7 +72,6 @@ abstract class TradeFilterStoreBase with Store {
|
||||
displayMorphToken = true;
|
||||
displaySimpleSwap = true;
|
||||
displayTrocador = true;
|
||||
displayExolix = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -107,8 +98,7 @@ abstract class TradeFilterStoreBase with Store {
|
||||
||(displaySimpleSwap &&
|
||||
item.trade.provider ==
|
||||
ExchangeProviderDescription.simpleSwap)
|
||||
||(displayTrocador && item.trade.provider == ExchangeProviderDescription.trocador)
|
||||
||(displayExolix && item.trade.provider == ExchangeProviderDescription.exolix))
|
||||
||(displayTrocador && item.trade.provider == ExchangeProviderDescription.trocador))
|
||||
.toList()
|
||||
: _trades;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user