Merge pull request #64 from Foundation-Devices/PASS1-536-show-passphrase

PASS1-536: moved passphrase display to seed words flow
Foundation-Devices · Dec 1, 2022 · 0e504fe · 0e504fe
2 parents 103142b + d22bc02
commit 0e504fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/ports/stm32/boards/Passport/modules/flows/about_flow.py b/ports/stm32/boards/Passport/modules/flows/about_flow.py
@@ -18,7 +18,6 @@ def __init__(self):
     async def about_page(self):
         from common import settings, system
         from utils import has_seed
-        import stash
 
         serial = system.get_serial_number()
         my_xfp = settings.get('xfp', 0)
@@ -44,12 +43,6 @@ async def about_page(self):
         else:
             msg = ''
 
-        if len(stash.bip39_passphrase) > 0:
-            msg += '\n{passphrase_title}\n{passphrase}\n'.format(
-                passphrase_title=recolor(HIGHLIGHT_TEXT_HEX, 'Active Passphrase'),
-                passphrase=stash.bip39_passphrase
-            )
-
         msg += '''
 {serial_title}
 {serial}'''.format(

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
@@ -9,6 +9,7 @@
 from flows import Flow
 from tasks import get_seed_words_task
 from utils import spinner_task
+import stash
 
 
 class ViewSeedWordsFlow(Flow):
@@ -40,6 +41,8 @@ async def show_seed_words(self):
         if error is None and words is not None:
             from pages import SeedWordsListPage
             result = await SeedWordsListPage(words=words).show()
+            if stash.bip39_passphrase != '':
+                await InfoPage(text='Passphrase: {}'.format(stash.bip39_passphrase)).show()
             self.set_result(result)
         else:
             await ErrorPage(text='Unable to retrieve seed: {}'.format(error)).show()