From 8e400b0e2b3b1d86f7dfd5b00c4000877c576825 Mon Sep 17 00:00:00 2001
From: Juan Leni <lenijuan@gmail.com>
Date: Tue, 25 May 2021 12:16:58 +0200
Subject: [PATCH] fix incorrect images

---
 .gdbinit                                  |  10 ++--
 .gitignore                                |  60 +++++++++-------------
 CMakeLists.txt                            |   2 +-
 Makefile                                  |  15 ++----
 README.md                                 |   2 +
 tests_zemu/snapshots/s-mainmenu/00004.png | Bin 646 -> 658 bytes
 tests_zemu/snapshots/s-mainmenu/00006.png | Bin 769 -> 677 bytes
 tests_zemu/snapshots/s-mainmenu/00007.png | Bin 677 -> 342 bytes
 tests_zemu/snapshots/s-mainmenu/00011.png | Bin 769 -> 658 bytes
 tests_zemu/snapshots/s-mainmenu/00012.png | Bin 646 -> 708 bytes
 tests_zemu/snapshots/s-mainmenu/00013.png | Bin 708 -> 651 bytes
 tests_zemu/snapshots/x-mainmenu/00004.png | Bin 631 -> 628 bytes
 tests_zemu/snapshots/x-mainmenu/00011.png | Bin 631 -> 628 bytes
 tests_zemu/tests/standard.test.ts         |   2 +-
 14 files changed, 37 insertions(+), 54 deletions(-)

diff --git a/.gdbinit b/.gdbinit
index 8abe1fb..b45602e 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -4,8 +4,8 @@
 # set auto-load local-gdbinit on
 # add-auto-load-safe-path /
 
-set architecture arm
-handle SIGILL nostop pass noprint
-add-symbol-file app/bin/app.elf 0x40000000
-set backtrace limit 20
-b *0x40000000
+# set architecture arm
+# handle SIGILL nostop pass noprint
+# add-symbol-file app/bin/app.elf 0x40000000
+# set backtrace limit 20
+# b *0x40000000
diff --git a/.gitignore b/.gitignore
index 12aea63..f633842 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,40 +47,30 @@
 # Kernel Module Compile Results
 *.mod*
 *.cmd
-.tmp_versions/
-modules.order
-Module.symvers
-Mkfile.old
-dkms.conf
-
-\cmake-build-debug
-\.idea/
-/tmp/
-/deps/nano2-sdk/
-
-# Created by cmake
-googletest-download/
-googletest-src/
-googletest-build/
-CMakeFiles/
-CMakeCache.txt
-unittests
-*.cmake
-Testing/
-cmake-build-fuzz/
-
-# Others
-/cmake-build-debug/
-/cmake-build-fuzz/
-\.idea
-/app/bin/
-/app/debug/
-/app/obj/
 
+##########################
+
+tests_zemu/.yarn/*
+tests_zemu/!.yarn/patches
+tests_zemu/!.yarn/releases
+tests_zemu/!.yarn/plugins
+tests_zemu/!.yarn/sdks
+tests_zemu/!.yarn/versions
+tests_zemu/.pnp.*
+
+#########################
+
+.vscode
+.idea
+
+node_modules
+fuzz/corpora
+
+!build/.gitkeep
+build/*
+cmake-build-debug
+
+tests_zemu/snapshots-tmp
 tests_zemu/yarn.lock
-/tests_zemu/snapshots-tmp/
-/build
-/fuzz-*.log
-/fuzz/corpora
-/tests_tools/target/
-!/tests_tools/neon/yarn.lock
+tests_tools/target
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28f544e..78475a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ if(ENABLE_FUZZING)
         message(FATAL_ERROR "Fuzz logging enabled")
     endif()
 
-    set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=-*,bugprone-*,cert-*,clang-analyzer-*,-cert-err58-cpp,misc-*,-bugprone-suspicious-include)
+    set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=-*,bugprone-*,cert-*,clang-analyzer-*,-cert-err58-cpp,misc-*)
 
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
         # require at least clang 3.2
diff --git a/Makefile b/Makefile
index ff0ad95..652187e 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,9 @@
 
 ifeq ($(BOLOS_SDK),)
 # In this case, there is not predefined SDK and we run dockerized
+# When not using the SDK, we override and build the XL complete app
+
+SUBSTRATE_PARSER_FULL ?= 1
 include $(CURDIR)/deps/ledger-zxlib/dockerized_build.mk
 
 else
@@ -33,18 +36,6 @@ default:
 	COIN=$(COIN) $(MAKE) -C app $@
 endif
 
-build_sr25519: SUPPORT_SR25519=1       # Alternative app purpose
-build_sr25519: SUBSTRATE_PARSER_FULL=1 # Use full parser
-build_sr25519: buildS
-	cp $(CURDIR)/app/bin/app.elf $(CURDIR)/app/output/app_sr25519.elf
-	cp $(CURDIR)/app/bin/app.elf $(CURDIR)/app/bin/app_sr25519.elf
-
-build_full_parser_s: SUBSTRATE_PARSER_FULL=1
-build_full_parser_s: buildS
-
-build_full_parser_x: SUBSTRATE_PARSER_FULL=1
-build_full_parser_x: buildX
-
 tests_tools_build:
 	cd tests_tools/neon && yarn install
 
diff --git a/README.md b/README.md
index a086f91..29ebb98 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ This project contains the Edgeware app (https://edgewa.re/) for Ledger Nano S an
 - C++ unit tests
 - Zemu tests
 
+For more information: [How to build](docs/build.md)
+
 ## ATTENTION
 
 Please:
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
index f5097a00d0b6e8e9193ec95f677885c8d30b9047..79d90118787e27dd57b3891b97448724230d550c 100644
GIT binary patch
delta 633
zcmZo;oy0mpr9RTr#WAFU@$JEjMYlLaTn-v*J^OE8A*Xg_t?pXU18i?pZUk-r;eTGG
z@P_!;9^<)ReT3To3Iv?HwP^D^&qo{hx%0pD9A3wvv3^0K^E0Qz6D(_bh1a`1`|y3v
z4?d}NSv$PaOma?KFi3GbJVBDzxvh<NW+=0f3D3-n8x%jE5{vV#XXahqrdT}r3{WAD
zWQrTJ(c*_dV<e4EC>Tqb0bv^tP-N=d3R9!iZOcv8NabZkn8sxMm~bW|!n8(QUGC}!
zO{4gAi6>$vRC<BzD4+aOPi&rI^BH;dVsXioFr)XAB2Ox8o>bX&rhLnXo;IM2uh9vc
zC5>%U&t&XaS>MPe6=t*;NXjW0OJ(fnK9jMau`OJEfz6^sXOP=_fKJxGXpj=d>-?->
ze(U)x2_x;97YizKxwo6#S(|ubjnqGlnHL?HLDJU>LJvnXoq8`dVIkwp-nQ95P2neH
z{!L;7GEVH-`e8R)N*fQa|3u3_$wnqUY$<iyKh%dY8%Z0P)Oe(s07HrI{|p}96EVs_
z+aETa$+!XZkM_*vraUvtftVY}o-JjTQn#q}{3J<UajCX5%T4breYgzlCthc^nHN6@
z>(;ck%?8T&@|xrTO_bW#bLL?^_k2a?!|hV{RE?!T@nCeKW(DKS)lzQEye3652@fNU
z_%kawjeuU=8(q<MCZj@<cX8s?f{Oc{=_WOnl2REGM)E*!1HIaI<}MJ=n^Q66%yt!L
zW}t&sr(`ThRQ)W>snLEn%HqwfLy6bL_;znAxUseM@VdWDx3naFX~kJuFaUw4tDnm{
Hr-UW|r*jbC

delta 621
zcmbQl+QvFTrQX-m#WAFU@$JFryvH0O&Ig?j-ud73^Pt%~o)(R|qkfm(9$6*y|Mf(b
zvh}XEk38IMCmnfL%Aw(&doi$IWn(ojcm9`-yWWBU^BfPio#|{--27XLeO~XGckeAf
z2%F5gS}^TQ#*GOJ6HoNCDH=<)@$gC;t!7KfkT6=D==^M^uFdRvHmNXP=VwYYr=9_d
zp6FpqaXSn&#yDkyW12}05b{U@MU1UK<fMf0@@Gbv#$4HuWpS}!@|lbX(?25Y@2-B(
zG>TuBcw)|kN{_=6Bzfi4J_qaAII+#lSO2VNbYe})x=E2I6*f<*>^S4U<wHlCV)GeS
zqZ4<QHnst6+_9p*5$FJ;#X$0%lCf0A4}qB%9hiB~`#J1%2YLwTc1fU<;}<2KSR>VT
z=3TOw-D)5c=%RN!bz?4lNaS@+yZT{miW@Vp3D3;Cfrle`^Eox%n<_Xn8%gtupIjq#
zZqm)as=Pqm6DqSG?qy2>1_A%Xn}3syOn_d!7hO@mnsFwtq*UG{Nw5j_YCxUOIW)d!
zSOCMz3}}(pGoU5URslmc>&67j)xcmgkN%-E^I`$eO*K)6+f8Cro6kh@I<w8Z_+hqg
zO>0{>(4nrpz>vFOAXRoh`Jr)2#*UQ_wPs#407^`7e71}&WnI>S#P9Q4-A~?Gn)Y!1
zB*(PvTR(6B^_xh!9bT1Kez(!xq{dQG3K${groiwAMbNS~#m`-Qcf6muXYKH81BKcC
onGKt&Be{1^-?pJT6G44rpQ^~ucCAGujsXZfUHx3vIVCg!0MaKC7XSbN

diff --git a/tests_zemu/snapshots/s-mainmenu/00006.png b/tests_zemu/snapshots/s-mainmenu/00006.png
index 8a57fc94b4a05a64ae9f5f88922121841ad39da3..d389fce28dd31269425693eb884e2bdddc4e74a2 100644
GIT binary patch
delta 653
zcmZo<Tgo~?r9Q{g#WAFU@$JFDJf%nxmxGg4i~e(;>z64ptt#T(k-MRqXPMHG{Z(q6
zhqD9ETU?GjuToec%XBI-y5yR%r%c@8W74*dKLoK%alc@YQYO`Q=Hc(T6(vUP`=1|K
zoGoGGeYo#T#*K-RyeBSfIMLH4J9BBGdzuN)%=GOabEMjMj84?|v?(^9$%v4eP&u6k
zsC<HBn#mtC^?9C$LwUUq#{$&=Db|_yA01gMwa?|*`bj%GK_Y!;^0yW8OQ!rQHwr&l
z)5&AheMa8&!UyR&JKUL#fEKMzaXY-+RL4j>C1XM2M8`HZDY2RSrf*L0NJ?cyq|`|>
zJ{9A&Hd>tMUY}<2=7fyg@nhkpJTqO>Ol0J4AFGzKTbp=7hqqn+N<rx1XzA-F3eG^&
zcxE1Ep0F@+IpfUjX8%?*&Qx?h9Gk*t@6*<HvEfX8?w+d+XZm<}<tIt<0zG(`fAT`c
znb|B;qD^8ZNP_K}_;Yca;%AUO`k4_a_pWYG{>))kzt1bpBql?`X#S-QCN_K86pf|U
zWl4a%;9l^^+GNjaM#+?n9nrubxVS-i^JO45(E*1lD<}*_jZA7*Japz2m(n{CGr^G!
zsK|szGG)Tei93PO0kn7j#m?%Jca}U128Ktw)P#i(SGCPH)#06g$slFk+0N<{J@sw*
z*9#_ttligprd?{@&11Gw89&T;yFrn$JLR9pvoxdfi8nJBJiN%MVGj(JH$V%3w)M1e
zgPg&`>)h6+xEUCRF&R4)jDhhFjO|Jmrc=g1FSWnlTv(AQ-9BAyflS=BV-J_+%EaBW
Z&-D<qo4!$2nE?nqUD^Cx);T3K0RS9|8?FEV

literal 769
zcmYLHe@IhN7@ZA<%C3;+bkADOQX|vF^DPzEnr&`w<~G7jtwD|+bN(oYLYf5mBcE6n
zPto9kk+NWfQo;f!m?1CfSyP-gjF4glgZ`+D3bqjK(}MoE_nv$1<@@eA=k}Y8Iuwt^
z^LRX@FVmcbwG&2qtN`YB8LmtoZx5%}lvK9Ie3=hi{usMYGrwy6y?x4eup<zBb@Qbv
zmOg{~44aR$hYDv!ziuSm`>9FnTa%8BJ}J#UIruyzKQ_CXlprfrMdPq5<Xk07M@2~O
z@YuO)p5FUf0TXaV&NXjlp){NjG8UE=14@xkl2%lVPf!S`Ma=r|Y~0SRUkpt<Q*mxU
zKx$b4ZabHrk1aLqAl*(`*lAgMrr%HbovBD27Qc@m%!&#ctL3(!%gV>=<V{2qp?DC(
zOpucAFY4q9O<0Pz4Mtn=G-Q&h*{W(^pAi3`4IgC!$4Sb+NG=V{lnIzyq$I-&j1>{<
zjUfqA?@)AfSb$M}gM(OBu@$72j|ki0d|-_19lvv|iyHAeeR{Sn(X4da)efSG8vs!k
z9@@FhWOyATk_4e5?hb8ub8RawFD3Oh6e{$fpoXnM-{Ov3Z%|PJ@&uMQR3jhFY>i|g
zZW5!fHit}z6N<5~8Lg4mBq-%J>qAfBBI%6K(AduH-@?ThU8GY*2dD!~U`m<~J{F^t
z1w|=@&;rdp=i7(<&bRfcc-2CBj}Xsc*tL#NVl1ygB@koEH!dq{a0EMrC<jugfn417
zOf^s*5E7gkiuQ{nU{@cetZ;w`Evw~2eYHa;5W|KpD&LKx2ZAt7yJU>1K4NBR5D|1)
zSPLSSrw;w~=~-<^0tVD$a}_LI5+2E2cXv@TsaM*1*Kfhw8h4@%s`&VJcY(4z{29Vb
z!#QvpLKY%06rd5F$L%6RxL~h2LDm@BSP>=2F8yD&_&;prMDOk7aroLieW_9N=yYxO
EAE6{dTmS$7

diff --git a/tests_zemu/snapshots/s-mainmenu/00007.png b/tests_zemu/snapshots/s-mainmenu/00007.png
index d389fce28dd31269425693eb884e2bdddc4e74a2..1f707f9f5db639635153a307684f4c0294a1001c 100644
GIT binary patch
delta 316
zcmZ3=dW~s<ay_H0r;B4q1>@U;7xQih@VFe@-176k{F(ONf<TV4RCQm5rEMo9Ken4s
zlGuAf+U!<^a_7Z%hRqv$&F*<5eG$0xvF&0PgYhjcx9o!%x)N(y7jI42BGz*)Z;!Be
z_ayn^!Ua#}?}(UEqIh5rvpD~hn%Uj1C(j*S^yGGoj@LS^3U<AEzL+_OSoOrjcih-{
z;OL{I=S<?^B6}V^3g1z2@@W0yl;td{;UYGVnN)XJOzqa+De;{1-!mrFZlRc-*Ie&*
zI-Fz%O0)`1*|UU2^|8%CTUCF}pQ2s?pOU?RCLRD<bb!^%ZfQzkW4HFMLQ}6YJ-#V6
z0h@x07CbrCq#e9zhlJ^QPJ_j3!ESE47-bN}jph+M2K_~;vc<O^{$v0GPgg&ebxsLQ
E0R3%@%m4rY

delta 654
zcmcb{w3Ky%ay?Uyr;B4q1>@U;fq6=iA}$9fs}}v|KG!c(Vp>(iyCZi)HP14oBm1k=
zIuB<Dp0~Ihd0wTkLYC=NWOT_jV^5j5!^fm;AAbm9nc{xIAf-&I?aag9b1O=W+V?*{
zvN&79$op{LnT#6~C3#O=*l?n!O?KweME5iko|);}Kjuia@fg(u1r?jmWJE|!sGQCN
zR6fBm&E$`n`aI9Wp}gLQV}WXb6zk0UkB+RB+UN3Y{iL0pAd$W^`P&NlB~$*D8-<^&
z>Eto$J|k~>;e+&?9q!CVKr>gTxE)?@s$(RclCdChqGKDIl-Nvu(>Eu0B&9MUQtG4`
zpNjEX8!b+(2fF6X2^qQL$HGl{X1b=C$jIG3RxM?>Ht~cGZ@c`Jg3!a!($`HCoPnnC
z%sk9IVPWEO#+lpA{;g)5spxz-HiggLr>*T`!<qWrJy#pf^zrb@Pm<&Xdhjs+<b{kg
zvstD@o5W0z1lu+7=i)ZS&mepBGb2*&UEQGknWNrppI4emOooKf{7V~5Z1%J%8cVIq
zk^p(Zz2K3x$)44Wk|`NGqJcqhaf9;a%Rp?R0}fSIP#B6DnbfR!=*%lFrFSA`f+HJH
zkqM7v%7mK}cLJjWXz%`uoz*ArEO{6V43BoH2@4;tYMX7U!#n?yLCU<doz*Amd)o4^
z7fc3OyRY|5yVSg!$84oCewguggCb*h%0G{1X-4G}Z)Prdc#%`X9vCcdfEEC4>uKW#
zIfIASxvfocGcXKeGIl5!1LGeU+m$R#r;LGKYJb1Eup(2seY)BLnYe4m9xlz5iMwT=
Y>mg=0eWR>00}yz!yZX7Tb4q9e0PtEI0RR91

diff --git a/tests_zemu/snapshots/s-mainmenu/00011.png b/tests_zemu/snapshots/s-mainmenu/00011.png
index 8a57fc94b4a05a64ae9f5f88922121841ad39da3..79d90118787e27dd57b3891b97448724230d550c 100644
GIT binary patch
delta 633
zcmZo<o5VUnr9RTr#WAFU@$JEjMYlLaTn-v*J^OE8A*Xg_t?pXU18i?pZUk-r;eTGG
z@P_!;9^<)ReT3To3Iv?HwP^D^&qo{hx%0pD9A3wvv3^0K^E0Qz6D(_bh1a`1`|y3v
z4?d}NSv$PaOma?KFi3GbJVBDzxvh<NW+=0f3D3-n8x%jE5{vV#XXahqrdT}r3{WAD
zWQrTJ(c*_dV<e4EC>Tqb0bv^tP-N=d3R9!iZOcv8NabZkn8sxMm~bW|!n8(QUGC}!
zO{4gAi6>$vRC<BzD4+aOPi&rI^BH;dVsXioFr)XAB2Ox8o>bX&rhLnXo;IM2uh9vc
zC5>%U&t&XaS>MPe6=t*;NXjW0OJ(fnK9jMau`OJEfz6^sXOP=_fKJxGXpj=d>-?->
ze(U)x2_x;97YizKxwo6#S(|ubjnqGlnHL?HLDJU>LJvnXoq8`dVIkwp-nQ95P2neH
z{!L;7GEVH-`e8R)N*fQa|3u3_$wnqUY$<iyKh%dY8%Z0P)Oe(s07HrI{|p}96EVs_
z+aETa$+!XZkM_*vraUvtftVY}o-JjTQn#q}{3J<UajCX5%T4breYgzlCthc^nHN6@
z>(;ck%?8T&@|xrTO_bW#bLL?^_k2a?!|hV{RE?!T@nCeKW(DKS)lzQEye3652@fNU
z_%kawjeuU=8(q<MCZj@<cX8s?f{Oc{=_WOnl2REGM)E*!1HIaI<}MJ=n^Q66%yt!L
zW}t&sr(`ThRQ)W>snLEn%HqwfLy6bL_;znAxUseM@VdWDx3naFX~kJuFaUw4tDnm{
Hr-UW|osJOP

literal 769
zcmYLHe@IhN7@ZA<%C3;+bkADOQX|vF^DPzEnr&`w<~G7jtwD|+bN(oYLYf5mBcE6n
zPto9kk+NWfQo;f!m?1CfSyP-gjF4glgZ`+D3bqjK(}MoE_nv$1<@@eA=k}Y8Iuwt^
z^LRX@FVmcbwG&2qtN`YB8LmtoZx5%}lvK9Ie3=hi{usMYGrwy6y?x4eup<zBb@Qbv
zmOg{~44aR$hYDv!ziuSm`>9FnTa%8BJ}J#UIruyzKQ_CXlprfrMdPq5<Xk07M@2~O
z@YuO)p5FUf0TXaV&NXjlp){NjG8UE=14@xkl2%lVPf!S`Ma=r|Y~0SRUkpt<Q*mxU
zKx$b4ZabHrk1aLqAl*(`*lAgMrr%HbovBD27Qc@m%!&#ctL3(!%gV>=<V{2qp?DC(
zOpucAFY4q9O<0Pz4Mtn=G-Q&h*{W(^pAi3`4IgC!$4Sb+NG=V{lnIzyq$I-&j1>{<
zjUfqA?@)AfSb$M}gM(OBu@$72j|ki0d|-_19lvv|iyHAeeR{Sn(X4da)efSG8vs!k
z9@@FhWOyATk_4e5?hb8ub8RawFD3Oh6e{$fpoXnM-{Ov3Z%|PJ@&uMQR3jhFY>i|g
zZW5!fHit}z6N<5~8Lg4mBq-%J>qAfBBI%6K(AduH-@?ThU8GY*2dD!~U`m<~J{F^t
z1w|=@&;rdp=i7(<&bRfcc-2CBj}Xsc*tL#NVl1ygB@koEH!dq{a0EMrC<jugfn417
zOf^s*5E7gkiuQ{nU{@cetZ;w`Evw~2eYHa;5W|KpD&LKx2ZAt7yJU>1K4NBR5D|1)
zSPLSSrw;w~=~-<^0tVD$a}_LI5+2E2cXv@TsaM*1*Kfhw8h4@%s`&VJcY(4z{29Vb
z!#QvpLKY%06rd5F$L%6RxL~h2LDm@BSP>=2F8yD&_&;prMDOk7aroLieW_9N=yYxO
EAE6{dTmS$7

diff --git a/tests_zemu/snapshots/s-mainmenu/00012.png b/tests_zemu/snapshots/s-mainmenu/00012.png
index f5097a00d0b6e8e9193ec95f677885c8d30b9047..27a6e3361436131c5767e0823740af7ec4bb92b5 100644
GIT binary patch
delta 684
zcmZo;J;FLcrM}zK#WAFU@$JFryvH0O&Ig?j-ud73^Pr&~o70uLt#4KQj;|8>|9YZI
z*?U*pM;`9Bla9Qr<<M}?y%^Z9vay<<TmDPO-Dtspx~4YXnel5APwctWIN$A=s#Mz<
zYs(LlP1mGkM4Y@(;FNZCgQBt2goO`X4o|q5;n3Em=zQ1<C|Ez~X2y;ciOy*zJTuR4
z`*7Lhf<el;NjE20UNlIVAj!MBZR!~>wwaryfb0`<G9-)^Ctfv3@iXC(OmRCLZvEl%
ziJTJ`91c&|xhiq-L#3JiR|~=phXQp88^u38uvcoH(&x1)|1^#6XFe1(I#JWz26V%^
zNsiA{fp$1PQ<}M2sy^cf7k59<;1e+_&1YhzG9-A@O><1<0PQomP%!mO#)5~5Kub@o
z0ouno^P&SY?|nyyo$iO*&ScyGs*yIDzbx^@8@bIN*0d>Zo+Qb;dw%Z2Np1VD8Ki{q
z?iSCoSp9HuYca^*>rHuP<|{X!dB-CuWhOP@XU0Q+-V;2M^-^+5o2v~arQDc}>Z5+F
zV4TS-DU}B_2pArByH8$dIAh6l%2vwnL=P~0FK(E$b7dlssrY$An_}^z#1nUxCZ71S
zT5O)Gu@o>+W-dRWu=#flyPfl4SKbo}&cL8Z2U>d(6!d1mP+OCtmvv)8r0E|q?(;w=
zEo+-CRo`|dezIelYBP_~;)g9~e0iPOW?nP^#$JBGgFvJ5%pEHpD)Itj=gv~bnZ0eH
zhuse67e5dLs#OI>EHHN64qr|&ld7BD>TYu3LuSf5wdOOyDSp7f{Crzx$MiGPCoF6P
z+G3XC#>^XTdPl{XnOA$JB9PqQ*s!TOntQkE_H7%gv$=P}sBiM^{#piiFC=L&0D-5g
KpUXO@geCy~a5bC&

delta 621
zcmX@Y+QvFTrQX-m#WAFU@$JFryvH0O&Ig?j-ud73^Pt%~o)(R|qkfm(9$6*y|Mf(b
zvh}XEk38IMCmnfL%Aw(&doi$IWn(ojcm9`-yWWBU^BfPio#|{--27XLeO~XGckeAf
z2%F5gS}^TQ#*GOJ6HoNCDH=<)@$gC;t!7KfkT6=D==^M^uFdRvHmNXP=VwYYr=9_d
zp6FpqaXSn&#yDkyW12}05b{U@MU1UK<fMf0@@Gbv#$4HuWpS}!@|lbX(?25Y@2-B(
zG>TuBcw)|kN{_=6Bzfi4J_qaAII+#lSO2VNbYe})x=E2I6*f<*>^S4U<wHlCV)GeS
zqZ4<QHnst6+_9p*5$FJ;#X$0%lCf0A4}qB%9hiB~`#J1%2YLwTc1fU<;}<2KSR>VT
z=3TOw-D)5c=%RN!bz?4lNaS@+yZT{miW@Vp3D3;Cfrle`^Eox%n<_Xn8%gtupIjq#
zZqm)as=Pqm6DqSG?qy2>1_A%Xn}3syOn_d!7hO@mnsFwtq*UG{Nw5j_YCxUOIW)d!
zSOCMz3}}(pGoU5URslmc>&67j)xcmgkN%-E^I`$eO*K)6+f8Cro6kh@I<w8Z_+hqg
zO>0{>(4nrpz>vFOAXRoh`Jr)2#*UQ_wPs#407^`7e71}&WnI>S#P9Q4-A~?Gn)Y!1
zB*(PvTR(6B^_xh!9bT1Kez(!xq{dQG3K${groiwAMbNS~#m`-Qcf6muXYKH81BKcC
onGKt&Be{1^-?pJT6G44rpQ^~ucCAGujsXZfUHx3vIVCg!084-pNdN!<

diff --git a/tests_zemu/snapshots/s-mainmenu/00013.png b/tests_zemu/snapshots/s-mainmenu/00013.png
index 27a6e3361436131c5767e0823740af7ec4bb92b5..f9903bac9b7e90968b2a92513cd68f64eea96fd2 100644
GIT binary patch
delta 626
zcmX@Y+RZvar9Q~h#WAFU@$JFDyvJc8E(b5SRR8CG*WXtlY{R2md2CW@KhGwwKg-1@
zS;%%*9c<OBQtZ53$e|&gd(l;2rO>LaH~vf0<%Jv?>lY-tKl3^~!P54)^m?~vUuy6D
z;FQYC+TodI^5(<^gA}*J6C`<^+uCGjE@hOIYCDs0V`62h^!oZ`jcrR4Pweqdn+TL<
zn|ZO}Ova8&1}SYkMkjjO<^rK&^O=l_)cieCGnYP8<n=zhTWVUHHgCO(F_51BsJGg*
zrt8dQQ=XaHM*Nu)MvEUFPO0nabw8o-`Du!s3)@WBXWLW6BvZs@wx9UpBHf=MVFa{{
zZRT#13mbqIl-HYHa5$`FES0g~p`Ov=#x{PSGfXagc*QcM8tCpGpmQ&7Q2s2!>zoEO
ze0l%PA8XnaHv`2lXWy=912Ro&G-qCPVCHpxR&uc*`0#p=KA>kZcX&Sg;wv>FQfk7_
ztH;78TK-KnGU;JU`IrAVGQ|y~{LA!{7aGp!)-#>5m0Ab2=)|2XK+8%%vg>=#Pm<&f
z2L@F8NuX`ls~<~B-MiYrV`Ng}b+``{dN(sc;WVvHu~<ZUzM}JCdDEJx!xJ3SOn4+y
zfI;njc*0GfUlu2xkU1&cKWV4;;dT?AnM)Iax`6I{`Q1!T(O7DpUv`?w9hGKaU<0FQ
z!p`n97jtbEHMZp|e-@Yt3Ql+B1$&y>fGXS0T-u;)40NduueFi)VWnadrc)Dvp{{((
sLiW}%5NokefM5I8LaQykmlytJ{`8R3Zno52YX%_jboFyt=akR{01C1lJOBUy

delta 684
zcmeBXJ;FLcrM}zK#WAFU@$JFryvH0O&Ig?j-ud73^Pr&~o70uLt#4KQj;|8>|9YZI
z*?U*pM;`9Bla9Qr<<M}?y%^Z9vay<<TmDPO-Dtspx~4YXnel5APwctWIN$A=s#Mz<
zYs(LlP1mGkM4Y@(;FNZCgQBt2goO`X4o|q5;n3Em=zQ1<C|Ez~X2y;ciOy*zJTuR4
z`*7Lhf<el;NjE20UNlIVAj!MBZR!~>wwaryfb0`<G9-)^Ctfv3@iXC(OmRCLZvEl%
ziJTJ`91c&|xhiq-L#3JiR|~=phXQp88^u38uvcoH(&x1)|1^#6XFe1(I#JWz26V%^
zNsiA{fp$1PQ<}M2sy^cf7k59<;1e+_&1YhzG9-A@O><1<0PQomP%!mO#)5~5Kub@o
z0ouno^P&SY?|nyyo$iO*&ScyGs*yIDzbx^@8@bIN*0d>Zo+Qb;dw%Z2Np1VD8Ki{q
z?iSCoSp9HuYca^*>rHuP<|{X!dB-CuWhOP@XU0Q+-V;2M^-^+5o2v~arQDc}>Z5+F
zV4TS-DU}B_2pArByH8$dIAh6l%2vwnL=P~0FK(E$b7dlssrY$An_}^z#1nUxCZ71S
zT5O)Gu@o>+W-dRWu=#flyPfl4SKbo}&cL8Z2U>d(6!d1mP+OCtmvv)8r0E|q?(;w=
zEo+-CRo`|dezIelYBP_~;)g9~e0iPOW?nP^#$JBGgFvJ5%pEHpD)Itj=gv~bnZ0eH
zhuse67e5dLs#OI>EHHN64qr|&ld7BD>TYu3LuSf5wdOOyDSp7f{Crzx$MiGPCoF6P
z+G3XC#>^XTdPl{XnOA$JB9PqQ*s!TOntQkE_H7%gv$=P}sBiM^{#piiFC=L&0D-5g
KpUXO@geCwB+clv8

diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index 207f14031bc272cf78fbb495e86bb929815e92b3..05b5e01027427c77cf6c9a92c812083b2ee9e981 100644
GIT binary patch
literal 628
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|_QLba4!+V0?R!F-zK$f#Kji
zNBfum?N{F4bg>{(;Mh6Kw#O=GLuCJy-IG0jaND%Udmg{rVg0`EaYFQQ#yNN9K0jGl
z4wh*<*!;OKSChS9lWz6~-CR=8+hfA3Dwcc-Ji27l-#fkP%QpSpp0{U4*ZGhdw^X1+
zkl{)n(aEPm3|EHO1nmr25#pm2d{lXAx^YF4sOa=A&!^g2;!{^91qII33R%|GucbEC
z)72HIG34V4u;9G2Kr@S0{^;!TJ{qp2Cn_KMM|$eYM?oLY<n5UW)UG^r{)!nuo$rGx
z)0)K>ev;J!nr9!lbH$37kUFQQp*(hhA9=L2^nkX8Yk_H3*Q56XW@>5eb532gV#N>p
z(3)oqesUoz_DljA2Xt=E{}ln1CKUk-H|<rQ+U3q(P!zuK(<-3D-kt|Kk=f$sTBp?N
zcu}qC2brgKy|oQpVPn-WIXAM|JS6aAEYN)+AvH@EJ(_yA!dO&G^nT#Sz}8dqLss~R
zYOT-s(4=LzYDUPu)lR9Y&EiXf3RedFlor*BU%6sMMSAnwU@fipc^ejVtz49}D&k_V
z_)?&2{_sw97uC|1(pmIqcZil&h@PnU)Gn^6;iU}fw>PofzC<>vV_d)2T9QdSF9w*J
O7(8A5T-G@yGywp1lN+S~

literal 631
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|_QIba4!+V0?S9F<04~f#IO7
z)7+f@s=2yd9e)_vkN^9@%QDgBoXnr1dW*j1T;1b;8`~d0{8u2ue%p%g!MVeK>z-Ha
zu$MW0a9i8KqkkK7HQ5W&qpu}I-y#Y1s)rOV{S<g~$)>+|dexV0`nx@E&y23~AvJEP
zt9AsfoDs6D%QJP=j1aALA%3D-qLWX7l;^PduUYgc#BgPe>(eDhp*~t#!L6r4J_1cK
zTDf9{k7zg$PVNGV<mA~HP7OZlA2LU4Ur^zyA1fZ+2TCvRN-ukSHpE9ue&rt*pq|j0
z>8FgP_i#*o9}sA{@=xC>PoS}%gtgWuedz2;4+ty_nhDe%2&T2P{<WM63H&Il73}JI
z^#967#_R>p7dbth3N&sx(5b(pTTfkmu*fO3+FwgF94NQY>1im?g}2{_uJ8eJr*lnx
zTN}D!4x6}^=<VuN0XwZ4tZ#41+q1CC^QpBK(2wC-^MSsOyV`3WyfEmatmyo}pL4mU
zu5@}T${QDO)EyWC<)JIq<a}rf(E<iYJ<w`xQBl$NZ;pNA2RfkKEF$1&NT6Zpnit2q
zLBR)fZD{MMt~?!}LTfEQt>s)(J(ng0RfdukTgXux?;ombdAM_jJ}^Nsc)I$ztaD0e
F0szlqB_{v?

diff --git a/tests_zemu/snapshots/x-mainmenu/00011.png b/tests_zemu/snapshots/x-mainmenu/00011.png
index 207f14031bc272cf78fbb495e86bb929815e92b3..05b5e01027427c77cf6c9a92c812083b2ee9e981 100644
GIT binary patch
literal 628
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|_QLba4!+V0?R!F-zK$f#Kji
zNBfum?N{F4bg>{(;Mh6Kw#O=GLuCJy-IG0jaND%Udmg{rVg0`EaYFQQ#yNN9K0jGl
z4wh*<*!;OKSChS9lWz6~-CR=8+hfA3Dwcc-Ji27l-#fkP%QpSpp0{U4*ZGhdw^X1+
zkl{)n(aEPm3|EHO1nmr25#pm2d{lXAx^YF4sOa=A&!^g2;!{^91qII33R%|GucbEC
z)72HIG34V4u;9G2Kr@S0{^;!TJ{qp2Cn_KMM|$eYM?oLY<n5UW)UG^r{)!nuo$rGx
z)0)K>ev;J!nr9!lbH$37kUFQQp*(hhA9=L2^nkX8Yk_H3*Q56XW@>5eb532gV#N>p
z(3)oqesUoz_DljA2Xt=E{}ln1CKUk-H|<rQ+U3q(P!zuK(<-3D-kt|Kk=f$sTBp?N
zcu}qC2brgKy|oQpVPn-WIXAM|JS6aAEYN)+AvH@EJ(_yA!dO&G^nT#Sz}8dqLss~R
zYOT-s(4=LzYDUPu)lR9Y&EiXf3RedFlor*BU%6sMMSAnwU@fipc^ejVtz49}D&k_V
z_)?&2{_sw97uC|1(pmIqcZil&h@PnU)Gn^6;iU}fw>PofzC<>vV_d)2T9QdSF9w*J
O7(8A5T-G@yGywp1lN+S~

literal 631
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|_QIba4!+V0?S9F<04~f#IO7
z)7+f@s=2yd9e)_vkN^9@%QDgBoXnr1dW*j1T;1b;8`~d0{8u2ue%p%g!MVeK>z-Ha
zu$MW0a9i8KqkkK7HQ5W&qpu}I-y#Y1s)rOV{S<g~$)>+|dexV0`nx@E&y23~AvJEP
zt9AsfoDs6D%QJP=j1aALA%3D-qLWX7l;^PduUYgc#BgPe>(eDhp*~t#!L6r4J_1cK
zTDf9{k7zg$PVNGV<mA~HP7OZlA2LU4Ur^zyA1fZ+2TCvRN-ukSHpE9ue&rt*pq|j0
z>8FgP_i#*o9}sA{@=xC>PoS}%gtgWuedz2;4+ty_nhDe%2&T2P{<WM63H&Il73}JI
z^#967#_R>p7dbth3N&sx(5b(pTTfkmu*fO3+FwgF94NQY>1im?g}2{_uJ8eJr*lnx
zTN}D!4x6}^=<VuN0XwZ4tZ#41+q1CC^QpBK(2wC-^MSsOyV`3WyfEmatmyo}pL4mU
zu5@}T${QDO)EyWC<)JIq<a}rf(E<iYJ<w`xQBl$NZ;pNA2RfkKEF$1&NT6Zpnit2q
zLBR)fZD{MMt~?!}LTfEQt>s)(J(ng0RfdukTgXux?;ombdAM_jJ}^Nsc)I$ztaD0e
F0szlqB_{v?

diff --git a/tests_zemu/tests/standard.test.ts b/tests_zemu/tests/standard.test.ts
index f2f02a4..3ad13be 100644
--- a/tests_zemu/tests/standard.test.ts
+++ b/tests_zemu/tests/standard.test.ts
@@ -15,8 +15,8 @@
  ******************************************************************************* */
 
 import Zemu, { DEFAULT_START_OPTIONS } from '@zondax/zemu'
-import { newEdgewareApp } from '@zondax/ledger-polkadot'
 import { APP_SEED, models } from './common'
+import { newEdgewareApp } from '@zondax/ledger-polkadot'
 
 // @ts-ignore
 import ed25519 from 'ed25519-supercop'