From fe8d6a4157f4b596c56b6b35b540cab7388f0b01 Mon Sep 17 00:00:00 2001 From: Nick Klockenga Date: Mon, 13 Sep 2021 17:17:02 +0000 Subject: [PATCH] fix keyboard issue --- src/seedsigner/controller.py | 5 +++-- src/seedsigner/views/settings_tools_view.py | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/seedsigner/controller.py b/src/seedsigner/controller.py index dab0571f..085bd2ef 100644 --- a/src/seedsigner/controller.py +++ b/src/seedsigner/controller.py @@ -475,7 +475,7 @@ class Controller(Singleton): # choose single sig or multisig wallet type wallet_type = "multisig" script_type = "native segwit" - derivation = "m/0" + derivation = self.settings.custom_derivation r = self.menu_view.display_generic_selection_menu(["Single Sig", "Multisig"], "Wallet Type?") if r == 1: wallet_type = "single sig" @@ -493,7 +493,8 @@ class Controller(Singleton): # calculated derivation or get custom from keyboard entry if script_type == "custom": - derivation = self.settings_tools_view.draw_derivation_keyboard_entry() + derivation = self.settings_tools_view.draw_derivation_keyboard_entry(existing_derivation=self.settings.custom_derivation) + self.settings.custom_derivation = derivation # save for next time else: derivation = Settings.calc_derivation(self.settings.network, wallet_type, script_type) diff --git a/src/seedsigner/views/settings_tools_view.py b/src/seedsigner/views/settings_tools_view.py index cf106fd8..1b533716 100644 --- a/src/seedsigner/views/settings_tools_view.py +++ b/src/seedsigner/views/settings_tools_view.py @@ -10,6 +10,7 @@ class SettingsToolsView(View): self.qr = QR() self.donate_image = None + self.derivation = None ### Donate Menu Item @@ -168,16 +169,19 @@ class SettingsToolsView(View): keyboard_start_y = text_entry_bottom_y + text_entry_bottom_padding keyboard_digits = Keyboard( View.draw, - charset="0123456789/'", + charset="/'0123456789", rows=3, cols=6, rect=(0, keyboard_start_y, View.canvas_width - right_panel_buttons_width, View.canvas_height), auto_wrap=[Keyboard.WRAP_LEFT, Keyboard.WRAP_RIGHT], render_now=False ) - keyboard_digits.set_selected_key(selected_letter="0") + keyboard_digits.set_selected_key(selected_letter="/") keyboard_digits.render_keys() render_right_panel() + + text_entry_display.render(self.derivation) + View.DispShowImage() # Start the interactive update loop while True: