diff --git a/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart b/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart index 9e9d8a6fc..781022ac7 100644 --- a/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart +++ b/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart @@ -103,11 +103,9 @@ class _AddWalletViewState extends ConsumerState { _searchFieldController = TextEditingController(); _searchFocusNode = FocusNode(); _coinsTestnet.remove(Coin.firoTestNet); - if (isDesktop) { + if (Platform.isWindows) { + _coins.remove(Coin.monero); _coins.remove(Coin.wownero); - if (Platform.isWindows) { - _coins.remove(Coin.monero); - } } coinEntities.addAll(_coins.map((e) => CoinEntity(e))); diff --git a/lib/pages_desktop_specific/settings/settings_menu/nodes_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/nodes_settings.dart index 8840383d7..4a9cecc65 100644 --- a/lib/pages_desktop_specific/settings/settings_menu/nodes_settings.dart +++ b/lib/pages_desktop_specific/settings/settings_menu/nodes_settings.dart @@ -54,12 +54,10 @@ class _NodesSettings extends ConsumerState { void initState() { _coins = _coins.toList(); _coins.remove(Coin.firoTestNet); - if (isDesktop) { - _coins.remove(Coin.wownero); if (Platform.isWindows) { _coins.remove(Coin.monero); + _coins.remove(Coin.wownero); } - } searchNodeController = TextEditingController(); searchNodeFocusNode = FocusNode(); diff --git a/lib/services/coins/bitcoincash/bitcoincash_wallet.dart b/lib/services/coins/bitcoincash/bitcoincash_wallet.dart index a6d35e8f8..73d44b91e 100644 --- a/lib/services/coins/bitcoincash/bitcoincash_wallet.dart +++ b/lib/services/coins/bitcoincash/bitcoincash_wallet.dart @@ -46,7 +46,7 @@ import 'package:stackwallet/utilities/prefs.dart'; import 'package:tuple/tuple.dart'; import 'package:uuid/uuid.dart'; -const int MINIMUM_CONFIRMATIONS = 1; +const int MINIMUM_CONFIRMATIONS = 0; const int DUST_LIMIT = 546; const String GENESIS_HASH_MAINNET = diff --git a/lib/utilities/enums/coin_enum.dart b/lib/utilities/enums/coin_enum.dart index b4c994f8c..e62203628 100644 --- a/lib/utilities/enums/coin_enum.dart +++ b/lib/utilities/enums/coin_enum.dart @@ -17,6 +17,7 @@ import 'package:stackwallet/services/coins/particl/particl_wallet.dart' as particl; import 'package:stackwallet/services/coins/wownero/wownero_wallet.dart' as wow; import 'package:stackwallet/utilities/constants.dart'; +import 'dart:io' show Platform; enum Coin { bitcoin, @@ -44,6 +45,7 @@ enum Coin { } final int kTestNetCoinCount = 4; // Util.isDesktop ? 5 : 4; +// remove firotestnet for now extension CoinExt on Coin { String get prettyName { diff --git a/pubspec.yaml b/pubspec.yaml index fc75379ab..e278530ed 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: Stack Wallet # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.6.4+146 +version: 1.6.5+147 environment: sdk: ">=2.17.0 <3.0.0" diff --git a/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart b/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart index d6a3f7454..604bb741e 100644 --- a/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart +++ b/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart @@ -25,7 +25,7 @@ import 'bitcoincash_wallet_test_parameters.dart'; void main() async { group("bitcoincash constants", () { test("bitcoincash minimum confirmations", () async { - expect(MINIMUM_CONFIRMATIONS, 1); + expect(MINIMUM_CONFIRMATIONS, 0); }); test("bitcoincash dust limit", () async { expect(DUST_LIMIT, 546);