🔀 Merge #1857 into deploy/rinkeby

likecoin · Oct 3, 2024 · 4cfa318 · 4cfa318
2 parents ac6e422 + bfeaafd
commit 4cfa318
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/pages/nft/claim/index.vue b/src/pages/nft/claim/index.vue
@@ -564,6 +564,7 @@ import {
   getNFTClassCollectionType,
   nftClassCollectionType,
   parseNFTMetadataURL,
+  parseAutoMemo,
 } from '~/util/nft';
 import { ellipsis } from '~/util/ui';
 import { NFT_BOOK_PLATFORM_LIKER_LAND } from '~/constant';
@@ -844,7 +845,7 @@ export default {
         this.giftInfo = giftInfo;
         this.isPhysicalOnly = isPhysicalOnly;
         this.isAutoDeliver = isAutoDeliver;
-        this.creatorMessage = autoMemo;
+        this.creatorMessage = parseAutoMemo(autoMemo);
         this.status = status;
         this.quantity = quantity;
       } catch (err) {
@@ -859,7 +860,7 @@ export default {
       const { isPhysicalOnly, autoMemo, isAutoDeliver } = data;
       this.isPhysicalOnly = isPhysicalOnly;
       this.isAutoDeliver = isAutoDeliver;
-      this.creatorMessage = autoMemo;
+      this.creatorMessage = parseAutoMemo(autoMemo);
     }
 
     try {

diff --git a/src/util/nft.js b/src/util/nft.js
@@ -214,18 +214,22 @@ export function checkIsNFTBook(classMetadata) {
   );
 }
 
-export function formatEventMemo(event) {
-  const { memo } = event;
+export function parseAutoMemo(memo, index = 0) {
   if (!memo) return memo;
   try {
-    const payload = JSON.parse(event.memo);
+    const payload = JSON.parse(memo.replaceAll('\\"', '"'));
     if (Array.isArray(payload)) {
-      return payload[event.msg_index || 0] || memo;
+      return payload[index] || memo;
     }
   } catch (error) {}
   return memo;
 }
 
+export function formatEventMemo(event) {
+  const { memo } = event;
+  return parseAutoMemo(memo, event.msg_index || 0);
+}
+
 export function formatNFTEvent(event) {
   const {
     class_id: classId,