From 6bc99e8b98723b40a0002b83b9c33f592acdd179 Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Thu, 10 Feb 2022 09:40:28 +0100 Subject: [PATCH] Removed NFT transactions unused screens & fixed ERC-1155 setApproveForAll number of screens --- src_plugins/erc1155/erc1155_plugin.c | 4 +++- src_plugins/erc721/erc721_ui.c | 24 ------------------------ 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src_plugins/erc1155/erc1155_plugin.c b/src_plugins/erc1155/erc1155_plugin.c index dbc1b8e..ea65515 100644 --- a/src_plugins/erc1155/erc1155_plugin.c +++ b/src_plugins/erc1155/erc1155_plugin.c @@ -63,10 +63,12 @@ static void handle_finalize(void *parameters) { case SAFE_TRANSFER: msg->numScreens = 5; break; - case SET_APPROVAL_FOR_ALL: case SAFE_BATCH_TRANSFER: msg->numScreens = 4; break; + case SET_APPROVAL_FOR_ALL: + msg->numScreens = 3; + break; default: msg->result = ETH_PLUGIN_RESULT_ERROR; return; diff --git a/src_plugins/erc721/erc721_ui.c b/src_plugins/erc721/erc721_ui.c index b9f3a62..565defa 100644 --- a/src_plugins/erc721/erc721_ui.c +++ b/src_plugins/erc721/erc721_ui.c @@ -40,14 +40,6 @@ static void set_approval_ui(ethQueryContractUI_t *msg, erc721_context_t *context msg->msg, msg->msgLength); break; - case 4: - strlcpy(msg->title, "And send", msg->titleLength); - amountToString((uint8_t *) &msg->pluginSharedRO->txContent->value, - sizeof(msg->pluginSharedRO->txContent->value), - WEI_TO_ETHER, - msg->network_ticker, - msg->msg, - msg->msgLength); default: PRINTF("Unsupported screen index %d\n", msg->screenIndex); msg->result = ETH_PLUGIN_RESULT_ERROR; @@ -90,14 +82,6 @@ static void set_approval_for_all_ui(ethQueryContractUI_t *msg, erc721_context_t &global_sha3, chainConfig->chainId); break; - case 3: - strlcpy(msg->title, "And send", msg->titleLength); - amountToString((uint8_t *) &msg->pluginSharedRO->txContent->value, - sizeof(msg->pluginSharedRO->txContent->value), - WEI_TO_ETHER, - msg->network_ticker, - msg->msg, - msg->msgLength); default: PRINTF("Unsupported screen index %d\n", msg->screenIndex); msg->result = ETH_PLUGIN_RESULT_ERROR; @@ -143,14 +127,6 @@ static void set_transfer_ui(ethQueryContractUI_t *msg, erc721_context_t *context msg->msg, msg->msgLength); break; - case 4: - strlcpy(msg->title, "And send", msg->titleLength); - amountToString((uint8_t *) &msg->pluginSharedRO->txContent->value, - sizeof(msg->pluginSharedRO->txContent->value), - WEI_TO_ETHER, - msg->network_ticker, - msg->msg, - msg->msgLength); default: PRINTF("Unsupported screen index %d\n", msg->screenIndex); msg->result = ETH_PLUGIN_RESULT_ERROR;