From 5b08eaead7758e130a60c2571e09f1c2fb27f01f Mon Sep 17 00:00:00 2001
From: scgbckbone <scgbckbone@proton.me>
Date: Thu, 26 Sep 2024 20:21:06 +0200
Subject: [PATCH] do NOT allow to enable/disable Seed Vault while in temporary
 seed mode

(cherry picked from commit 9e1ce7a9566f81212c5d4c26676cd4da224156d3)
---
 releases/Next-ChangeLog.md | 12 +++++++-----
 shared/flow.py             |  2 +-
 testing/test_ephemeral.py  | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/releases/Next-ChangeLog.md b/releases/Next-ChangeLog.md
index 50dcaa01..1fe2be0c 100644
--- a/releases/Next-ChangeLog.md
+++ b/releases/Next-ChangeLog.md
@@ -4,12 +4,14 @@ This lists the new changes that have not yet been published in a normal release.
 
 # Shared Improvements - Both Mk4 and Q
 
+- Bugfix: Sometimes see a struck screen after _Verifying..._ in boot up sequence.
+  On Q, result is blank screen, on Mk4, result is three-dots screen.
+- Bugfix: Do not allow to enable/disable Seed Vault feature when in temporary seed mode
+
+
 # Mk4 Specific Changes
 
-- tbd
-
-
-## 5.4.? - 2024-??-??
+## 5.4.1 - 2024-??-??
 
 - tbd
 
@@ -17,6 +19,6 @@ This lists the new changes that have not yet been published in a normal release.
 
 # Q Specific Changes
 
-## 1.3.?Q - 2024-??-??
+## 1.3.1Q - 2024-??-??
 
 - Bugfix: Properly re-draw status bar after Restore Master on COLDCARD without master seed.
diff --git a/shared/flow.py b/shared/flow.py
index 3bcd9b93..e366a827 100644
--- a/shared/flow.py
+++ b/shared/flow.py
@@ -295,7 +295,7 @@ DangerZoneMenu = [
                           "WARNING: Seed Vault is encrypted (AES-256-CTR) by your seed,"
                           " but not held directly inside secure elements. Backups are required"
                           " after any change to vault! Recommended for experiments or temporary use."),
-                   predicate=has_se_secrets),
+                   predicate=has_real_secret),
     MenuItem('Perform Selftest', f=start_selftest),             # little harmful
     MenuItem("Set High-Water", f=set_highwater),
     MenuItem('Wipe HSM Policy', f=wipe_hsm_policy, predicate=hsm_policy_available),
diff --git a/testing/test_ephemeral.py b/testing/test_ephemeral.py
index 795a8744..4f6e5409 100644
--- a/testing/test_ephemeral.py
+++ b/testing/test_ephemeral.py
@@ -1473,4 +1473,21 @@ def test_home_menu_xfp(goto_home, pick_menu_item, press_select, cap_story, cap_m
     m = cap_menu()
     assert m[0] == "Ready To Sign"
 
+
+def test_seed_vault_enable_on_tmp(generate_ephemeral_words, reset_seed_words,
+                                  goto_eph_seed_menu, ephemeral_seed_disabled,
+                                  verify_ephemeral_secret_ui, goto_home, cap_menu,
+                                  restore_main_seed, pick_menu_item, settings_set):
+    settings_set("seedvault", None)  # disable seed vault
+    reset_seed_words()
+    goto_eph_seed_menu()
+    ephemeral_seed_disabled()
+    e_seed_words = generate_ephemeral_words(num_words=12, dice=False,
+                                            from_main=True, seed_vault=False)
+    verify_ephemeral_secret_ui(mnemonic=e_seed_words, seed_vault=False)
+    goto_home()
+    pick_menu_item("Advanced/Tools")
+    m = cap_menu()
+    assert "Seed Vault" not in m
+
 # EOF