fix(legacy): fix OK-22415 & OK-22406 & OK-22397 (#468)

Author: lyxyx

legacy/firmware/ethereum.c

@@ -226,7 +226,7 @@ static uint32_t rlp_calculate_access_list_length(
 static void send_request_chunk(void) {
   int progress = 1000 - (data_total > 1000000 ? data_left / (data_total / 800)
                                               : data_left * 800 / data_total);
-  layoutProgress(_("Signing"), progress);
+  layoutProgressAdapter(_("Signing"), progress);
   msg_tx_request.has_data_length = true;
   msg_tx_request.data_length = data_left <= 1024 ? data_left : 1024;
   msg_write(MessageType_MessageType_EthereumTxRequest, &msg_tx_request);
@@ -240,7 +240,7 @@ int ethereum_is_canonic(uint8_t v, uint8_t signature[64]) {
 static void send_signature(void) {
   uint8_t hash[32] = {0}, sig[64] = {0};
   uint8_t v = 0;
-  layoutProgress(_("Signing"), 1000);
+  layoutProgressAdapter(_("Signing"), 1000);
 
   if (eip1559) {
     hash_rlp_list_length(rlp_calculate_access_list_length(
@@ -663,7 +663,7 @@ void ethereum_signing_init(const EthereumSignTx *msg, const HDNode *node,
   /* Stage 1: Calculate total RLP length */
   uint32_t rlp_length = 0;
 
-  layoutProgress(_("Signing"), 0);
+  layoutProgressAdapter(_("Signing"), 0);
 
   rlp_length += rlp_calculate_length(msg->nonce.size, msg->nonce.bytes[0]);
   rlp_length +=
@@ -685,7 +685,7 @@ void ethereum_signing_init(const EthereumSignTx *msg, const HDNode *node,
   /* Stage 2: Store header fields */
   hash_rlp_list_length(rlp_length);
 
-  layoutProgress(_("Signing"), 100);
+  layoutProgressAdapter(_("Signing"), 100);
 
   if (tx_type) {
     hash_rlp_number(tx_type);
@@ -777,7 +777,7 @@ void ethereum_signing_init_eip1559(const EthereumSignTxEIP1559 *msg,
   /* Stage 1: Calculate total RLP length */
   uint32_t rlp_length = 0;
 
-  layoutProgress(_("Signing"), 0);
+  layoutProgressAdapter(_("Signing"), 0);
 
   rlp_length += rlp_calculate_number_length(chain_id);
   rlp_length += rlp_calculate_length(msg->nonce.size, msg->nonce.bytes[0]);
@@ -802,7 +802,7 @@ void ethereum_signing_init_eip1559(const EthereumSignTxEIP1559 *msg,
   hash_rlp_number(EIP1559_TX_TYPE);
   hash_rlp_list_length(rlp_length);
 
-  layoutProgress(_("Signing"), 100);
+  layoutProgressAdapter(_("Signing"), 100);
 
   hash_rlp_number(chain_id);
   hash_rlp_field(msg->nonce.bytes, msg->nonce.size);

legacy/firmware/ethereum_onekey.c

@@ -786,7 +786,7 @@ void ethereum_signing_init_eip1559_onekey(
   /* Stage 1: Calculate total RLP length */
   uint32_t rlp_length = 0;
 
-  layoutProgress(_("Signing"), 0);
+  layoutProgressAdapter(_("Signing"), 0);
 
   rlp_length += rlp_calculate_number_length(chain_id);
   rlp_length += rlp_calculate_length(msg->nonce.size, msg->nonce.bytes[0]);
@@ -811,7 +811,7 @@ void ethereum_signing_init_eip1559_onekey(
   hash_rlp_number(EIP1559_TX_TYPE);
   hash_rlp_list_length(rlp_length);
 
-  layoutProgress(_("Signing"), 100);
+  layoutProgressAdapter(_("Signing"), 100);
 
   hash_rlp_number(chain_id);
   hash_rlp_field(msg->nonce.bytes, msg->nonce.size);

legacy/firmware/language.c

@@ -300,6 +300,8 @@ const char *languages[][2] = {
     {"Destination Coins", "来源金额"},
     // layout2.c
     {"Device ID:", "设备ID:"},
+    // menu_list.c
+    {"Device Info", "设备信息"},
     // reset.c reset.c
     {"Device failed initialized", ""},  // msg
     //

legacy/firmware/layout2.c

@@ -3470,12 +3470,12 @@ void layoutConfirmHash(const BITMAP *icon, const char *description,
 
   layoutSwipe();
   oledClear();
-  oledDrawBitmap(0, 0, icon);
-  oledDrawString(20, 0 * 9, description, FONT_STANDARD);
-  oledDrawString(20, 1 * 9, str[0], FONT_FIXED);
-  oledDrawString(20, 2 * 9, str[1], FONT_FIXED);
-  oledDrawString(20, 3 * 9, str[2], FONT_FIXED);
-  oledDrawString(20, 4 * 9, str[3], FONT_FIXED);
+  oledDrawBitmap(0, 0 + 2, icon);
+  oledDrawString(20, 0 * 9 + 2, description, FONT_STANDARD);
+  oledDrawString(20, 1 * 9 + 2, str[0], FONT_FIXED);
+  oledDrawString(20, 2 * 9 + 2, str[1], FONT_FIXED);
+  oledDrawString(20, 3 * 9 + 2, str[2], FONT_FIXED);
+  oledDrawString(20, 4 * 9 + 2, str[3], FONT_FIXED);
   oledHLine(OLED_HEIGHT - 13);
 
   layoutButtonNoAdapter(_("Cancel"), &bmp_btn_cancel);