Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-18 16:44:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/staging' into add-ethereum

Browse source 
# Conflicts:
#	lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
This commit is contained in:
julian 2023-03-27 08:50:10 -06:00
commit e29d8dc047
6 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
View file

@ -103,11 +103,9 @@ class _AddWalletViewState extends ConsumerState<AddWalletView> {
_searchFieldController = TextEditingController(); _searchFieldController = TextEditingController();
_searchFocusNode = FocusNode(); _searchFocusNode = FocusNode();
_coinsTestnet.remove(Coin.firoTestNet); _coinsTestnet.remove(Coin.firoTestNet);
if (isDesktop) {
_coins.remove(Coin.wownero);
if (Platform.isWindows) { if (Platform.isWindows) {
_coins.remove(Coin.monero); _coins.remove(Coin.monero);
} _coins.remove(Coin.wownero);
} }
coinEntities.addAll(_coins.map((e) => CoinEntity(e))); coinEntities.addAll(_coins.map((e) => CoinEntity(e)));

4
lib/pages_desktop_specific/settings/settings_menu/nodes_settings.dart
View file

@ -54,11 +54,9 @@ class _NodesSettings extends ConsumerState<NodesSettings> {
void initState() { void initState() {
_coins = _coins.toList(); _coins = _coins.toList();
_coins.remove(Coin.firoTestNet); _coins.remove(Coin.firoTestNet);
if (isDesktop) {
_coins.remove(Coin.wownero);
if (Platform.isWindows) { if (Platform.isWindows) {
_coins.remove(Coin.monero); _coins.remove(Coin.monero);
} _coins.remove(Coin.wownero);
} }
searchNodeController = TextEditingController(); searchNodeController = TextEditingController();

2
lib/services/coins/bitcoincash/bitcoincash_wallet.dart
View file

@ -46,7 +46,7 @@ import 'package:stackwallet/utilities/prefs.dart';
import 'package:tuple/tuple.dart'; import 'package:tuple/tuple.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
const int MINIMUM_CONFIRMATIONS = 1; const int MINIMUM_CONFIRMATIONS = 0;
const int DUST_LIMIT = 546; const int DUST_LIMIT = 546;
const String GENESIS_HASH_MAINNET = const String GENESIS_HASH_MAINNET =

2
lib/utilities/enums/coin_enum.dart
View file

@ -17,6 +17,7 @@ import 'package:stackwallet/services/coins/particl/particl_wallet.dart'
as particl; as particl;
import 'package:stackwallet/services/coins/wownero/wownero_wallet.dart' as wow; import 'package:stackwallet/services/coins/wownero/wownero_wallet.dart' as wow;
import 'package:stackwallet/utilities/constants.dart'; import 'package:stackwallet/utilities/constants.dart';
import 'dart:io' show Platform;
enum Coin { enum Coin {
bitcoin, bitcoin,
@ -44,6 +45,7 @@ enum Coin {
} }
final int kTestNetCoinCount = 4; // Util.isDesktop ? 5 : 4; final int kTestNetCoinCount = 4; // Util.isDesktop ? 5 : 4;
// remove firotestnet for now
extension CoinExt on Coin { extension CoinExt on Coin {
String get prettyName { String get prettyName {

2
pubspec.yaml
View file

@ -11,7 +11,7 @@ description: Stack Wallet
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.6.4+146 version: 1.6.5+147
environment: environment:
sdk: ">=2.17.0 <3.0.0" sdk: ">=2.17.0 <3.0.0"

2
test/services/coins/bitcoincash/bitcoincash_wallet_test.dart
View file

@ -25,7 +25,7 @@ import 'bitcoincash_wallet_test_parameters.dart';
void main() async { void main() async {
group("bitcoincash constants", () { group("bitcoincash constants", () {
test("bitcoincash minimum confirmations", () async { test("bitcoincash minimum confirmations", () async {
expect(MINIMUM_CONFIRMATIONS, 1); expect(MINIMUM_CONFIRMATIONS, 0);
}); });
test("bitcoincash dust limit", () async { test("bitcoincash dust limit", () async {
expect(DUST_LIMIT, 546); expect(DUST_LIMIT, 546);