Skip to content

Commit 9d72e39

Browse files
Icons new design
1 parent b20849f commit 9d72e39

File tree

200 files changed

+18
-15
lines changed
  • glyphs
  • icons
  • src/ui
  • tests/snapshots
    • nanosp
      • test_dashboard
      • test_get_extended_pubkey_non_standard_0_0
      • test_get_extended_pubkey_non_standard_reject_0_0
      • test_get_extended_pubkey_standard_display_m
      • test_get_wallet_address_multisig_legacy_v1_ui_0_0
      • test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0
      • test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0
      • test_register_miniscript_long_policy_0_0
      • test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0
      • test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0
      • test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0
      • test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0
      • test_register_wallet_accept_legacy_0_0
      • test_register_wallet_accept_legacy_v1_0_0
      • test_register_wallet_accept_sh_wit_0_0
      • test_register_wallet_accept_sh_wit_v1_0_0
      • test_register_wallet_accept_wit_0_0
      • test_register_wallet_accept_wit_v1_0_0
      • test_register_wallet_reject_header_0_0
      • test_register_wallet_reject_header_v1_0_0
      • test_register_wallet_tr_script_pk_0_0
      • test_register_wallet_tr_script_sortedmulti_0_0
      • test_register_wallet_tr_with_nums_keypath_0_0
      • test_register_wallet_with_long_name_0_0
      • test_sighash_all_anyone_input_changed_0_0
      • test_sighash_all_anyone_output_changed_0_0
      • test_sighash_all_anyone_sign_0_0
      • test_sighash_all_input_modified_0_0
      • test_sighash_all_output_modified_0_0
      • test_sighash_all_sign_psbt_0_0
      • test_sighash_none_anyone_input_changed_0_0
      • test_sighash_none_anyone_output_changed_0_0
      • test_sighash_none_anyone_sign_0_0
      • test_sighash_none_input_modified_0_0
      • test_sighash_none_output_modified_0_0
      • test_sighash_none_sign_psbt_0_0
      • test_sighash_segwitv0_sighash1_0_0
      • test_sighash_segwitv0_sighash2_0_0
      • test_sighash_segwitv0_sighash3_0_0
      • test_sighash_segwitv0_sighash81_0_0
      • test_sighash_segwitv0_sighash82_0_0
      • test_sighash_segwitv0_sighash83_0_0
      • test_sighash_single_anyone_input_changed_0_0
      • test_sighash_single_anyone_output_changed_0_0
      • test_sighash_single_anyone_sign_0_0
      • test_sighash_single_input_modified_0_0
      • test_sighash_single_output_different_index_modified_0_0
      • test_sighash_single_output_same_index_modified_0_0
      • test_sighash_single_sign_psbt_0_0
      • test_sighash_unsupported_0_0
      • test_sighash_unsupported_for_segwitv0_0_0
      • test_sign_message_0_0
      • test_sign_message_accept_0_0
      • test_sign_message_accept_long_0_0
      • test_sign_message_accept_non_ascii_0_0
      • test_sign_message_accept_too_long_0_0
      • test_sign_message_hash_reject_0_0
      • test_sign_message_reject_0_0
      • test_sign_psbt_against_wrong_tapleaf_hash_0_0
      • test_sign_psbt_highfee_0_0
      • test_sign_psbt_miniscript_multikey_0_0
      • test_sign_psbt_multisig_sh_wsh_0_0
      • test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0
      • test_sign_psbt_multisig_wsh_0_0
      • test_sign_psbt_multisig_wsh_v1_0_0
      • test_sign_psbt_singlesig_large_amount_0_0
      • test_sign_psbt_singlesig_pkh_1to1_0_0
      • test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0
      • test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0
      • test_sign_psbt_singlesig_pkh_1to1_v1_0_0
      • test_sign_psbt_singlesig_sh_wpkh_1to2_0_0
      • test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0
      • test_sign_psbt_singlesig_wpkh_1to2_0_0
      • test_sign_psbt_singlesig_wpkh_1to2_v1_0_0
      • test_sign_psbt_singlesig_wpkh_2to2_0_0
      • test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_0_0
      • test_sign_psbt_singlesig_wpkh_2to2_v1_0_0
      • test_sign_psbt_singlesig_wpkh_selftransfer_0_0
      • test_sign_psbt_taproot_1to2_sighash_all_0_0
      • test_sign_psbt_taproot_1to2_sighash_default_0_0_0
      • test_sign_psbt_taproot_1to2_sighash_default_1_0_0
      • test_sign_psbt_taproot_1to2_v1_0_0
      • test_sign_psbt_tr_script_pk_sighash_all_0_0
      • test_sign_psbt_with_external_inputs_0_0_0
      • test_sign_psbt_with_external_inputs_1_0_0
      • test_sign_psbt_with_external_inputs_2_0_0
      • test_sign_psbt_with_naked_opreturn_0_0
      • test_sign_psbt_with_opreturn_0_0
      • test_sign_psbt_with_opreturn_v1_0_0
      • test_sign_psbt_with_segwit_v16_0_0
      • test_sign_psbt_with_segwit_v16_v1_0_0
    • nanox
      • test_dashboard
      • test_get_extended_pubkey_non_standard_0_0
      • test_get_extended_pubkey_non_standard_reject_0_0
      • test_get_extended_pubkey_standard_display_m
      • test_get_wallet_address_multisig_legacy_v1_ui_0_0
      • test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0
      • test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0
      • test_register_miniscript_long_policy_0_0
      • test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0
      • test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0
      • test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0
      • test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0
      • test_register_wallet_accept_legacy_0_0
      • test_register_wallet_accept_legacy_v1_0_0
      • test_register_wallet_accept_sh_wit_0_0
      • test_register_wallet_accept_sh_wit_v1_0_0
      • test_register_wallet_accept_wit_0_0
      • test_register_wallet_accept_wit_v1_0_0
      • test_register_wallet_reject_header_0_0
      • test_register_wallet_reject_header_v1_0_0
      • test_register_wallet_tr_script_pk_0_0
      • test_register_wallet_tr_script_sortedmulti_0_0
      • test_register_wallet_tr_with_nums_keypath_0_0
      • test_register_wallet_with_long_name_0_0
      • test_sighash_all_anyone_input_changed_0_0
      • test_sighash_all_anyone_output_changed_0_0
      • test_sighash_all_anyone_sign_0_0
      • test_sighash_all_input_modified_0_0
      • test_sighash_all_output_modified_0_0
      • test_sighash_all_sign_psbt_0_0
      • test_sighash_none_anyone_input_changed_0_0
      • test_sighash_none_anyone_output_changed_0_0
      • test_sighash_none_anyone_sign_0_0
      • test_sighash_none_input_modified_0_0
      • test_sighash_none_output_modified_0_0
      • test_sighash_none_sign_psbt_0_0
      • test_sighash_segwitv0_sighash1_0_0
      • test_sighash_segwitv0_sighash2_0_0
      • test_sighash_segwitv0_sighash3_0_0
      • test_sighash_segwitv0_sighash81_0_0
      • test_sighash_segwitv0_sighash82_0_0
      • test_sighash_segwitv0_sighash83_0_0
      • test_sighash_single_anyone_input_changed_0_0
      • test_sighash_single_anyone_output_changed_0_0
      • test_sighash_single_anyone_sign_0_0
      • test_sighash_single_input_modified_0_0
      • test_sighash_single_output_different_index_modified_0_0
      • test_sighash_single_output_same_index_modified_0_0
      • test_sighash_single_sign_psbt_0_0
      • test_sighash_unsupported_0_0
      • test_sighash_unsupported_for_segwitv0_0_0
      • test_sign_message_0_0
      • test_sign_message_accept_0_0
      • test_sign_message_accept_long_0_0
      • test_sign_message_accept_non_ascii_0_0
      • test_sign_message_accept_too_long_0_0
      • test_sign_message_hash_reject_0_0
      • test_sign_message_reject_0_0
      • test_sign_psbt_against_wrong_tapleaf_hash_0_0
      • test_sign_psbt_highfee_0_0
      • test_sign_psbt_miniscript_multikey_0_0
      • test_sign_psbt_multisig_sh_wsh_0_0
      • test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0
      • test_sign_psbt_multisig_wsh_0_0
      • test_sign_psbt_multisig_wsh_v1_0_0
      • test_sign_psbt_singlesig_large_amount_0_0
      • test_sign_psbt_singlesig_pkh_1to1_0_0
      • test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0
      • test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0
      • test_sign_psbt_singlesig_pkh_1to1_v1_0_0
      • test_sign_psbt_singlesig_sh_wpkh_1to2_0_0
      • test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0
      • test_sign_psbt_singlesig_wpkh_1to2_0_0
      • test_sign_psbt_singlesig_wpkh_1to2_v1_0_0
      • test_sign_psbt_singlesig_wpkh_2to2_0_0
      • test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_0_0
      • test_sign_psbt_singlesig_wpkh_2to2_v1_0_0
      • test_sign_psbt_singlesig_wpkh_selftransfer_0_0
      • test_sign_psbt_taproot_1to2_sighash_all_0_0
      • test_sign_psbt_taproot_1to2_sighash_default_0_0_0
      • test_sign_psbt_taproot_1to2_sighash_default_1_0_0
      • test_sign_psbt_taproot_1to2_v1_0_0
      • test_sign_psbt_tr_script_pk_sighash_all_0_0
      • test_sign_psbt_with_external_inputs_0_0_0
      • test_sign_psbt_with_external_inputs_1_0_0
      • test_sign_psbt_with_external_inputs_2_0_0
      • test_sign_psbt_with_naked_opreturn_0_0
      • test_sign_psbt_with_opreturn_0_0
      • test_sign_psbt_with_opreturn_v1_0_0
      • test_sign_psbt_with_segwit_v16_0_0
      • test_sign_psbt_with_segwit_v16_v1_0_0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+18
-15
lines changed

glyphs/bitcoin_logo.gif

29 Bytes

glyphs/bitcoin_logo_inv.gif

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../icons/nanox_app_bitcoin.gif

icons/nanox_app_bitcoin.gif

-1.01 KB

src/ui/display.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@
2222

2323
#ifdef SCREEN_SIZE_WALLET
2424
#define ICON_APP_IMPORTANT C_Important_Circle_64px
25-
#define ICON_APP_LOGO C_Bitcoin_64px
25+
#define ICON_APP_HOME C_Bitcoin_64px
26+
#define ICON_APP_ACTION C_Bitcoin_64px
2627
#else
2728
#define ICON_APP_IMPORTANT C_icon_warning
28-
#define ICON_APP_LOGO C_bitcoin_logo
29+
#define ICON_APP_HOME C_bitcoin_logo
30+
#define ICON_APP_ACTION C_bitcoin_logo_inv
2931
#endif
3032

3133
typedef struct tx_ux_warning_s {

src/ui/display_nbgl.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ void ui_accept_transaction_simplified_flow(void) {
234234

235235
nbgl_useCaseReview(TYPE_TRANSACTION,
236236
&pairList,
237-
&ICON_APP_LOGO,
237+
&ICON_APP_ACTION,
238238
GA_REVIEW_TRANSACTION,
239239
NULL,
240240
GA_SIGN_TRANSACTION,
@@ -243,7 +243,7 @@ void ui_accept_transaction_simplified_flow(void) {
243243

244244
void ui_display_transaction_prompt(void) {
245245
nbgl_useCaseReviewStreamingStart(TYPE_TRANSACTION,
246-
&ICON_APP_LOGO,
246+
&ICON_APP_ACTION,
247247
GA_REVIEW_TRANSACTION,
248248
NULL,
249249
start_transaction_callback);
@@ -307,7 +307,7 @@ void ui_display_pubkey_flow(void) {
307307

308308
nbgl_useCaseReviewLight(TYPE_OPERATION,
309309
&pairList,
310-
&ICON_APP_LOGO,
310+
&ICON_APP_ACTION,
311311
"Confirm public key",
312312
NULL,
313313
"Approve public key",
@@ -326,7 +326,7 @@ void ui_display_receive_in_wallet_flow(void) {
326326

327327
nbgl_useCaseAddressReview(g_ui_state.wallet.address,
328328
&pairList,
329-
&ICON_APP_LOGO,
329+
&ICON_APP_ACTION,
330330
"Verify Bitcoin\naddress",
331331
NULL,
332332
status_address_callback);
@@ -372,7 +372,7 @@ void ui_display_register_wallet_policy_flow(void) {
372372

373373
nbgl_useCaseReviewLight(TYPE_OPERATION,
374374
&pairList,
375-
&ICON_APP_LOGO,
375+
&ICON_APP_ACTION,
376376
"Review account\nto register",
377377
NULL,
378378
GA_REGISTER_ACCOUNT,
@@ -395,7 +395,7 @@ void ui_display_pubkey_suspicious_flow(void) {
395395
pairList.pairs = pairs;
396396

397397
contentList[0].type = CENTERED_INFO;
398-
contentList[0].content.centeredInfo.icon = &ICON_APP_LOGO;
398+
contentList[0].content.centeredInfo.icon = &ICON_APP_ACTION;
399399
contentList[0].content.centeredInfo.text1 = "Confirm public key";
400400
contentList[0].content.centeredInfo.text2 = NULL;
401401
#ifdef SCREEN_SIZE_WALLET
@@ -426,7 +426,7 @@ void ui_display_pubkey_suspicious_flow(void) {
426426

427427
contentList[3].type = INFO_BUTTON;
428428
contentList[3].content.infoButton.text = "Approve public key";
429-
contentList[3].content.infoButton.icon = &ICON_APP_LOGO;
429+
contentList[3].content.infoButton.icon = &ICON_APP_ACTION;
430430
#ifdef SCREEN_SIZE_WALLET
431431
contentList[3].content.infoButton.buttonText = "Approve";
432432
#else
@@ -510,7 +510,7 @@ void ui_sign_message_content_flow(void) {
510510
if (show_message_start_page == true) {
511511
show_message_start_page = false;
512512
nbgl_useCaseReviewStreamingStart(TYPE_MESSAGE,
513-
&ICON_APP_LOGO,
513+
&ICON_APP_ACTION,
514514
GA_REVIEW_MESSAGE,
515515
NULL,
516516
message_display_content);
@@ -521,7 +521,7 @@ void ui_sign_message_content_flow(void) {
521521

522522
void ui_sign_message_path_hash_and_confirm_flow(void) {
523523
nbgl_useCaseReviewStreamingStart(TYPE_MESSAGE,
524-
&ICON_APP_LOGO,
524+
&ICON_APP_ACTION,
525525
GA_REVIEW_MESSAGE,
526526
NULL,
527527
message_display_path);
@@ -550,7 +550,7 @@ void ui_display_spend_from_wallet_flow(void) {
550550

551551
nbgl_useCaseReviewLight(TYPE_OPERATION,
552552
&pairList,
553-
&ICON_APP_LOGO,
553+
&ICON_APP_ACTION,
554554
"Spend from\nknown account",
555555
NULL,
556556
"Confirm account name",
@@ -561,7 +561,7 @@ void ui_display_spend_from_wallet_flow(void) {
561561
void ui_display_default_wallet_address_flow(void) {
562562
nbgl_useCaseAddressReview(g_ui_state.wallet.address,
563563
NULL,
564-
&ICON_APP_LOGO,
564+
&ICON_APP_ACTION,
565565
"Verify Bitcoin\naddress",
566566
NULL,
567567
status_address_callback);

src/ui/menu_nbgl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extern void app_exit(void);
3535

3636
void ui_menu_main_flow_bitcoin(void) {
3737
nbgl_useCaseHomeAndSettings(APPNAME,
38-
&ICON_APP_LOGO,
38+
&ICON_APP_HOME,
3939
NULL,
4040
INIT_HOME_PAGE,
4141
NULL,
@@ -47,7 +47,7 @@ void ui_menu_main_flow_bitcoin(void) {
4747
void ui_menu_main_flow_bitcoin_testnet(void) {
4848
nbgl_useCaseHomeAndSettings(
4949
"Bitcoin Testnet",
50-
&ICON_APP_LOGO,
50+
&ICON_APP_HOME,
5151
#ifdef SCREEN_SIZE_WALLET
5252
"This app enables signing\ntransactions on all the Bitcoin\ntest networks.",
5353
#else
-6 Bytes
-67 Bytes
-67 Bytes
-73 Bytes

0 commit comments

Comments
 (0)