Merge pull request #10 from cake-tech/cyjan-fixes

Fix issues reported after release
cake-tech · Nov 26, 2024 · b81afb0 · b81afb0
2 parents 7e8172c + 8475a7d
commit b81afb0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/lib/coins/abstract.dart b/lib/coins/abstract.dart
@@ -61,6 +61,8 @@ abstract class CoinWalletInfo {
 
   Future<bool> checkWalletPassword(String password);
 
+  bool exists();
+
   Future<CoinWallet> openWallet(BuildContext context,
       {required String password});
 

diff --git a/lib/coins/monero/coin.dart b/lib/coins/monero/coin.dart
@@ -400,4 +400,7 @@ class MoneroWalletInfo extends CoinWalletInfo {
     File("$walletName.keys").rename(p.join(basePath, "$newName.keys"));
     _walletName = newName;
   }
+
+  @override
+  bool exists() => File("$walletName.keys").existsSync();
 }
diff --git a/lib/view_model/create_wallet_view_model.dart b/lib/view_model/create_wallet_view_model.dart
@@ -512,8 +512,8 @@ class PinFormElement extends FormElement {
   Future<void> Function(BuildContext context)? onChanged;
   Future<void> Function(BuildContext context)? onConfirm;
   Future<void> onConfirmInternal(BuildContext context) async {
-    isConfirmed = true;
     await valueOutcome.encode(ctrl.text);
+    isConfirmed = true;
   }
 
   bool isConfirmed = false;

diff --git a/lib/view_model/open_wallet_view_model.dart b/lib/view_model/open_wallet_view_model.dart
@@ -50,7 +50,11 @@ class OpenWalletViewModel extends ViewModel {
   }
 
   Future<bool> checkWalletPassword() async {
-    return coinInfo.checkWalletPassword(await walletPassword.value);
+    try {
+      return coinInfo.checkWalletPassword(await walletPassword.value);
+    } catch (e) {
+      return false;
+    }
   }
 
   Future<void> openWalletIfPasswordCorrect(BuildContext context) async {

diff --git a/lib/view_model/security_backup_view_model.dart b/lib/view_model/security_backup_view_model.dart
@@ -31,8 +31,11 @@ class SecurityBackupViewModel extends ViewModel {
         },
         showNumboard: true,
         onConfirm: (BuildContext context) async {
-          await form.first.value;
-
+          try {
+            await form.first.value;
+          } catch (e) {
+            print(e);
+          }
           isLocked = false;
           markNeedsBuild();
         })

diff --git a/lib/views/home_screen.dart b/lib/views/home_screen.dart
@@ -161,6 +161,7 @@ class HomeScreen extends AbstractView {
     if (config.lastWallet == null) return;
     if (!context.mounted) return;
     if (!viewModel.openLastWallet) return;
+    if (config.lastWallet?.exists() != true) return;
     config.lastWallet!.openUI(context);
   }
 }