diff --git a/ports/stm32/boards/Passport/modules/derived_key.py b/ports/stm32/boards/Passport/modules/derived_key.py index ad5873308..aeda4f15b 100644 --- a/ports/stm32/boards/Passport/modules/derived_key.py +++ b/ports/stm32/boards/Passport/modules/derived_key.py @@ -29,8 +29,8 @@ 'indexed': True, 'words': False, 'task': nostr_key_task, - 'continue_text': 'post on your behalf', - 'info_type_text': 'your keys', + 'continue_text': 'profile', + 'info_type_text': 'your key', 'menu': nostr_menu}, ] diff --git a/ports/stm32/boards/Passport/modules/flows/export_derived_key_flow.py b/ports/stm32/boards/Passport/modules/flows/export_derived_key_flow.py index 71608cd4b..7fc51f1ff 100644 --- a/ports/stm32/boards/Passport/modules/flows/export_derived_key_flow.py +++ b/ports/stm32/boards/Passport/modules/flows/export_derived_key_flow.py @@ -47,7 +47,8 @@ async def generate_key(self): qr_option=True, sd_option=True, path=self.path, - filename=self.filename).run() + filename=self.filename, + key_manager=True).run() self.set_result(result) return @@ -79,8 +80,7 @@ async def show_qr_code(self): result = await SeedWarningFlow(action_text="display your {} as a QR code" .format(self.key_type['title']), - info_type_text=self.key_type.get('info_type_text'), - continue_text=self.key_type.get('continue_text', None)).run() + key_manager=True).run() if not result: self.back() @@ -119,8 +119,7 @@ async def save_to_sd(self): result = await SeedWarningFlow(action_text="copy your {} to the microSD card" .format(self.key_type['title']), - info_type_text=self.key_type.get('info_type_text'), - continue_text=self.key_type.get('continue_text', None)).run() + key_manager=True).run() if not result: self.back() diff --git a/ports/stm32/boards/Passport/modules/flows/seed_warning_flow.py b/ports/stm32/boards/Passport/modules/flows/seed_warning_flow.py index 9a1d8f723..ce6d359da 100644 --- a/ports/stm32/boards/Passport/modules/flows/seed_warning_flow.py +++ b/ports/stm32/boards/Passport/modules/flows/seed_warning_flow.py @@ -12,13 +12,15 @@ def __init__(self, mention_passphrase=False, continue_text=None, info_type_text=None, initial=False, - allow_skip=True): + allow_skip=True, + key_manager=False): self.mention_passphrase = mention_passphrase self.action_text = action_text - self.continue_text = continue_text or "control your funds" + self.continue_text = continue_text or "funds" self.info_type_text = info_type_text or "these words" self.allow_skip = allow_skip self.initial = initial + self.key_manager = key_manager initial_state = self.show_skippable if (initial and allow_skip) else self.show_intro super().__init__(initial_state=initial_state, name='SeedWarningFlow') @@ -57,9 +59,11 @@ async def show_intro(self): # Empty microns have no action, so backing out isn't allowed left_micron = microns.Back if self.allow_skip else None + right_micron = microns.Checkmark if self.key_manager else microns.Forward + result = await InfoPage( icon=lv.LARGE_ICON_SEED, text=text, - left_micron=left_micron, right_micron=microns.Forward).show() + left_micron=left_micron, right_micron=right_micron).show() if not result: self.set_result(False) @@ -69,6 +73,10 @@ async def show_intro(self): self.goto(self.prompt_backup) return + if self.key_manager: + self.set_result(True) + return + self.goto(self.confirm_show) async def prompt_backup(self): @@ -90,8 +98,8 @@ async def confirm_show(self): from pages import QuestionPage import microns - text = 'Beware of any request to expose {} outside of Passport.' \ - 'Sharing them in any way could allow someone else to {}.' \ + text = 'Anyone requesting you expose {} outside Passport ' \ + 'will gain full control over your {}. Take care.' \ .format(self.info_type_text, self.continue_text) left_micron = microns.Cancel diff --git a/ports/stm32/boards/Passport/modules/flows/view_seed_words_flow.py b/ports/stm32/boards/Passport/modules/flows/view_seed_words_flow.py index b2f98020b..f00108ce8 100644 --- a/ports/stm32/boards/Passport/modules/flows/view_seed_words_flow.py +++ b/ports/stm32/boards/Passport/modules/flows/view_seed_words_flow.py @@ -15,7 +15,8 @@ def __init__(self, filename=None, initial=False, allow_skip=True, - qr_button=False): + qr_button=False, + key_manager=False): import microns self.external_key = external_key @@ -35,6 +36,7 @@ def __init__(self, self.allow_skip = allow_skip self.use_qr_button = qr_button self.seen_warning = False + self.key_manager = key_manager super().__init__(initial_state=self.generate_words, name='ViewSeedWordsFlow') async def generate_words(self): @@ -90,7 +92,8 @@ async def show_qr(self): result = await SeedWarningFlow(action_text="display your seed as a QR code", mention_passphrase=self.mention_passphrase, initial=self.initial, - allow_skip=self.allow_skip).run() + allow_skip=self.allow_skip, + key_manager=self.key_manager).run() if not result: self.back() @@ -126,7 +129,8 @@ async def save_to_sd(self): result = await SeedWarningFlow(action_text="copy your seed to the microSD card", mention_passphrase=self.mention_passphrase, initial=self.initial, - allow_skip=self.allow_skip).run() + allow_skip=self.allow_skip, + key_manager=self.key_manager).run() if not result: self.back() @@ -151,7 +155,8 @@ async def show_seed_words(self): if not self.seen_warning: # We already gave the seed warning flow result = await SeedWarningFlow(mention_passphrase=self.mention_passphrase, initial=self.initial, - allow_skip=self.allow_skip).run() + allow_skip=self.allow_skip, + key_manager=self.key_manager).run() if not result: self.set_result(False)