Merge pull request #558 from Foundation-Devices/dev-v2.3.3

Dev v2.3.3
Foundation-Devices · Sep 19, 2024 · 288e73b · 288e73b
2 parents d6cdae7 + 5f59be8
commit 288e73b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/extmod/foundation/modfoundation-ur.h b/extmod/foundation/modfoundation-ur.h
@@ -52,7 +52,7 @@ STATIC NORETURN void mod_foundation_ur_raise(UR_Error *error) {
             type = &mp_type_UnsupportedError;
             break;
         case UR_ERROR_KIND_NOT_MULTI_PART:
-            type = &mp_type_UnsupportedError;
+            type = &mp_type_NotMultiPartError;
             break;
         default:
             type = &mp_type_RuntimeError;

diff --git a/ports/stm32/boards/Passport/modules/flows/connect_wallet_flow.py b/ports/stm32/boards/Passport/modules/flows/connect_wallet_flow.py
@@ -25,10 +25,10 @@
     get_deriv_path_from_addr_type_and_acct,
     get_addr_type_from_deriv,
     derive_address)
-from public_constants import MUSIG_SKIP
+from public_constants import MUSIG_SKIP, MARGIN_FOR_ADDRESSES
 from wallets.constants import EXPORT_MODE_MICROSD, EXPORT_MODE_QR
 from wallets.sw_wallets import supported_software_wallets
-from utils import random_hex, spinner_task
+from utils import random_hex, spinner_task, stylize_address
 from foundation import ur
 import common
 import microns
@@ -538,9 +538,7 @@ async def show_rx_address_intro(self):
         self.goto(self.show_rx_address)
 
     async def show_rx_address(self):
-        from utils import split_to_lines
         from pages import LongTextPage
-        from math import ceil
         NUM_ADDRESSES = 1
 
         (addresses, error) = await spinner_task(
@@ -558,11 +556,12 @@ async def show_rx_address(self):
 
         for entry in addresses:
             _, address = entry
-            # Split to three lines for readability (addresses are 27-34 characters)
-            max_line_len = ceil(len(address) / 3)
-            msg += split_to_lines(address, max_line_len)
+            msg += stylize_address(address)
 
-        result = await LongTextPage(text=msg, card_header={'title': 'Verify Address'}, centered=True).show()
+        result = await LongTextPage(text=msg,
+                                    card_header={'title': 'Verify Address'},
+                                    centered=True,
+                                    margins=MARGIN_FOR_ADDRESSES).show()
         if not result:
             if not self.back():
                 self.set_result(False)

diff --git a/ports/stm32/boards/Passport/modules/flows/restore_seed_flow.py b/ports/stm32/boards/Passport/modules/flows/restore_seed_flow.py
@@ -86,7 +86,8 @@ async def choose_restore_method(self):
                    {'label': 'Compact SeedQR', 'value': QRType.COMPACT_SEED_QR},
                    {'label': 'SeedQR', 'value': QRType.SEED_QR}]
 
-        choice = await ChooserPage(card_header={'title': 'Seed Format'}, options=options).show()
+        choice = await ChooserPage(card_header={'title': 'Seed Format'}, options=options,
+                                   left_micron=microns.Back).show()
 
         if choice is None:
             if not self.back():

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.3.2
+2.3.3