From 54ef70edacf267eaf3c13721f8001c59542c9a23 Mon Sep 17 00:00:00 2001
From: Ajinkya Rajandekar <145996984+ajinkyaraj-23@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:51:01 +0100
Subject: [PATCH] Change menu and settings code according to app_boilerplate
 from Ledger for bagl. It simplifies maintainance.

---
 app/glyphs/tezos_16px.gif                     | Bin 0 -> 71 bytes
 app/src/globals.h                             |   2 +
 app/src/ui_home.c                             |  59 ++++++++----------
 app/src/ui_settings.c                         |  42 +++++--------
 .../integration/nano/snapshots/nanos/back.png | Bin 294 -> 342 bytes
 .../integration/nano/snapshots/nanos/home.png | Bin 342 -> 435 bytes
 .../integration/nano/snapshots/nanos/quit.png | Bin 284 -> 274 bytes
 .../nano/snapshots/nanos/settings.png         | Bin 351 -> 355 bytes
 .../nanos/settings_expert_mode_disabled.png   | Bin 403 -> 420 bytes
 .../nanos/settings_expert_mode_enabled.png    | Bin 394 -> 409 bytes
 .../wrong_last_packet/00012.png               | Bin 342 -> 435 bytes
 .../nano/snapshots/nanos/version.png          | Bin 340 -> 334 bytes
 .../nano/snapshots/nanosp/back.png            | Bin 317 -> 365 bytes
 .../nano/snapshots/nanosp/home.png            | Bin 368 -> 506 bytes
 .../nano/snapshots/nanosp/quit.png            | Bin 305 -> 295 bytes
 .../nano/snapshots/nanosp/settings.png        | Bin 387 -> 381 bytes
 .../nanosp/settings_expert_mode_disabled.png  | Bin 431 -> 450 bytes
 .../nanosp/settings_expert_mode_enabled.png   | Bin 421 -> 438 bytes
 .../wrong_last_packet/00007.png               | Bin 368 -> 506 bytes
 .../nano/snapshots/nanosp/version.png         | Bin 368 -> 361 bytes
 .../integration/nano/snapshots/nanox/back.png | Bin 317 -> 365 bytes
 .../integration/nano/snapshots/nanox/home.png | Bin 368 -> 506 bytes
 .../integration/nano/snapshots/nanox/quit.png | Bin 305 -> 295 bytes
 .../nano/snapshots/nanox/settings.png         | Bin 387 -> 381 bytes
 .../nanox/settings_expert_mode_disabled.png   | Bin 431 -> 450 bytes
 .../nanox/settings_expert_mode_enabled.png    | Bin 421 -> 438 bytes
 .../wrong_last_packet/00007.png               | Bin 368 -> 506 bytes
 .../nano/snapshots/nanox/version.png          | Bin 368 -> 361 bytes
 tests/integration/nano/test_basic.py          |  16 ++---
 29 files changed, 53 insertions(+), 66 deletions(-)
 create mode 100644 app/glyphs/tezos_16px.gif

diff --git a/app/glyphs/tezos_16px.gif b/app/glyphs/tezos_16px.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8aa134eaa3648152ea48e9125550fe26647043a8
GIT binary patch
literal 71
zcmZ?wbh9u|6krfwXkY+=|NsB%fM}2i1Cv@$<FefxJfU3$mmX}YJCmeeIR8drLgj?1
VF9PDEQ(w03T61eg1*aH;H30G@8BG8H

literal 0
HcmV?d00001

diff --git a/app/src/globals.h b/app/src/globals.h
index d852ed245..3bb6954f3 100644
--- a/app/src/globals.h
+++ b/app/src/globals.h
@@ -112,6 +112,8 @@ typedef struct {
     struct {
         bagl_element_t bagls[4 + TZ_SCREEN_LINES_11PX];
     } ux;  /// Config for history screens for nano devices.
+    char expert_mode_state[10];  /// Expert mode state to be displayed in
+                                 /// settings.ENAELED/DISABLED.
 #endif
 
 #ifdef HAVE_NBGL
diff --git a/app/src/ui_home.c b/app/src/ui_home.c
index 5b2d145ad..06c701187 100644
--- a/app/src/ui_home.c
+++ b/app/src/ui_home.c
@@ -22,53 +22,46 @@
 #include "app_main.h"
 #include "globals.h"
 #include "ui_home_nbgl.h"
+#include "os.h"
+#include "ux.h"
+#include "glyphs.h"
 
 #ifdef HAVE_BAGL
 /* Prototypes */
 
 static void cb(tz_ui_cb_type_t cb_type);
 
-/**
- * @brief Callback for home screen stream.
- *
- * @param cb_type one of the 4 home screens (HOME, VERSION, SETTINGS, QUIT) */
-static void
-cb(tz_ui_cb_type_t cb_type)
-{
-    FUNC_ENTER(("cb_type=%u", cb_type));
-
-    switch (cb_type) {
-    case SCREEN_HOME:
-    case SCREEN_VERSION:
-        break;
-    case SCREEN_SETTINGS:
-        ui_settings_init(SETTINGS_HOME_PAGE);
-        break;
-    case SCREEN_QUIT:
-        app_exit();
-    }
 
-    FUNC_LEAVE();
-}
 
-#endif  // HAVE_BAGL
+UX_STEP_NOCB(ux_menu_ready_step, pnn,{&C_tezos_16px , "Application", "is ready"});
+UX_STEP_NOCB(ux_menu_version_step, bn, {"Version", APPVERSION});
+UX_STEP_CB(ux_menu_settings_step, pb, ui_settings_init(SETTINGS_HOME_PAGE), {&C_icon_coggle, "Settings"});
+UX_STEP_VALID(ux_menu_exit_step, pb, os_sched_exit(-1), {&C_icon_dashboard_x, "Quit"});
 
+// FLOW for the main menu:
+// #1 screen: ready
+// #2 screen: version of the app
+// #3 screen: about submenu
+// #4 screen: quit
+UX_FLOW(ux_menu_main_flow,
+        &ux_menu_ready_step,
+        &ux_menu_version_step,
+        &ux_menu_settings_step,
+        &ux_menu_exit_step,
+        FLOW_LOOP);
+
+#endif // HAVE_BAGL
 void
 ui_home_init(void)
 {
     FUNC_ENTER(("void"));
 #ifdef HAVE_BAGL
-    tz_ui_stream_init(cb);
-    tz_ui_stream_push(SCREEN_HOME, "Application", "is ready",
-                      TZ_UI_LAYOUT_HOME_N, TZ_UI_ICON_NONE);
-    tz_ui_stream_push(SCREEN_VERSION, "Version", APPVERSION,
-                      TZ_UI_LAYOUT_HOME_BN, TZ_UI_ICON_NONE);
-    tz_ui_stream_push(SCREEN_SETTINGS, "Settings", "", TZ_UI_LAYOUT_HOME_PB,
-                      TZ_UI_ICON_SETTINGS);
-    tz_ui_stream_push(SCREEN_QUIT, "Quit?", "", TZ_UI_LAYOUT_HOME_PB,
-                      TZ_UI_ICON_DASHBOARD);
-    tz_ui_stream_close();
-    tz_ui_stream_start();
+    if (G_ux.stack_count == 0) {
+        ux_stack_push();
+    }
+
+    ux_flow_init(0, ux_menu_main_flow, NULL);
+
 #elif defined(HAVE_NBGL)
     tz_ui_home_redisplay();
 #endif
diff --git a/app/src/ui_settings.c b/app/src/ui_settings.c
index b6ff5c9de..a87f1512b 100644
--- a/app/src/ui_settings.c
+++ b/app/src/ui_settings.c
@@ -21,44 +21,34 @@
 
 #include "globals.h"
 
-static void cb(tz_ui_cb_type_t cb_type);
-
-#define EXPERT_MODE 0x01
-#define BACK        0x02
-
 static void
-cb(tz_ui_cb_type_t cb_type)
+expert_mode_toggle()
 {
-    FUNC_ENTER(("cb_type=%u", cb_type));
-    switch (cb_type) {
-    case EXPERT_MODE:
-        toggle_expert_mode();
-        ui_settings_init(SETTINGS_HOME_PAGE);
-        break;
-    case BACK:
-        ui_home_init();
-        break;
-    }
+    FUNC_ENTER();
+    toggle_expert_mode();
+    ui_settings_init(SETTINGS_HOME_PAGE);
+    FUNC_LEAVE();
 }
 
+UX_STEP_CB(ux_expert_mode_step, bn, expert_mode_toggle(), {"Expert mode", global.expert_mode_state});
+UX_STEP_CB(ux_back_step, pb, ui_home_init(), {&C_icon_back, "Back"});
+
+UX_FLOW(ux_expert_mode_flow,
+        &ux_expert_mode_step,
+        &ux_back_step,
+        FLOW_LOOP);
+
 void
 ui_settings_init(int16_t page)
 {
-    const char *exp_mode = "DISABLED";
+    strncpy(global.expert_mode_state,"DISABLED", sizeof(global.expert_mode_state));
 
     FUNC_ENTER(("void"));
 
     if (N_settings.expert_mode) {
-        exp_mode = "ENABLED";
+        strncpy(global.expert_mode_state, "ENABLED", sizeof(global.expert_mode_state));
     }
 
-    tz_ui_stream_init(cb);
-    tz_ui_stream_push(EXPERT_MODE, "Expert mode", exp_mode,
-                      TZ_UI_LAYOUT_HOME_BN, TZ_UI_ICON_NONE);
-    tz_ui_stream_push(BACK, "Back", "", TZ_UI_LAYOUT_HOME_PB,
-                      TZ_UI_ICON_BACK);
-    tz_ui_stream_close();
-    global.stream.current = page;
-    tz_ui_stream_start();
+    ux_flow_init(0, ux_expert_mode_flow, NULL);
     FUNC_LEAVE();
 }
diff --git a/tests/integration/nano/snapshots/nanos/back.png b/tests/integration/nano/snapshots/nanos/back.png
index 7bbfa7095c5bebc36b7af93c59320cc9ed4a94cb..b5c1b1cbe236c9d115fe1d9a418c296b46fa8c36 100644
GIT binary patch
delta 316
zcmV-C0mJ^L0@ebMBYy!MNkl<Zc%1E-%MODe5Jkb1|NmeYb}<Q3hDRx>+^ciqqQN$q
z+=EjD=M3Y?_|*mc%CVoHeOOn=EQA8m=u<c~Y^w_xB&M(9u8F~hN<bt1><c_l2@qoX
zK9IJZ6dnOzwtlvUfJZ<iM%?X43=j%%B?q){3UGIbUf>Z>?0++QkgXjl0gN+?sAg5F
z&u@dzpmx^a#S5PyZ?zksG%Ca|UhttbjfkFN;n>fMkvllxr5d$4xPVT`=HRbbyl7w_
z$Yk?nXq_X!g<l#mya~gHIKyjo0prw8gWKb%7I|7w?F>@Jb;>jC>q2;1P`U-3y?=F=
z7O3ev4go1~rZod+Is}`5BHaxl;MF&S0R2y(w}8^|V%)$E48t&thw=tYW^cBxr3oYe
O0000<MNUMnLSTZQgplt5

delta 268
zcmV+n0rURW0;U3xBYyzxNkl<Zc%1E-!4AV93`4`T{{IJaU<Wi570SeznmF@2rmB?K
zB+w#42qA>vQL>b5oy0B=>jb_9U-}BB0ZsjMnC9^V01XJFzKA621QwZ39zaU~J0KQl
z9U#$05MT#1-9sFN01c2(9*hits4B$#83CbwSg5`wRNo$YaDO}9cR<OG_P5i5SW2wE
z>!+3rx>Ha(-1UKb5qEeFV$KWJ>qDnHk9#f3_pgX6P4&|n?^WIzUpIpAC9EZu_eGf2
z_v6g;s=i<tplK`Jv8GF)88BpG#;JS!fnY$t6ZF^dIzE)!u?K_@LI@#$$O}heP2Xxt
Sryu|T002ovP6b4+LSTYn(Rbni

diff --git a/tests/integration/nano/snapshots/nanos/home.png b/tests/integration/nano/snapshots/nanos/home.png
index 37183b78b6d4728bd74f7a6c6878538eeeaca12d..056ffc4017890607ec11b7cd57be8dcd68458456 100644
GIT binary patch
delta 409
zcmV;K0cQTz0<!~<B!7BIL_t(|ob8#>7K0!NhHa<b|AD(`7j7N~sVF$9_|7gC&06q-
zVj(z=<2cStj$Jyi?+V@by%o_5fAgR*r?0dBz!}g-%T_YNA@rBahDX6*$HUW6oIBnJ
zngOTZ%f@OgVqT|e)TTWH%1WV>wUac6^r(fgf<rM-f=2r&27lFRBwqbPwH|5NKA%T2
zH3Lx1fmMhWx||UKC*GX)(<EFNHI1sS`NBVT&BdkF8qx-NiWQ&c#J?ah=FI$9$XWx;
z0rEwNd!NH^ck&H@miN2M4!sn|cu_zMUex3a2gn_iAYlyB(&A219YJ;u2ud*sE#+cp
z+8NAgQtC+~)_<g5sQSK!^J(cqo>$z62~}3^yr{in1&l;DV#i5<MklPb*^=`M^lUC#
za0?R|QG;#C`$2yzLJ|y)cc{8Ajz$2Y<AhxpQ=#;%?aj_A?E$EYRFdO^-U_7Eow528
zOuP?>^zC#8qJ8fujbb$_f)_H5!$M_$&~Y5+j=TZ#pc3V$RQCPQ00000NkvXXu0mjf
DAr;0w

delta 315
zcmV-B0mS~Z1J(kNB!3-AL_t(|ob8yw5`!QNM6uKU{|EQb9+)~bi4kpy3+y{-6bxAi
zl9UJ`gb*?fujj7~&-HNnyF-zq5EeoBpx>`{;5$ak!!wpm^qb2=wkpNWw`QxFFOGv=
z0p_)D+|5Om{p=ds6T1S|IVk4iAN%i(@D$WKMp@K;ln58V%zwEP6DWYlIb{~oTjG{c
zP;R_ibAR20omNw0E`=f2hc&2Myc_c(ew0&66d)Q)0}>83xDwFlH+2hV%s8He0y1pN
zjV0a<8~;q8?auH2R((wzL|W8BI;Ot9=D&QjoOd+<<!DXK+!PUn3FuMq1XxpwuYrEr
zTNy5cdJt=LU^L0yB4vNP6>zQwm(<+nnG+N+RZvq98IYX)2_b}hcmvH|xe!s5_t^jd
N002ovPDHLkV1nV>kL~~f

diff --git a/tests/integration/nano/snapshots/nanos/quit.png b/tests/integration/nano/snapshots/nanos/quit.png
index 6e442b793bef038104a3906c808d5588188e0e1c..e2279803e79ec6d6443deff45a1f9326b562e303 100644
GIT binary patch
delta 246
zcmV<S015w`0+IrdB!AgSL_t(|ob8#x3d0}}1vTLRe{c@zK@d@EX==0kWaelRSl(=m
z(GUOt0Q9)daGlmg{K{cnz+Fo8;tn(gG@&ay5EL+sTh@V^fJxAr4%7r}N3<^B7JakF
zWKqWgl;41ubaO9s0yJk*8M=6n_OgCYxhAIfEl%%0#vp3ae{UEZSi&r1$%l|}@K=b}
z8w!8IP1np9%K2s%)5~a1UA{VmQ8=+t-ij#s)<M^U&4^2s1<Wb4knb&{eFcbs0Amnf
wjC%oj`pzHH;SzJQgIhlf3m{5+Z~(9sFN_;!JHmN%^8f$<07*qoM6N<$f>SweHUIzs

delta 256
zcmV+b0ssDz0-OSnB!A;cL_t(|ob8yw4#OY}Ltz^K|G^yC0SO^MRO`@Ur+!C7tJF?P
zNC-j*Ap{>Khmx&>_?4G+0C#E9lY78vz#uxa2ZRPJ<)-z3&47*2oF1?l;Ere=z%Axv
zkI5pA129)WOuV``m<@2j$^g#O%nMTA5~**A)VD_-{GI6@P<b*+Z#QJaKB~HT-qXJX
z<h!mxsDokD{MF=nxfykKy=p_jGo?w{YuYakE7-iP12|1g<L{{10GU{ixd}t69~@S|
z465{%2UGy|VSs8tP1~y7vc=rA%l)(B0Fu%kc_4%k!XF>2A!kvU?SrWR0000<MNUMn
GLSTZP=XezW

diff --git a/tests/integration/nano/snapshots/nanos/settings.png b/tests/integration/nano/snapshots/nanos/settings.png
index 60133e61ceb4cb22da13428ec09ee094dc6e0f36..34cf547a2c1e2400746daefd61018ba07f6d86e8 100644
GIT binary patch
delta 328
zcmV-O0k{6&0^<UZB!4PNL_t(|ob8#>4udcVMRAG$|G_@E2a={zs@uBsa+ULDr-VX*
z!bFlJNs@$*eUp7dD>2Fot-wzhyED6CK`Zb*J##PXTs{5+VFb8_=Cr=>ML>Q0)#&XC
z6@(FRFW4eLY0CiN*;fc7z%9be7oj5*J5eP|A3&kAa-k~GPJe{95$o#AxEWF$Q>XPO
zlRiL_SqRCk>M$K?-e?5qgvW<DDuK2chVtQE-n>TI0eGMzz&*SsCeCeLUMR!S`jd8I
z>WalhPmEcRIo%?%tOtWCx@aC<Y3KhL)W7zG%mVFzvUxMrnU-YG*$nLfX?#!?&3PZk
zq`O)&&IeEjOhF#&x9&veABj?gm0l>AMN?PXBHUXvGGi3s2N3%T8=wX}8*~bqgPVeq
aL`2?#CX<%zj4h7<0000<MNUMnLSTaMftQ8=

delta 324
zcmV-K0lWU=0^b6VB!4DJL_t(|ob8y=4udcVMRAG$|G_@E2a=|vt-5squHN&u>Kb|}
zAczn`2qAdvo9tV(5wpCa4fqM8JF**=Xal}yB=@rV+VLL%BcLlZruu>x0rmA)(c2X$
z03+aDphbYvmI1)KuK-3sw+JJD2mzvUmp<Tb>Z6<ot`WOrEq~UL;5d<&>N_wLnd-Yi
zA4HNa3u!H#si;8JI9(mSsGWHYNb#DU&C#8(+GP4zGu}DYy1Y<EL-k+Uc~N)UxJEih
zCv0xFh%D=epo%V<pWWS#C#Ln&(I#F*JD?oi^t5hCCOVr%J3tyAltpvj=P~K7-Z{<(
zp$>2!YPRl-&OJYpr3fpdP%w+8uC_&Zv}pFsQG_2r?oZeRHQ?Dqryw7?DTok49?u)9
Ww3~5=`7DC~0000<MNUMnLSTXk<(RJk

diff --git a/tests/integration/nano/snapshots/nanos/settings_expert_mode_disabled.png b/tests/integration/nano/snapshots/nanos/settings_expert_mode_disabled.png
index e14c6998ac8c8849d7ee5ab8402925ca82abf3e6..a10bdaeacfd22d90c63e4c46e5e4d164850b8154 100644
GIT binary patch
delta 394
zcmV;50d@Y91Ed3xB!6p3L_t(|ob8#>4#OY_MeVZw{|EP>doUpsuC(b2y2*K3913!)
zwOC4$BuO$Wi{se)#{8^~jvl1O92o7}-Gkp`!jt8JzW@X+h-JmUsYTdR<GulVEdw_b
zzH}ryJQ#EFQu^gF=z)D}KB~M${7YRZ^}L<ila1)kHG?DTVSg{i@F=lcP<<Zlt%J`K
z&iR`sQ4iQktCrk{z%A$oBkb?aG5Bvm9Ju@ia7%d#xD7&gQQ8N-1MKAwU&XbrAr&A0
zB3yp{BDojC^Tc^#9^;+%;$)^>5;2tk#Yl3mEX*cAfvKJ?1>H#vdNSNDG!@4rt7@qJ
zb`Oc;P^i&|LVsQAvBzmuAcPGJz?HD{o&#%Y@P{^QeLxs}Pg^>z{@5?!L@{<P=;DHf
z<>lLEu?#GLt{IRXwW=x#3FS<%k@8LqEI>uv!2I1gZFm6$@V@Mq=_-JI;ipe2`fkUl
oY#ZlJ<JL1tk|arzBnjaIf8X6{hkm2t00000NkvXXt^-0~f~&N@3jhEB

delta 376
zcmV-;0f+vi1Cs-gB!5~-L_t(|ob8#x5`!QNM77iY{|9@p2WB!cSyRWFK<&Phg8>2y
zF~T$vLI@$G3v*)I>!SL3C3bWn&F4aIpXoj14W@juGRPM|kPR`v@UxT{dnsHOVDDwn
zW~MLiiFXhBJY^~U$Y^xKy6i4hU1Hu!6`6WnuI<IfRM(opmVbS-2YtAd+7Q&%V;nm4
zIN_MTS&6>Ey=nE5=TI1ePB21zPxc`{1Zm**H^7i`6)+6K?y9se{079^AAX8k-9Rec
z{z0_-`a^QghdXfd;VIBCYeUeV<8x>VPz}<6ltT@AvYq|R!?>8>1j6Se{-hypXYU8t
z*gywT@s4!^9&zcw2XD5QzXo+bmK1~qW<i}nYk%ych=Uszo^GBtt7TvT{4cBM(ULjy
zA3J>#Y@~S?1{R=U66f0`aKj5=fY&v@OjiNo`zD{I_^XBBU^U1)gG)C;2qA<JQo<Yh
WX~(-+v;7$W0000<MNUMnLSTXnfwKny

diff --git a/tests/integration/nano/snapshots/nanos/settings_expert_mode_enabled.png b/tests/integration/nano/snapshots/nanos/settings_expert_mode_enabled.png
index 363c6c9bb4458c5cf98e55f89561b7239b2402a3..1b968b6c27caad50d50292651cbdadcd11917fee 100644
GIT binary patch
delta 382
zcmV-^0fGLC1DOMmB!6H@L_t(|ob8#x5`-WKhHYni{|D~S9-Lta2%QpWlke2JD#)Ld
zR7#R0Nir*o;oSR%?5u`{22y=?^!96R!EQ0`!Lq<!001_`vdY)cLi$7Fz6t%g47eMy
z#XaHfi9Q!Ar9T#v9@w|jTNSsEe_;rO9=GHE(1#4inu#;>X@5I?7>aKSs`sOwI`BHh
zHQ%`t`GjX-<&xXrn1U|wg#2#ogMA9Zh})karj${LX;3uhrM=@bK;Qo2qqvS$q{8!e
zg5}2#l50MU$IlY7=x;QN#!5p1F_i#C335~vW)q-@p`I-S;iLwUJT41O#WBdN8p_Y^
zKCXzBgXT|+UUz#SefU5hJj2^YJQ<uF4)|e0yzVJBh~>N>d{4qX@OtN~iLM2SmEqyT
zZ(4aRN^&3xr<ra3HU&lRfPP+@m!2v>=a;hoCt3g{JA($~)vdNGHErd+Q~BPRBuSDa
cNs>771N>a?3tQMQ3;+NC07*qoM6N<$f{3)bdjJ3c

delta 367
zcmV-#0g(Qg1BwHXB!5v!L_t(|ob8#x5`!QNM72}@|ARf)12aq{OJvjprTb2n1_%U}
zh|@#}A%u`F%#LkutLSHO?C3_4&w<{4-FxsGO!#DZ;2(fY-VpPGpL0oJp9{AY*y}Jz
zv!XBUiFObAJb6X><I(7jZLKa<SyKF)tK_Md<<dUe6xC(SV1LWH*+w63C02scdbFiO
zjuVdg%1YD?)}~d5+=oC3I>8h4-Ps3!36j9=UjQZLE}#s;?xJEJcm~+pA0EZ2t`REP
zej_sc@*p|q!w3vMJOLVJtOWfzI)`QeqCqhr;V=e0+0VY`W!xdP%LZv+|CHFTzJ-mh
z7=w1NConOs<!Gilmxa$Q@4E0dDS&rmK?5ICXzlmDihviBw^zT|%di;YPzcVU+Pp%7
z5WROmJA>-dQv=ZWq2~Sc4uGM~IR-`QmdcGQRU_{-KDQA<2qA=!Kz?@h*<I<kJh}h?
N002ovPDHLkV1ktSvLFBe

diff --git a/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00012.png b/tests/integration/nano/snapshots/nanos/test_parsing_errors/wrong_last_packet/00012.png
index 37183b78b6d4728bd74f7a6c6878538eeeaca12d..056ffc4017890607ec11b7cd57be8dcd68458456 100644
GIT binary patch
delta 409
zcmV;K0cQTz0<!~<B!7BIL_t(|ob8#>7K0!NhHa<b|AD(`7j7N~sVF$9_|7gC&06q-
zVj(z=<2cStj$Jyi?+V@by%o_5fAgR*r?0dBz!}g-%T_YNA@rBahDX6*$HUW6oIBnJ
zngOTZ%f@OgVqT|e)TTWH%1WV>wUac6^r(fgf<rM-f=2r&27lFRBwqbPwH|5NKA%T2
zH3Lx1fmMhWx||UKC*GX)(<EFNHI1sS`NBVT&BdkF8qx-NiWQ&c#J?ah=FI$9$XWx;
z0rEwNd!NH^ck&H@miN2M4!sn|cu_zMUex3a2gn_iAYlyB(&A219YJ;u2ud*sE#+cp
z+8NAgQtC+~)_<g5sQSK!^J(cqo>$z62~}3^yr{in1&l;DV#i5<MklPb*^=`M^lUC#
za0?R|QG;#C`$2yzLJ|y)cc{8Ajz$2Y<AhxpQ=#;%?aj_A?E$EYRFdO^-U_7Eow528
zOuP?>^zC#8qJ8fujbb$_f)_H5!$M_$&~Y5+j=TZ#pc3V$RQCPQ00000NkvXXu0mjf
DAr;0w

delta 315
zcmV-B0mS~Z1J(kNB!3-AL_t(|ob8yw5`!QNM6uKU{|EQb9+)~bi4kpy3+y{-6bxAi
zl9UJ`gb*?fujj7~&-HNnyF-zq5EeoBpx>`{;5$ak!!wpm^qb2=wkpNWw`QxFFOGv=
z0p_)D+|5Om{p=ds6T1S|IVk4iAN%i(@D$WKMp@K;ln58V%zwEP6DWYlIb{~oTjG{c
zP;R_ibAR20omNw0E`=f2hc&2Myc_c(ew0&66d)Q)0}>83xDwFlH+2hV%s8He0y1pN
zjV0a<8~;q8?auH2R((wzL|W8BI;Ot9=D&QjoOd+<<!DXK+!PUn3FuMq1XxpwuYrEr
zTNy5cdJt=LU^L0yB4vNP6>zQwm(<+nnG+N+RZvq98IYX)2_b}hcmvH|xe!s5_t^jd
N002ovPDHLkV1nV>kL~~f

diff --git a/tests/integration/nano/snapshots/nanos/version.png b/tests/integration/nano/snapshots/nanos/version.png
index b3aaadcc82d3f9a08cf1ad3bf75c034e5a519a77..c2181ffc029ec88984e4f7cbb6d1de318f8ff4be 100644
GIT binary patch
delta 307
zcmV-30nGl?0?q=EB!3l2L_t(|ob8xP4#OY}M4hU+|AASg3o6SZn54ADV`<(B@e`Rb
z4j@7ZA%ui+6gf(#{N+?hct$Var)+!l3O)wd02|9y*`vs|zw5QobP!{McCa;eAb??y
z=mj{alvY`hPKMDw-VDvC>H!P@JD`T7jmm-Cathlf>b-$rx_>JG1`HTW)>s9p?<J5a
z=)RO*{yA5o+Jj+$s?!u|YVuB&w$)SIYsDqoIXW2^@>2Z;xFS>iWpt#b`ir3lkuVEI
zlIcHu=NNi90~BcMxl8wH!E3U8;6E7SBK8lGJWgQ01<CAHHi`O@U<cIK9{5Z$4ZHyp
zRJZg8fNdUp3M`tyCZ9aH2$J(Lv?+T{<4QsZA%qYT%?nCPn@4QJPzV43002ovPDHLk
FV1j#<h~WSL

delta 313
zcmV-90mlB$0@MPKB!3%8L_t(|ob8xP4udcZL`_xhe_$4L;mWc?oTQYJu{v)R<)<)X
zjDrXvgb+ghm3@<atF*t|Dhbco2e_1Foqd9j0XD$LvMRf8vaIiZYZMd2*<cfVk6#F2
z*kkqq0!&J;tVkup*qmsGVwHLT1Hc=gA?c&CA-5dDwut&@A%B?e27mz#+L9GkLF(HD
zG6juG8Reg2C#pRd2ADcULsL^!S^CjP@n{s9Y^8J>hJ>a1Kcyot)xUvIWU7A~^k62L
zvd~Bs)ZGD!tl#14%{ChHbD*B3c9_~dAX(KM0C+d9od^3@gq*!e0jeK>aT9K!KO3Mj
z$)&&>Z~}G9J~9B<=E0|+6ZqtlCl^6-EJKTSG}P`Sgb+dqA+vb_99o-G9Se9s00000
LNkvXXu0mjfds2#z

diff --git a/tests/integration/nano/snapshots/nanosp/back.png b/tests/integration/nano/snapshots/nanosp/back.png
index 5da237b76ef5d9d8b186f5dac453b2e9a2bc1f65..e06738f46b9701ea6fb0360a18dfd7d65519421a 100644
GIT binary patch
delta 338
zcmdnX^p<IYO1+7vi(^Q|oVPcl`3@-vv?k`<;rtyhRQ<8BMPQxM$}^e&-k)5cR>IeJ
z!HS&$3L2vK`uRU7S8VxmtGd2G&02-|g!la5o`+Vpjj1btmF}!Q7@;P1V8O4W>>(Yj
z0!v?2zZbpj=cn1AAHDxtzk_Cj%G8Qm6W>hcIk448pnj=T!)5*2B_a-+&tGYddh4Ot
zz<4*_S+e1ycBb6EmUo_4p6>11-W%T_JuM>X(_PiPnzz@To_&eAW}>E3&im@bgC);P
z6kR7PO+L6*W4-0F`5mIKQ!}Sa?$54I)+!L%7Jo$c{bk{ZYu4ZUj-Oqoak;6=zu|F3
z?9;j5zWN*KYSc4$2h6Ek9?iY^YPk^OlS^LPV=k*EF`D@1pO3s(%gqw-U-*jogHIpR
hcIu|Xd=I26R`4IaxTt4#V3IdT)YH|^Wt~$(698#dm=XX0

delta 290
zcmV+-0p0%X0=)u|B!2`+L_t(|obA~`Zo?oD1yEY$Cfxr>+@%XE4l$`K$5K2)-`j;K
z68td(kxKyp0000WwANZ{?dn;a^?mgO-ZVk<i<AXe)33E&JCpPB6=0_HODSJhPvDsS
z&Xchu`F6l$lI?&pT?@*$1J>N<xCrGdK$)usDGN|$=|2GcYk#5t2W&1mhYsH5xAD*F
z7q_5jcf0r@o^jiJZmk7haQ}StQ{5jAyQrrY6fOPVGVQ-z#>bS;w69Nkw4i9|ulk6~
z{Y6-x@1H$0=DHS-0@PZgb^p=&q({#5kf%d9MGZzf#n|kgfVQ`wfHfFTg7I~HKmKz5
o(G~>&0000002=@R0KkNP0Q66B*=$kT0RR9107*qoM6N<$f`(g)^Z)<=

diff --git a/tests/integration/nano/snapshots/nanosp/home.png b/tests/integration/nano/snapshots/nanosp/home.png
index 39ed6ff597a035972d1cd276b6717deb5308e2c2..13403d2ebee9c21bfd7b23d1c9bdd935beb869e7 100644
GIT binary patch
delta 480
zcmV<60U!SG0{R1xB!9t4L_t(|obB2{a>F1D1yI__O}PJ&xJwsIsVXqW9t-sGf2+ia
z4TBIiN<ttaA|fIpB6^dr)g8DXrIcU97}b%c@-@%CS9jp;AOp~!_*ftVKx>Ro{FD+(
zmV8!s;2L!wmZLm)XZB{3B?xr%16&3))!6`KlMKMMLjdyJkAE>j?7Wm60uWl8WE7|Y
zkh3289sqn31|4w)H3Krxbzi~`fCRb_VFy4x|G<qt5h=`KQzyeaXY_BkQck>g1t)Xs
zup2W+f7%E-8FWSV>QfG_dZ0e7>DL{Ty_H1>b(Rcve%m~2q{U~c&V;%LcIpghzV079
zU5f^<b9&H-ynp`RK0wVNqlR<XjoM1T9>4N~)ZG793u>pv)6LsmJh<Nv*TbueaTAum
z(iPK&e5!|cUNuw&UuIjgnm<zFmrL2v+%Grb&RMV4OojL42X--T0}KEW5v^wW*z=xe
zDyKXLz{}rK`kS))_>I3wtDWG&0<cHp1<wALuhvtS^I4Js(#YJbXSZdK47m$HSyK8j
zs6TaH2R-600GZM1T*`2MR)2Q^xK{)X)!d)(`x4#ZEh;R=(JcOdE+!%(A|fIp+TRai
W^-$f}$6z%80000<MNUMnLSTXhjNw)Q

delta 341
zcmeyx{DEnLO1-(Ki(^Q|oVPaug$@e{G(6mLdG?O~6YnhLPwUwvcrily=l<nk-bXfZ
z-ezM!fUt*q|8Gu;=e~PA)=PqQtKb&<7xQn*{*Y9D9<$V7ZP35Vmea3#HOubn+8VWP
zM_&<Z$Nbl=?K@X&oO{@bb(OZlxq~@&aX0>L<<+`S@8`JqxCYBtw}}_{8fFyF_t9sF
zJm<MN;HSqO?K4aG@9o_wFMnuiRKJ>DtLpXkis1aebv9w&7Rd-OgeLJU=#@B=Qu3v}
z?DRR?+b=t{l(*}aJzjdBKd{z6U|M+G|L^CnZ|XhKv3Y`Ywtf8S|3BXp-Yfaszt~&1
z*jU=pnz?G)P6odtQ-b;(f4+X(_mHWWk%KMu`40X~lmDJ&UGSbKPy3l&wcp}3uC1FD
jGCtmmp8XFI0tVN__x$>|JvU_aGmxOCtDnm{r-UW|OtYU1

diff --git a/tests/integration/nano/snapshots/nanosp/quit.png b/tests/integration/nano/snapshots/nanosp/quit.png
index 24033fcb8a8e925f3e765f9773db15a037355d01..bcb20c6830e069f9bf98c9dbf2a07da0d1aded53 100644
GIT binary patch
delta 268
zcmV+n0rUQ`0;d9yB!BKnL_t(|obA~`Zi6rs1W?ke`2I)wcj+Q3LJpy7qGAtuZ;2A=
zYlfI$FAD$w000000K2NHszy)omaowRyl#y?x`WgLy3lhwh%8_??$8eM3OEQlv4gw<
zF6K6RfEPX9?5(vSle{VW7tmS@&3%<!zy<ULBtFN2{1UJ9Pk-<<Wa*z~Cu-@ROa~)b
zg+}rm9!b2@3D}D0?waFQ-}{HtUymo!oq7G~2rS~fEO;wo&37C0_F{KsPQe8nTUVjU
zH|#E3Knev6rhvg_FW|m>*N^4lFJ@IeTjICh{r^cnfGEe)0RR910001F`3CM$i?`)b
SQ@8*C002ovP6b4+LSTY?=z3KE

delta 278
zcmV+x0qOpy0<i*+B!BoxL_t(|obA{_Zo?oD1yHx@O}PJ&<}O`CB@{=lny6xizPF2o
zBRn4i<~RTV0000;Eg~XfbuV7^zPbZX>ZPxqLCFB7qL<E~UH}ivT{nYb0bCTiXa>as
z*w5SQ4m{&L*jsB$dh)u$Z$N9UZr!`W0qj8l0I*2j?|^Bue}BE>yfr?z8ULiro;AZa
z{dCm)tCQ!4jnkf8&)d+5NIp_}DaV?Q7pE)9eT+ZySN}(?wP`x)G30!-`x~%9^)IA-
zw0i)3>})3ak<qs`V9N}WF9!1>oFs$Wn2j&TX%4xVFvolUzNi0yQm!Wh0000000000
c04U-Up=giO?GFiDqW}N^07*qoM6N<$f(255-2eap

diff --git a/tests/integration/nano/snapshots/nanosp/settings.png b/tests/integration/nano/snapshots/nanosp/settings.png
index 99d3e4228ec7c3b8be3672d8558b37410b03ab6c..d885fe67b493f41a049111c376b0642375e01aed 100644
GIT binary patch
delta 354
zcmV-o0iFJX1N{P!B!5InL_t(|obB0BZo?oDMN!(Vu>U2omwuokG=NjZDv#&f^A|fo
zcwh!YQUU+~0000000000OqEhfDe7L_@~!T`n?l@uhv7@zfp@IJopavYllv?)U>a!0
z=qJYv=%;@T`gp~NWd=NnUj|g;GGI6NE6WU+F2cSqLY8W{+kZabInnoe61$Dqi{5%Y
zjHzXiiT*Z|P!s*l7y~7$kP_>#65&0L{wU)9QCe-m^e95?k2|UGHM{-S1#t#UCvV7!
z>sYrhw4>?%C*yhbv{_;H9B~*IW_L;{=iCRh-parFkJHw!|FP-st{T}!JOJ(C!<pK)
zA|tP6`V0tT&|5Bs`F>w0cYVvkG0+b{?_aCIIGpnOlMY#gt5qt5i(y?I7va^#(B>hF
z@bex13VT)w`at@f@CMTo1ONa4000000D#Z%15@hKeRM__*8l(j07*qoM6N<$g8z7`
Ae*gdg

delta 360
zcmey%)XY3VrQXZa#WAE}&fA-gLWdN190K2j?)X2kNL;)})cM7Vt)9XEqca1$7@4jF
zF+jm`H6<mXyIp&yy<n?xK5AQPerJ*NhmDatve%x|{n=S#e1NCq(u?UO#tY>C>ArY8
zHRjXVhHg(Y=2?Z3CoI0r2Fk~@1n0MW%6u4ip3%j={+KCW5<|m((R#ic^;2?9pV)F`
z%!}?eFE@IX?D^e3ZT43l0m1VNQ~2Uc)wd<@txKpixl*566PFV9`rG8=AM|b?wY%~{
zZ|Rk&-woRq{kpK<H2Zd4(yi&|v@B0p%$p}GAoTZZ-z%Tj(^CFyp82XdHSEF71>c;W
zvY6ic9{h6M`kR%BH(%%foz%4G*Mj^53#YFBHTSds#!EdLdB2`<ede{JHgN6g$4WN4
zSG@WX-?DhxjRf`kho1eme~|RZ{}A695f)gOfax8}tW{aBXBuzbzzE`dy85}Sb4q9e
E0M??c*8l(j

diff --git a/tests/integration/nano/snapshots/nanosp/settings_expert_mode_disabled.png b/tests/integration/nano/snapshots/nanosp/settings_expert_mode_disabled.png
index f19ea84c946b9137f782107733b3611e37edf663..c38eac887fcbface100aff4569cb469cc1e69d61 100644
GIT binary patch
delta 424
zcmV;Z0ayO71HuE4B!7uXL_t(|obB0Ba)clZfMK@Nn{fXlahE<gWim-XYYni=|2;Vr
z0g1#eqyzu}000000000007AUtnl7c(>zs33M-Mv2JaV+((H+D+%=pQQ5FUW4E{L47
zdtFOZ{aRQ`vGr{jWHr^79f=*DJLVJ?>92@JrBX`kRh1>`uYdKHI`y(#)~|Kc?J{O=
z%eL8zV|dok6m-0g{nR0!(|zXuyot8K*0kD?2N{=wZdf6|M~@*q1xfDmSKO5H6gLgJ
z-3^Pq4#49puI8Nn@^?SQ<(J#?z0@r4k{^<LWB99+cB1oLtJ5j{&eD9?S+lTP0Fpb^
z6Q^Lq0HoDouz#E7vd~sm{0{HKPH*6DXkTXw=ycPjvxn2)flzha0qnxvQ*$qDwbl=a
z&b_B4vzGqQU&64K-V3ssq*d*>=vTg2ZLoC%VD}7aJdRyewULm{0=Cq=SL+7gpiW>u
z@1L~Q1E9F)Wp8a}0Qv`hDrKwmBD2uN)5Ol%q&olr03iSX000000002+)_wp)C_J@d
SQhA{O0000<MNUMnLSTXlS<#jN

delta 405
zcmX@ayq<Z2N`0B9i(^Q|oVPavi&_+T8WOi%o?Y-?xp2CjMXHgf%XHI;xBge(DimzK
z*b%|SfB+mHyI$|wdaeF?)MLJqg}TqqWb9weFJM07&ty?W8^+lEidk#lz2E1$^}Td-
z_O`vg%{j~ZQk6G8+-W#{gHOF{iPqL@-}FLvy8f-dUH)=;T;BAz)zVvcpP6}k^V@GJ
zJlDN+9dCcN(335i^KORyPNCfP>g89L*?7cp&f4Hq+ux_ShsE>V+x0tCpK9evmhexX
z_IpqIfgj(><&VCde*1Gw=CtaQ>?dP*{6Bnn$obA7*!zNg`tu8|EGost4LMI9_`Q0=
zu6Jy&XnTyhMNGZ1gpOiQd_$<Tc|(BNhTA*5t={q9&dL90b>n-1w^L+-Sc&oXTk%zz
zkDl<p4qNpy?c_DzhT7D(KX0fNzp~vXqnfkw^S!mR8+vD1*yl5CuVNDUUVL_bSvu3P
w`?Et%hCOu+TR2&MGu!-QcMxF*WEs3?*E*;8K;R|c$)g|%Pgg&ebxsLQ00kYrY5)KL

diff --git a/tests/integration/nano/snapshots/nanosp/settings_expert_mode_enabled.png b/tests/integration/nano/snapshots/nanosp/settings_expert_mode_enabled.png
index 90dc4e8dc0c28bb0657b78cea8b3bcc348466d90..7adaf2fb335b9ef08bf1e74b46e6220bec083b50 100644
GIT binary patch
delta 412
zcmV;N0b~B91GWQ@B!7KLL_t(|obB0dl7k=&fML6{H{t$A;x7BcStdgQT1$Y!`~0$$
zFNwxVj{^Vz00000000000JwPhbsb|&#~}p2ff_pJ+;g_S-UIlZO#j95;2wY^-4G!J
z^Ej1c^;2PtQP<aDkkzuW^i1^h%sC%!k^b@MREjZ{E>&5QeSe#pq@|bTvVN+QHJ33n
zd)D3FoI_h(Q_y)m)>DT(PxG8Vxe|4UrDfG2chWBfJupLl_nw1$3X;s*KVznpR?IYL
z4%aRAc>tQ<aVh82Z-4Vq9RHa;KTFNBm3)vqo5Q;<`ti<pr9p>`J4*3nN3Ftc0XWR1
z9=HS>2H==227kMmE(>jC#^>-p^zu6HhF&V|_Q(qLkFvM=-a}SLH{6l=W>9)L&@U6_
z@tw^Eb31R8u5ZG3=>5*M4c-efcZQoc|8SILRgy!Na4xgW_okq!cSEIB^U|aNxcN`n
z0_J@Nq!?tsEYI@FR%qpSXXXD+000000000000026m=!<Io>3wC2lV0q0000<MNUMn
GLSTX@E65H2

delta 395
zcmdnSyp(x@N_~!}i(^Q|oVPavCp9bZG$fX%=O6mpKV|ou=FL88omV!hM1A`|Zw)KU
z;>Jt4%nS&ix$n~~v59qeqE7F=;8HzbyZZO!+QvNxuiRh5^OEt!FYb#`-2J~LgZIrB
z5sbgr?kH}2{gds-yWGF`EOq^5y*SX<rB5!j_E=5*?bTnR*Pnm=X>ZTUb;)Ae-psbW
z*}l^&_`*M%zTkGbbc<)@^IYyfxS0D@(LZQ<lU{{W-T8OURa}=2UBAx}d`c%#ibp?O
z?DsCqgg?L9gE#)+jNUhGR;jM-#F*EIxy0n>3Gr<<Vf|ZN$GcasAt{k3pjYC~$vc0K
zoZT_K&rG_c@ngOF-CIAFuh)F6eeJ{D-N8EyY@=rX+L}{Q^K5(Gj@cm(jKdtc{evHF
zuKyh7vcu4F@2}b6k=GO~XS94ax?SVK#bsM%>=$jSZ)?J!{(nW}f#T;4a?G1cZlC8b
nd&Kto+`;>~h!A67nDJ6PuhGnB*(a_dkg%t#p9{-6r-UW|WuCc4

diff --git a/tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00007.png b/tests/integration/nano/snapshots/nanosp/test_parsing_errors/wrong_last_packet/00007.png
index 39ed6ff597a035972d1cd276b6717deb5308e2c2..13403d2ebee9c21bfd7b23d1c9bdd935beb869e7 100644
GIT binary patch
delta 480
zcmV<60U!SG0{R1xB!9t4L_t(|obB2{a>F1D1yI__O}PJ&xJwsIsVXqW9t-sGf2+ia
z4TBIiN<ttaA|fIpB6^dr)g8DXrIcU97}b%c@-@%CS9jp;AOp~!_*ftVKx>Ro{FD+(
zmV8!s;2L!wmZLm)XZB{3B?xr%16&3))!6`KlMKMMLjdyJkAE>j?7Wm60uWl8WE7|Y
zkh3289sqn31|4w)H3Krxbzi~`fCRb_VFy4x|G<qt5h=`KQzyeaXY_BkQck>g1t)Xs
zup2W+f7%E-8FWSV>QfG_dZ0e7>DL{Ty_H1>b(Rcve%m~2q{U~c&V;%LcIpghzV079
zU5f^<b9&H-ynp`RK0wVNqlR<XjoM1T9>4N~)ZG793u>pv)6LsmJh<Nv*TbueaTAum
z(iPK&e5!|cUNuw&UuIjgnm<zFmrL2v+%Grb&RMV4OojL42X--T0}KEW5v^wW*z=xe
zDyKXLz{}rK`kS))_>I3wtDWG&0<cHp1<wALuhvtS^I4Js(#YJbXSZdK47m$HSyK8j
zs6TaH2R-600GZM1T*`2MR)2Q^xK{)X)!d)(`x4#ZEh;R=(JcOdE+!%(A|fIp+TRai
W^-$f}$6z%80000<MNUMnLSTXhjNw)Q

delta 341
zcmeyx{DEnLO1-(Ki(^Q|oVPaug$@e{G(6mLdG?O~6YnhLPwUwvcrily=l<nk-bXfZ
z-ezM!fUt*q|8Gu;=e~PA)=PqQtKb&<7xQn*{*Y9D9<$V7ZP35Vmea3#HOubn+8VWP
zM_&<Z$Nbl=?K@X&oO{@bb(OZlxq~@&aX0>L<<+`S@8`JqxCYBtw}}_{8fFyF_t9sF
zJm<MN;HSqO?K4aG@9o_wFMnuiRKJ>DtLpXkis1aebv9w&7Rd-OgeLJU=#@B=Qu3v}
z?DRR?+b=t{l(*}aJzjdBKd{z6U|M+G|L^CnZ|XhKv3Y`Ywtf8S|3BXp-Yfaszt~&1
z*jU=pnz?G)P6odtQ-b;(f4+X(_mHWWk%KMu`40X~lmDJ&UGSbKPy3l&wcp}3uC1FD
jGCtmmp8XFI0tVN__x$>|JvU_aGmxOCtDnm{r-UW|OtYU1

diff --git a/tests/integration/nano/snapshots/nanosp/version.png b/tests/integration/nano/snapshots/nanosp/version.png
index 1d2e4606814b5ebda15d0aa979126bc3a47b78fa..e7e6e3a697e3a5e91fc913664abf31c1e3dd8d50 100644
GIT binary patch
delta 334
zcmeys^pa_UO1*)ni(^Q|oVPck`I;33S`#mosK2TA+&tZG!X!;|-O%(E|G%d=@K`oi
za56F=z#mOP!HK_q9QR)PDATr4`KZL&<sVG<vtG!yRMl28Ja%Osf0uBRmb0DX_7{zE
zT;Dd#bBOK>QkS+{J?TktRk()RQmHw{uO+{gJJd%_stV<M#CLU*Zdh&pg6(&Ve>3s)
zC~JE?HNNjFw|&9iz;EB?@4A><d5USqo?}l-x|l1o`!4O>d!%}AnAxM)cdAvccPDuM
zH|kyC`9JB(0ioR!ROcO@Ce~ekKKsQpQNJ12|C-e6e%bZK@*nqukKR87R{xn(@K;~s
zOx>w<lj=Uyv%4?ZZ~L!&QszBw1I18ndxkmU=YNZtIOf}Nzjc+nx_;r&!u8pAI1nCZ
bc=v#H&(2#v0)MR71`_pj^>bP0l+XkKi|>~E

delta 341
zcmaFK^nq!DO1-(Ki(^Q|oVPau*EK5$v?dl^p1a|{>e;w=%$hU1d7|=k+n@cP$J4bi
zU875rkpT`G^i$K)%545UUt9Ju!nUFOl;wK4L#Io)A3QJeymqGO+|s>rCgLjLZB>o=
zA7w?kzHP2zs5SMPpYtnv>Y_N|y9-~2W)+-Yk-nz>Kl>ETm+4Ox-j&SQc6Lp_)vBj)
zYxNHtu-LRLWY*7lK`~A1+$GoAA9uU?$wOqpvdc0zg11k%msXXVJ9XRL)nD}VSiOI3
zx9Xh!#a@AD<`?@msWn?JYn43Jees3QyeIqKy7Ld;oinp~x_;s>-Ma@%zA?_;Ys${@
z{n*`)9`#)wo2@nd4t`M<vVPe3X`^G7YNh^HCLfKftN0l{K3b{oDE#Nq=8I8FUi^@{
kCF8#QSTEf3K*o-{`g300J{9kF<pxOD)78&qol`;+0PPf@EC2ui

diff --git a/tests/integration/nano/snapshots/nanox/back.png b/tests/integration/nano/snapshots/nanox/back.png
index 5da237b76ef5d9d8b186f5dac453b2e9a2bc1f65..e06738f46b9701ea6fb0360a18dfd7d65519421a 100644
GIT binary patch
delta 338
zcmdnX^p<IYO1+7vi(^Q|oVPcl`3@-vv?k`<;rtyhRQ<8BMPQxM$}^e&-k)5cR>IeJ
z!HS&$3L2vK`uRU7S8VxmtGd2G&02-|g!la5o`+Vpjj1btmF}!Q7@;P1V8O4W>>(Yj
z0!v?2zZbpj=cn1AAHDxtzk_Cj%G8Qm6W>hcIk448pnj=T!)5*2B_a-+&tGYddh4Ot
zz<4*_S+e1ycBb6EmUo_4p6>11-W%T_JuM>X(_PiPnzz@To_&eAW}>E3&im@bgC);P
z6kR7PO+L6*W4-0F`5mIKQ!}Sa?$54I)+!L%7Jo$c{bk{ZYu4ZUj-Oqoak;6=zu|F3
z?9;j5zWN*KYSc4$2h6Ek9?iY^YPk^OlS^LPV=k*EF`D@1pO3s(%gqw-U-*jogHIpR
hcIu|Xd=I26R`4IaxTt4#V3IdT)YH|^Wt~$(698#dm=XX0

delta 290
zcmV+-0p0%X0=)u|B!2`+L_t(|obA~`Zo?oD1yEY$Cfxr>+@%XE4l$`K$5K2)-`j;K
z68td(kxKyp0000WwANZ{?dn;a^?mgO-ZVk<i<AXe)33E&JCpPB6=0_HODSJhPvDsS
z&Xchu`F6l$lI?&pT?@*$1J>N<xCrGdK$)usDGN|$=|2GcYk#5t2W&1mhYsH5xAD*F
z7q_5jcf0r@o^jiJZmk7haQ}StQ{5jAyQrrY6fOPVGVQ-z#>bS;w69Nkw4i9|ulk6~
z{Y6-x@1H$0=DHS-0@PZgb^p=&q({#5kf%d9MGZzf#n|kgfVQ`wfHfFTg7I~HKmKz5
o(G~>&0000002=@R0KkNP0Q66B*=$kT0RR9107*qoM6N<$f`(g)^Z)<=

diff --git a/tests/integration/nano/snapshots/nanox/home.png b/tests/integration/nano/snapshots/nanox/home.png
index 39ed6ff597a035972d1cd276b6717deb5308e2c2..13403d2ebee9c21bfd7b23d1c9bdd935beb869e7 100644
GIT binary patch
delta 480
zcmV<60U!SG0{R1xB!9t4L_t(|obB2{a>F1D1yI__O}PJ&xJwsIsVXqW9t-sGf2+ia
z4TBIiN<ttaA|fIpB6^dr)g8DXrIcU97}b%c@-@%CS9jp;AOp~!_*ftVKx>Ro{FD+(
zmV8!s;2L!wmZLm)XZB{3B?xr%16&3))!6`KlMKMMLjdyJkAE>j?7Wm60uWl8WE7|Y
zkh3289sqn31|4w)H3Krxbzi~`fCRb_VFy4x|G<qt5h=`KQzyeaXY_BkQck>g1t)Xs
zup2W+f7%E-8FWSV>QfG_dZ0e7>DL{Ty_H1>b(Rcve%m~2q{U~c&V;%LcIpghzV079
zU5f^<b9&H-ynp`RK0wVNqlR<XjoM1T9>4N~)ZG793u>pv)6LsmJh<Nv*TbueaTAum
z(iPK&e5!|cUNuw&UuIjgnm<zFmrL2v+%Grb&RMV4OojL42X--T0}KEW5v^wW*z=xe
zDyKXLz{}rK`kS))_>I3wtDWG&0<cHp1<wALuhvtS^I4Js(#YJbXSZdK47m$HSyK8j
zs6TaH2R-600GZM1T*`2MR)2Q^xK{)X)!d)(`x4#ZEh;R=(JcOdE+!%(A|fIp+TRai
W^-$f}$6z%80000<MNUMnLSTXhjNw)Q

delta 341
zcmeyx{DEnLO1-(Ki(^Q|oVPaug$@e{G(6mLdG?O~6YnhLPwUwvcrily=l<nk-bXfZ
z-ezM!fUt*q|8Gu;=e~PA)=PqQtKb&<7xQn*{*Y9D9<$V7ZP35Vmea3#HOubn+8VWP
zM_&<Z$Nbl=?K@X&oO{@bb(OZlxq~@&aX0>L<<+`S@8`JqxCYBtw}}_{8fFyF_t9sF
zJm<MN;HSqO?K4aG@9o_wFMnuiRKJ>DtLpXkis1aebv9w&7Rd-OgeLJU=#@B=Qu3v}
z?DRR?+b=t{l(*}aJzjdBKd{z6U|M+G|L^CnZ|XhKv3Y`Ywtf8S|3BXp-Yfaszt~&1
z*jU=pnz?G)P6odtQ-b;(f4+X(_mHWWk%KMu`40X~lmDJ&UGSbKPy3l&wcp}3uC1FD
jGCtmmp8XFI0tVN__x$>|JvU_aGmxOCtDnm{r-UW|OtYU1

diff --git a/tests/integration/nano/snapshots/nanox/quit.png b/tests/integration/nano/snapshots/nanox/quit.png
index 24033fcb8a8e925f3e765f9773db15a037355d01..bcb20c6830e069f9bf98c9dbf2a07da0d1aded53 100644
GIT binary patch
delta 268
zcmV+n0rUQ`0;d9yB!BKnL_t(|obA~`Zi6rs1W?ke`2I)wcj+Q3LJpy7qGAtuZ;2A=
zYlfI$FAD$w000000K2NHszy)omaowRyl#y?x`WgLy3lhwh%8_??$8eM3OEQlv4gw<
zF6K6RfEPX9?5(vSle{VW7tmS@&3%<!zy<ULBtFN2{1UJ9Pk-<<Wa*z~Cu-@ROa~)b
zg+}rm9!b2@3D}D0?waFQ-}{HtUymo!oq7G~2rS~fEO;wo&37C0_F{KsPQe8nTUVjU
zH|#E3Knev6rhvg_FW|m>*N^4lFJ@IeTjICh{r^cnfGEe)0RR910001F`3CM$i?`)b
SQ@8*C002ovP6b4+LSTY?=z3KE

delta 278
zcmV+x0qOpy0<i*+B!BoxL_t(|obA{_Zo?oD1yHx@O}PJ&<}O`CB@{=lny6xizPF2o
zBRn4i<~RTV0000;Eg~XfbuV7^zPbZX>ZPxqLCFB7qL<E~UH}ivT{nYb0bCTiXa>as
z*w5SQ4m{&L*jsB$dh)u$Z$N9UZr!`W0qj8l0I*2j?|^Bue}BE>yfr?z8ULiro;AZa
z{dCm)tCQ!4jnkf8&)d+5NIp_}DaV?Q7pE)9eT+ZySN}(?wP`x)G30!-`x~%9^)IA-
zw0i)3>})3ak<qs`V9N}WF9!1>oFs$Wn2j&TX%4xVFvolUzNi0yQm!Wh0000000000
c04U-Up=giO?GFiDqW}N^07*qoM6N<$f(255-2eap

diff --git a/tests/integration/nano/snapshots/nanox/settings.png b/tests/integration/nano/snapshots/nanox/settings.png
index 99d3e4228ec7c3b8be3672d8558b37410b03ab6c..d885fe67b493f41a049111c376b0642375e01aed 100644
GIT binary patch
delta 354
zcmV-o0iFJX1N{P!B!5InL_t(|obB0BZo?oDMN!(Vu>U2omwuokG=NjZDv#&f^A|fo
zcwh!YQUU+~0000000000OqEhfDe7L_@~!T`n?l@uhv7@zfp@IJopavYllv?)U>a!0
z=qJYv=%;@T`gp~NWd=NnUj|g;GGI6NE6WU+F2cSqLY8W{+kZabInnoe61$Dqi{5%Y
zjHzXiiT*Z|P!s*l7y~7$kP_>#65&0L{wU)9QCe-m^e95?k2|UGHM{-S1#t#UCvV7!
z>sYrhw4>?%C*yhbv{_;H9B~*IW_L;{=iCRh-parFkJHw!|FP-st{T}!JOJ(C!<pK)
zA|tP6`V0tT&|5Bs`F>w0cYVvkG0+b{?_aCIIGpnOlMY#gt5qt5i(y?I7va^#(B>hF
z@bex13VT)w`at@f@CMTo1ONa4000000D#Z%15@hKeRM__*8l(j07*qoM6N<$g8z7`
Ae*gdg

delta 360
zcmey%)XY3VrQXZa#WAE}&fA-gLWdN190K2j?)X2kNL;)})cM7Vt)9XEqca1$7@4jF
zF+jm`H6<mXyIp&yy<n?xK5AQPerJ*NhmDatve%x|{n=S#e1NCq(u?UO#tY>C>ArY8
zHRjXVhHg(Y=2?Z3CoI0r2Fk~@1n0MW%6u4ip3%j={+KCW5<|m((R#ic^;2?9pV)F`
z%!}?eFE@IX?D^e3ZT43l0m1VNQ~2Uc)wd<@txKpixl*566PFV9`rG8=AM|b?wY%~{
zZ|Rk&-woRq{kpK<H2Zd4(yi&|v@B0p%$p}GAoTZZ-z%Tj(^CFyp82XdHSEF71>c;W
zvY6ic9{h6M`kR%BH(%%foz%4G*Mj^53#YFBHTSds#!EdLdB2`<ede{JHgN6g$4WN4
zSG@WX-?DhxjRf`kho1eme~|RZ{}A695f)gOfax8}tW{aBXBuzbzzE`dy85}Sb4q9e
E0M??c*8l(j

diff --git a/tests/integration/nano/snapshots/nanox/settings_expert_mode_disabled.png b/tests/integration/nano/snapshots/nanox/settings_expert_mode_disabled.png
index f19ea84c946b9137f782107733b3611e37edf663..c38eac887fcbface100aff4569cb469cc1e69d61 100644
GIT binary patch
delta 424
zcmV;Z0ayO71HuE4B!7uXL_t(|obB0Ba)clZfMK@Nn{fXlahE<gWim-XYYni=|2;Vr
z0g1#eqyzu}000000000007AUtnl7c(>zs33M-Mv2JaV+((H+D+%=pQQ5FUW4E{L47
zdtFOZ{aRQ`vGr{jWHr^79f=*DJLVJ?>92@JrBX`kRh1>`uYdKHI`y(#)~|Kc?J{O=
z%eL8zV|dok6m-0g{nR0!(|zXuyot8K*0kD?2N{=wZdf6|M~@*q1xfDmSKO5H6gLgJ
z-3^Pq4#49puI8Nn@^?SQ<(J#?z0@r4k{^<LWB99+cB1oLtJ5j{&eD9?S+lTP0Fpb^
z6Q^Lq0HoDouz#E7vd~sm{0{HKPH*6DXkTXw=ycPjvxn2)flzha0qnxvQ*$qDwbl=a
z&b_B4vzGqQU&64K-V3ssq*d*>=vTg2ZLoC%VD}7aJdRyewULm{0=Cq=SL+7gpiW>u
z@1L~Q1E9F)Wp8a}0Qv`hDrKwmBD2uN)5Ol%q&olr03iSX000000002+)_wp)C_J@d
SQhA{O0000<MNUMnLSTXlS<#jN

delta 405
zcmX@ayq<Z2N`0B9i(^Q|oVPavi&_+T8WOi%o?Y-?xp2CjMXHgf%XHI;xBge(DimzK
z*b%|SfB+mHyI$|wdaeF?)MLJqg}TqqWb9weFJM07&ty?W8^+lEidk#lz2E1$^}Td-
z_O`vg%{j~ZQk6G8+-W#{gHOF{iPqL@-}FLvy8f-dUH)=;T;BAz)zVvcpP6}k^V@GJ
zJlDN+9dCcN(335i^KORyPNCfP>g89L*?7cp&f4Hq+ux_ShsE>V+x0tCpK9evmhexX
z_IpqIfgj(><&VCde*1Gw=CtaQ>?dP*{6Bnn$obA7*!zNg`tu8|EGost4LMI9_`Q0=
zu6Jy&XnTyhMNGZ1gpOiQd_$<Tc|(BNhTA*5t={q9&dL90b>n-1w^L+-Sc&oXTk%zz
zkDl<p4qNpy?c_DzhT7D(KX0fNzp~vXqnfkw^S!mR8+vD1*yl5CuVNDUUVL_bSvu3P
w`?Et%hCOu+TR2&MGu!-QcMxF*WEs3?*E*;8K;R|c$)g|%Pgg&ebxsLQ00kYrY5)KL

diff --git a/tests/integration/nano/snapshots/nanox/settings_expert_mode_enabled.png b/tests/integration/nano/snapshots/nanox/settings_expert_mode_enabled.png
index 90dc4e8dc0c28bb0657b78cea8b3bcc348466d90..7adaf2fb335b9ef08bf1e74b46e6220bec083b50 100644
GIT binary patch
delta 412
zcmV;N0b~B91GWQ@B!7KLL_t(|obB0dl7k=&fML6{H{t$A;x7BcStdgQT1$Y!`~0$$
zFNwxVj{^Vz00000000000JwPhbsb|&#~}p2ff_pJ+;g_S-UIlZO#j95;2wY^-4G!J
z^Ej1c^;2PtQP<aDkkzuW^i1^h%sC%!k^b@MREjZ{E>&5QeSe#pq@|bTvVN+QHJ33n
zd)D3FoI_h(Q_y)m)>DT(PxG8Vxe|4UrDfG2chWBfJupLl_nw1$3X;s*KVznpR?IYL
z4%aRAc>tQ<aVh82Z-4Vq9RHa;KTFNBm3)vqo5Q;<`ti<pr9p>`J4*3nN3Ftc0XWR1
z9=HS>2H==227kMmE(>jC#^>-p^zu6HhF&V|_Q(qLkFvM=-a}SLH{6l=W>9)L&@U6_
z@tw^Eb31R8u5ZG3=>5*M4c-efcZQoc|8SILRgy!Na4xgW_okq!cSEIB^U|aNxcN`n
z0_J@Nq!?tsEYI@FR%qpSXXXD+000000000000026m=!<Io>3wC2lV0q0000<MNUMn
GLSTX@E65H2

delta 395
zcmdnSyp(x@N_~!}i(^Q|oVPavCp9bZG$fX%=O6mpKV|ou=FL88omV!hM1A`|Zw)KU
z;>Jt4%nS&ix$n~~v59qeqE7F=;8HzbyZZO!+QvNxuiRh5^OEt!FYb#`-2J~LgZIrB
z5sbgr?kH}2{gds-yWGF`EOq^5y*SX<rB5!j_E=5*?bTnR*Pnm=X>ZTUb;)Ae-psbW
z*}l^&_`*M%zTkGbbc<)@^IYyfxS0D@(LZQ<lU{{W-T8OURa}=2UBAx}d`c%#ibp?O
z?DsCqgg?L9gE#)+jNUhGR;jM-#F*EIxy0n>3Gr<<Vf|ZN$GcasAt{k3pjYC~$vc0K
zoZT_K&rG_c@ngOF-CIAFuh)F6eeJ{D-N8EyY@=rX+L}{Q^K5(Gj@cm(jKdtc{evHF
zuKyh7vcu4F@2}b6k=GO~XS94ax?SVK#bsM%>=$jSZ)?J!{(nW}f#T;4a?G1cZlC8b
nd&Kto+`;>~h!A67nDJ6PuhGnB*(a_dkg%t#p9{-6r-UW|WuCc4

diff --git a/tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00007.png b/tests/integration/nano/snapshots/nanox/test_parsing_errors/wrong_last_packet/00007.png
index 39ed6ff597a035972d1cd276b6717deb5308e2c2..13403d2ebee9c21bfd7b23d1c9bdd935beb869e7 100644
GIT binary patch
delta 480
zcmV<60U!SG0{R1xB!9t4L_t(|obB2{a>F1D1yI__O}PJ&xJwsIsVXqW9t-sGf2+ia
z4TBIiN<ttaA|fIpB6^dr)g8DXrIcU97}b%c@-@%CS9jp;AOp~!_*ftVKx>Ro{FD+(
zmV8!s;2L!wmZLm)XZB{3B?xr%16&3))!6`KlMKMMLjdyJkAE>j?7Wm60uWl8WE7|Y
zkh3289sqn31|4w)H3Krxbzi~`fCRb_VFy4x|G<qt5h=`KQzyeaXY_BkQck>g1t)Xs
zup2W+f7%E-8FWSV>QfG_dZ0e7>DL{Ty_H1>b(Rcve%m~2q{U~c&V;%LcIpghzV079
zU5f^<b9&H-ynp`RK0wVNqlR<XjoM1T9>4N~)ZG793u>pv)6LsmJh<Nv*TbueaTAum
z(iPK&e5!|cUNuw&UuIjgnm<zFmrL2v+%Grb&RMV4OojL42X--T0}KEW5v^wW*z=xe
zDyKXLz{}rK`kS))_>I3wtDWG&0<cHp1<wALuhvtS^I4Js(#YJbXSZdK47m$HSyK8j
zs6TaH2R-600GZM1T*`2MR)2Q^xK{)X)!d)(`x4#ZEh;R=(JcOdE+!%(A|fIp+TRai
W^-$f}$6z%80000<MNUMnLSTXhjNw)Q

delta 341
zcmeyx{DEnLO1-(Ki(^Q|oVPaug$@e{G(6mLdG?O~6YnhLPwUwvcrily=l<nk-bXfZ
z-ezM!fUt*q|8Gu;=e~PA)=PqQtKb&<7xQn*{*Y9D9<$V7ZP35Vmea3#HOubn+8VWP
zM_&<Z$Nbl=?K@X&oO{@bb(OZlxq~@&aX0>L<<+`S@8`JqxCYBtw}}_{8fFyF_t9sF
zJm<MN;HSqO?K4aG@9o_wFMnuiRKJ>DtLpXkis1aebv9w&7Rd-OgeLJU=#@B=Qu3v}
z?DRR?+b=t{l(*}aJzjdBKd{z6U|M+G|L^CnZ|XhKv3Y`Ywtf8S|3BXp-Yfaszt~&1
z*jU=pnz?G)P6odtQ-b;(f4+X(_mHWWk%KMu`40X~lmDJ&UGSbKPy3l&wcp}3uC1FD
jGCtmmp8XFI0tVN__x$>|JvU_aGmxOCtDnm{r-UW|OtYU1

diff --git a/tests/integration/nano/snapshots/nanox/version.png b/tests/integration/nano/snapshots/nanox/version.png
index 1d2e4606814b5ebda15d0aa979126bc3a47b78fa..e7e6e3a697e3a5e91fc913664abf31c1e3dd8d50 100644
GIT binary patch
delta 334
zcmeys^pa_UO1*)ni(^Q|oVPck`I;33S`#mosK2TA+&tZG!X!;|-O%(E|G%d=@K`oi
za56F=z#mOP!HK_q9QR)PDATr4`KZL&<sVG<vtG!yRMl28Ja%Osf0uBRmb0DX_7{zE
zT;Dd#bBOK>QkS+{J?TktRk()RQmHw{uO+{gJJd%_stV<M#CLU*Zdh&pg6(&Ve>3s)
zC~JE?HNNjFw|&9iz;EB?@4A><d5USqo?}l-x|l1o`!4O>d!%}AnAxM)cdAvccPDuM
zH|kyC`9JB(0ioR!ROcO@Ce~ekKKsQpQNJ12|C-e6e%bZK@*nqukKR87R{xn(@K;~s
zOx>w<lj=Uyv%4?ZZ~L!&QszBw1I18ndxkmU=YNZtIOf}Nzjc+nx_;r&!u8pAI1nCZ
bc=v#H&(2#v0)MR71`_pj^>bP0l+XkKi|>~E

delta 341
zcmaFK^nq!DO1-(Ki(^Q|oVPau*EK5$v?dl^p1a|{>e;w=%$hU1d7|=k+n@cP$J4bi
zU875rkpT`G^i$K)%545UUt9Ju!nUFOl;wK4L#Io)A3QJeymqGO+|s>rCgLjLZB>o=
zA7w?kzHP2zs5SMPpYtnv>Y_N|y9-~2W)+-Yk-nz>Kl>ETm+4Ox-j&SQc6Lp_)vBj)
zYxNHtu-LRLWY*7lK`~A1+$GoAA9uU?$wOqpvdc0zg11k%msXXVJ9XRL)nD}VSiOI3
zx9Xh!#a@AD<`?@msWn?JYn43Jees3QyeIqKy7Ld;oinp~x_;s>-Ma@%zA?_;Ys${@
z{n*`)9`#)wo2@nd4t`M<vVPe3X`^G7YNh^HCLfKftN0l{K3b{oDE#Nq=8I8FUi^@{
kCF8#QSTEf3K*o-{`g300J{9kF<pxOD)78&qol`;+0PPf@EC2ui

diff --git a/tests/integration/nano/test_basic.py b/tests/integration/nano/test_basic.py
index 2437dee22..08d19eba9 100755
--- a/tests/integration/nano/test_basic.py
+++ b/tests/integration/nano/test_basic.py
@@ -32,10 +32,12 @@ def test_basic(app):
     app.assert_screen(Screen.Version)
     app.backend.left_click()
     app.assert_screen(Screen.Home)
-    app.backend.left_click()
-    app.assert_screen(Screen.Home)
     app.backend.both_click()
     app.assert_screen(Screen.Home)
+    app.backend.left_click()
+    app.assert_screen(Screen.Quit)
+    app.backend.right_click()
+    app.assert_screen(Screen.Home)
     app.backend.right_click()
     app.assert_screen(Screen.Version)
     app.backend.right_click()
@@ -43,10 +45,12 @@ def test_basic(app):
     app.backend.right_click()
     app.assert_screen(Screen.Quit)
     app.backend.right_click()
-    app.assert_screen(Screen.Quit)
+    app.assert_screen(Screen.Home)
+    app.backend.right_click()
+    app.assert_screen(Screen.Version)
 
     # Check Settings menu operation
-    app.backend.left_click()
+    app.backend.right_click()
     app.assert_screen(Screen.Settings)
     app.backend.both_click()
     app.assert_screen(Screen.Settings_expert_mode_disabled)
@@ -62,7 +66,5 @@ def test_basic(app):
     app.assert_screen(Screen.Settings_back)
     app.backend.both_click()
     app.assert_screen(Screen.Home)
-    app.backend.right_click()
-    app.backend.right_click()
-    app.backend.right_click()
+    app.backend.left_click()
     app._quit()