Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-23 19:05:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve merge conflicts

Browse source
This commit is contained in:
ryleedavis 2023-08-23 10:59:13 -06:00
parent cceab1a036
commit 467f57c74e
4 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
View file

@ -196,10 +196,11 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
} catch (_) {}
break;
case Coin.stellar:
case Coin.stellarTestnet:
case Coin.stellarTestNet:
try {
testPassed = await testStellarNodeConnection(formData.host!, formData.port!);
} catch(_) {}
testPassed =
await testStellarNodeConnection(formData.host!, formData.port!);
} catch (_) {}
break;
case Coin.nano:
@ -749,7 +750,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
case Coin.banano:
case Coin.eCash:
case Coin.stellar:
case Coin.stellarTestnet:
case Coin.stellarTestNet:
return false;
case Coin.ethereum:

16
lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart
View file

@ -26,6 +26,7 @@ import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/test_epic_box_connection.dart';
import 'package:stackwallet/utilities/test_eth_node_connection.dart';
import 'package:stackwallet/utilities/test_monero_node_connection.dart';
import 'package:stackwallet/utilities/test_stellar_node_connection.dart';
import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/background.dart';
@ -172,20 +173,19 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
case Coin.nano:
case Coin.banano:
case Coin.tezos:
case Coin.stellar:
case Coin.stellarTestNet:
try {
testPassed = await testStellarNodeConnection(node!.host, node.port);
} catch(_) {
testPassed = false;
}
try {
testPassed = await testStellarNodeConnection(node!.host, node.port);
} catch (_) {
testPassed = false;
}
break;
case Coin.nano:
case Coin.banano:
case Coin.tezos:
throw UnimplementedError();
//TODO: check network/node
//TODO: check network/node
}
if (testPassed) {

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

@ -262,7 +262,8 @@ extension CoinExt on Coin {
case Coin.ethereum:
case Coin.eCash:
case Coin.stellar:
case Coin.stellarTestnet:
case Coin.stellarTestNet:
case Coin.tezos:
return true;
case Coin.epicCash:

5
lib/widgets/node_card.dart
View file

@ -29,6 +29,7 @@ import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/test_epic_box_connection.dart';
import 'package:stackwallet/utilities/test_eth_node_connection.dart';
import 'package:stackwallet/utilities/test_monero_node_connection.dart';
import 'package:stackwallet/utilities/test_stellar_node_connection.dart';
import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/conditional_parent.dart';
@ -199,7 +200,7 @@ class _NodeCardState extends ConsumerState<NodeCard> {
case Coin.stellarTestNet:
try {
testPassed = await testStellarNodeConnection(node.host, node.port);
} catch(_) {
} catch (_) {
testPassed = false;
}
break;
@ -207,7 +208,7 @@ class _NodeCardState extends ConsumerState<NodeCard> {
case Coin.nano:
case Coin.banano:
throw UnimplementedError();
//TODO: check network/node
//TODO: check network/node
}
if (testPassed) {