Skip to content

Commit c84794b

Browse files
get_displayable_ticker function now takes a given chain_config_t struct
1 parent df74ace commit c84794b

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

src/eth_plugin_handler.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ void eth_plugin_prepare_query_contract_UI(ethQueryContractUI_t *queryContractUI,
6767

6868
queryContractUI->screenIndex = screenIndex;
6969
chain_id = get_tx_chain_id();
70-
strlcpy(queryContractUI->network_ticker, get_displayable_ticker(&chain_id), MAX_TICKER_LEN);
70+
strlcpy(queryContractUI->network_ticker,
71+
get_displayable_ticker(&chain_id, chainConfig),
72+
sizeof(queryContractUI->network_ticker));
7173
queryContractUI->title = title;
7274
queryContractUI->titleLength = titleLength;
7375
queryContractUI->msg = msg;

src/network.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ uint64_t get_tx_chain_id(void) {
136136
return chain_id;
137137
}
138138

139-
const char *get_displayable_ticker(const uint64_t *chain_id) {
139+
const char *get_displayable_ticker(const uint64_t *chain_id, const chain_config_t *chain_cfg) {
140140
const char *ticker = get_network_ticker_from_chain_id(chain_id);
141141

142142
if (ticker == NULL) {
143-
ticker = chainConfig->coinName;
143+
ticker = chain_cfg->coinName;
144144
}
145145
return ticker;
146146
}

src/network.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <stdint.h>
44
#include <stdbool.h>
5+
#include "chainConfig.h"
56

67
#define UNSUPPORTED_CHAIN_ID_MSG(id) \
78
do { \
@@ -16,4 +17,4 @@ bool app_compatible_with_chain_id(const uint64_t *chain_id);
1617

1718
uint64_t get_tx_chain_id(void);
1819

19-
const char *get_displayable_ticker(const uint64_t *chain_id);
20+
const char *get_displayable_ticker(const uint64_t *chain_id, const chain_config_t *chain_cfg);

src_features/signTx/logic_signTx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static void address_to_string(uint8_t *in,
200200

201201
static void raw_fee_to_string(uint256_t *rawFee, char *displayBuffer, uint32_t displayBufferSize) {
202202
uint64_t chain_id = get_tx_chain_id();
203-
const char *feeTicker = get_displayable_ticker(&chain_id);
203+
const char *feeTicker = get_displayable_ticker(&chain_id, chainConfig);
204204
uint8_t tickerOffset = 0;
205205
uint32_t i;
206206

@@ -323,7 +323,7 @@ __attribute__((noinline)) static void finalize_parsing_helper(bool direct, bool
323323
char displayBuffer[50];
324324
uint8_t decimals = WEI_TO_ETHER;
325325
uint64_t chain_id = get_tx_chain_id();
326-
const char *ticker = get_displayable_ticker(&chain_id);
326+
const char *ticker = get_displayable_ticker(&chain_id, chainConfig);
327327
ethPluginFinalize_t pluginFinalize;
328328

329329
*use_standard_UI = true;

0 commit comments

Comments
 (0)