Merge pull request #1142 from LedgerHQ/fix-missing-letter-in-nbgl-keyboard

Fix missing letter in NBGL keyboard for Nano

Author: nroggeman-ledger

lib_nbgl/src/nbgl_layout_keyboard_nanos.c

@@ -104,7 +104,6 @@ int nbgl_layoutUpdateKeyboard(nbgl_layout_t *layout, uint8_t index, uint32_t key
     if ((keyboard == NULL) || (keyboard->obj.type != KEYBOARD)) {
         return -1;
     }
-    keyboard->keyMask = keyMask;
     if (keyboard->lettersOnly) {
         if (keyMask & (1 << 26)) {
             keyboard->selectedCharIndex = cx_rng_u32() % 26;
@@ -113,6 +112,14 @@ int nbgl_layoutUpdateKeyboard(nbgl_layout_t *layout, uint8_t index, uint32_t key
             keyboard->selectedCharIndex = 0;
         }
     }
+    else {
+        // if current keyMask was O and new one filters all keys,
+        // we should select Validate by default
+        if ((keyboard->keyMask == 0) && ((keyMask & 0x3FFFFFF) == 0x3FFFFFF)) {
+            keyboard->selectedCharIndex = 27;
+        }
+    }
+    keyboard->keyMask = keyMask;
 
     nbgl_objDraw((nbgl_obj_t *) keyboard);
 

lib_nbgl/src/nbgl_obj_keyboard_nanos.c

@@ -269,6 +269,7 @@ static void keyboardDrawRegular(nbgl_keyboard_t *keyboard)
             charIndex = maxLen - 1;
         }
     }
+    keysToDraw[0] = keys[charIndex];
 
     // mode is defined, so draw the proper 3 letters (or icons)
     for (i = 0; i < 3; i++) {