Merge branch 'Q' of github.com:Coldcard/q1firmware into Q

shared/actions.py

@@ -1656,6 +1656,7 @@ async def _batch_sign(choices=None):
 
     if not choices:
         await ux_show_story("No PSBTs found. Need to have '.psbt' suffix.")
+        return
 
     from auth import sign_psbt_file
     from ux import the_ux

shared/notes.py

@@ -4,19 +4,19 @@
 #
 import ngu, bip39
 from menu import MenuItem, MenuSystem, ShortcutItem
-from ux import ux_show_story, the_ux, ux_dramatic_pause, ux_confirm, the_ux
-from ux import PressRelease, ux_input_numbers, ux_input_text, show_qr_code, import_export_prompt
+from ux import ux_show_story, ux_dramatic_pause, ux_confirm, the_ux
+from ux import ux_input_text, show_qr_code, import_export_prompt
 from ux_q1 import QRScannerInteraction
 from actions import goto_top_menu
 from glob import settings, dis
 from files import CardMissingError, needs_microsd, CardSlot
-from charcodes import KEY_QR, KEY_NFC, KEY_ENTER, KEY_CANCEL, KEY_CLEAR
+from charcodes import KEY_QR, KEY_NFC, KEY_CANCEL
 from charcodes import KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6
 from lcd_display import CHARS_W
 from decoders import url_decode
 from utils import problem_file_line
 
-# title, username and such are limited to this so they fit on one line both in
+# title, username and such are limited that they fit on the one line both in
 # text entry (W-2) and also in menu display (W-3)
 # - but W-3 is not centered .. so just lose some extra chars on right side if too long in menu
 ONE_LINE = CHARS_W-2
@@ -173,7 +173,6 @@ class NotesMenu(MenuSystem):
         settings.remove_key('notes')
         settings.save()
 
-        from actions import goto_top_menu
         goto_top_menu()
 
     @classmethod
@@ -426,7 +425,7 @@ class PasswordContent(NoteContentBase):
 
 class NoteContent(NoteContentBase):
     # Pure "notes" have just a title and free-form text
-    flds = ['title', 'misc' ]
+    flds = ['title', 'misc']
     type_label = 'note'
 
     async def make_menu(self, *a):

testing/test_notes.py

@@ -461,8 +461,15 @@ def test_top_import(goto_notes, cap_menu, cap_story, need_keypress, settings_get
     for p in parts:
         scan_a_qr(p)
 
-    time.sleep(.5)      # decompression time in some cases
+    time.sleep(.5)  # decompression time in some cases
     m = cap_menu()
+    for _ in range(3):
+        if "1:" in m[0]:
+            break
+        time.sleep(.2)
+        m = cap_menu()
+        continue
+
     mm = [n.split(":")[-1].strip() for n in m if ":" in n]
     for note in notes:
         assert note['title'] in mm
@@ -481,12 +488,11 @@ def test_top_import(goto_notes, cap_menu, cap_story, need_keypress, settings_get
 def test_top_qr(qr, title, goto_notes, pick_menu_item, cap_menu, cap_story, need_keypress,
                 settings_get, settings_set, scan_a_qr):
     # import some fun QR codes (will be notes) from top-level, undocumented
-
     goto_notes()
     need_keypress(KEY_QR)
 
     scan_a_qr(qr)
-    time.sleep(.5)
+    time.sleep(1)
 
     # lazy readback
     notes = settings_get('notes', [])