From 18083286ba11ce6047ab25b8c6ae9a11a8da98d2 Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Thu, 8 Dec 2022 14:39:58 +0100 Subject: [PATCH 1/2] Fix stax icons for Ropsten & Goerli --- icons/stax_app_goerli.gif | Bin 1035 -> 313 bytes icons/stax_app_goerli_64px.gif | Bin 0 -> 1035 bytes icons/stax_app_ropsten.gif | Bin 1049 -> 305 bytes icons/stax_app_ropsten_64px.gif | Bin 0 -> 1049 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/stax_app_goerli_64px.gif create mode 100644 icons/stax_app_ropsten_64px.gif diff --git a/icons/stax_app_goerli.gif b/icons/stax_app_goerli.gif index b80118f18dde57c8ce43fd496542078a26b80772..762c3bbe26f95610ac4c5480ae003ae564c9ee06 100644 GIT binary patch literal 313 zcmZ?wbhEHbRA5kG_{;zT%*@QZyu4y!V!FDz@$vBu4GpVTufBcz_OoZtzI^%e|Nnom zDk!1&lLgFD{Lk%~o0y*Jo0y)NoXwY>n46nuYoKRh3W5weAT=Nx7+6jeoLqWAQ-$Tg z?&mIr3c;STM=s>Xb8|2kYNQ2ms*j?8W`I8b&kc);DshRP@VN3oY5G%bc6x9q66vC8aoJn~c)Z v!wl7&dyXsEd7RNN>^t7$Z@!JuwpYXAkRIb*qcT-4F7eY5itL<^1sSXX2 zxx|Q|)^szo@JFSYuG-2-k#JgBB$Bx8irR;{&b?QpAD$ogKIfe0JnuQ@edT-i#Kq=G zK?)@RTLF#1SMcw2I>9HM&~ZIy9#N%b80jh05<0i1z+B%d0Pq{eGH@df2~`@(Wx>VQ z&!h72P#?ONMJD_bo0QlDN%x08cvcfzygalT2_HP~$b+1~6RCMK)>tH{Qfq2Bm)Mdy zvaDmRtV4uZj!bN4kg>=~;zpnQT3i@~A|8_FRLz=Nr^t2_o*+ zS&+{a61#@4u0uCM*v8;X@Azu-(n1SnQK2a%1b~M+tSNC7X#6q?X;dCE;OX-%2*AaK zRpb%JwDH(>bg|s1uyV5?_JVE1p+aULK)`3Z(%LPa3~tbsw2wYjjEuk3 z3B&Wc^44wd+ZSg)-d+4RtY*{Uj-#(jtD@VsW;*iQsl;p_@13eI7AoU<|Kd2 zxx|Q|)^szo@JFSYuG-2-k#JgBB$Bx8irR;{&b?QpAD$ogKIfe0JnuQ@edT-i#Kq=G zK?)@RTLF#1SMcw2I>9HM&~ZIy9#N%b80jh05<0i1z+B%d0Pq{eGH@df2~`@(Wx>VQ z&!h72P#?ONMJD_bo0QlDN%x08cvcfzygalT2_HP~$b+1~6RCMK)>tH{Qfq2Bm)Mdy zvaDmRtV4uZj!bN4kg>=~;zpnQT3i@~A|8_FRLz=Nr^t2_o*+ zS&+{a61#@4u0uCM*v8;X@Azu-(n1SnQK2a%1b~M+tSNC7X#6q?X;dCE;OX-%2*AaK zRpb%JwDH(>bg|s1uyV5?_JVE1p+aULK)`3Z(%LPa3~tbsw2wYjjEuk3 z3B&Wc^44wd+ZSg)-d+4RtY*{Uj-#(jtD@VsW;*iQsl;p_@13eI7AoU<|KdWtYugSLHdP$9O}INZ*us}9rl7WttE`%tmBUep!=y1=LD7&+ zBDK1RwL@Y?wKP+$W@qbM8GSXaB}=Bu$4Auai7H1j& literal 1049 zcmZuvdq`7p6#m^sb7`rwwEZlHH9@m{q?VSixm?qXu*ZrX(0ZAr=`by0mNtim7>U^o zU4twl%Bh=5G|VzHCu#|^f*#t7z(-E6>7>Wjx%Y+?^!sPu`ObH~oyV0VZj1;&AVflR z8lhDP9)*kH*KW5X=VVMqw52y|bI$CFfcc&rwW=OUK7 zhof?L|C4I2M!)9}U~Ca$3n%W*3$v37TcRY(R6v@YZc4oDh~O%SvA5wM$WACKVnS?* zXT&1IJduG5Sw@U4=@Pz&gwF>VlDSTs@)&*CTpjJ85{cZXl%o>-p(|`@aB%7d|5*~S z@oq2ZnL<2X!B&(&=;vBT;j_=#iXNM_8nWP^7JI``;6pz-tO6eUj22`Jb)IXYfXtN+ zef}#hQ_JWq`d19xtTUqefo@5SL*G4wIDl=|MrxnrDBzK*PP^TP$7k4?#~9`8IR3%3 z55c8dMf6>IV0;*}v{MK<<}vsBQ#i^-Kw~DA204$Nz;lrRPh^AA6CvJvM0g`dgtUq^urWL($5VZex0Px0 zSL5l@$I>gbRT9ii+0xgfnqg5>OuwseSSg3WsSgqPOooJj7?V7>Cas~`fd2vv*VIdc znNBeI6FyN0F&U4?u3}RDtZ6S@SkS&R2*h|Y3V=4Z4M>WgjEc?4!sJbBZ6YQ&4=VC7 z+0^x2zTGR%Z$T9%A8~AG4rggXgLfR_EcD-Jl3#Btb`?0MC+KU$Dz{LN7L)#l=%QP6 z$)b5#pG=qeNo--4L10n`2c?uIHXeLZ6|qFr(-r!mT`MGb^Iw~NwrU+NEqA}Y$j^K$ zsW2wMSU%jZ*_Gxj9`5(sp^kj0{Iz2Gu*u+)S(CHwq^_ep<3wv|ck&UbG3M*Xj#O*l zyVi4`SOeXQ13$DJb;;jxcV>8JtI9X<)KzK2XJe(nH((#GKhPn1qx|wSH*Bcq)`rS0 zI?v{pb=M9(ExM1>WSYifgDKZ4!^N*!(tcz-c=PS}%fp4f68_re)V`BT@&_Vkf@JSE Q)d$7iiC*73LJ%nOH%X#taR2}S diff --git a/icons/stax_app_ropsten_64px.gif b/icons/stax_app_ropsten_64px.gif new file mode 100644 index 0000000000000000000000000000000000000000..97fbdefd79b1f2413c65e9614aecf35b192150de GIT binary patch literal 1049 zcmZuvdq`7p6#m^sb7`rwwEZlHH9@m{q?VSixm?qXu*ZrX(0ZAr=`by0mNtim7>U^o zU4twl%Bh=5G|VzHCu#|^f*#t7z(-E6>7>Wjx%Y+?^!sPu`ObH~oyV0VZj1;&AVflR z8lhDP9)*kH*KW5X=VVMqw52y|bI$CFfcc&rwW=OUK7 zhof?L|C4I2M!)9}U~Ca$3n%W*3$v37TcRY(R6v@YZc4oDh~O%SvA5wM$WACKVnS?* zXT&1IJduG5Sw@U4=@Pz&gwF>VlDSTs@)&*CTpjJ85{cZXl%o>-p(|`@aB%7d|5*~S z@oq2ZnL<2X!B&(&=;vBT;j_=#iXNM_8nWP^7JI``;6pz-tO6eUj22`Jb)IXYfXtN+ zef}#hQ_JWq`d19xtTUqefo@5SL*G4wIDl=|MrxnrDBzK*PP^TP$7k4?#~9`8IR3%3 z55c8dMf6>IV0;*}v{MK<<}vsBQ#i^-Kw~DA204$Nz;lrRPh^AA6CvJvM0g`dgtUq^urWL($5VZex0Px0 zSL5l@$I>gbRT9ii+0xgfnqg5>OuwseSSg3WsSgqPOooJj7?V7>Cas~`fd2vv*VIdc znNBeI6FyN0F&U4?u3}RDtZ6S@SkS&R2*h|Y3V=4Z4M>WgjEc?4!sJbBZ6YQ&4=VC7 z+0^x2zTGR%Z$T9%A8~AG4rggXgLfR_EcD-Jl3#Btb`?0MC+KU$Dz{LN7L)#l=%QP6 z$)b5#pG=qeNo--4L10n`2c?uIHXeLZ6|qFr(-r!mT`MGb^Iw~NwrU+NEqA}Y$j^K$ zsW2wMSU%jZ*_Gxj9`5(sp^kj0{Iz2Gu*u+)S(CHwq^_ep<3wv|ck&UbG3M*Xj#O*l zyVi4`SOeXQ13$DJb;;jxcV>8JtI9X<)KzK2XJe(nH((#GKhPn1qx|wSH*Bcq)`rS0 zI?v{pb=M9(ExM1>WSYifgDKZ4!^N*!(tcz-c=PS}%fp4f68_re)V`BT@&_Vkf@JSE Q)d$7iiC*73LJ%nOH%X#taR2}S literal 0 HcmV?d00001 From 1151e9233843ce7ad1f34042616d0774c593aa34 Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Thu, 8 Dec 2022 14:40:45 +0100 Subject: [PATCH 2/2] Fix naming in Stax UI for standalone clones (testnet apps) --- Makefile | 2 +- src_nbgl/ui_settings.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d6308f8e..3010886a 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ include ./makefile_conf/chain/$(CHAIN).mk else $(error Unsupported CHAIN - use $(SUPPORTED_CHAINS)) endif -DEFINES += APPNAME=\"$(APPNAME)\" +CFLAGS += -DAPPNAME=\"$(APPNAME)\" ######### # Other # diff --git a/src_nbgl/ui_settings.c b/src_nbgl/ui_settings.c index 8e35f031..29dd614c 100644 --- a/src_nbgl/ui_settings.c +++ b/src_nbgl/ui_settings.c @@ -2,7 +2,7 @@ #include "ui_nbgl.h" #include "nbgl_use_case.h" -static const char* const infoTypes[] = {"Version", "Ethereum App"}; +static const char* const infoTypes[] = {"Version", APPNAME" App"}; static const char* const infoContents[] = {APPVERSION, "(c) 2022 Ledger"}; enum { @@ -98,5 +98,5 @@ static void controlsCallback(int token, uint8_t index) { } void ui_menu_settings(void) { - nbgl_useCaseSettings("Ethereum settings", 0, 3, true, ui_idle, navCallback, controlsCallback); + nbgl_useCaseSettings(APPNAME" settings", 0, 3, true, ui_idle, navCallback, controlsCallback); }