From ca819b7dfd681f724ed954a03e5e90d98e9b870e Mon Sep 17 00:00:00 2001 From: scgbckbone Date: Mon, 27 May 2024 15:46:26 +0200 Subject: [PATCH] bugfix: yikes when showing change in address explorer if both NFC and VDisk OFF --- releases/Next-ChangeLog.md | 6 +++--- shared/address_explorer.py | 2 +- shared/ux.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/releases/Next-ChangeLog.md b/releases/Next-ChangeLog.md index 7eae2906..5a131852 100644 --- a/releases/Next-ChangeLog.md +++ b/releases/Next-ChangeLog.md @@ -9,14 +9,14 @@ This lists the new changes that have not yet been published in a normal release. # Mk4 Specific Changes -## 5.3.1 - 2024-05-09 +## 5.3.2 - 2024-06-XX -- none, just above fixes +- Bugfix: Displaying change address in Address Explorer fails if NFC and Vdisk not enabled # Q Specific Changes -## 1.2.1Q - 2024-05-09 +## 1.2.2Q - 2024-06-XX - none, just above fixes diff --git a/shared/address_explorer.py b/shared/address_explorer.py index 26c9f43c..3b200c96 100644 --- a/shared/address_explorer.py +++ b/shared/address_explorer.py @@ -332,7 +332,7 @@ Press (3) if you really understand and accept these risks. else: escape += "79" - if start == self.start: + if export_msg and start == self.start: # Show CTA about export at bottom, and only for first page -- it can be huge! msg += export_msg if n: diff --git a/shared/ux.py b/shared/ux.py index d9450cb5..18391eef 100644 --- a/shared/ux.py +++ b/shared/ux.py @@ -391,7 +391,7 @@ def export_prompt_builder(what_it_is, no_qr=False, no_nfc=False, key0=None): prompt, escape = None, KEY_CANCEL+"x" - if (NFC or VD) or num_sd_slots>1 or key0: + if (NFC or VD) or (num_sd_slots>1) or key0: # no need to spam with another prompt, only option is SD card prompt = "Press (1) to save %s to SD Card" % what_it_is