From 35e9d25537815f1a1d21873d78eea6f9394a46c7 Mon Sep 17 00:00:00 2001
From: Lucas PASCAL <lucas.pascal@ledger.com>
Date: Wed, 26 Jun 2024 15:37:34 +0200
Subject: [PATCH] [fix] Macro correctly defined in future Stax SDK versions (>=
 1.5)

---
 src/ui_shared.c                                 |   4 ++--
 .../nanos/test_fido_screens_settings/00002.png  | Bin 318 -> 320 bytes
 .../nanos/test_u2f_screens_idle/00002.png       | Bin 318 -> 320 bytes
 .../nanosp/test_fido_screens_settings/00002.png | Bin 349 -> 352 bytes
 .../nanosp/test_u2f_screens_idle/00002.png      | Bin 349 -> 352 bytes
 .../nanox/test_fido_screens_settings/00002.png  | Bin 349 -> 352 bytes
 .../nanox/test_u2f_screens_idle/00002.png       | Bin 349 -> 352 bytes
 7 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui_shared.c b/src/ui_shared.c
index 748f1e84..5a6bd6c4 100644
--- a/src/ui_shared.c
+++ b/src/ui_shared.c
@@ -249,9 +249,9 @@ static void controls_callback(int token, uint8_t index, int page) {
  * When no NFC, warning status page
  */
 
-#ifdef TARGET_STAX
+#if defined(TARGET_STAX) && API_LEVEL <= 15
 #define C_Info_32px C_info_i_32px
-#endif  // TARGET_STAX
+#endif  // defined(TARGET_STAX) && API_LEVEL <= 15
 
 static const nbgl_pageInfoDescription_t nfc_info = {
     .centeredInfo.icon = &INFO_I_ICON,
diff --git a/tests/speculos/snapshots/nanos/test_fido_screens_settings/00002.png b/tests/speculos/snapshots/nanos/test_fido_screens_settings/00002.png
index 860165da4bcc862b93a3d146841be7716b6d696c..2d8c4166f6e58103b39fd7c2261370651d4aff68 100644
GIT binary patch
delta 293
zcmV+=0owk)0>A>0B!34<L_t(|ob8#x4#OY}L(^&f{}1kg9+*%>2{1MhNAf!{AXQ}3
z45$bpgb?CJx+GnV_K%MW!rME6zjB=38GH?}0eUTGWz!|c`ROl>YJw;m$^_k`0|5+s
zc_&~{q}0laG%8G)V?CjY${xS~@CM{1saIu3Zh0)*YSmkTV1K$701W8Rm#nf1Qr{tv
zC1_qstNuJYQSHGnpr}(da%r-5mU`4u+#1Ct+CDlM19_?b227Eu{x%v?Q~k}*15a3m
zJc;)|Jh>B{k8%Vsr2#o(OX7tnFfa~c9oEiJaZX;?cR@ptE|%ATe*^khcR_IoZa{o!
r0GXlsq@~-|&>r(AA%qY@2!Y`SRBDNDSCtsa00000NkvXXu0mjfB&2>U

delta 291
zcmV+;0o?w;0=@!}B!2}-L_t(|obB1s4uc>J1<<<8|Nmef^nrymXbW=-y-n_UA_|7w
zB2y<qL_`$kC~}mW_K%lJ;vGGKzuNZb8GH@60D3LgWRD`-{yE+nT?bKRXdUzsJrJN^
zujmOFT9i6jk((W+^|7wdjjA<(0dNP@C8<}X6SrKJZMW*Jfq!7RHvk22_>py`g3Naa
zatoS|(%OHn2T{v|QGk|C*Qi^Q^<=5fT8Ud{ab<gsPG%4<(_g?0ndvWc6E)Lcj5UbF
zT_{q%-{Hw8(fLt<0H-uiXKY36kMjFqz<3dJWO|2s0{dIg5YmU`XW;JupY<&$kK_f&
pj|HF^-CtU|Jsf$8h=_=Ykemlsi(@`+33UJf002ovPDHLkV1mW+h9Cd{

diff --git a/tests/speculos/snapshots/nanos/test_u2f_screens_idle/00002.png b/tests/speculos/snapshots/nanos/test_u2f_screens_idle/00002.png
index 860165da4bcc862b93a3d146841be7716b6d696c..2d8c4166f6e58103b39fd7c2261370651d4aff68 100644
GIT binary patch
delta 293
zcmV+=0owk)0>A>0B!34<L_t(|ob8#x4#OY}L(^&f{}1kg9+*%>2{1MhNAf!{AXQ}3
z45$bpgb?CJx+GnV_K%MW!rME6zjB=38GH?}0eUTGWz!|c`ROl>YJw;m$^_k`0|5+s
zc_&~{q}0laG%8G)V?CjY${xS~@CM{1saIu3Zh0)*YSmkTV1K$701W8Rm#nf1Qr{tv
zC1_qstNuJYQSHGnpr}(da%r-5mU`4u+#1Ct+CDlM19_?b227Eu{x%v?Q~k}*15a3m
zJc;)|Jh>B{k8%Vsr2#o(OX7tnFfa~c9oEiJaZX;?cR@ptE|%ATe*^khcR_IoZa{o!
r0GXlsq@~-|&>r(AA%qY@2!Y`SRBDNDSCtsa00000NkvXXu0mjfB&2>U

delta 291
zcmV+;0o?w;0=@!}B!2}-L_t(|obB1s4uc>J1<<<8|Nmef^nrymXbW=-y-n_UA_|7w
zB2y<qL_`$kC~}mW_K%lJ;vGGKzuNZb8GH@60D3LgWRD`-{yE+nT?bKRXdUzsJrJN^
zujmOFT9i6jk((W+^|7wdjjA<(0dNP@C8<}X6SrKJZMW*Jfq!7RHvk22_>py`g3Naa
zatoS|(%OHn2T{v|QGk|C*Qi^Q^<=5fT8Ud{ab<gsPG%4<(_g?0ndvWc6E)Lcj5UbF
zT_{q%-{Hw8(fLt<0H-uiXKY36kMjFqz<3dJWO|2s0{dIg5YmU`XW;JupY<&$kK_f&
pj|HF^-CtU|Jsf$8h=_=Ykemlsi(@`+33UJf002ovPDHLkV1mW+h9Cd{

diff --git a/tests/speculos/snapshots/nanosp/test_fido_screens_settings/00002.png b/tests/speculos/snapshots/nanosp/test_fido_screens_settings/00002.png
index 20aa4b298efadec445b5c6c7cd03a3d0d740b236..3979e06fde31d8596f184a8c2746da9bed9c6fac 100644
GIT binary patch
delta 295
zcmcc1^nhuC3Zwc&Ri*kH)A&BKW*wcvfB*+vJ3BhQyyed~?QZ|huut>(8{3w<kHj3#
zKb^Fu<H?-UA8%#od9333%2ex8-V?B4_jiVAS2apEz1*wix;L$)eOdU*gZXZ?E&sVR
zf`iU`DZjhodpqq~zm?nRy`S_O4)(3l3_Vj5?pni=+h6ph{?AMPHeLT{hUwRL%<{WD
zVfxXyUvD%%UX0Y&{^<8z$aZn!i6!;3T32}fPq}hH*k94VhQIpN<Gnk3lEoi~Ub=C$
z^Ba@Z>Pe3u?J^NteNlT>$NrYB$-xziI_0bMGeTGNK22V<p5b<eeuh%9_yZ;l2D6NR
mmoB}%xbmMe)VtCk`iHhZuf)!+-yL<PgSeiqelF{r5}E+OtB9ol

delta 292
zcmaFBbeCy@3Zu$IRi%2LXqji+AxEY#Aix3F&W?^RZ~5)B#Q5Jc)&!rsS<SKgsBXi&
z)2fkzCoQMH-g?nyLWtxm=3ia!Bo-!=zh~509r!Bca&>6euQM-%XT>dL+b{W5@SpYq
zA5UBD-W|c_xw9kfUrFeGKeeBM&3e<a5W~;0q8~-K*q*vr|9km<iETEyj4|5^P3JCC
z)bHN=<!<1k#k=Fe9?i`Ywq2ZfVoCk1))k)rQ?48k&R6uW;je!6c<;`hWbtI}%sH=I
zZa17;^<>8mz22i)@@XwXAE$39`>84OOD7|AMf20-Me7-EztG80Di(jhq`_d8@$b^5
ix4qjDUS*Itu)mVY)M5AIe%%-!khrI-pUXO@geCx-5rC=y

diff --git a/tests/speculos/snapshots/nanosp/test_u2f_screens_idle/00002.png b/tests/speculos/snapshots/nanosp/test_u2f_screens_idle/00002.png
index 20aa4b298efadec445b5c6c7cd03a3d0d740b236..3979e06fde31d8596f184a8c2746da9bed9c6fac 100644
GIT binary patch
delta 295
zcmcc1^nhuC3Zwc&Ri*kH)A&BKW*wcvfB*+vJ3BhQyyed~?QZ|huut>(8{3w<kHj3#
zKb^Fu<H?-UA8%#od9333%2ex8-V?B4_jiVAS2apEz1*wix;L$)eOdU*gZXZ?E&sVR
zf`iU`DZjhodpqq~zm?nRy`S_O4)(3l3_Vj5?pni=+h6ph{?AMPHeLT{hUwRL%<{WD
zVfxXyUvD%%UX0Y&{^<8z$aZn!i6!;3T32}fPq}hH*k94VhQIpN<Gnk3lEoi~Ub=C$
z^Ba@Z>Pe3u?J^NteNlT>$NrYB$-xziI_0bMGeTGNK22V<p5b<eeuh%9_yZ;l2D6NR
mmoB}%xbmMe)VtCk`iHhZuf)!+-yL<PgSeiqelF{r5}E+OtB9ol

delta 292
zcmaFBbeCy@3Zu$IRi%2LXqji+AxEY#Aix3F&W?^RZ~5)B#Q5Jc)&!rsS<SKgsBXi&
z)2fkzCoQMH-g?nyLWtxm=3ia!Bo-!=zh~509r!Bca&>6euQM-%XT>dL+b{W5@SpYq
zA5UBD-W|c_xw9kfUrFeGKeeBM&3e<a5W~;0q8~-K*q*vr|9km<iETEyj4|5^P3JCC
z)bHN=<!<1k#k=Fe9?i`Ywq2ZfVoCk1))k)rQ?48k&R6uW;je!6c<;`hWbtI}%sH=I
zZa17;^<>8mz22i)@@XwXAE$39`>84OOD7|AMf20-Me7-EztG80Di(jhq`_d8@$b^5
ix4qjDUS*Itu)mVY)M5AIe%%-!khrI-pUXO@geCx-5rC=y

diff --git a/tests/speculos/snapshots/nanox/test_fido_screens_settings/00002.png b/tests/speculos/snapshots/nanox/test_fido_screens_settings/00002.png
index 20aa4b298efadec445b5c6c7cd03a3d0d740b236..3979e06fde31d8596f184a8c2746da9bed9c6fac 100644
GIT binary patch
delta 295
zcmcc1^nhuC3Zwc&Ri*kH)A&BKW*wcvfB*+vJ3BhQyyed~?QZ|huut>(8{3w<kHj3#
zKb^Fu<H?-UA8%#od9333%2ex8-V?B4_jiVAS2apEz1*wix;L$)eOdU*gZXZ?E&sVR
zf`iU`DZjhodpqq~zm?nRy`S_O4)(3l3_Vj5?pni=+h6ph{?AMPHeLT{hUwRL%<{WD
zVfxXyUvD%%UX0Y&{^<8z$aZn!i6!;3T32}fPq}hH*k94VhQIpN<Gnk3lEoi~Ub=C$
z^Ba@Z>Pe3u?J^NteNlT>$NrYB$-xziI_0bMGeTGNK22V<p5b<eeuh%9_yZ;l2D6NR
mmoB}%xbmMe)VtCk`iHhZuf)!+-yL<PgSeiqelF{r5}E+OtB9ol

delta 292
zcmaFBbeCy@3Zu$IRi%2LXqji+AxEY#Aix3F&W?^RZ~5)B#Q5Jc)&!rsS<SKgsBXi&
z)2fkzCoQMH-g?nyLWtxm=3ia!Bo-!=zh~509r!Bca&>6euQM-%XT>dL+b{W5@SpYq
zA5UBD-W|c_xw9kfUrFeGKeeBM&3e<a5W~;0q8~-K*q*vr|9km<iETEyj4|5^P3JCC
z)bHN=<!<1k#k=Fe9?i`Ywq2ZfVoCk1))k)rQ?48k&R6uW;je!6c<;`hWbtI}%sH=I
zZa17;^<>8mz22i)@@XwXAE$39`>84OOD7|AMf20-Me7-EztG80Di(jhq`_d8@$b^5
ix4qjDUS*Itu)mVY)M5AIe%%-!khrI-pUXO@geCx-5rC=y

diff --git a/tests/speculos/snapshots/nanox/test_u2f_screens_idle/00002.png b/tests/speculos/snapshots/nanox/test_u2f_screens_idle/00002.png
index 20aa4b298efadec445b5c6c7cd03a3d0d740b236..3979e06fde31d8596f184a8c2746da9bed9c6fac 100644
GIT binary patch
delta 295
zcmcc1^nhuC3Zwc&Ri*kH)A&BKW*wcvfB*+vJ3BhQyyed~?QZ|huut>(8{3w<kHj3#
zKb^Fu<H?-UA8%#od9333%2ex8-V?B4_jiVAS2apEz1*wix;L$)eOdU*gZXZ?E&sVR
zf`iU`DZjhodpqq~zm?nRy`S_O4)(3l3_Vj5?pni=+h6ph{?AMPHeLT{hUwRL%<{WD
zVfxXyUvD%%UX0Y&{^<8z$aZn!i6!;3T32}fPq}hH*k94VhQIpN<Gnk3lEoi~Ub=C$
z^Ba@Z>Pe3u?J^NteNlT>$NrYB$-xziI_0bMGeTGNK22V<p5b<eeuh%9_yZ;l2D6NR
mmoB}%xbmMe)VtCk`iHhZuf)!+-yL<PgSeiqelF{r5}E+OtB9ol

delta 292
zcmaFBbeCy@3Zu$IRi%2LXqji+AxEY#Aix3F&W?^RZ~5)B#Q5Jc)&!rsS<SKgsBXi&
z)2fkzCoQMH-g?nyLWtxm=3ia!Bo-!=zh~509r!Bca&>6euQM-%XT>dL+b{W5@SpYq
zA5UBD-W|c_xw9kfUrFeGKeeBM&3e<a5W~;0q8~-K*q*vr|9km<iETEyj4|5^P3JCC
z)bHN=<!<1k#k=Fe9?i`Ywq2ZfVoCk1))k)rQ?48k&R6uW;je!6c<;`hWbtI}%sH=I
zZa17;^<>8mz22i)@@XwXAE$39`>84OOD7|AMf20-Me7-EztG80Di(jhq`_d8@$b^5
ix4qjDUS*Itu)mVY)M5AIe%%-!khrI-pUXO@geCx-5rC=y