From 40a85fe10b7b3fe90fde4d17102fbc3f1c6c1058 Mon Sep 17 00:00:00 2001
From: Charles-Edouard de la Vergne <charles-edouard.delavergne@ledger.fr>
Date: Wed, 13 Mar 2024 14:46:11 +0100
Subject: [PATCH] Fix Name display

---
 src/gpg_ux_nanos.c | 6 ++----
 src/gpg_ux_nanox.c | 6 ++----
 src/gpg_ux_nbgl.c  | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/gpg_ux_nanos.c b/src/gpg_ux_nanos.c
index cc32264..87255d9 100644
--- a/src/gpg_ux_nanos.c
+++ b/src/gpg_ux_nanos.c
@@ -1002,11 +1002,9 @@ const bagl_element_t *ui_menu_main_predisplay(const ux_menu_entry_t *entry,
         explicit_bzero(G_gpg_vstate.menu, sizeof(G_gpg_vstate.menu));
         if (element->component.userid == 0x21) {
             memmove(G_gpg_vstate.menu, (void *) (N_gpg_pstate->name.value), 12);
-            if (G_gpg_vstate.menu[0] == 0) {
-                strlcpy(G_gpg_vstate.menu, "<No Name>", 9);
-            } else {
+            if (G_gpg_vstate.menu[0] != 0) {
                 for (int i = 0; i < 12; i++) {
-                    if (G_gpg_vstate.menu[i] == '<') {
+                    if ((G_gpg_vstate.menu[i] == '<') || (G_gpg_vstate.menu[i] == '>')) {
                         G_gpg_vstate.menu[i] = ' ';
                     }
                 }
diff --git a/src/gpg_ux_nanox.c b/src/gpg_ux_nanox.c
index 7c9c348..fec2006 100644
--- a/src/gpg_ux_nanox.c
+++ b/src/gpg_ux_nanox.c
@@ -1207,11 +1207,9 @@ UX_FLOW(ux_flow_main,
 void ui_menu_main_predisplay() {
     explicit_bzero(G_gpg_vstate.ux_buff1, sizeof(G_gpg_vstate.ux_buff1));
     memmove(G_gpg_vstate.ux_buff1, (void *) (N_gpg_pstate->name.value), 20);
-    if (G_gpg_vstate.ux_buff1[0] == 0) {
-        strlcpy(G_gpg_vstate.ux_buff1, "<No Name>", 9);
-    } else {
+    if (G_gpg_vstate.ux_buff1[0] != 0) {
         for (int i = 0; i < 12; i++) {
-            if (G_gpg_vstate.ux_buff1[i] == '<') {
+            if ((G_gpg_vstate.menu[i] == '<') || (G_gpg_vstate.menu[i] == '>')) {
                 G_gpg_vstate.ux_buff1[i] = ' ';
             }
         }
diff --git a/src/gpg_ux_nbgl.c b/src/gpg_ux_nbgl.c
index 371025c..1f7e9e1 100644
--- a/src/gpg_ux_nbgl.c
+++ b/src/gpg_ux_nbgl.c
@@ -96,7 +96,7 @@ void ui_init(void) {
     memmove(name, (void*) (N_gpg_pstate->name.value), 20);
     if (name[0] != 0) {
         for (int i = 0; i < 12; i++) {
-            if (name[i] == '<') {
+            if ((name[i] == '<') || (name[i] == '>')) {
                 name[i] = ' ';
             }
         }