Merge pull request #358 from Foundation-Devices/SFT-2453-warning-icon…

…-cut SFT-2453: warning icon cut
Foundation-Devices · Jul 19, 2023 · 838ab76 · 838ab76
2 parents 725fe93 + d968bcd
commit 838ab76
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ports/stm32/boards/Passport/modules/flows/scan_qr_flow.py b/ports/stm32/boards/Passport/modules/flows/scan_qr_flow.py
@@ -3,7 +3,7 @@
 
 from data_codecs.qr_type import QRType
 from flows import Flow
-from pages import ScanQRPage, ErrorPage
+from pages import ScanQRPage, LongErrorPage
 from foundation import ur
 
 
@@ -16,7 +16,8 @@ def __init__(self,
                  ur_types=None,
                  explicit_type=None,
                  data_description=None,
-                 max_frames=None):
+                 max_frames=None,
+                 failure_message=None):
         """
         Initialize the scan QR flow.
 
@@ -40,6 +41,7 @@ def __init__(self,
         self.data_description = data_description
         self.data = None
         self.max_frames = max_frames
+        self.failure_message = failure_message or 'Unable to scan QR code.\n\n{}'
 
         if len(self.qr_types) == 0:
             raise ValueError('At least one QR type must be provided')
@@ -62,7 +64,7 @@ async def scan(self):
             return
 
         if result.is_failure():
-            await ErrorPage(text='Unable to scan QR code.\n\n{}'.format(result.error)).show()
+            await LongErrorPage(text=self.failure_message.format(result.error)).show()
             self.set_result(None)
             return
 

diff --git a/ports/stm32/boards/Passport/modules/flows/sign_psbt_qr_flow.py b/ports/stm32/boards/Passport/modules/flows/sign_psbt_qr_flow.py
@@ -32,7 +32,9 @@ async def scan_transaction(self):
         result = await ScanQRFlow(qr_types=[QRType.QR, QRType.UR2],
                                   ur_types=[ur.Value.CRYPTO_PSBT, ur.Value.BYTES],
                                   data_description='a PSBT file',
-                                  max_frames=self.max_frames).run()
+                                  max_frames=self.max_frames,
+                                  failure_message="Unable to Scan QR code, \
+try signing using the microSD card.\n\n{}").run()
         if result is None:
             # User canceled the scan
             self.set_result(False)