From bc7e1babb9c7cb96280a8a3b32d440fcb0fa66a7 Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 10:59:10 +0300 Subject: [PATCH 01/18] const: COLLECTION_DEPOSIT, learnMore --- utils/constants.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/constants.ts b/utils/constants.ts index 1cabf445a0..00ac80079d 100644 --- a/utils/constants.ts +++ b/utils/constants.ts @@ -65,6 +65,10 @@ export const URLS = { cloudflare: 'https://cloudflare-ipfs.com/ipfs/', pinata: 'https://api.pinata.cloud/', }, + collection: { + learnMore: + 'https://hello.kodadot.xyz/multi-chain/fees/assethub-fees#polkadot-asset-hub-fees-prev.-statemint', + }, } export const apolloClientConfig = { @@ -109,3 +113,5 @@ export const NFT_SQUID_SORT_COLLECTIONS: string[] = [ export const MIN_OFFER_PRICE = 0.01 export const EXTERNAL_LINK_WHITELIST = ['*.kodadot.xyz'] + +export const COLLECTION_DEPOSIT = 0.1 From 46d65191a8619c95e906798429542e741066d7e4 Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 10:59:44 +0300 Subject: [PATCH 02/18] fix: Add variant --- components/base/SubmitButton.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/base/SubmitButton.vue b/components/base/SubmitButton.vue index 750817f360..cdc05bbf70 100644 --- a/components/base/SubmitButton.vue +++ b/components/base/SubmitButton.vue @@ -7,6 +7,7 @@ :disabled="disabled" :loading="loading" :expanded="expanded" + :variant="variant" icon-pack="far" outlined @click.native="$emit('click')"> @@ -19,6 +20,7 @@ From 4d63931ed5da088ec04b726100ebd55b9af90d13 Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 11:12:03 +0300 Subject: [PATCH 03/18] locale --- locales/en.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/locales/en.json b/locales/en.json index 4755fa4ea4..bae1cfe08a 100644 --- a/locales/en.json +++ b/locales/en.json @@ -35,6 +35,7 @@ "facts": "Facts", "computed id": "Computed id", "create collection": "Create Collection", + "not enough funds": "Not Enough Funds", "Select collection where do you want mint your token": "Select collection where do you want mint your token", "Maximum NFTs in collection": "Maximum NFTs in collection", "name": "Name", @@ -538,7 +539,9 @@ "smallDisplay": "Small Display", "largeDisplay": "Large Display", "emptyAddress": "Receiver address cannot be empty", - "emptyListAmount": "Amount should be greater than 0" + "emptyListAmount": "Amount should be greater than 0", + "deposit1": "A deposit of", + "deposit2": "is required to create a collection. Please note, this initial deposit is refundable." }, "nft": { "carbonless": "This NFT is carbonless", From d92c4ef1583d94aea1765068cde717ce2d7c79b1 Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 11:13:44 +0300 Subject: [PATCH 04/18] feat: create collection submit message --- components/rmrk/Create/CreateCollection.vue | 34 ++++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/components/rmrk/Create/CreateCollection.vue b/components/rmrk/Create/CreateCollection.vue index b7ddecfb7b..e3d54ac6f9 100644 --- a/components/rmrk/Create/CreateCollection.vue +++ b/components/rmrk/Create/CreateCollection.vue @@ -38,15 +38,21 @@ @@ -65,6 +71,7 @@ import SubmitButton from '@/components/base/SubmitButton.vue' import { NeoField, NeoInput } from '@kodadot1/brick' import { BaseCollectionType } from '@/composables/transaction/types' import useLoader from '@/composables/useLoader' +import { COLLECTION_DEPOSIT, URLS } from '@/utils/constants' interface ComponentWithCheckValidity extends Vue { checkValidity(): boolean @@ -93,9 +100,8 @@ const checkValidity = () => { const rmrkId = computed(() => generateId(accountId.value, symbol.value)) -const balanceNotEnough = computed(() => Number(balance.value) <= 2) -const balanceNotEnoughMessage = computed(() => - balanceNotEnough.value ? $i18n.t('tooltip.notEnoughBalance') : '' +const balanceNotEnough = computed( + () => Number(balance.value) <= COLLECTION_DEPOSIT ) const isMintDisabled = computed(() => balanceNotEnough.value) @@ -154,3 +160,15 @@ const submit = async () => { } } + + From 5156e82b4c7cc8ed7b7f18502b3f9d576661dd9f Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 13:11:03 +0300 Subject: [PATCH 05/18] fix: unused imports --- components/rmrk/Create/CreateCollection.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/components/rmrk/Create/CreateCollection.vue b/components/rmrk/Create/CreateCollection.vue index e3d54ac6f9..660838ae3c 100644 --- a/components/rmrk/Create/CreateCollection.vue +++ b/components/rmrk/Create/CreateCollection.vue @@ -90,7 +90,6 @@ const symbolInput = ref() const { accountId, balance, isLogIn } = useAuth() const { isLoading, status } = useLoader() const emit = defineEmits(['created']) -const { $i18n } = useNuxtApp() const checkValidity = () => { return ( From 46bf2c6fa46e6ee6fa230825441374cb67a35f42 Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 13:19:18 +0300 Subject: [PATCH 06/18] fix: sonar-cloud xss warning --- components/rmrk/Create/CreateCollection.vue | 5 ++++- utils/constants.ts | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/components/rmrk/Create/CreateCollection.vue b/components/rmrk/Create/CreateCollection.vue index 660838ae3c..10b1b0c05b 100644 --- a/components/rmrk/Create/CreateCollection.vue +++ b/components/rmrk/Create/CreateCollection.vue @@ -51,7 +51,10 @@ {{ $t('tooltip.deposit1') }} {{ COLLECTION_DEPOSIT }} KSM {{ $t('tooltip.deposit2') }} - Learn more + Learn more diff --git a/utils/constants.ts b/utils/constants.ts index 00ac80079d..9349230bd0 100644 --- a/utils/constants.ts +++ b/utils/constants.ts @@ -65,10 +65,6 @@ export const URLS = { cloudflare: 'https://cloudflare-ipfs.com/ipfs/', pinata: 'https://api.pinata.cloud/', }, - collection: { - learnMore: - 'https://hello.kodadot.xyz/multi-chain/fees/assethub-fees#polkadot-asset-hub-fees-prev.-statemint', - }, } export const apolloClientConfig = { From 21ef9ebd4bb83591215fe10da85473ca0264a505 Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 13:20:42 +0300 Subject: [PATCH 07/18] fix: unused imports --- components/rmrk/Create/CreateCollection.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/rmrk/Create/CreateCollection.vue b/components/rmrk/Create/CreateCollection.vue index 10b1b0c05b..3fa5a700ef 100644 --- a/components/rmrk/Create/CreateCollection.vue +++ b/components/rmrk/Create/CreateCollection.vue @@ -74,7 +74,7 @@ import SubmitButton from '@/components/base/SubmitButton.vue' import { NeoField, NeoInput } from '@kodadot1/brick' import { BaseCollectionType } from '@/composables/transaction/types' import useLoader from '@/composables/useLoader' -import { COLLECTION_DEPOSIT, URLS } from '@/utils/constants' +import { COLLECTION_DEPOSIT } from '@/utils/constants' interface ComponentWithCheckValidity extends Vue { checkValidity(): boolean From e7f0415fafc41519e6d6986effbb57d108d35964 Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 13:52:17 +0300 Subject: [PATCH 08/18] fix: add safe href --- components/rmrk/Create/CreateCollection.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/rmrk/Create/CreateCollection.vue b/components/rmrk/Create/CreateCollection.vue index 3fa5a700ef..d1143445ce 100644 --- a/components/rmrk/Create/CreateCollection.vue +++ b/components/rmrk/Create/CreateCollection.vue @@ -52,7 +52,9 @@ {{ COLLECTION_DEPOSIT }} KSM {{ $t('tooltip.deposit2') }} Learn more From 46f4e37f194b2d276a2fd331dac34a2ad2580711 Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 15:15:30 +0300 Subject: [PATCH 09/18] fix: disabled icon --- components/base/SubmitButton.vue | 4 +++- components/rmrk/Create/CreateCollection.vue | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/base/SubmitButton.vue b/components/base/SubmitButton.vue index cdc05bbf70..413939a911 100644 --- a/components/base/SubmitButton.vue +++ b/components/base/SubmitButton.vue @@ -3,7 +3,7 @@ (), { loading: false, disabled: false, + disabledIcon: false, type: 'is-primary', icon: 'paper-plane', size: 'medium', diff --git a/components/rmrk/Create/CreateCollection.vue b/components/rmrk/Create/CreateCollection.vue index d1143445ce..bac8f75526 100644 --- a/components/rmrk/Create/CreateCollection.vue +++ b/components/rmrk/Create/CreateCollection.vue @@ -43,7 +43,7 @@ expanded :label="balanceNotEnough ? 'not enough funds' : 'create collection'" :loading="isLoading" - :icon="'false'" + disabled-icon variant="k-accent" :disabled="balanceNotEnough" @click="submit" /> From 203293808fe304b480006a29b6c1f02cdfe9b348 Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 20:16:01 +0300 Subject: [PATCH 10/18] remove default icon --- components/base/SubmitButton.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/base/SubmitButton.vue b/components/base/SubmitButton.vue index 413939a911..5fa147336b 100644 --- a/components/base/SubmitButton.vue +++ b/components/base/SubmitButton.vue @@ -3,7 +3,7 @@ (), { disabled: false, disabledIcon: false, type: 'is-primary', - icon: 'paper-plane', + icon: '', size: 'medium', variant: 'k-accent', }) From 62b18a1bf19bd97a463153179a1329f8883caf5e Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 20:16:48 +0300 Subject: [PATCH 11/18] refactor: collection deposit message --- components/shared/CollectionDeposit.vue | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 components/shared/CollectionDeposit.vue diff --git a/components/shared/CollectionDeposit.vue b/components/shared/CollectionDeposit.vue new file mode 100644 index 0000000000..acfce0ad77 --- /dev/null +++ b/components/shared/CollectionDeposit.vue @@ -0,0 +1,45 @@ + + + + + From c75c6593c33241dc6f065f761ff7ad35c17bf59e Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 20:17:27 +0300 Subject: [PATCH 12/18] locale --- locales/en.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/locales/en.json b/locales/en.json index bae1cfe08a..25325e4840 100644 --- a/locales/en.json +++ b/locales/en.json @@ -35,7 +35,6 @@ "facts": "Facts", "computed id": "Computed id", "create collection": "Create Collection", - "not enough funds": "Not Enough Funds", "Select collection where do you want mint your token": "Select collection where do you want mint your token", "Maximum NFTs in collection": "Maximum NFTs in collection", "name": "Name", @@ -540,8 +539,7 @@ "largeDisplay": "Large Display", "emptyAddress": "Receiver address cannot be empty", "emptyListAmount": "Amount should be greater than 0", - "deposit1": "A deposit of", - "deposit2": "is required to create a collection. Please note, this initial deposit is refundable." + "deposit": "A deposit of {amount} {token} is required to create a collection. Please note, this initial deposit is refundable." }, "nft": { "carbonless": "This NFT is carbonless", From 7d33ec8344446288b999d2b3f6d5e430c3fa3d63 Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 20:18:04 +0300 Subject: [PATCH 13/18] refactor collection deposit values --- utils/constants.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/constants.ts b/utils/constants.ts index 9349230bd0..55a2389d9d 100644 --- a/utils/constants.ts +++ b/utils/constants.ts @@ -110,4 +110,6 @@ export const MIN_OFFER_PRICE = 0.01 export const EXTERNAL_LINK_WHITELIST = ['*.kodadot.xyz'] -export const COLLECTION_DEPOSIT = 0.1 +export const COLLECTION_DEPOSIT_KSM = 0.1 + +export const COLLECTION_DEPOSIT_BSX = 0.0067 From d5ff609d7d43e959ece06380e7912301f09839ae Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 20:21:17 +0300 Subject: [PATCH 14/18] refactor: collection deposit component --- components/bsx/Create/CreateCollection.vue | 23 +++++++++----- components/rmrk/Create/CreateCollection.vue | 33 ++++++--------------- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/components/bsx/Create/CreateCollection.vue b/components/bsx/Create/CreateCollection.vue index 8442c388c0..1a72f81f3a 100644 --- a/components/bsx/Create/CreateCollection.vue +++ b/components/bsx/Create/CreateCollection.vue @@ -25,12 +25,20 @@ - + + @@ -61,6 +69,8 @@ import { BaseCollectionType } from '@/composables/transaction/types' import shouldUpdate from '@/utils/shouldUpdate' import { Token, getBalance, getDeposit, getFeesToken } from './utils' import { NeoField } from '@kodadot1/brick' +import CollectionDeposit from '@/components/shared/CollectionDeposit.vue' +import { COLLECTION_DEPOSIT_BSX } from '~~/utils/constants' const components = { Loader: () => import('@/components/shared/Loader.vue'), @@ -91,7 +101,7 @@ export default class CreateCollection extends mixins( public collectionDeposit = '' protected id = '0' protected attributes: Attribute[] = [] - protected balanceNotEnough = false + protected balanceNotEnough = this.balanceOfToken <= COLLECTION_DEPOSIT_BSX public feesToken: Token = 'BSX' @Ref('collectionForm') readonly collectionForm @@ -99,11 +109,8 @@ export default class CreateCollection extends mixins( return this.collectionForm.checkValidity() } - get balanceNotEnoughMessage() { - if (this.balanceNotEnough) { - return this.$t('tooltip.notEnoughBalance') - } - return '' + get isBalanceNotEnough() { + return this.balanceNotEnough } @Watch('accountId', { immediate: true }) diff --git a/components/rmrk/Create/CreateCollection.vue b/components/rmrk/Create/CreateCollection.vue index bac8f75526..0edcfa23e0 100644 --- a/components/rmrk/Create/CreateCollection.vue +++ b/components/rmrk/Create/CreateCollection.vue @@ -41,22 +41,18 @@ @@ -76,7 +72,8 @@ import SubmitButton from '@/components/base/SubmitButton.vue' import { NeoField, NeoInput } from '@kodadot1/brick' import { BaseCollectionType } from '@/composables/transaction/types' import useLoader from '@/composables/useLoader' -import { COLLECTION_DEPOSIT } from '@/utils/constants' +import CollectionDeposit from '@/components/shared/CollectionDeposit.vue' +import { COLLECTION_DEPOSIT_KSM } from '~~/utils/constants' interface ComponentWithCheckValidity extends Vue { checkValidity(): boolean @@ -105,7 +102,7 @@ const checkValidity = () => { const rmrkId = computed(() => generateId(accountId.value, symbol.value)) const balanceNotEnough = computed( - () => Number(balance.value) <= COLLECTION_DEPOSIT + () => Number(balance.value) <= COLLECTION_DEPOSIT_KSM ) const isMintDisabled = computed(() => balanceNotEnough.value) @@ -164,15 +161,3 @@ const submit = async () => { } } - - From b713ced3416c37de87f1eea2b588ffc535109c3b Mon Sep 17 00:00:00 2001 From: Peter Kompasz Date: Mon, 21 Aug 2023 20:24:46 +0300 Subject: [PATCH 15/18] fix bug + warning --- components/bsx/Create/CreateCollection.vue | 2 +- components/shared/CollectionDeposit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/bsx/Create/CreateCollection.vue b/components/bsx/Create/CreateCollection.vue index 1a72f81f3a..71c4febef3 100644 --- a/components/bsx/Create/CreateCollection.vue +++ b/components/bsx/Create/CreateCollection.vue @@ -69,7 +69,6 @@ import { BaseCollectionType } from '@/composables/transaction/types' import shouldUpdate from '@/utils/shouldUpdate' import { Token, getBalance, getDeposit, getFeesToken } from './utils' import { NeoField } from '@kodadot1/brick' -import CollectionDeposit from '@/components/shared/CollectionDeposit.vue' import { COLLECTION_DEPOSIT_BSX } from '~~/utils/constants' const components = { @@ -82,6 +81,7 @@ const components = { AccountBalance: () => import('@/components/shared/AccountBalance.vue'), MultiPaymentFeeButton: () => import('@/components/bsx/specific/MultiPaymentFeeButton.vue'), + CollectionDeposit: () => import('@/components/shared/CollectionDeposit.vue'), NeoField, } diff --git a/components/shared/CollectionDeposit.vue b/components/shared/CollectionDeposit.vue index acfce0ad77..ba7d8f52df 100644 --- a/components/shared/CollectionDeposit.vue +++ b/components/shared/CollectionDeposit.vue @@ -28,7 +28,7 @@ const requiredAmount = const learnMoreLink = token === 'KSM' ? 'https://hello.kodadot.xyz/multi-chain/fees/assethub-fees#polkadot-asset-hub-fees-prev.-statemint' - : 'https://hello.kodadot.xyz/multi-chain/fees/assethub-fees#polkadot-asset-hub-fees-prev.-statemint' + : 'https://hello.kodadot.xyz/multi-chain/fees/assethub-fees#polkadot-asset-hub-fees-prev.-statemint?'