diff --git a/.github/workflows/lint-workflow.yml b/.github/workflows/lint-workflow.yml index 224a2d44..9b551ced 100644 --- a/.github/workflows/lint-workflow.yml +++ b/.github/workflows/lint-workflow.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v2 - name: Lint - uses: DoozyX/clang-format-lint-action@v0.11 + uses: DoozyX/clang-format-lint-action@v0.18.1 with: source: 'src' extensions: 'h,c' diff --git a/Makefile b/Makefile index 543aa3ca..8afe2dbc 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ all: default APPNAME = "Recovery Check" APPVERSION_M = 1 APPVERSION_N = 4 -APPVERSION_P = 0 +APPVERSION_P = 1 APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)" VARIANT_PARAM = NONE diff --git a/src/bagl/nanox_enter_phrase.c b/src/bagl/nanox_enter_phrase.c index ca1d8503..bb8142ee 100644 --- a/src/bagl/nanox_enter_phrase.c +++ b/src/bagl/nanox_enter_phrase.c @@ -204,13 +204,13 @@ void screen_onboarding_4_restore_word_display_auto_complete(void) { 0, #ifdef HAVE_BOLOS_NOT_SHUFFLED_RESTORE 0, /*always restart from the first element in the list*/ -#else // HAVE_BOLOS_NOT_SHUFFLED_RESTORE +#else // HAVE_BOLOS_NOT_SHUFFLED_RESTORE (strlen(G_ux.string_buffer + 16) ? 0 : cx_rng_u8() % auto_complete_count), /* start from a random element in the list for the word start letter, else keep the order */ -#endif // HAVE_BOLOS_NOT_SHUFFLED_RESTORE - // recompute alphabet and set the number of elements in the keyboard +#endif // HAVE_BOLOS_NOT_SHUFFLED_RESTORE + // recompute alphabet and set the number of elements in the keyboard auto_complete_count + (strlen(G_ux.string_buffer + 16) ? 1 @@ -532,7 +532,7 @@ void screen_onboarding_4_restore_word_init(unsigned int firstWord) { ARRAYLEN(screen_onboarding_4_restore_word_intro_elements); G_ux.stack[0].element_arrays_count = 1; ux_stack_display(0); -#else // RESTORE_INTRO_WORD +#else // RESTORE_INTRO_WORD screen_onboarding_4_restore_word_display_auto_complete(); #endif // RESTORE_INTRO_WORD } diff --git a/src/nbgl/passphrase_length_screen.c b/src/nbgl/passphrase_length_screen.c index 5bfd164a..7a839db6 100644 --- a/src/nbgl/passphrase_length_screen.c +++ b/src/nbgl/passphrase_length_screen.c @@ -54,7 +54,6 @@ void passphrase_length_configure_buttons(nbgl_button_t **buttons, const size_t s button->radius = BUTTON_RADIUS; button->fontId = SMALL_BOLD_1BPP_FONT; button->icon = NULL; - button->localized = true; button->obj.alignmentMarginX = 0; button->obj.alignmentMarginY = (button->obj.area.height + 8) * i + BORDER_MARGIN; button->obj.alignment = BOTTOM_MIDDLE; diff --git a/tests/functional/snapshots/flex/info.png b/tests/functional/snapshots/flex/info.png index 6b27cbf2..16fff712 100644 Binary files a/tests/functional/snapshots/flex/info.png and b/tests/functional/snapshots/flex/info.png differ diff --git a/tests/functional/snapshots/stax/info.png b/tests/functional/snapshots/stax/info.png index db799ee2..4bc31086 100644 Binary files a/tests/functional/snapshots/stax/info.png and b/tests/functional/snapshots/stax/info.png differ