From 72f4266ae249bdc9f4664453f395d249da312619 Mon Sep 17 00:00:00 2001 From: "Ng Wing Tat, David" Date: Thu, 24 Nov 2022 12:04:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20W.NFT=20checking=20?= =?UTF-8?q?from=20`isWritingNFT`=20to=20`checkIsWritingNFT`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/portfolio.js | 6 +++--- src/store/modules/nft.js | 6 +++--- src/util/nft.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mixins/portfolio.js b/src/mixins/portfolio.js index 340f06c54..9e36885eb 100644 --- a/src/mixins/portfolio.js +++ b/src/mixins/portfolio.js @@ -4,7 +4,7 @@ import throat from 'throat'; import { NFT_CLASS_LIST_SORTING, NFT_CLASS_LIST_SORTING_ORDER, - isWritingNFT, + checkIsWritingNFT, } from '~/util/nft'; import clipboardMixin from '~/mixins/clipboard'; import userInfoMixin from '~/mixins/user-info'; @@ -79,7 +79,7 @@ export default { const nftClassMapOfOther = new Map(); allNFTClassMap.forEach(nft => { - if (!isWritingNFT(this.getNFTClassMetadataById(nft.classId))) { + if (!checkIsWritingNFT(this.getNFTClassMetadataById(nft.classId))) { nftClassMapOfOther.set(nft.classId, nft); } }); @@ -335,7 +335,7 @@ export default { }); // wait for metadata to determine if it is writing NFT - if (isWritingNFT(metadata)) { + if (checkIsWritingNFT(metadata)) { try { await this.fetchNFTPurchaseInfo(classId); } catch (error) { diff --git a/src/store/modules/nft.js b/src/store/modules/nft.js index 24b79e346..1822ed9d7 100644 --- a/src/store/modules/nft.js +++ b/src/store/modules/nft.js @@ -5,7 +5,7 @@ import * as api from '@/util/api'; import { NFT_CLASS_LIST_SORTING, NFT_CLASS_LIST_SORTING_ORDER, - isWritingNFT, + checkIsWritingNFT, isValidHttpUrl, formatOwnerInfoFromChain, getNFTsRespectDualPrefix, @@ -48,10 +48,10 @@ function compareIsWritingNFT(getters, classIdA, classIdB) { const aPurchaseData = getters.getNFTClassPurchaseInfoById(classIdA); const bPurchaseData = getters.getNFTClassPurchaseInfoById(classIdB); const aIsWritingNFT = - isWritingNFT(aMetadata) && + checkIsWritingNFT(aMetadata) && (aPurchaseData?.price || aPurchaseData?.lastSoldPrice) !== undefined; const bIsWritingNFT = - isWritingNFT(bMetadata) && + checkIsWritingNFT(bMetadata) && (bPurchaseData?.price || bPurchaseData?.lastSoldPrice) !== undefined; if (aIsWritingNFT && !bIsWritingNFT) return -1; if (!aIsWritingNFT && bIsWritingNFT) return 1; diff --git a/src/util/nft.js b/src/util/nft.js index e321c5f8c..bc6b93900 100644 --- a/src/util/nft.js +++ b/src/util/nft.js @@ -166,7 +166,7 @@ export function getNFTClassCollectionType(classMetadata) { } } -export function isWritingNFT(classMetadata) { +export function checkIsWritingNFT(classMetadata) { return ( getNFTClassCollectionType(classMetadata) === nftClassCollectionType.WritingNFT From 715e666de29992f70b7071c326390fd96198b48c Mon Sep 17 00:00:00 2001 From: "Ng Wing Tat, David" Date: Thu, 24 Nov 2022 12:24:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=92=84=20[NFT=20Details]=20Hide=20mes?= =?UTF-8?q?sage=20list=20identity=20type=20except=20for=20`mint=5Fnft`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/NFTMessage/Identity.vue | 9 ++++++++- src/components/NFTMessage/index.vue | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/components/NFTMessage/Identity.vue b/src/components/NFTMessage/Identity.vue index 115aba156..c1a3152ca 100644 --- a/src/components/NFTMessage/Identity.vue +++ b/src/components/NFTMessage/Identity.vue @@ -20,7 +20,10 @@ :is-avatar-outlined="isUserCivicLiker" />
-
{{ userLabel }}
+
{{ userLabel }}
@@ -49,6 +52,10 @@ export default { type: [String, Array], default: undefined, }, + isShowTypeLabel: { + type: Boolean, + default: true, + }, }, computed: { toRoute() { diff --git a/src/components/NFTMessage/index.vue b/src/components/NFTMessage/index.vue index 2383ce91c..849bf1f2a 100644 --- a/src/components/NFTMessage/index.vue +++ b/src/components/NFTMessage/index.vue @@ -31,6 +31,7 @@ @@ -101,6 +103,9 @@ export default { return this.$t('nft_message_type_generic'); } }, + isShowIdentityTypeLabel() { + return this.type === 'mint_nft'; + }, }, }; From 8bd023c12979d8f6f1798ced09d649b6bf3d6928 Mon Sep 17 00:00:00 2001 From: "Ng Wing Tat, David" Date: Thu, 24 Nov 2022 12:36:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=92=84=20[Event=20List=20Table]=20Add?= =?UTF-8?q?=20icon=20for=20`mint=5Fnft`=20&=20unknown=20event?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/NFTPage/EventList/Table.vue | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/components/NFTPage/EventList/Table.vue b/src/components/NFTPage/EventList/Table.vue index 9a2cea8c2..1ad9cf1bc 100644 --- a/src/components/NFTPage/EventList/Table.vue +++ b/src/components/NFTPage/EventList/Table.vue @@ -18,7 +18,6 @@