Skip to content

Commit

Permalink
Merge pull request #604 from LedgerHQ/fbe/fix_clone_icons_in_review
Browse files Browse the repository at this point in the history
Fix clone icons not being used in review context
  • Loading branch information
fbeutin-ledger authored Jul 4, 2024
2 parents 115fe9a + 7b0fd02 commit 5bfbacc
Show file tree
Hide file tree
Showing 278 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ethereum-plugin-sdk
10 changes: 7 additions & 3 deletions src_nbgl/ui_approve_tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,16 @@ static const nbgl_icon_details_t *get_tx_icon(void) {
const nbgl_icon_details_t *icon = NULL;

if (tx_approval_context.fromPlugin && (pluginType == EXTERNAL)) {
if (caller_app && caller_app->name) {
if ((strlen(strings.common.toAddress) == strlen(caller_app->name)) &&
(strcmp(strings.common.toAddress, caller_app->name) == 0)) {
if ((caller_app != NULL) && (caller_app->name != NULL)) {
if (strcmp(strings.common.toAddress, caller_app->name) == 0) {
icon = get_app_icon(true);
}
}
// icon is NULL in this case
// Check with Alex if this is expected or a bug
} else if ((caller_app != NULL) && !tx_approval_context.fromPlugin) {
// Clone case
icon = get_app_icon(true);
} else {
uint64_t chain_id = get_tx_chain_id();
if (chain_id == chainConfig->chainId) {
Expand Down
Binary file modified tests/ragger/snapshots/flex/domain_name_non_mainnet/00000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_non_mainnet/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_non_mainnet/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_non_mainnet/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_non_mainnet/00005.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_unknown_chain/00000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_unknown_chain/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_unknown_chain/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_unknown_chain/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_unknown_chain/00005.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_verbose_False/00000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_verbose_False/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_verbose_False/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_verbose_False/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_verbose_False/00005.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_verbose_True/00000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_verbose_True/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_verbose_True/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_verbose_True/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_verbose_True/00005.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_wrong_addr/00000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_wrong_addr/00001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_wrong_addr/00002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_wrong_addr/00003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/domain_name_wrong_addr/00005.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00000.png
Binary file modified tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00001.png
Binary file modified tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00002.png
Binary file modified tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00003.png
Binary file modified tests/ragger/snapshots/flex/erc1155_safeTransferFrom_1/00004.png
Binary file modified tests/ragger/snapshots/flex/erc1155_safeTransferFrom_137/00004.png
Binary file modified tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00000.png
Binary file modified tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00001.png
Binary file modified tests/ragger/snapshots/flex/erc1155_safeTransferFrom_5/00004.png
Binary file modified tests/ragger/snapshots/flex/erc1155_setApprovalForAll_5/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_1/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_1/00001.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_1/00002.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_1/00003.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_1/00004.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_1/00005.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_137/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_137/00001.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_137/00002.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_137/00003.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_137/00004.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_137/00006.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_5/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_5/00001.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_5/00002.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_5/00003.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_5/00004.png
Binary file modified tests/ragger/snapshots/flex/erc721_approve_5/00006.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00001.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00003.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00004.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_1/00005.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00002.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_137/00004.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00001.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00002.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00003.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00004.png
Binary file modified tests/ragger/snapshots/flex/erc721_safeTransferFrom_5/00006.png
Binary file modified tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00001.png
Binary file modified tests/ragger/snapshots/flex/erc721_setApprovalForAll_1/00003.png
Binary file modified tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_setApprovalForAll_137/00002.png
Binary file modified tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00001.png
Binary file modified tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00002.png
Binary file modified tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00003.png
Binary file modified tests/ragger/snapshots/flex/erc721_setApprovalForAll_5/00005.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_1/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_1/00001.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_1/00003.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_1/00004.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_1/00005.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_137/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_137/00001.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_137/00002.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_137/00003.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_137/00004.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_137/00006.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_5/00000.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_5/00001.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_5/00002.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_5/00003.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_5/00004.png
Binary file modified tests/ragger/snapshots/flex/erc721_transferFrom_5/00006.png
Binary file modified tests/ragger/snapshots/flex/get_pk_1/00000.png
Binary file modified tests/ragger/snapshots/flex/get_pk_1/00001.png
Binary file modified tests/ragger/snapshots/flex/get_pk_1/00003.png
Binary file modified tests/ragger/snapshots/flex/get_pk_137/00000.png
Binary file modified tests/ragger/snapshots/flex/get_pk_137/00001.png
Binary file modified tests/ragger/snapshots/flex/get_pk_137/00003.png
Binary file modified tests/ragger/snapshots/flex/get_pk_2/00000.png
Binary file modified tests/ragger/snapshots/flex/get_pk_2/00001.png
Binary file modified tests/ragger/snapshots/flex/get_pk_2/00003.png
Binary file modified tests/ragger/snapshots/flex/get_pk_5/00000.png
Binary file modified tests/ragger/snapshots/flex/get_pk_5/00001.png
Binary file modified tests/ragger/snapshots/flex/get_pk_5/00003.png
Binary file modified tests/ragger/snapshots/flex/get_pk_None/00000.png
Binary file modified tests/ragger/snapshots/flex/get_pk_None/00001.png
Binary file modified tests/ragger/snapshots/flex/get_pk_None/00003.png
Binary file modified tests/ragger/snapshots/flex/get_pk_rejected_60/00000.png
Binary file modified tests/ragger/snapshots/flex/get_pk_rejected_60/00001.png
Binary file modified tests/ragger/snapshots/flex/get_pk_rejected_60/00003.png
Binary file modified tests/ragger/snapshots/flex/get_pk_rejected_700/00000.png
Binary file modified tests/ragger/snapshots/flex/get_pk_rejected_700/00001.png
Binary file modified tests/ragger/snapshots/flex/get_pk_rejected_700/00003.png
Binary file modified tests/ragger/snapshots/flex/test_blind_sign_rejected/00001.png
Binary file modified tests/ragger/snapshots/flex/test_blind_sign_signed/00002.png
Binary file modified tests/ragger/snapshots/flex/test_blind_sign_signed/00003.png
Binary file modified tests/ragger/snapshots/flex/test_blind_sign_signed/00004.png
Binary file modified tests/ragger/snapshots/flex/test_blind_sign_signed/00005.png
Binary file modified tests/ragger/snapshots/flex/test_clone_thundercore/00000.png
Binary file modified tests/ragger/snapshots/flex/test_clone_thundercore/00001.png
Binary file modified tests/ragger/snapshots/flex/test_clone_thundercore/00002.png
Binary file modified tests/ragger/snapshots/flex/test_clone_thundercore/00003.png
Binary file modified tests/ragger/snapshots/flex/test_clone_thundercore/00005.png
Binary file modified tests/ragger/snapshots/flex/test_get_eth2_pk/00000.png
Binary file modified tests/ragger/snapshots/flex/test_get_eth2_pk/00001.png
Binary file modified tests/ragger/snapshots/flex/test_get_eth2_pk/00003.png
Binary file modified tests/ragger/snapshots/flex/test_legacy_chainid/00000.png
Binary file modified tests/ragger/snapshots/flex/test_legacy_chainid/00001.png
Binary file modified tests/ragger/snapshots/flex/test_legacy_chainid/00002.png
Binary file modified tests/ragger/snapshots/flex/test_legacy_chainid/00003.png
Binary file modified tests/ragger/snapshots/flex/test_legacy_chainid/00005.png
Binary file modified tests/ragger/snapshots/flex/test_legacy_send_bsc/00000.png
Binary file modified tests/ragger/snapshots/flex/test_legacy_send_bsc/00001.png
Binary file modified tests/ragger/snapshots/flex/test_legacy_send_bsc/00002.png
Binary file modified tests/ragger/snapshots/flex/test_legacy_send_bsc/00003.png
Binary file modified tests/ragger/snapshots/flex/test_legacy_send_bsc/00005.png
Binary file modified tests/ragger/snapshots/flex/test_personal_sign_metamask/00001.png
Binary file modified tests/ragger/snapshots/flex/test_personal_sign_non_ascii/00001.png
Binary file modified tests/ragger/snapshots/flex/test_personal_sign_opensea/00001.png
Binary file modified tests/ragger/snapshots/flex/test_personal_sign_opensea/00002.png
Binary file modified tests/ragger/snapshots/flex/test_personal_sign_opensea/00003.png
Binary file modified tests/ragger/snapshots/flex/test_personal_sign_reject/00000.png
Binary file modified tests/ragger/snapshots/flex/test_personal_sign_reject/00001.png
Binary file modified tests/ragger/snapshots/flex/test_personal_sign_reject/00002.png
Binary file modified tests/ragger/snapshots/flex/test_personal_sign_reject/00005.png
Binary file modified tests/ragger/snapshots/flex/test_sign_eip_2930/00000.png
Binary file modified tests/ragger/snapshots/flex/test_sign_eip_2930/00001.png
Binary file modified tests/ragger/snapshots/flex/test_sign_eip_2930/00002.png
Binary file modified tests/ragger/snapshots/flex/test_sign_eip_2930/00003.png
Binary file modified tests/ragger/snapshots/flex/test_sign_eip_2930/00005.png
Binary file modified tests/ragger/snapshots/flex/test_sign_limit_nonce/00000.png
Binary file modified tests/ragger/snapshots/flex/test_sign_limit_nonce/00001.png
Binary file modified tests/ragger/snapshots/flex/test_sign_limit_nonce/00002.png
Binary file modified tests/ragger/snapshots/flex/test_sign_limit_nonce/00003.png
Binary file modified tests/ragger/snapshots/flex/test_sign_limit_nonce/00005.png
Binary file modified tests/ragger/snapshots/flex/test_sign_nonce_display/00000.png
Binary file modified tests/ragger/snapshots/flex/test_sign_nonce_display/00001.png
Binary file modified tests/ragger/snapshots/flex/test_sign_nonce_display/00002.png
Binary file modified tests/ragger/snapshots/flex/test_sign_nonce_display/00003.png
Binary file modified tests/ragger/snapshots/flex/test_sign_nonce_display/00005.png
Binary file modified tests/ragger/snapshots/flex/test_sign_reject/00000.png
Binary file modified tests/ragger/snapshots/flex/test_sign_reject/00001.png
Binary file modified tests/ragger/snapshots/flex/test_sign_reject/00002.png
Binary file modified tests/ragger/snapshots/flex/test_sign_reject/00003.png
Binary file modified tests/ragger/snapshots/flex/test_sign_reject/00004.png
Binary file modified tests/ragger/snapshots/flex/test_sign_reject/00006.png
Binary file modified tests/ragger/snapshots/flex/test_sign_simple/00000.png
Binary file modified tests/ragger/snapshots/flex/test_sign_simple/00001.png
Binary file modified tests/ragger/snapshots/flex/test_sign_simple/00002.png
Binary file modified tests/ragger/snapshots/flex/test_sign_simple/00003.png
Binary file modified tests/ragger/snapshots/flex/test_sign_simple/00005.png
Binary file modified tests/ragger/snapshots/stax/test_clone_thundercore/00000.png
Binary file modified tests/ragger/snapshots/stax/test_clone_thundercore/00003.png

0 comments on commit 5bfbacc

Please sign in to comment.