usawa

commit 81ee3d4f0914110cf75df09a7f02e5977de62e70
parent 934c3348fb71f48db933c88fd9f7b79efa1494f3
Author: lash <dev@holbrook.no>
Date:   Sun,  7 Jun 2026 16:47:11 -0600

Handle passphrase setting from dialog widget

Diffstat:
M
dummy/usawa/gui/components/passphrase_dialog.py
 | 
18
++++++++++--------
M
dummy/usawa/gui/main_window.py
 | 
5
+++--

2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/dummy/usawa/gui/components/passphrase_dialog.py b/dummy/usawa/gui/components/passphrase_dialog.py
@@ -24,9 +24,11 @@ class PassphraseDialog(Adw.Dialog):
     :type on_cancel: callable or None
     """
 
-    def __init__(self, store, wallet_class, on_success, on_cancel=None):
+    #def __init__(self, ctx, store, wallet_class, on_success, on_cancel=None):
+    def __init__(self, ctx, wallet_class, on_success, on_cancel=None):
         super().__init__()
-        self.store = store
+        #self.store = store
+        self.ctx = ctx
         self.wallet_class = wallet_class
         self.on_success = on_success
         self.on_cancel = on_cancel
@@ -120,11 +122,10 @@ class PassphraseDialog(Adw.Dialog):
 
     def _do_unlock(self, passphrase):
         try:
-            wallet = self.store.get_key(
-                wallet_class=self.wallet_class,
-                passphrase=passphrase,
-            )
-            GLib.idle_add(self._unlock_success, wallet, passphrase)
+            # TODO: hacky, the passphrase pwgetter should instead be the value from the form
+            self.ctx.cfg.add(passphrase, 'WALLET_KEY_PASSPHRASE', exists_ok=True)
+            self.ctx.load_wallet(signing=True, replace=True)
+            GLib.idle_add(self._unlock_success, self.ctx.wallet, passphrase)
         except Exception as e:
             logg.warning("Passphrase unlock failed: %s", e)
             GLib.idle_add(self._unlock_failure, str(e))
@@ -135,7 +136,8 @@ class PassphraseDialog(Adw.Dialog):
         self._unlocked = True
         self.force_close()
         if self.on_success:
-            self.on_success(wallet, passphrase)
+            #self.on_success(wallet, passphrase)
+            self.on_success(wallet)
 
     def _unlock_failure(self, error_msg):
         self._set_loading(False)
diff --git a/dummy/usawa/gui/main_window.py b/dummy/usawa/gui/main_window.py
@@ -132,14 +132,15 @@ class UsawaMainWindow(Adw.ApplicationWindow):
             self._init_with_wallet()
         except usawa.error.VerifyError:
             dialog = PassphraseDialog(
-                store=self.ctx.keystore,
+                    #store=self.ctx.keystore,
+                ctx=self.ctx,
                 wallet_class=DemoWallet,
                 on_success=self._init_with_wallet,
                 on_cancel=self._on_wallet_cancelled,
             )
             dialog.present(self)
 
-    def _init_with_wallet(self):
+    def _init_with_wallet(self, wallet):
         repository = LedgerRepository(self.ctx)
         entry_service = EntryService(repository=repository)
         self.entry_controller = EntryController(entry_service=entry_service)