diff --git a/shared/multisig.py b/shared/multisig.py index 33d7a088..873b90b1 100644 --- a/shared/multisig.py +++ b/shared/multisig.py @@ -1378,7 +1378,7 @@ async def export_multisig_xpubs(*a): # Consumer for this file is supposed to be ourselves, when we build on-device multisig. # - however some 3rd parties are making use of it as well. # - from glob import NFC + from glob import NFC, dis xfp = xfp2str(settings.get('xfp', 0)) chain = chains.current_chain() @@ -1414,6 +1414,8 @@ OK to continue. X to abort.'''.format(coin=chain.b44_cointype) force_vdisk = True if ch not in escape: return + dis.fullscreen('Generating...') + todo = [ ( "m/45'", 'p2sh', AF_P2SH), # iff acct_num == 0 ( "m/48'/{coin}'/{acct_num}'/1'", 'p2sh_p2wsh', AF_P2WSH_P2SH ), diff --git a/shared/trick_pins.py b/shared/trick_pins.py index 69c0fba5..26764832 100644 --- a/shared/trick_pins.py +++ b/shared/trick_pins.py @@ -437,6 +437,8 @@ class TrickPinMenu(MenuSystem): async def done_picking(self, item, parents): # done picking/drilling down tree. # - shows point-form summary and gets confirmation + from glob import dis + wants_wipe = (self.WillWipeMenu in parents) self.WillWipeMenu = None # memory free @@ -477,10 +479,11 @@ class TrickPinMenu(MenuSystem): if ch != 'y': return # save it + dis.fullscreen("Saving...") try: bpin = self.proposed_pin.encode() - b, slot = tp.update_slot(bpin, new=True, tc_flags=flags, - tc_arg=tc_arg, secret=new_secret) + tp.update_slot(bpin, new=True, tc_flags=flags, + tc_arg=tc_arg, secret=new_secret) await ux_dramatic_pause("Saved.", 1) except BaseException as exc: sys.print_exception(exc) @@ -905,10 +908,14 @@ class StoryMenuItem(MenuItem): super().__init__(label, **kws) async def activate(self, menu, idx): + from glob import dis + ch = await ux_show_story(self.story) if ch == 'x': return + dis.fullscreen('Wait...') + if getattr(self, 'next_menu', None): # drill down more return await super().activate(menu, idx)