Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-03-21 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #764 from cypherstack/null-wallet

Browse source 
Do not trap user in "restore failed" dialog if serverside issues lead to failure
This commit is contained in:
Diego Salazar 2024-02-20 16:40:40 -07:00 committed by GitHub
commit d6710166f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/pages/add_wallet_views/restore_wallet_view/sub_widgets/restore_failed_dialog.dart
View file

@ -13,6 +13,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/providers/global/secure_store_provider.dart'; import 'package:stackwallet/providers/global/secure_store_provider.dart';
import 'package:stackwallet/providers/providers.dart'; import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/themes/stack_colors.dart'; import 'package:stackwallet/themes/stack_colors.dart';
import 'package:stackwallet/utilities/logger.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart'; import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart';
import 'package:stackwallet/widgets/stack_dialog.dart'; import 'package:stackwallet/widgets/stack_dialog.dart';
@ -65,14 +66,22 @@ class _RestoreFailedDialogState extends ConsumerState<RestoreFailedDialog> {
style: STextStyles.itemSubtitle12(context), style: STextStyles.itemSubtitle12(context),
), ),
onPressed: () async { onPressed: () async {
try {
await ref.read(pWallets).deleteWallet( await ref.read(pWallets).deleteWallet(
ref.read(pWalletInfo(walletId)), ref.read(pWalletInfo(walletId)),
ref.read(secureStoreProvider), ref.read(secureStoreProvider),
); );
} catch (e, s) {
Logging.instance.log(
"Error while getting wallet info in restore failed dialog\n"
"Error: $e\nStack trace: $s",
level: LogLevel.Error,
);
} finally {
if (mounted) { if (mounted) {
Navigator.of(context).pop(); Navigator.of(context).pop();
} }
}
}, },
), ),
), ),

8
lib/services/wallets.dart
View file

@ -42,7 +42,13 @@ class Wallets {
final Map<String, Wallet> _wallets = {}; final Map<String, Wallet> _wallets = {};
Wallet getWallet(String walletId) => _wallets[walletId]!; Wallet getWallet(String walletId) {
if (_wallets[walletId] != null) {
return _wallets[walletId]!;
} else {
throw Exception("Wallet with id $walletId not found");
}
}
void addWallet(Wallet wallet) { void addWallet(Wallet wallet) {
if (_wallets[wallet.walletId] != null) { if (_wallets[wallet.walletId] != null) {