LedgerHQ · bigspider · Sep 9, 2024 · Sep 9, 2024 · Sep 9, 2024 · Sep 9, 2024
diff --git a/src/handler/get_wallet_address.c b/src/handler/get_wallet_address.c
@@ -217,5 +217,18 @@ void handler_get_wallet_address(dispatcher_context_t *dc, uint8_t protocol_versi
         }
 
         SEND_RESPONSE(dc, address, address_len, SW_OK);
+
+#ifdef HAVE_NBGL
+        // Workaround for a glitch when get_wallet_address is called right after a UX flow that has
+        // a long confirmation screen (e.g. register_wallet), as processing this command sometimes
+        // lead to the "Processing..." screen not being cleared at the end of the command.
+        // By forcing to show the dashboard, we avoid it; however, this is not a perfect solution,
+        // as it results in cutting short the duration of the "Address verified" status.
+        // This only happens on Flex and Stax, and only for complex policies. Therefore,
+        // we use the workaround for non-default wallets, and only on NBGL devices.
+        if (!is_wallet_default) {
+            ui_menu_main();
+        }
+#endif
     }
 }
diff --git a/tests/snapshots/flex/test_dashboard/00001.png b/tests/snapshots/flex/test_dashboard/00001.png
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00003.png
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00003.png
diff --git a/...pshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png b/...pshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png
diff --git a/...shots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png b/...shots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png
diff --git a/...s/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png b/...s/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png
diff --git a/...flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png b/...flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png
diff --git a/...ts/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png b/...ts/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png
diff --git a/...s/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png b/...s/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png
diff --git a/...s/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png b/...s/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00007.png b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00007.png
diff --git a/...hots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00004.png b/...hots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00004.png
diff --git a/...ex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00004.png b/...ex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00004.png
diff --git a/...ex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00004.png b/...ex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00004.png
diff --git a/...ots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00004.png b/...ots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00004.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00005.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00005.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00005.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00005.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00005.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00005.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00005.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00005.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00005.png b/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00005.png
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00005.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00005.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00005.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00005.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00006.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00006.png
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00005.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00005.png
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00005.png b/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00005.png
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00003.png
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00003.png
diff --git a/...pshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png b/...pshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png
diff --git a/...shots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png b/...shots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png
diff --git a/...s/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png b/...s/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png
diff --git a/...stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png b/...stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png
diff --git a/...ts/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png b/...ts/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png
diff --git a/...s/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png b/...s/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png
diff --git a/...s/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png b/...s/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png
diff --git a/...s/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00001.png b/...s/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00001.png
diff --git a/...s/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00001.png b/...s/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00001.png
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00002.png b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00002.png
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00007.png b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00007.png
diff --git a/...hots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00004.png b/...hots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00004.png
diff --git a/...ax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00004.png b/...ax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00004.png
diff --git a/...ax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00004.png b/...ax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00004.png
diff --git a/...ots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00004.png b/...ots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00004.png
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00005.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00005.png
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00005.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00005.png
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00005.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00005.png
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00005.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00005.png
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00005.png b/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00005.png
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00005.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00005.png
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00005.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00005.png
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00006.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00006.png
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00005.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00005.png
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00005.png b/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00005.png