From 8a5b950c44f0e0baf87544b75c1759f35aa49cd6 Mon Sep 17 00:00:00 2001
From: lulu <pengfei.lulu@gmail.com>
Date: Fri, 22 Dec 2023 18:24:23 +0800
Subject: [PATCH] fix(legacy): fix OK-25083 & OK-25088 (#508)

---
 legacy/firmware/fsm_msg_nostr.h                   |  5 ++---
 legacy/firmware/language.c                        |  3 ++-
 legacy/firmware/layout2.c                         |  6 +++++-
 .../polkadot/substrate/substrate_dispatch_V18.c   | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/legacy/firmware/fsm_msg_nostr.h b/legacy/firmware/fsm_msg_nostr.h
index ca7b48077d..103d93cf78 100644
--- a/legacy/firmware/fsm_msg_nostr.h
+++ b/legacy/firmware/fsm_msg_nostr.h
@@ -47,9 +47,8 @@ void fsm_msgNostrGetPublicKey(const NostrGetPublicKey *msg) {
 
   if (msg->has_show_display && msg->show_display) {
     char desc[32] = {0};
-    strcat(desc, "Nostr");
-    strcat(desc, " ");
-    strcat(desc, _("Address:"));
+    strcat(desc, "Nostr ");
+    strcat(desc, _("Public Key"));
     if (!fsm_layoutAddress(resp->npub, NULL, desc, false, 0, msg->address_n,
                            msg->address_n_count, true, NULL, 0, 0, NULL)) {
       return;
diff --git a/legacy/firmware/language.c b/legacy/firmware/language.c
index 8081ad7e11..41e6f8fce8 100644
--- a/legacy/firmware/language.c
+++ b/legacy/firmware/language.c
@@ -617,7 +617,8 @@ const char *languages[][2] = {
     {"Propose", "投票"},
     {"Proposer", "提案申请人"},
     // lisk.c
-    {"Public Key:", "公钥"},
+    {"Public Key", "公钥"},
+    {"Public Key:", "公钥:"},
     // layout2.c
     {"QR Code", "二维码"},
     //
diff --git a/legacy/firmware/layout2.c b/legacy/firmware/layout2.c
index ed3e3331e2..c86bece2d7 100644
--- a/legacy/firmware/layout2.c
+++ b/legacy/firmware/layout2.c
@@ -1439,7 +1439,11 @@ uint8_t layoutAddress(const char *address, const char *address_type,
         if (address_type) {
           oledDrawStringAdapter(0, 13, address_type, FONT_STANDARD);
         } else {
-          oledDrawStringAdapter(0, 13, _("Address:"), FONT_STANDARD);
+          if (address && (memcmp(address, "npub", 4) == 0)) {
+            oledDrawStringAdapter(0, 13, _("Public Key:"), FONT_STANDARD);
+          } else {
+            oledDrawStringAdapter(0, 13, _("Address:"), FONT_STANDARD);
+          }
         }
         oledDrawStringAdapter(0, 13 + 1 * 10, str[0], FONT_STANDARD);
         oledDrawStringAdapter(0, 13 + 2 * 10, str[1], FONT_STANDARD);
diff --git a/legacy/firmware/polkadot/substrate/substrate_dispatch_V18.c b/legacy/firmware/polkadot/substrate/substrate_dispatch_V18.c
index fb43eb18ba..14104396fb 100644
--- a/legacy/firmware/polkadot/substrate/substrate_dispatch_V18.c
+++ b/legacy/firmware/polkadot/substrate/substrate_dispatch_V18.c
@@ -230,8 +230,11 @@ const char* _getMethod_Name_V18(uint8_t moduleIdx, uint8_t callIdx) {
 
   switch (callPrivIdx) {
     case 1280: /* module 5 call 0 */
+    case 1287:
     case 1024:
+    case 1031:
     case 7936:
+    case 7943:
       return STR_ME_TRANSFER;
     case 1282: /* module 5 call 2 */
     case 1026:
@@ -266,8 +269,11 @@ uint8_t _getMethod_NumItems_V18(uint8_t moduleIdx, uint8_t callIdx) {
 
   switch (callPrivIdx) {
     case 1280: /* module 5 call 0 */
+    case 1287:
     case 1024:
+    case 1031:
     case 7936:
+    case 7943:
       return 2;
     case 1282: /* module 5 call 2 */
     case 1026:
@@ -294,8 +300,11 @@ const char* _getMethod_ItemName_V18(uint8_t moduleIdx, uint8_t callIdx,
 
   switch (callPrivIdx) {
     case 1280: /* module 5 call 0 */
+    case 1287:
     case 1024:
+    case 1031:
     case 7936:
+    case 7943:
       switch (itemIdx) {
         case 0:
           return STR_IT_amount;
@@ -354,8 +363,11 @@ parser_error_t _getMethod_ItemValue_V18(pd_Method_V18_t* m, uint8_t moduleIdx,
 
   switch (callPrivIdx) {
     case 1280: /* module 5 call 0 */
+    case 1287: /* module 5 call 0 */
     case 1024: /* module 5 call 0 */
+    case 1031: /* module 5 call 0 */
     case 7936: /* module 5 call 0 */
+    case 7943:
       switch (itemIdx) {
         case 0: /* balances_transfer_V18 - amount */;
           return _toStringCompactBalance(
@@ -439,8 +451,11 @@ bool _getMethod_IsNestingSupported_V18(uint8_t moduleIdx, uint8_t callIdx) {
 
   switch (callPrivIdx) {  // Balances & BlindSign
     case 1280:            /* module 5 call 0 */
+    case 1287:            /* module 5 call 0 */
     case 1024:            /* module 5 call 0 */
+    case 1031:            /* module 5 call 0 */
     case 7936:            /* module 5 call 0 */
+    case 7943:
     case 1282:
     case 1026:
     case 7938: