From 6bdc2eeeb6743b37b3dece00361f8e44f44ac702 Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Mon, 13 Nov 2023 16:09:51 +0100
Subject: [PATCH 01/85] =?UTF-8?q?=F0=9F=9A=A7=20wip:=20customize=20collect?=
 =?UTF-8?q?ion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/collection/CustomizeModal.vue      | 63 +++++++++++++++++++
 .../HeroButtonCustomizeCollection.vue         | 48 ++++++++++++++
 components/collection/HeroButtons.vue         | 12 ++--
 composables/transaction/types.ts              |  1 +
 pnpm-lock.yaml                                |  2 +-
 .../general/collectionByIdMinimal.graphql     |  1 +
 6 files changed, 119 insertions(+), 8 deletions(-)
 create mode 100644 components/collection/CustomizeModal.vue
 create mode 100644 components/collection/HeroButtonCustomizeCollection.vue

diff --git a/components/collection/CustomizeModal.vue b/components/collection/CustomizeModal.vue
new file mode 100644
index 0000000000..c03e9ed550
--- /dev/null
+++ b/components/collection/CustomizeModal.vue
@@ -0,0 +1,63 @@
+<template>
+  <NeoModal :value="value" @close="value = false">
+    <div class="py-4 px-5 limit-width">
+      <div class="is-flex mb-3 is-size-6">
+        {{ 'Customize Collection' }}
+      </div>
+      <div class="has-text-grey is-size-7 mb-5">
+        This will update the Maximum items in your collection
+      </div>
+      <!-- collection max nfts -->
+      <NeoField
+        :label="$t('Maximum NFTs in collection')"
+        data-testid="collection-maxAmount"
+        required>
+        <div class="w-full">
+          <NeoInput
+            v-model="max"
+            type="number"
+            :placeholder="`${min} is the minimum`"
+            :min="min" />
+        </div>
+      </NeoField>
+      <div class="is-flex is-justify-content-flex-end">
+        <NeoButton
+          class="has-text-weight-bold mr-4"
+          variant="text"
+          no-shadow
+          @click="emit('customize')">
+          <span class="has-text-k-green">
+            {{ $t('Update') }}
+          </span>
+        </NeoButton>
+        <NeoButton
+          class="has-text-weight-bold"
+          variant="text"
+          no-shadow
+          :label="$t('cancel')"
+          @click="value = false" />
+      </div>
+    </div>
+  </NeoModal>
+</template>
+
+<script setup lang="ts">
+import { NeoButton, NeoField, NeoInput, NeoModal } from '@kodadot1/brick'
+
+const props = defineProps<{
+  modelValue: boolean
+  min: number
+}>()
+const emit = defineEmits(['update:value', 'customize'])
+
+const value = useVModel(props, 'modelValue')
+
+const min = computed(() => props.min || 1)
+const max = ref(undefined)
+</script>
+
+<style lang="scss" scoped>
+.limit-width {
+  max-width: 314px;
+}
+</style>
diff --git a/components/collection/HeroButtonCustomizeCollection.vue b/components/collection/HeroButtonCustomizeCollection.vue
new file mode 100644
index 0000000000..2aca241755
--- /dev/null
+++ b/components/collection/HeroButtonCustomizeCollection.vue
@@ -0,0 +1,48 @@
+<template>
+  <NeoDropdownItem @click="customizeCollectionModalActive = true">
+    {{ $i18n.t('moreActions.customize') }}
+  </NeoDropdownItem>
+
+  <CollectionCustomizeModal
+    v-model="customizeCollectionModalActive"
+    :min="min"
+    @customize="closeAndCustomize" />
+</template>
+
+<script setup lang="ts">
+import { Collections } from '@/composables/transaction/types'
+import { NeoDropdownItem } from '@kodadot1/brick'
+
+withDefaults(
+  defineProps<{
+    min: number
+  }>(),
+  {
+    min: undefined,
+  },
+)
+
+const route = useRoute()
+const { $i18n, $updateLoader } = useNuxtApp()
+const { transaction } = useTransaction()
+const { urlPrefix } = usePrefix()
+// const { accountId } = useAuth()
+
+const customizeCollectionModalActive = ref(false)
+
+const customizeCollection = async () => {
+  $updateLoader(true)
+  const id = route.params.id.toString()
+
+  await transaction({
+    interaction: Collections.SET_MAX_SUPPLY,
+    urlPrefix: urlPrefix.value,
+    collectionId: id,
+  })
+}
+
+const closeAndCustomize = () => {
+  customizeCollectionModalActive.value = false
+  customizeCollection()
+}
+</script>
diff --git a/components/collection/HeroButtons.vue b/components/collection/HeroButtons.vue
index be00e802ff..881082267e 100644
--- a/components/collection/HeroButtons.vue
+++ b/components/collection/HeroButtons.vue
@@ -63,11 +63,10 @@
 
           <!-- related: #5792 -->
           <div v-if="isOwner">
-            <HeroButtonDeleteNfts />
-            <HeroButtonDeleteCollection />
-            <!-- <NeoDropdownItem>
-                {{ $i18n.t('moreActions.customize') }}
-              </NeoDropdownItem> -->
+            <CollectionHeroButtonDeleteNfts />
+            <CollectionHeroButtonDeleteCollection />
+            <CollectionHeroButtonCustomizeCollection
+              :min="collectionNftCount" />
           </div>
           <NeoDropdownItem disabled>
             {{ $i18n.t('moreActions.reportCollection') }}
@@ -96,8 +95,6 @@ import {
   NeoModal,
 } from '@kodadot1/brick'
 import { useCollectionMinimal } from '@/components/collection/utils/useCollectionDetails'
-import HeroButtonDeleteCollection from './HeroButtonDeleteCollection.vue'
-import HeroButtonDeleteNfts from './HeroButtonDeleteNfts.vue'
 
 const route = useRoute()
 const { isCurrentOwner } = useAuth()
@@ -114,6 +111,7 @@ const { collection } = useCollectionMinimal({
   collectionId: collectionId.value,
 })
 const collectionIssuer = computed(() => collection.value?.issuer)
+const collectionNftCount = computed(() => collection.value?.nftCount)
 
 const { twitter } = useIdentity({
   address: collectionIssuer,
diff --git a/composables/transaction/types.ts b/composables/transaction/types.ts
index 2525ee686e..c1d856d55e 100644
--- a/composables/transaction/types.ts
+++ b/composables/transaction/types.ts
@@ -180,6 +180,7 @@ export interface ActionMintCollection {
 
 export enum Collections {
   DELETE = 'delete',
+  SET_MAX_SUPPLY = 'setCollectionMaxSupply',
 }
 
 export type ActionsInteractions = Interaction | ShoppingActions | Collections
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 65794c6461..c05acea267 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
 
 settings:
   autoInstallPeers: false
diff --git a/queries/subsquid/general/collectionByIdMinimal.graphql b/queries/subsquid/general/collectionByIdMinimal.graphql
index 3c45c88c22..970e7afe89 100644
--- a/queries/subsquid/general/collectionByIdMinimal.graphql
+++ b/queries/subsquid/general/collectionByIdMinimal.graphql
@@ -10,6 +10,7 @@ query collectionByIdMinimal($id: String!) {
       name
       type
     }
+    nftCount
     metadata
     name
     currentOwner

From 733304a4b9c373591c7e4477598499e78094a97d Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Thu, 23 Nov 2023 17:03:57 +0700
Subject: [PATCH 02/85] fix: show migrate waiting

---
 components/migrate/landing/content/Waiting.vue | 15 +--------------
 locales/en.json                                |  4 +---
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index 9d913a2f2f..3a73283e09 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mt-8 pt-4">
-    <!-- <div class="is-flex is-relative section-title">
+    <div class="is-flex is-relative section-title">
       <img src="/migrate/state-waiting.svg" alt="Ready" />
       <p>{{ $t('migrate.waiting.title') }}</p>
     </div>
@@ -52,19 +52,6 @@
           </div>
         </div>
       </div>
-    </div> -->
-
-    <div class="mt-8 pt-4">
-      <hr />
-      <p class="has-text-grey mb-2">
-        {{ $t('migrate.migrationNotPossible') }}
-      </p>
-      <p>
-        <span v-dompurify-html="$t('migrate.migrationNotPossibleLabel')"></span>
-        <strong v-for="collection in collections" :key="collection.id">
-          &nbsp;{{ collection.name }},
-        </strong>
-      </p>
     </div>
   </div>
 </template>
diff --git a/locales/en.json b/locales/en.json
index d583347be1..b46173a270 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1477,8 +1477,6 @@
       "cta": "Migrate Items",
       "own": "You Own <strong>{0}</strong> From This Collection"
     },
-    "migrationNotPossible": "Migration Not Possible:",
-    "migrationNotPossibleLabel": "Migration Is <strong>Not Possible</strong> For  Following Collections That You Own:",
     "homeButton": "Migration Homepage",
     "review": "Review",
     "reviewCtaUncheck": "Acknowledge Before Proceeding",
@@ -1523,7 +1521,7 @@
       "finalizingItems": "Finalizing {0} Items"
     }
   },
-  "transactionSteps" : {
+  "transactionSteps": {
     "completed": "Completed",
     "error": "Failed to Sign",
     "loading": "Transaction in Progress",

From 2b367566ad4e105db644031f13982e1e5615eefd Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Thu, 23 Nov 2023 17:06:28 +0700
Subject: [PATCH 03/85] Add 'Migrate' menu item to WalletAssetMenu.vue

---
 components/common/ConnectWallet/WalletAssetMenu.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/common/ConnectWallet/WalletAssetMenu.vue b/components/common/ConnectWallet/WalletAssetMenu.vue
index 85415e2888..6dd8e72f54 100644
--- a/components/common/ConnectWallet/WalletAssetMenu.vue
+++ b/components/common/ConnectWallet/WalletAssetMenu.vue
@@ -83,6 +83,10 @@ const menus = ref([
     label: 'Onchain Identity',
     to: '/identity',
   },
+  {
+    label: 'Migrate',
+    to: '/migrate',
+  },
 ])
 
 watchEffect(() => {

From f27b3bcee122987258a92f450d154ac16701b998 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Thu, 23 Nov 2023 17:43:16 +0700
Subject: [PATCH 04/85] Fix image rendering issue in Ready and Waiting
 components

---
 components/migrate/landing/content/Ready.vue  | 15 ++++++++++--
 .../migrate/landing/content/Waiting.vue       | 23 +++++++++++++++----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/components/migrate/landing/content/Ready.vue b/components/migrate/landing/content/Ready.vue
index 322b3786d6..83465d5ecf 100644
--- a/components/migrate/landing/content/Ready.vue
+++ b/components/migrate/landing/content/Ready.vue
@@ -18,12 +18,12 @@
         <div
           class="collection-card-banner"
           :style="{
-            backgroundImage: `url(${sanitizeIpfsUrl(collection.meta?.image)})`,
+            backgroundImage: `url(${entities[collection.id]?.image})`,
           }"></div>
         <div
           class="collection-card-avatar"
           :style="{
-            backgroundImage: `url(${sanitizeIpfsUrl(collection.meta?.image)})`,
+            backgroundImage: `url(${entities[collection.id]?.image})`,
           }"></div>
 
         <div class="collection-card-info">
@@ -68,4 +68,15 @@ defineProps<{
 }>()
 
 const { collections } = await useCollectionReady()
+
+const { urlPrefix } = usePrefix()
+const entities = reactive({})
+watchEffect(() => {
+  collections.value.forEach(async (collection) => {
+    entities[collection.id] = await getNftMetadata(
+      collection as unknown as MinimalNFT,
+      urlPrefix.value,
+    )
+  })
+})
 </script>
diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index 3a73283e09..b4e0abd17f 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -17,22 +17,22 @@
         <div
           class="collection-card-banner"
           :style="{
-            backgroundImage: `url(${sanitizeIpfsUrl(collection.meta?.image)})`,
+            backgroundImage: `url(${entities[collection.id]?.image})`,
           }"></div>
         <div
           class="collection-card-avatar"
           :style="{
-            backgroundImage: `url(${sanitizeIpfsUrl(collection.meta?.image)})`,
+            backgroundImage: `url(${entities[collection.id]?.image})`,
           }"></div>
 
         <div class="collection-card-info">
           <p class="is-size-5 has-text-weight-bold">{{ collection.name }}</p>
-          <p>
+          <!-- <p>
             <span class="has-text-grey mr-2">
               {{ $t('migrate.waiting.status') }}
             </span>
             <a href="#!" class="has-text-k-blue">Another nice name </a>
-          </p>
+          </p> -->
         </div>
 
         <div class="collection-card-info">
@@ -45,7 +45,9 @@
                 "></p>
             </div>
             <div>
-              <NeoButton variant="pill" @click="toReview(collection.id)">
+              <NeoButton
+                variant="pill"
+                @click="toReview(collection.id, collection.nfts?.length)">
                 {{ $t('migrate.waiting.cta') }}
               </NeoButton>
             </div>
@@ -97,4 +99,15 @@ const collections = computed(() => {
 
   return []
 })
+
+const { urlPrefix } = usePrefix()
+const entities = reactive({})
+watchEffect(() => {
+  collections.value.forEach(async (collection) => {
+    entities[collection.id] = await getNftMetadata(
+      collection as unknown as MinimalNFT,
+      urlPrefix.value,
+    )
+  })
+})
 </script>

From 9ad25474f7cd051acd7d279572512f4d647c09b2 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Thu, 23 Nov 2023 18:37:19 +0700
Subject: [PATCH 05/85] Fix migration button visibility

---
 components/migrate/landing/content/Waiting.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index b4e0abd17f..6dc55980c9 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -44,13 +44,14 @@
                   $t('migrate.waiting.own', [collection.nfts?.length])
                 "></p>
             </div>
-            <div>
+            <!-- TODO: how to check if owner already migrate it -->
+            <!-- <div>
               <NeoButton
                 variant="pill"
                 @click="toReview(collection.id, collection.nfts?.length)">
                 {{ $t('migrate.waiting.cta') }}
               </NeoButton>
-            </div>
+            </div> -->
           </div>
         </div>
       </div>

From 0ab18e7c693e957fbf576ba01d1744d6e8b582f3 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:16:17 +0700
Subject: [PATCH 06/85] check migrated button

---
 .../migrate/landing/content/Waiting.vue       | 28 +++++++++++++------
 components/migrate/steps/SignLoader1.vue      | 14 +++++-----
 .../general/collectionMigrateWaiting.graphql  |  1 +
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index 6dc55980c9..aea8c8211a 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -27,12 +27,15 @@
 
         <div class="collection-card-info">
           <p class="is-size-5 has-text-weight-bold">{{ collection.name }}</p>
-          <!-- <p>
+          <p v-if="entities[collection.id]?.migrated[0]?.issuer" class="flex">
             <span class="has-text-grey mr-2">
               {{ $t('migrate.waiting.status') }}
             </span>
-            <a href="#!" class="has-text-k-blue">Another nice name </a>
-          </p> -->
+            <Avatar
+              :value="entities[collection.id]?.migrated[0]?.issuer"
+              :size="26"
+              class="mr-2" />
+          </p>
         </div>
 
         <div class="collection-card-info">
@@ -44,14 +47,13 @@
                   $t('migrate.waiting.own', [collection.nfts?.length])
                 "></p>
             </div>
-            <!-- TODO: how to check if owner already migrate it -->
-            <!-- <div>
+            <div v-if="entities[collection.id]?.migrated[0]?.issuer">
               <NeoButton
                 variant="pill"
                 @click="toReview(collection.id, collection.nfts?.length)">
                 {{ $t('migrate.waiting.cta') }}
               </NeoButton>
-            </div> -->
+            </div>
           </div>
         </div>
       </div>
@@ -60,8 +62,9 @@
 </template>
 
 <script setup lang="ts">
-// import { NeoButton } from '@kodadot1/brick'
+import { NeoButton } from '@kodadot1/brick'
 import collectionMigrateWaiting from '@/queries/subsquid/general/collectionMigrateWaiting.graphql'
+import waifuApi from '@/services/waifu'
 
 defineProps<{
   toReview: (string, number) => void
@@ -74,6 +77,7 @@ type Collections = {
   collectionEntities?: {
     id: string
     name: string
+    currentOwner: string
     nfts?: {
       id: string
     }[]
@@ -105,10 +109,18 @@ const { urlPrefix } = usePrefix()
 const entities = reactive({})
 watchEffect(() => {
   collections.value.forEach(async (collection) => {
-    entities[collection.id] = await getNftMetadata(
+    const metadata = await getNftMetadata(
       collection as unknown as MinimalNFT,
       urlPrefix.value,
     )
+    const migrated = await waifuApi(
+      `/relocations/owners/${collection.currentOwner}`,
+    )
+
+    entities[collection.id] = {
+      ...metadata,
+      migrated: migrated.filter((item) => item.collection === collection.id),
+    }
   })
 })
 </script>
diff --git a/components/migrate/steps/SignLoader1.vue b/components/migrate/steps/SignLoader1.vue
index 54ff2d89f4..140e1826c2 100644
--- a/components/migrate/steps/SignLoader1.vue
+++ b/components/migrate/steps/SignLoader1.vue
@@ -102,12 +102,12 @@ const fromCollection = collections.value.find(
   (collection) => collection.id === route.query.collectionId,
 )
 
-const deleteRelocations = async () => {
-  const relocationsId = `${from}-${fromAccountId}`
-  return await waifuApi(`/relocations/${relocationsId}`, {
-    method: 'DELETE',
-  })
-}
+// const deleteRelocations = async () => {
+//   const relocationsId = `${from}-${fromAccountId}`
+//   return await waifuApi(`/relocations/${relocationsId}`, {
+//     method: 'DELETE',
+//   })
+// }
 
 const startStep1 = async () => {
   step1Iterations.value -= 1
@@ -124,7 +124,7 @@ const startStep1 = async () => {
     issuer: fromAccountId, // accountId.value
   }
 
-  await deleteRelocations()
+  // await deleteRelocations()
 
   if (nextId.value && fromCollection?.metadata) {
     const createArgs = createArgsForNftPallet(accountId.value)
diff --git a/queries/subsquid/general/collectionMigrateWaiting.graphql b/queries/subsquid/general/collectionMigrateWaiting.graphql
index 5187bb973b..fd15a29b94 100644
--- a/queries/subsquid/general/collectionMigrateWaiting.graphql
+++ b/queries/subsquid/general/collectionMigrateWaiting.graphql
@@ -4,6 +4,7 @@ query collectionByAccount($account: String!) {
   ) {
     id
     name
+    currentOwner
     nfts(where: { currentOwner_eq: $account }) {
       id
     }

From 9bd87d73cf839893b515202a94b8e3606fe4ac2e Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Tue, 28 Nov 2023 15:48:45 +0700
Subject: [PATCH 07/85] fix: migrate empty item

---
 components/migrate/landing/content/Ready.vue |  2 +-
 components/migrate/steps/Index.vue           | 16 +-------
 components/migrate/steps/Review.vue          | 18 +--------
 components/migrate/steps/SignLoader1.vue     | 22 ++++++----
 components/migrate/steps/SignLoader2.vue     |  2 +-
 components/migrate/steps/SignLoader3.vue     | 42 +++++++++++++-------
 6 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/components/migrate/landing/content/Ready.vue b/components/migrate/landing/content/Ready.vue
index 83465d5ecf..ee394b653f 100644
--- a/components/migrate/landing/content/Ready.vue
+++ b/components/migrate/landing/content/Ready.vue
@@ -14,7 +14,7 @@
         v-for="collection in collections"
         :key="collection.id"
         class="collection-card"
-        :class="{ 'collection-card-empty': !collection.nftsOwned?.length }">
+        :class="{ 'collection-card-empty': !collection.nfts?.length }">
         <div
           class="collection-card-banner"
           :style="{
diff --git a/components/migrate/steps/Index.vue b/components/migrate/steps/Index.vue
index d15b00224e..1b478107c0 100644
--- a/components/migrate/steps/Index.vue
+++ b/components/migrate/steps/Index.vue
@@ -34,7 +34,7 @@
 
         <div
           v-if="accountId"
-          class="rounded shade-border-color is-flex is-justify-content-start is-flex-grow-1 pl-3">
+          class="rounded-full border border-k-shade is-flex is-justify-content-start is-flex-grow-1 pl-3">
           <IdentityItem
             :label="$t('confirmPurchase.connectedWith')"
             hide-identity-popover
@@ -96,17 +96,3 @@ onBeforeMount(() => {
   }
 })
 </script>
-
-<style scoped lang="scss">
-@import '@/assets/styles/abstracts/variables';
-
-.rounded {
-  border-radius: 10rem;
-}
-
-.shade-border-color {
-  @include ktheme() {
-    border: 1px solid theme('k-shade');
-  }
-}
-</style>
diff --git a/components/migrate/steps/Review.vue b/components/migrate/steps/Review.vue
index 156b6bf02e..493135f632 100644
--- a/components/migrate/steps/Review.vue
+++ b/components/migrate/steps/Review.vue
@@ -25,7 +25,7 @@
       <p>{{ collection?.nftsOwned?.length }}/{{ collection?.nfts?.length }}</p>
     </div>
 
-    <div class="shade-border-color p-2 is-flex is-size-7 has-text-grey">
+    <div class="border border-k-shade p-2 is-flex is-size-7 has-text-grey">
       <NeoIcon icon="circle-info" class="mr-2" />
       <p>{{ $t('migrate.reviewNotes') }}</p>
     </div>
@@ -176,7 +176,7 @@
       :label="checkBalances.label"
       variant="k-accent"
       :disabled="checkBalances.disabled"
-      class="mt-4 btn-submit is-capitalized"
+      class="mt-4 h-14 is-capitalized"
       expanded
       @click="toSign()" />
   </div>
@@ -289,17 +289,3 @@ const toSign = () => {
   })
 }
 </script>
-
-<style scoped lang="scss">
-@import '@/assets/styles/abstracts/variables';
-
-.shade-border-color {
-  @include ktheme() {
-    border: 1px solid theme('k-shade');
-  }
-}
-
-.btn-submit {
-  height: 3.5rem;
-}
-</style>
diff --git a/components/migrate/steps/SignLoader1.vue b/components/migrate/steps/SignLoader1.vue
index 140e1826c2..66e6edfa13 100644
--- a/components/migrate/steps/SignLoader1.vue
+++ b/components/migrate/steps/SignLoader1.vue
@@ -84,6 +84,7 @@ const router = useRouter()
 const to = route.query.destination as Prefix
 const from = route.query.source as Prefix
 const fromAccountId = route.query.accountId?.toString()
+const itemCount = route.query.itemCount?.toString()
 
 const api = await apiInstance.value
 const { steps, updateSteps } = inject('steps') as {
@@ -155,18 +156,25 @@ const startStep1 = async () => {
 const validationStep1 = async () => {
   step1Iterations.value -= 1
 
+  router.push({
+    query: {
+      ...route.query,
+      nextCollectionId: nextId.value,
+    },
+  })
+
   try {
     await waifuApi('/relocations', {
       method: 'POST',
       body: relocationsBody.value,
     })
-    updateSteps('step2')
-    router.push({
-      query: {
-        ...route.query,
-        nextCollectionId: nextId.value,
-      },
-    })
+
+    // skip step2 if no items
+    if (itemCount === '0') {
+      updateSteps('step3-burn')
+    } else {
+      updateSteps('step2')
+    }
   } catch (error) {
     $consola.log(error)
   }
diff --git a/components/migrate/steps/SignLoader2.vue b/components/migrate/steps/SignLoader2.vue
index 2f55758a64..d287daa30e 100644
--- a/components/migrate/steps/SignLoader2.vue
+++ b/components/migrate/steps/SignLoader2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="mb-5">
+  <div v-if="itemCount !== '0'" class="mb-5">
     <div class="is-flex is-align-items-center mb-4">
       <div class="mr-5">
         <NeoIcon v-if="iterations === 0" v-bind="iconSuccess" class="fa-2x" />
diff --git a/components/migrate/steps/SignLoader3.vue b/components/migrate/steps/SignLoader3.vue
index 7a63bac4de..bf3e15865f 100644
--- a/components/migrate/steps/SignLoader3.vue
+++ b/components/migrate/steps/SignLoader3.vue
@@ -31,7 +31,7 @@
 
 <script setup lang="ts">
 import type { Prefix } from '@kodadot1/static'
-import { NFTs } from '@/composables/transaction/types'
+// import { NFTs } from '@/composables/transaction/types'
 import { NeoIcon } from '@kodadot1/brick'
 import {
   type Steps,
@@ -41,7 +41,8 @@ import {
 } from '@/composables/useMigrate'
 
 const route = useRoute()
-const { transaction, status } = useTransaction()
+// const { transaction, status } = useTransaction()
+const { status } = useTransaction()
 
 const from = route.query.source as Prefix
 const fromAccountId = route.query.accountId?.toString()
@@ -81,17 +82,17 @@ const { data } = useGraphql({
   },
 })
 
-const burnItems = async (ids: string[]) => {
-  await transaction(
-    {
-      interaction: NFTs.BURN_MULTIPLE,
-      nftIds: ids,
-      urlPrefix: from,
-    },
-    from,
-  )
-  updateSteps('step3-burn')
-}
+// const burnItems = async (ids: string[]) => {
+//   await transaction(
+//     {
+//       interaction: NFTs.BURN_MULTIPLE,
+//       nftIds: ids,
+//       urlPrefix: from,
+//     },
+//     from,
+//   )
+//   updateSteps('step3-burn')
+// }
 
 // const burnCollection = async () => {
 //   if (fromCollectionId) {
@@ -117,11 +118,16 @@ const congratsPage = () => {
 watchEffect(() => {
   const nfts = (data.value as NftIds)?.nfts
 
+  // burn items
   if (steps.value === 'step3' && nfts?.length) {
-    const ids = nfts.map((nft) => nft.id)
-    burnItems(ids)
+    // const ids = nfts.map((nft) => nft.id)
+    // burnItems(ids)
+
+    // skip burn at the moment
+    congratsPage()
   }
 
+  // ensure to burn items
   if (
     steps.value === 'step3-burn' &&
     status.value === TransactionStatus.Finalized
@@ -130,11 +136,17 @@ watchEffect(() => {
     congratsPage()
   }
 
+  // ensure to burn collection
   if (
     steps.value === 'step3-burn-collection' &&
     status.value === TransactionStatus.Finalized
   ) {
     congratsPage()
   }
+
+  // skip burn at the moment
+  if (steps.value === 'step3-burn') {
+    congratsPage()
+  }
 })
 </script>

From 106070c46b2ca956471998c0d04e76c0ec674696 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Tue, 28 Nov 2023 20:16:41 +0700
Subject: [PATCH 08/85] Refactor migration content components

---
 components/migrate/landing/content/Index.vue  | 19 ++-------------
 components/migrate/landing/content/Ready.vue  |  5 +---
 .../migrate/landing/content/Waiting.vue       | 24 ++++++++++++-------
 composables/useMigrate.ts                     | 16 +++++++++++++
 4 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/components/migrate/landing/content/Index.vue b/components/migrate/landing/content/Index.vue
index 758b06340f..d4d273c295 100644
--- a/components/migrate/landing/content/Index.vue
+++ b/components/migrate/landing/content/Index.vue
@@ -35,10 +35,10 @@
 
     <div v-if="accountId">
       <!-- ready state for migration here -->
-      <MigrateLandingContentReady :key="urlPrefix" :to-review="toReview" />
+      <MigrateLandingContentReady :key="urlPrefix" />
 
       <!-- waiting state for migration here -->
-      <MigrateLandingContentWaiting :key="urlPrefix" :to-review="toReview" />
+      <MigrateLandingContentWaiting :key="urlPrefix" />
     </div>
 
     <!-- empty state collection here -->
@@ -56,23 +56,8 @@
 import { NeoIcon, NeoTooltip } from '@kodadot1/brick'
 import Identity from '@/components/identity/IdentityIndex.vue'
 
-const { sourceSelected, destinationSelected } = useMigrate()
-
 const { accountId } = useAuth()
 const { urlPrefix } = usePrefix()
-
-const toReview = (collectionId, itemCount) => {
-  navigateTo({
-    path: '/migrate/review',
-    query: {
-      accountId: accountId.value,
-      collectionId: collectionId,
-      source: sourceSelected.value?.value,
-      destination: destinationSelected.value?.value,
-      itemCount,
-    },
-  })
-}
 </script>
 
 <style lang="scss">
diff --git a/components/migrate/landing/content/Ready.vue b/components/migrate/landing/content/Ready.vue
index ee394b653f..6fb3bdf60e 100644
--- a/components/migrate/landing/content/Ready.vue
+++ b/components/migrate/landing/content/Ready.vue
@@ -63,10 +63,7 @@
 import { NeoButton } from '@kodadot1/brick'
 import { useCollectionReady } from '@/composables/useMigrate'
 
-defineProps<{
-  toReview: (string, number) => void
-}>()
-
+const { toReview } = useMigrate()
 const { collections } = await useCollectionReady()
 
 const { urlPrefix } = usePrefix()
diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index aea8c8211a..5a1d52230f 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -31,10 +31,13 @@
             <span class="has-text-grey mr-2">
               {{ $t('migrate.waiting.status') }}
             </span>
-            <Avatar
-              :value="entities[collection.id]?.migrated[0]?.issuer"
-              :size="26"
-              class="mr-2" />
+            <NuxtLink
+              :to="`/${urlPrefix}/u/${
+                entities[collection.id]?.migrated[0]?.issuer
+              }`">
+              <IdentityIndex
+                :address="entities[collection.id]?.migrated[0]?.issuer" />
+            </NuxtLink>
           </p>
         </div>
 
@@ -50,7 +53,13 @@
             <div v-if="entities[collection.id]?.migrated[0]?.issuer">
               <NeoButton
                 variant="pill"
-                @click="toReview(collection.id, collection.nfts?.length)">
+                @click="
+                  toReview(
+                    collection.id,
+                    collection.nfts?.length,
+                    entities[collection.id]?.migrated[0]?.issuer,
+                  )
+                ">
                 {{ $t('migrate.waiting.cta') }}
               </NeoButton>
             </div>
@@ -66,10 +75,7 @@ import { NeoButton } from '@kodadot1/brick'
 import collectionMigrateWaiting from '@/queries/subsquid/general/collectionMigrateWaiting.graphql'
 import waifuApi from '@/services/waifu'
 
-defineProps<{
-  toReview: (string, number) => void
-}>()
-
+const { toReview } = useMigrate()
 const { accountId } = useAuth()
 const { client } = usePrefix()
 
diff --git a/composables/useMigrate.ts b/composables/useMigrate.ts
index ceac4ae8e0..d63771e2d9 100644
--- a/composables/useMigrate.ts
+++ b/composables/useMigrate.ts
@@ -197,6 +197,7 @@ export default function useMigrate() {
   const sourceSelected = useSourceSelected()
   const destinationSelected = useDestinationSelected()
   const { urlPrefix, setUrlPrefix } = usePrefix()
+  const { accountId } = useAuth()
 
   watchEffect(() => {
     const chain = sourceSelected.value?.value
@@ -218,10 +219,25 @@ export default function useMigrate() {
     }
   })
 
+  const toReview = (collectionId, itemCount, collectionOwner = '') => {
+    navigateTo({
+      path: '/migrate/review',
+      query: {
+        accountId: accountId.value,
+        collectionId: collectionId,
+        source: sourceSelected.value?.value,
+        destination: destinationSelected.value?.value,
+        itemCount,
+        collectionOwner,
+      },
+    })
+  }
+
   return {
     source,
     sourceSelected,
     destination,
     destinationSelected,
+    toReview,
   }
 }

From 6706052b507ddf54ed5ffe9dabda86ad27d523da Mon Sep 17 00:00:00 2001
From: daiagi <daiagi@gmail.com>
Date: Tue, 28 Nov 2023 20:38:55 +0700
Subject: [PATCH 09/85] ground work

---
 composables/massmint/useMassMint.ts | 156 +++++++++++++++++++++++++++-
 1 file changed, 154 insertions(+), 2 deletions(-)

diff --git a/composables/massmint/useMassMint.ts b/composables/massmint/useMassMint.ts
index 6f2c65b55d..23137a2d01 100644
--- a/composables/massmint/useMassMint.ts
+++ b/composables/massmint/useMassMint.ts
@@ -1,13 +1,18 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
 import { unwrapSafe } from '@/utils/uniquery'
 import resolveQueryPath from '@/utils/queryPathResolver'
 import { NFTToMint, Status } from '@/components/massmint/types'
 import { Interaction } from '@kodadot1/minimark/v1'
-import { MintedCollection } from '@/composables/transaction/types'
+import { MintedCollection, TokenToMint } from '@/composables/transaction/types'
 import {
   createTokensToMint,
   kusamaMintAndList,
   subscribeToCollectionLengthUpdates,
 } from './massMintHelpers'
+import nftStorageApi from '~/services/nftStorage'
+import { createMetadata, unSanitizeIpfsUrl } from '@kodadot1/minimark/utils'
+import { FetchError } from 'ofetch'
 
 export const statusTranslation = (status?: Status): string => {
   const { $i18n } = useNuxtApp()
@@ -139,7 +144,8 @@ export const useMassMint = (
       isError.value = mintAndListResults.isError.value
     })
   } else {
-    simpleMint()
+    // simpleMint()
+    constructMeta(tokens)
   }
   return {
     blockNumber,
@@ -149,3 +155,149 @@ export const useMassMint = (
     isError,
   }
 }
+
+function getFileSuffix(filename: string): string {
+  return filename.split('.').pop() as string
+}
+
+export const pinDirectory = async (files: File[]): Promise<string> => {
+  const formData = new FormData()
+  files.forEach((file) => formData.append('file', file, file.name))
+
+  const response = await nftStorageApi('/pinFile', {
+    method: 'POST',
+    body: formData,
+  }).catch((error: FetchError) => {
+    throw new Error(
+      `[NFT::STORAGE] Unable to PIN Directory for reasons ${error.data}`,
+    )
+  })
+
+  const directoryCid = response.value.cid
+  return directoryCid
+}
+
+function createFilesFromTokens(tokensToMint: TokenToMint[]): File[] {
+  return tokensToMint.map((token, index) => {
+    if (!token.file) {
+      throw new ReferenceError('No file found for token index ' + index)
+    }
+    const suffix = getFileSuffix(token.file.name)
+    return new File([token.file], `${index}.${suffix}`)
+  })
+}
+
+function batchFiles(files: File[], maxBatchSize: number): File[][] {
+  let currentBatch: File[] = []
+  let currentBatchSize = 0
+  const batches: File[][] = []
+
+  const startNewBatch = (file: File) => {
+    currentBatch = [file]
+    currentBatchSize = file.size
+  }
+
+  for (const file of files) {
+    if (currentBatchSize + file.size > maxBatchSize) {
+      batches.push(currentBatch)
+      startNewBatch(file)
+    } else {
+      currentBatch.push(file)
+      currentBatchSize += file.size
+    }
+  }
+
+  if (currentBatch.length > 0) {
+    batches.push(currentBatch)
+  }
+
+  return batches
+}
+
+export async function uploadImages(
+  tokensToMint: TokenToMint[],
+): Promise<string[]> {
+  const MAX_BATCH_SIZE = 100 * 1024 * 1024 // 100 MB in bytes
+  const files = createFilesFromTokens(tokensToMint)
+  const fileBatches = batchFiles(files, MAX_BATCH_SIZE)
+
+  const directoryCIDs = await Promise.all(fileBatches.map(pinDirectory))
+
+  return directoryCIDs.flatMap((directoryCid, batchIndex) =>
+    fileBatches[batchIndex].map(
+      (file, fileIndex) =>
+        `ipfs://${directoryCid}/${fileIndex}.${getFileSuffix(file.name)}`,
+    ),
+  )
+}
+
+function createTokenMetadata(
+  token: TokenToMint,
+  primaryHash: string,
+  enableCarbonOffset: boolean,
+  index: number,
+): File {
+  const preferencesStore = usePreferencesStore()
+  const { name, description, tags, nsfw, file } = token
+  const attributes = [
+    ...(tags || []),
+    ...nsfwAttribute(nsfw),
+    ...(enableCarbonOffset
+      ? offsetAttribute(preferencesStore.getHasCarbonOffset)
+      : []),
+  ]
+
+  const meta = createMetadata(
+    name,
+    description,
+    primaryHash,
+    undefined,
+    attributes,
+    'https://kodadot.xyz',
+    (file as File).type,
+  )
+
+  return new File([JSON.stringify(meta, null, 2)], `${index}.json`, {
+    type: 'application/json',
+  })
+}
+
+async function preheatAndUploadFiles(
+  token: TokenToMint,
+  primaryHash: string,
+): Promise<void> {
+  const { $consola } = useNuxtApp()
+  preheatFileFromIPFS(primaryHash)
+  const filePair: [File, File | null] = [token.file as File, null]
+  const hashPair: [string, string | undefined] = [primaryHash, undefined]
+  await uploadDirectWhenMultiple(filePair, hashPair).catch($consola.warn)
+}
+
+export async function constructMeta(
+  tokensToMint: TokenToMint[],
+  options?: {
+    enableCarbonOffset?: boolean
+  },
+): Promise<string[]> {
+  const { enableCarbonOffset = false } = options || {}
+  const imageHashes = await uploadImages(tokensToMint)
+
+  // Create metadata files
+  const metadataFiles = tokensToMint.map((token, index) => {
+    const imageHash = imageHashes[index]
+    return createTokenMetadata(token, imageHash, enableCarbonOffset, index)
+  })
+
+  // Upload all metadata files as a directory
+  const metaDirectoryCid = await pinDirectory(metadataFiles)
+
+  // Preheat and upload files
+  for (const [index, token] of tokensToMint.entries()) {
+    const imageHash = imageHashes[index]
+    await preheatAndUploadFiles(token, imageHash)
+  }
+
+  return metadataFiles.map((_, index) =>
+    unSanitizeIpfsUrl(`ipfs://${metaDirectoryCid}/${index}.json`),
+  )
+}

From 0040a03be24062d10430c685061884cad96e0109 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Tue, 28 Nov 2023 20:57:03 +0700
Subject: [PATCH 10/85] fix: add skeleton component on deposit

---
 components/migrate/steps/Review.vue           | 97 +++++++++++++------
 composables/useMigrate.ts                     | 14 ++-
 .../general/collectionMigrateReady.graphql    |  2 +-
 3 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/components/migrate/steps/Review.vue b/components/migrate/steps/Review.vue
index 493135f632..a3a1d4f046 100644
--- a/components/migrate/steps/Review.vue
+++ b/components/migrate/steps/Review.vue
@@ -1,33 +1,41 @@
 <template>
   <div>
-    <div class="mt-5">
-      <p class="has-text-weight-bold">{{ $t('migrate.collection') }}</p>
-      <div class="is-flex mt-4">
-        <img
-          class="border mr-4"
-          :src="sanitizeIpfsUrl(collection?.meta?.image)"
-          alt="My crazy adventure"
-          width="48"
-          height="48" />
-        <div>
-          <p>{{ collection?.name }}</p>
-          <p class="has-text-grey is-size-7">
-            {{ $t('migrate.collectionName') }}
-          </p>
+    <div v-if="collectionOwner">
+      <div class="mt-6 font-bold">Migrate Items</div>
+      <hr />
+    </div>
+    <div v-else>
+      <div class="mt-5">
+        <p class="has-text-weight-bold">{{ $t('migrate.collection') }}</p>
+        <div class="is-flex mt-4">
+          <img
+            class="border mr-4"
+            :src="sanitizeIpfsUrl(collection?.meta?.image)"
+            alt="My crazy adventure"
+            width="48"
+            height="48" />
+          <div>
+            <p>{{ collection?.name }}</p>
+            <p class="has-text-grey is-size-7">
+              {{ $t('migrate.collectionName') }}
+            </p>
+          </div>
         </div>
       </div>
-    </div>
 
-    <hr />
+      <hr />
 
-    <div class="is-flex is-justify-content-space-between mb-5">
-      <p>{{ $t('migrate.ready.status') }}</p>
-      <p>{{ collection?.nftsOwned?.length }}/{{ collection?.nfts?.length }}</p>
-    </div>
+      <div class="is-flex is-justify-content-space-between mb-5">
+        <p>{{ $t('migrate.ready.status') }}</p>
+        <p>
+          {{ collection?.nftsOwned?.length }}/{{ collection?.nfts?.length }}
+        </p>
+      </div>
 
-    <div class="border border-k-shade p-2 is-flex is-size-7 has-text-grey">
-      <NeoIcon icon="circle-info" class="mr-2" />
-      <p>{{ $t('migrate.reviewNotes') }}</p>
+      <div class="border border-k-shade p-2 is-flex is-size-7 has-text-grey">
+        <NeoIcon icon="circle-info" class="mr-2" />
+        <p>{{ $t('migrate.reviewNotes') }}</p>
+      </div>
     </div>
 
     <div>
@@ -73,7 +81,10 @@
           </p>
           <div class="is-flex is-justify-content-space-between mb-5">
             <p>Burn {{ itemCount }} Items</p>
-            <p>{{ sourceNetworkFee }} {{ sourceSymbol }}</p>
+            <p v-if="sourceNetworkFee >= 0">
+              {{ sourceNetworkFee }} {{ sourceSymbol }}
+            </p>
+            <div v-else><NeoSkeleton width="100" size="small" /></div>
           </div>
 
           <!-- paid on destination chain -->
@@ -82,9 +93,15 @@
           </p>
           <div class="is-flex is-justify-content-space-between mt-1">
             <p>Migrate {{ itemCount }} Items</p>
-            <p>{{ destinationNetworkFee }} {{ destinationSymbol }}</p>
+            <p v-if="destinationSymbol && destinationNetworkFee >= 0">
+              {{ destinationNetworkFee }} {{ destinationSymbol }}
+            </p>
+            <div v-else><NeoSkeleton width="100" size="small" /></div>
           </div>
+
+          <!-- collection existential deposit -->
           <div
+            v-if="!collectionOwner"
             class="has-text-grey is-flex mt-1 is-align-items-center is-justify-content-space-between">
             <div>
               {{ $t('mint.collection.modal.existentialDeposit') }}
@@ -102,8 +119,13 @@
                 <NeoIcon icon="circle-question" />
               </NeoTooltip>
             </div>
-            <p>{{ totalCollectionDeposit }} {{ destinationSymbol }}</p>
+            <p v-if="destinationSymbol">
+              {{ totalCollectionDeposit }} {{ destinationSymbol }}
+            </p>
+            <div v-else><NeoSkeleton width="100" size="small" /></div>
           </div>
+
+          <!-- nft existential deposit -->
           <div
             class="has-text-grey is-flex mt-1 is-align-items-center is-justify-content-space-between">
             <div>
@@ -122,9 +144,13 @@
                 <NeoIcon icon="circle-question" />
               </NeoTooltip>
             </div>
-            <p>{{ destinationItemDeposit }} {{ destinationSymbol }}</p>
+            <p v-if="destinationSymbol && destinationItemDeposit >= 0">
+              {{ destinationItemDeposit }} {{ destinationSymbol }}
+            </p>
+            <div v-else><NeoSkeleton width="100" size="small" /></div>
           </div>
 
+          <!-- kodadot fee -->
           <div
             class="is-flex mt-1 has-text-grey is-align-items-center is-justify-content-space-between">
             <div>
@@ -138,7 +164,10 @@
                 <NeoIcon icon="circle-question" />
               </NeoTooltip>
             </div>
-            <div>{{ kodadotFee }} {{ destinationSymbol }}</div>
+            <div v-if="destinationSymbol">
+              {{ kodadotFee }} {{ destinationSymbol }}
+            </div>
+            <div v-else><NeoSkeleton width="100" size="small" /></div>
           </div>
         </div>
       </div>
@@ -151,21 +180,27 @@
       <div v-if="source?.value" class="has-text-k-grey is-capitalized">
         On {{ prefixToNetwork[source.value] }}
       </div>
-      <div class="is-flex is-align-items-center">
+      <div
+        v-if="sourceSymbol && sourceNetworkFee >= 0"
+        class="is-flex is-align-items-center">
         <div class="has-text-k-grey is-size-7 mr-2">${{ sourceTotalUsd }}</div>
         <div>{{ sourceNetworkFee }} {{ sourceSymbol }}</div>
       </div>
+      <div v-else><NeoSkeleton width="100" size="small" /></div>
     </div>
     <div class="pb-7 is-flex is-justify-content-space-between">
       <div v-if="destination?.value" class="has-text-k-grey is-capitalized">
         On {{ prefixToNetwork[destination.value] }}
       </div>
-      <div class="is-flex is-align-items-center">
+      <div
+        v-if="destinationSymbol && parseFloat(totalDestination.toString())"
+        class="is-flex is-align-items-center">
         <div class="has-text-k-grey is-size-7 mr-2">
           ${{ totalDestinationUsd }}
         </div>
         <div>{{ totalDestination }} {{ destinationSymbol }}</div>
       </div>
+      <div v-else><NeoSkeleton width="100" size="small" /></div>
     </div>
 
     <NeoField>
@@ -188,6 +223,7 @@ import {
   NeoCheckbox,
   NeoField,
   NeoIcon,
+  NeoSkeleton,
   NeoTooltip,
 } from '@kodadot1/brick'
 import { type Prefix } from '@kodadot1/static'
@@ -207,6 +243,7 @@ const destination = availablePrefixWithIcon().find(
 )
 const itemCount = parseInt(route.query.itemCount?.toString() || '0')
 const fromAccountId = route.query.accountId?.toString()
+const collectionOwner = route.query.collectionOwner?.toString()
 
 const collectionId = route.query.collectionId
 const { collections } = await useCollectionReady()
diff --git a/composables/useMigrate.ts b/composables/useMigrate.ts
index d63771e2d9..84eca3ebdb 100644
--- a/composables/useMigrate.ts
+++ b/composables/useMigrate.ts
@@ -106,6 +106,9 @@ export function useMigrateDeposit(
   const fiatStore = useFiatStore()
   const preferencesStore = usePreferencesStore()
 
+  const route = useRoute()
+  const collectionOwner = route.query.collectionOwner?.toString()
+
   const chainDecimals = computed(() => {
     if (chain.value?.tokenDecimals) {
       return chain.value.tokenDecimals
@@ -144,11 +147,12 @@ export function useMigrateDeposit(
   })
 
   const totalChain = computed(() => {
-    const total =
-      chainNetworkFee.value +
-      parseFloat(totalCollectionDeposit.value) +
-      chainItemDeposit.value +
-      kodadotFee.value
+    let total =
+      chainNetworkFee.value + chainItemDeposit.value + kodadotFee.value
+
+    if (!collectionOwner) {
+      total += parseFloat(totalCollectionDeposit.value)
+    }
 
     if (isNaN(total)) {
       return 0
diff --git a/queries/subsquid/general/collectionMigrateReady.graphql b/queries/subsquid/general/collectionMigrateReady.graphql
index a05dddb7e1..e5368b9388 100644
--- a/queries/subsquid/general/collectionMigrateReady.graphql
+++ b/queries/subsquid/general/collectionMigrateReady.graphql
@@ -1,4 +1,4 @@
-query collectionByAccount($account: String!) {
+query collectionMigrateReady($account: String!) {
   collectionEntities(
     where: { currentOwner_eq: $account }
     orderBy: blockNumber_DESC

From 14f5a99c49743b530c93a5901a28555c9671c4c7 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Tue, 28 Nov 2023 11:29:08 -0300
Subject: [PATCH 11/85] unecessary awaits

---
 tests/e2e/collection.spec.ts |  2 +-
 tests/e2e/explore.spec.ts    |  6 +++---
 tests/e2e/search.spec.ts     | 10 ----------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/tests/e2e/collection.spec.ts b/tests/e2e/collection.spec.ts
index cb97be7e03..0809a7aaa1 100644
--- a/tests/e2e/collection.spec.ts
+++ b/tests/e2e/collection.spec.ts
@@ -16,7 +16,7 @@ test('Collection interactions', async ({ page, Commands }) => {
     'Geometry',
   )
   //Share Button
-  const shareBtn = await page.getByTestId('share-button').first()
+  const shareBtn = page.getByTestId('share-button').first()
   await shareBtn.click()
   await page.getByTestId('hero-copy-link-dropdown').first().click()
   await Commands.copyText('http://localhost:9090/ahp/collection/38')
diff --git a/tests/e2e/explore.spec.ts b/tests/e2e/explore.spec.ts
index 87f5fd8018..e2fed7e536 100644
--- a/tests/e2e/explore.spec.ts
+++ b/tests/e2e/explore.spec.ts
@@ -35,16 +35,16 @@ test('Explore Items on ahk, sort by ascending price and filter by minimum 100 KS
   await expect(tabs.getByText('Items')).toBeVisible()
   const expandSearch = page.getByTestId('sidebar-price-filter')
   await expandSearch.click()
-  const inputMin = await expandSearch.getByTestId('input-min')
+  const inputMin = expandSearch.getByTestId('input-min')
   await inputMin.type('100')
-  const btnApply = await expandSearch.getByTestId('apply').first()
+  const btnApply = expandSearch.getByTestId('apply').first()
   await Promise.all([
     page.waitForResponse(
       (resp) => resp.url().includes('imagedelivery.net') && resp.ok(),
     ),
     btnApply.click(),
   ])
-  const exploreSort = await page.getByTestId('explore-sort-dropdown').nth(1)
+  const exploreSort = page.getByTestId('explore-sort-dropdown').nth(1)
   await exploreSort.click()
   await page.getByTestId('price_ASC').nth(1).click()
   const btnAsc = await page.$('[value="price_ASC"]')
diff --git a/tests/e2e/search.spec.ts b/tests/e2e/search.spec.ts
index 27cc50345d..b626568ee9 100644
--- a/tests/e2e/search.spec.ts
+++ b/tests/e2e/search.spec.ts
@@ -10,16 +10,6 @@ test('Check if search provide results', async ({ page }) => {
   const searchBar = page.getByTestId('search-bar')
   await searchBar.locator('input').fill('waifu')
   await page.locator('.search-suggestion-container').hover()
-  /* await Promise.all([
-    page.waitForResponse(
-      (resp) =>
-        resp
-          .url()
-          .includes(
-            'bafybeidqnzwlm5hvik7thsenuziurlnlkcfxuafbu2nfrqgcu4ladr2zhu'
-          ) && resp.status() === 302
-    ),
-  ]) */
   //check contents of Collection Tab
   const tabCollection = page.getByTestId('collection-tab')
   await expect(tabCollection.locator('.neo-skeleton-item').first()).toBeVisible(

From a13245494cd95cf857ed8499c4c7e413996d0811 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Tue, 28 Nov 2023 11:29:51 -0300
Subject: [PATCH 12/85] deprecated type command

---
 tests/e2e/explore.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/explore.spec.ts b/tests/e2e/explore.spec.ts
index e2fed7e536..db2c992b2e 100644
--- a/tests/e2e/explore.spec.ts
+++ b/tests/e2e/explore.spec.ts
@@ -36,7 +36,7 @@ test('Explore Items on ahk, sort by ascending price and filter by minimum 100 KS
   const expandSearch = page.getByTestId('sidebar-price-filter')
   await expandSearch.click()
   const inputMin = expandSearch.getByTestId('input-min')
-  await inputMin.type('100')
+  await inputMin.fill('100')
   const btnApply = expandSearch.getByTestId('apply').first()
   await Promise.all([
     page.waitForResponse(

From 9c325f256217a91207769d8ddac32e14a9d8bb60 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Tue, 28 Nov 2023 13:09:58 -0300
Subject: [PATCH 13/85] no more getByPlaceholder

---
 components/create/CreateCollection.vue    |  1 +
 components/rmrk/Create/AttributeInput.vue |  2 ++
 components/shared/AddressInput.vue        |  1 +
 tests/e2e/createcollection.spec.ts        |  2 +-
 tests/e2e/createnft.spec.ts               | 20 ++++++++++++++++----
 tests/e2e/footer.spec.ts                  |  2 +-
 tests/e2e/transfer.spec.ts                | 16 ++++------------
 7 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/components/create/CreateCollection.vue b/components/create/CreateCollection.vue
index c7d0ee440a..1a51623da4 100644
--- a/components/create/CreateCollection.vue
+++ b/components/create/CreateCollection.vue
@@ -68,6 +68,7 @@
             v-model="max"
             class="mt-3"
             type="number"
+            data-testid="collection-input-maximum-nfts"
             placeholder="1 is the minimum"
             :min="1" />
         </div>
diff --git a/components/rmrk/Create/AttributeInput.vue b/components/rmrk/Create/AttributeInput.vue
index a268e541d2..665e47b2f6 100644
--- a/components/rmrk/Create/AttributeInput.vue
+++ b/components/rmrk/Create/AttributeInput.vue
@@ -11,12 +11,14 @@
       v-model="vKey"
       placeholder="Section"
       expanded
+      data-testid="attribute-input-section"
       :disabled="disabled"
       spellcheck="true" />
     <NeoInput
       v-model="vValue"
       placeholder="Value"
       expanded
+      data-testid="attribute-input-value"
       spellcheck="true"
       :disabled="disabled" />
   </NeoField>
diff --git a/components/shared/AddressInput.vue b/components/shared/AddressInput.vue
index b89429b638..e39ec77323 100644
--- a/components/shared/AddressInput.vue
+++ b/components/shared/AddressInput.vue
@@ -5,6 +5,7 @@
         v-model="inputValue"
         :icon-right="iconRight"
         :placeholder="placeholder"
+        data-testid="global-address-input"
         icon-right-clickable
         @icon-right-click="clearIconClick" />
     </NeoField>
diff --git a/tests/e2e/createcollection.spec.ts b/tests/e2e/createcollection.spec.ts
index 9b0b668f75..59936b4244 100644
--- a/tests/e2e/createcollection.spec.ts
+++ b/tests/e2e/createcollection.spec.ts
@@ -23,7 +23,7 @@ test('Fill fields to check if they work', async ({ page, Commands }) => {
   const collectionAmount = page.getByTestId('collection-maxAmount')
   await collectionAmount.locator('.o-switch').click()
   await expect(
-    collectionAmount.getByPlaceholder('1 is the minimum'),
+    collectionAmount.getByTestId('collection-input-maximum-nfts'),
   ).toBeVisible()
   //Check if button exists
   await expect(page.getByTestId('collection-create')).toBeVisible()
diff --git a/tests/e2e/createnft.spec.ts b/tests/e2e/createnft.spec.ts
index aeae373911..957189cdbb 100644
--- a/tests/e2e/createnft.spec.ts
+++ b/tests/e2e/createnft.spec.ts
@@ -49,13 +49,25 @@ test('Create NFT', async ({ page, Commands }) => {
     //add new attribute
     await page.getByTestId('button-add-attribute').click()
     //fill section
-    await page.getByTestId('attr-0').getByPlaceholder('Section').fill('BG')
+    await page
+      .getByTestId('attr-0')
+      .getByTestId('attribute-input-section')
+      .fill('BG')
     //fill value
-    await page.getByTestId('attr-0').getByPlaceholder('Value').fill('Red')
+    await page
+      .getByTestId('attr-0')
+      .getByTestId('attribute-input-value')
+      .fill('Red')
     //add new attribute
     await page.getByTestId('button-add-attribute').click()
-    await page.getByTestId('attr-1').getByPlaceholder('Section').fill('Dress')
-    await page.getByTestId('attr-1').getByPlaceholder('Value').fill('Blue')
+    await page
+      .getByTestId('attr-1')
+      .getByTestId('attribute-input-section')
+      .fill('Dress')
+    await page
+      .getByTestId('attr-1')
+      .getByTestId('attribute-input-value')
+      .fill('Blue')
     //remove last attribute
     await page.getByTestId('attribute-button-remove').last().click()
     await expect(page.getByTestId('attr-1')).not.toBeVisible()
diff --git a/tests/e2e/footer.spec.ts b/tests/e2e/footer.spec.ts
index 880a4732c0..6b2d50f852 100644
--- a/tests/e2e/footer.spec.ts
+++ b/tests/e2e/footer.spec.ts
@@ -81,7 +81,7 @@ const footerSocialMediaLinks = [
 test('Check Footer Subscription', async ({ page }) => {
   await page.goto('/')
   const footerSubscribe = page.getByTestId('footer-subscribe')
-  await footerSubscribe.getByPlaceholder('jane.doe@kodadot.xyz').fill('a')
+  await footerSubscribe.locator('input').fill('a')
   await footerSubscribe.locator('button').click()
   await expect(footerSubscribe.locator('.error')).toBeVisible()
 })
diff --git a/tests/e2e/transfer.spec.ts b/tests/e2e/transfer.spec.ts
index 723cd06e31..777bb25597 100644
--- a/tests/e2e/transfer.spec.ts
+++ b/tests/e2e/transfer.spec.ts
@@ -8,23 +8,15 @@ test('Transfer Page Functionality', async ({ page, Commands }) => {
     .getAttribute('data-key')
   await page.getByTestId('transfer-copy-sender-address').click()
   await Commands.copyText(`${UserAddress}`)
-  await page
-    .getByPlaceholder('Enter wallet address')
-    .fill('0xwer6544443653444422')
+  await page.getByTestId('global-address-input').fill('0xwer6544443653444422')
   await expect(page.getByTestId('addresschecker-infobox-invalid')).toBeVisible()
   await test.step('Add and Fill input recipients', async () => {
-    await page
-      .getByPlaceholder('Enter wallet address')
-      .nth(0)
-      .fill(`${UserAddress}`)
+    await page.getByTestId('global-address-input').nth(0).fill(`${UserAddress}`)
     await page.getByTestId('transfer-input-amount-token').nth(0).fill('1')
     //add recipient
     await page.getByTestId('transfer-icon-add-recipient').click()
     //fill polkadot Address and amount on last field
-    await page
-      .getByPlaceholder('Enter wallet address')
-      .nth(1)
-      .fill(`${UserAddress}`)
+    await page.getByTestId('global-address-input').nth(1).fill(`${UserAddress}`)
     await page.getByTestId('transfer-input-amount-token').nth(1).fill('5')
   })
   //triggers switch to send same amount
@@ -68,7 +60,7 @@ test('Transfer Page Functionality', async ({ page, Commands }) => {
         .getByText('KSM')
         .click()
       await page
-        .getByPlaceholder('Enter wallet address')
+        .getByTestId('global-address-input')
         .nth(0)
         .fill(`${UserAddress}`)
       await expect(

From d2d536a308f24c9d86faecb715ddac755f38dd29 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Tue, 28 Nov 2023 14:57:38 -0300
Subject: [PATCH 14/85] collection test readability and debug

---
 tests/e2e/collection.spec.ts | 215 +++++++++++++++++++++--------------
 1 file changed, 128 insertions(+), 87 deletions(-)

diff --git a/tests/e2e/collection.spec.ts b/tests/e2e/collection.spec.ts
index 0809a7aaa1..a009c8f2cd 100644
--- a/tests/e2e/collection.spec.ts
+++ b/tests/e2e/collection.spec.ts
@@ -4,101 +4,142 @@ const collectionName = 'Pare1d0scope'
 const collectionAddress = '/ahp/collection/38/'
 
 test('Collection interactions', async ({ page, Commands }) => {
-  await page.goto(collectionAddress)
-  await Commands.scrollDownAndStop()
-  await expect(page.getByTestId('collection-banner-name')).toContainText(
-    collectionName,
-  )
-  //description show more
-  await page.getByTestId('description-show-less-more-button').click()
-  //collection description
-  await expect(page.getByTestId('collection-description')).toContainText(
-    'Geometry',
-  )
+  await test.step('Access collection address and scroll down', async () => {
+    await page.goto(collectionAddress)
+    await Commands.scrollDownAndStop()
+  })
+  await test.step('Check collection name and description', async () => {
+    await expect(page.getByTestId('collection-banner-name')).toContainText(
+      collectionName,
+    )
+    //description show more
+    await page.getByTestId('description-show-less-more-button').click()
+    //collection description
+    await expect(page.getByTestId('collection-description')).toContainText(
+      'Geometry',
+    )
+  })
+
   //Share Button
-  const shareBtn = page.getByTestId('share-button').first()
-  await shareBtn.click()
-  await page.getByTestId('hero-copy-link-dropdown').first().click()
-  await Commands.copyText('http://localhost:9090/ahp/collection/38')
-  await shareBtn.click()
-  await page.getByTestId('hero-share-QR-dropdown').first().click()
-  await expect(page.getByTestId('hero-share-qrcode-modal')).toBeVisible()
-  await page.keyboard.press('Escape')
-  await shareBtn.click()
-  await Commands.checkNewTab(
-    'https://twitter.com',
-    await page.getByTestId('hero-share-twitter-dropdown').first().click(),
-  )
+  await test.step('Share button functionality', async () => {
+    const shareBtn = page.getByTestId('share-button').first()
+    await shareBtn.click()
+    await page.getByTestId('hero-copy-link-dropdown').first().click()
+    await Commands.copyText('http://localhost:9090/ahp/collection/38')
+    await shareBtn.click()
+    await page.getByTestId('hero-share-QR-dropdown').first().click()
+    await expect(page.getByTestId('hero-share-qrcode-modal')).toBeVisible()
+    await page.keyboard.press('Escape')
+    await shareBtn.click()
+    await Commands.checkNewTab(
+      'https://twitter.com',
+      await page.getByTestId('hero-share-twitter-dropdown').first().click(),
+    )
+  })
+
   //ITEMS TAB ----------------------------
   //Buy Now Filter
-  await page.getByTestId('filter-checkbox-buynow').nth(1).click()
-  await Commands.scrollDownAndStop()
-  for (const el of await page.locator('[class="infinite-scroll-item"]').all()) {
-    await expect(el).toContainText('DOT')
-  }
+  await test.step('Verify if checking buy now filter only yield results with price ', async () => {
+    await page.getByTestId('filter-checkbox-buynow').nth(1).click()
+    await Commands.scrollDownAndStop()
+    for (const el of await page
+      .locator('[class="infinite-scroll-item"]')
+      .all()) {
+      await expect(el).toContainText('DOT')
+    }
+  })
+
   //Buy Now Button on nft card opens wallet sidebar
-  await page.locator('[class="infinite-scroll-item"]').first().hover()
-  await page.getByTestId('item-buy').first().click()
-  await expect(page.getByTestId('wallet-connect-sidebar-modal')).toBeVisible()
-  await page.keyboard.press('Escape')
-  await expect(
-    page.getByTestId('wallet-connect-sidebar-modal'),
-  ).not.toBeVisible()
+  await test.step('Verifies if buy now button on first NFT card opens connect wallet sidebar', async () => {
+    await page.locator('[class="infinite-scroll-item"]').first().hover()
+    await page.getByTestId('item-buy').first().click()
+    await expect(page.getByTestId('wallet-connect-sidebar-modal')).toBeVisible()
+    await page.keyboard.press('Escape')
+    await expect(
+      page.getByTestId('wallet-connect-sidebar-modal'),
+    ).not.toBeVisible()
+  })
+
   //cart test
-  await page.locator('[class="infinite-scroll-item"]').nth(0).hover()
-  await page.getByTestId('item-add-to-cart').nth(0).click()
-  await page.locator('[class="infinite-scroll-item"]').nth(1).hover()
-  await page.getByTestId('item-add-to-cart').nth(1).click()
-  await page.getByTestId('navbar-button-cart').click()
-  await expect(page.getByTestId('shopping-cart-modal')).toBeVisible()
-  await expect(page.getByTestId('shopping-cart-item').nth(0)).toContainText(
-    collectionName,
-  )
-  await expect(page.getByTestId('shopping-cart-item').nth(1)).toContainText(
-    collectionName,
-  )
-  await page.getByTestId('modal-close-button').click()
+  await test.step('Add two first nfts to cart and check if they got inserted', async () => {
+    await page.locator('[class="infinite-scroll-item"]').nth(0).hover()
+    await page.getByTestId('item-add-to-cart').nth(0).click()
+    await page.locator('[class="infinite-scroll-item"]').nth(1).hover()
+    await page.getByTestId('item-add-to-cart').nth(1).click()
+    await page.getByTestId('navbar-button-cart').click()
+    await expect(page.getByTestId('shopping-cart-modal')).toBeVisible()
+    await expect(page.getByTestId('shopping-cart-item').nth(0)).toContainText(
+      collectionName,
+    )
+    await expect(page.getByTestId('shopping-cart-item').nth(1)).toContainText(
+      collectionName,
+    )
+    await page.getByTestId('modal-close-button').click()
+  })
+
   //art view
-  await page.getByTestId('advanced-filter-collapsible').first().click()
-  await page.getByTestId('filter-artview-checkbox').nth(1).click()
-  await expect(page.getByTestId('nft-name')).not.toBeVisible()
-  await page.getByTestId('filter-artview-checkbox').nth(1).click()
+  await test.step('Activates art view and check if NFT name was hidden', async () => {
+    await page.getByTestId('advanced-filter-collapsible').first().click()
+    await page.getByTestId('filter-artview-checkbox').nth(1).click()
+    await Commands.scrollDownAndStop()
+    await expect(page.getByTestId('nft-name')).not.toBeVisible()
+    await page.getByTestId('filter-artview-checkbox').nth(1).click()
+  })
+
   //ACTIVITY TAB ----------------------------
-  await page.getByTestId('collection-tab-activity').nth(1).click()
-  await Commands.scrollDownAndStop()
+  await test.step('Switches to activity tab', async () => {
+    await page.getByTestId('collection-tab-activity').nth(1).click()
+    await Commands.scrollDownAndStop()
+  })
+
   //chart
-  await expect(page.getByTestId('collection-activity-chart')).toBeVisible()
+  await test.step('Checks chart visibility', async () => {
+    await expect(page.getByTestId('collection-activity-chart')).toBeVisible()
+  })
+
   //Holders Tab
-  const holdersTab = page.getByTestId('collection-holders-container')
-  //check if nft details on Holders tab has content
-  await page.getByTestId('collection-holder-nft-details').first().click()
-  await expect(holdersTab).toContainText(collectionName)
-  //check if popover on Holders is present
-  await expect(page.getByTestId('collection-nft-holder').first()).toBeVisible()
-  await page.getByTestId('collection-nft-holder-address').first().hover()
-  await expect(page.getByTestId('identity-popover-container')).toBeVisible()
+  await test.step('Holders tab Interactions', async () => {
+    const holdersTab = page.getByTestId('collection-holders-container')
+    //check if nft details on Holders tab has content
+    await page.getByTestId('collection-holder-nft-details').first().click()
+    await expect(holdersTab).toContainText(collectionName)
+    //check if popover on Holders is present
+    await expect(
+      page.getByTestId('collection-nft-holder').first(),
+    ).toBeVisible()
+    await page.getByTestId('collection-nft-holder-address').first().hover()
+    await expect(page.getByTestId('identity-popover-container')).toBeVisible()
+  })
+
   //event filters
-  const eventTable = page.getByTestId('nfts-event-table')
-  const saleFilter = page.getByTestId('event-checkbox-filter-sale').nth(1)
-  const listingFilter = page.getByTestId('event-checkbox-filter-listing').nth(1)
-  const mintFilter = page.getByTestId('event-checkbox-filter-mint').nth(1)
-  const transferFilter = page
-    .getByTestId('event-checkbox-filter-transfer')
-    .nth(1)
-  await saleFilter.check()
-  await expect(eventTable).toContainText('Sale')
-  await saleFilter.uncheck()
-  await listingFilter.check()
-  await expect(eventTable).toContainText('List')
-  await listingFilter.uncheck()
-  await mintFilter.check()
-  await expect(eventTable).toContainText('Mint')
-  await mintFilter.uncheck()
-  await transferFilter.check()
-  await expect(eventTable).toContainText('Transfer')
-  //check if creator address redirects to proper page
-  await page.getByTestId('collection-creator-address').click()
-  await expect(page).toHaveURL(
-    '/ahp/u/15CoYMEnJhhWHvdEPXDuTBnZKXwrJzMQdcMwcHGsVx5kXYvW',
-  )
+  await test.step('Event Filters(sale,list,mint,transfer)', async () => {
+    const eventTable = page.getByTestId('nfts-event-table')
+    const saleFilter = page.getByTestId('event-checkbox-filter-sale').nth(1)
+    const listingFilter = page
+      .getByTestId('event-checkbox-filter-listing')
+      .nth(1)
+    const mintFilter = page.getByTestId('event-checkbox-filter-mint').nth(1)
+    const transferFilter = page
+      .getByTestId('event-checkbox-filter-transfer')
+      .nth(1)
+    await saleFilter.check()
+    await expect(eventTable).toContainText('Sale')
+    await saleFilter.uncheck()
+    await listingFilter.check()
+    await expect(eventTable).toContainText('List')
+    await listingFilter.uncheck()
+    await mintFilter.check()
+    await expect(eventTable).toContainText('Mint')
+    await mintFilter.uncheck()
+    await transferFilter.check()
+    await expect(eventTable).toContainText('Transfer')
+  })
+
+  //Creator link
+  await test.step('Check if creator address redirects to proper page', async () => {
+    await page.getByTestId('collection-creator-address').click()
+    await expect(page).toHaveURL(
+      '/ahp/u/15CoYMEnJhhWHvdEPXDuTBnZKXwrJzMQdcMwcHGsVx5kXYvW',
+    )
+  })
 })

From b64a68cdf357eda4399dafdc3538968da3c020dd Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Tue, 28 Nov 2023 20:05:10 -0300
Subject: [PATCH 15/85] createcollection test readability and debug

---
 tests/e2e/createcollection.spec.ts | 105 +++++++++++++++++------------
 1 file changed, 61 insertions(+), 44 deletions(-)

diff --git a/tests/e2e/createcollection.spec.ts b/tests/e2e/createcollection.spec.ts
index 59936b4244..eb93df8253 100644
--- a/tests/e2e/createcollection.spec.ts
+++ b/tests/e2e/createcollection.spec.ts
@@ -1,65 +1,82 @@
 import { expect, test } from './fixtures'
 
 test('Fill fields to check if they work', async ({ page, Commands }) => {
-  //E2E connection
-  await Commands.e2elogin()
-  //Goto
-  await page.goto('/create/collection')
-  //upload image logo
-  await page.setInputFiles('input[type="file"]', 'tests/e2e/unsplash-image.jpg')
-  //checks if Collection Name Title Exists
-  await expect(
-    page
+  await test.step('Login and goto create collection ', async () => {
+    //E2E connection
+    await Commands.e2elogin()
+    //Goto
+    await page.goto('/create/collection')
+  })
+  await test.step('Upload image ', async () => {
+    //upload image logo
+    await page.setInputFiles(
+      'input[type="file"]',
+      'tests/e2e/unsplash-image.jpg',
+    )
+  })
+  await test.step('Fill collection name and description', async () => {
+    //checks if Collection Name Title Exists
+    await expect(
+      page
+        .getByTestId('collection-name')
+        .filter({ has: page.getByText('Collection Name') }),
+    ).toHaveCount(1)
+    await page
       .getByTestId('collection-name')
-      .filter({ has: page.getByText('Collection Name') }),
-  ).toHaveCount(1)
-  await page
-    .getByTestId('collection-name')
-    .locator('input')
-    .fill('Best Collection Name')
-  // Fill collection Description
-  await page.getByTestId('collection-desc').fill('Best Collection Ever Created')
-  //active unlimited items switch
-  const collectionAmount = page.getByTestId('collection-maxAmount')
-  await collectionAmount.locator('.o-switch').click()
-  await expect(
-    collectionAmount.getByTestId('collection-input-maximum-nfts'),
-  ).toBeVisible()
-  //Check if button exists
-  await expect(page.getByTestId('collection-create')).toBeVisible()
-  await expect(
-    page
-      .getByTestId('collection-create')
-      .filter({ has: page.getByText('Not Enough Funds') }),
-  ).toHaveCount(1)
+      .locator('input')
+      .fill('Best Collection Name')
+    // Fill collection Description
+    await page
+      .getByTestId('collection-desc')
+      .fill('Best Collection Ever Created')
+  })
+  await test.step('Activate unlimited items switch and verify if input is shown', async () => {
+    //active unlimited items switch
+    const collectionAmount = page.getByTestId('collection-maxAmount')
+    await collectionAmount.locator('.o-switch').click()
+    await expect(
+      collectionAmount.getByTestId('collection-input-maximum-nfts'),
+    ).toBeVisible()
+  })
+  await test.step('Check if create collection button is on page', async () => {
+    //Check if button exists
+    await expect(page.getByTestId('collection-create')).toBeVisible()
+    await expect(
+      page
+        .getByTestId('collection-create')
+        .filter({ has: page.getByText('Not Enough Funds') }),
+    ).toHaveCount(1)
+  })
 })
 
 test('Check if chain change works using the dropdown', async ({
   page,
   Commands,
 }) => {
-  //E2E connection
-  await Commands.e2elogin()
-  await page.goto('/create/collection')
+  await test.step('Login and goto create collection', async () => {
+    await Commands.e2elogin()
+    await page.goto('/create/collection')
+  })
   expect(page.getByTestId('collection-chain')).toBeVisible()
   await page.getByTestId('collection-chain').selectOption('KusamaHub')
-  //Check if balances and deposits shows
-  await expect(page.getByTestId('collection-deposit')).toBeVisible({
-    timeout: 30000,
+  await test.step('Verify if balances are loaded', async () => {
+    //Check if balances and deposits shows
+    await expect(page.getByTestId('collection-deposit')).toBeVisible({
+      timeout: 30000,
+    })
+    await expect(page.getByTestId('collection-balance')).toBeVisible({
+      timeout: 30000,
+    })
   })
-  await expect(page.getByTestId('collection-balance')).toBeVisible({
-    timeout: 30000,
+  await test.step('Changes to RMRK2 and verifies if chain changed', async () => {
+    await page.getByTestId('collection-chain').selectOption('RMRK2')
+    await expect(page.getByTestId('chain')).toContainText('rmrk2')
   })
-  await page.getByTestId('collection-chain').selectOption('RMRK2')
 })
 
-test('Show warning message on field when collection name empty', async ({
-  page,
-}) => {
+test('Verifies error message if collection name is empty', async ({ page }) => {
   await page.goto('/create/collection')
-  // defines a variable containing the collection name data-testid
   const collectionName = page.getByTestId('collection-name')
-  // Fill and check if Collection Name works properly by checking warning
   await collectionName.locator('input').fill('Kodadot Warning Test')
   await collectionName.locator('input').fill('')
   await page.getByTestId('collection-desc').click()

From 3ffb3b786b95ba386ab39df0d94dd0697747b5ea Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 13:32:29 +0700
Subject: [PATCH 16/85] Fix null reference error in WalletAssetNfts.vue

---
 components/common/ConnectWallet/WalletAssetNfts.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/common/ConnectWallet/WalletAssetNfts.vue b/components/common/ConnectWallet/WalletAssetNfts.vue
index f0dc9738c0..741eaa840a 100644
--- a/components/common/ConnectWallet/WalletAssetNfts.vue
+++ b/components/common/ConnectWallet/WalletAssetNfts.vue
@@ -5,11 +5,11 @@
     <div class="nfts">
       <a
         v-for="nft in nfts"
-        :key="nft.id"
-        v-safe-href="`/${urlPrefix}/gallery/${nft.id}`">
+        :key="nft?.id"
+        v-safe-href="`/${urlPrefix}/gallery/${nft?.id}`">
         <MediaItem
-          :src="sanitizeIpfsUrl(nft.meta.image)"
-          :mime-type="nft.type" />
+          :src="sanitizeIpfsUrl(nft?.meta.image)"
+          :mime-type="nft?.type" />
       </a>
     </div>
   </div>

From dbdc37fed643c9a00f191ceb131a35e3ee2d4d45 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:00:39 +0700
Subject: [PATCH 17/85] Refactor collection card class in Ready.vue

---
 components/migrate/landing/content/Ready.vue | 21 +++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/components/migrate/landing/content/Ready.vue b/components/migrate/landing/content/Ready.vue
index 6fb3bdf60e..7be442f8f5 100644
--- a/components/migrate/landing/content/Ready.vue
+++ b/components/migrate/landing/content/Ready.vue
@@ -14,7 +14,10 @@
         v-for="collection in collections"
         :key="collection.id"
         class="collection-card"
-        :class="{ 'collection-card-empty': !collection.nfts?.length }">
+        :class="{
+          'collection-card-empty':
+            !collection.nfts?.length || entities[collection.id]?.hide,
+        }">
         <div
           class="collection-card-banner"
           :style="{
@@ -62,18 +65,30 @@
 <script setup lang="ts">
 import { NeoButton } from '@kodadot1/brick'
 import { useCollectionReady } from '@/composables/useMigrate'
+import waifuApi from '@/services/waifu'
 
+const { accountId } = useAuth()
 const { toReview } = useMigrate()
 const { collections } = await useCollectionReady()
 
 const { urlPrefix } = usePrefix()
 const entities = reactive({})
-watchEffect(() => {
+watchEffect(async () => {
+  const migrated = await waifuApi(`/relocations/owners/${accountId.value}`)
+
   collections.value.forEach(async (collection) => {
-    entities[collection.id] = await getNftMetadata(
+    const metadata = await getNftMetadata(
       collection as unknown as MinimalNFT,
       urlPrefix.value,
     )
+    const hide = migrated?.some((item) => {
+      return item.collection === collection.id
+    })
+
+    entities[collection.id] = {
+      ...metadata,
+      hide,
+    }
   })
 })
 </script>

From d652286b952fbc554db9e123103e38f63029de4e Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:25:59 +0700
Subject: [PATCH 18/85] Refactor Review.vue component and useMigrate.ts

---
 components/migrate/steps/Review.vue           | 29 ++++++++++++++++++-
 composables/useMigrate.ts                     |  6 ++++
 .../general/collectionMigrateReady.graphql    |  6 ++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/components/migrate/steps/Review.vue b/components/migrate/steps/Review.vue
index a3a1d4f046..6528993338 100644
--- a/components/migrate/steps/Review.vue
+++ b/components/migrate/steps/Review.vue
@@ -1,7 +1,22 @@
 <template>
   <div>
     <div v-if="collectionOwner">
-      <div class="mt-6 font-bold">Migrate Items</div>
+      <div class="my-4 font-bold">Migrate Items</div>
+      <div class="max-h-40 overflow-auto">
+        <div
+          v-for="nft in collectionAnother?.nfts"
+          :key="nft.id"
+          class="flex items-center gap-4 mb-2"
+          :class="{ hidden: nft.currentOwner !== accountId }">
+          <NuxtImg
+            :src="sanitizeIpfsUrl(nft.meta?.image)"
+            :alt="nft.name"
+            width="32"
+            height="32"
+            class="border" />
+          <p>{{ nft.name }}</p>
+        </div>
+      </div>
       <hr />
     </div>
     <div v-else>
@@ -231,6 +246,7 @@ import { prefixToNetwork } from '@/composables/useMultipleBalance'
 import { useCollectionReady, useMigrateDeposit } from '@/composables/useMigrate'
 import { availablePrefixWithIcon } from '@/utils/chain'
 
+const { urlPrefix } = usePrefix()
 const { $i18n } = useNuxtApp()
 const { accountId } = useAuth()
 
@@ -246,11 +262,22 @@ const fromAccountId = route.query.accountId?.toString()
 const collectionOwner = route.query.collectionOwner?.toString()
 
 const collectionId = route.query.collectionId
+
+// a collection where the owner is myself
 const { collections } = await useCollectionReady()
 const collection = computed(() =>
   collections.value.find((item) => item.id === collectionId),
 )
 
+// a collection where the owner is someone else
+const { collections: collectionsAnother } = await useCollectionReady(
+  urlPrefix.value,
+  collectionOwner,
+)
+const collectionAnother = computed(() =>
+  collectionsAnother.value.find((item) => item.id === collectionId),
+)
+
 // source balance and deposit
 const sourceChain = computed(() => (source?.value || 'ksm') as Prefix)
 const {
diff --git a/composables/useMigrate.ts b/composables/useMigrate.ts
index 84eca3ebdb..37982ebac4 100644
--- a/composables/useMigrate.ts
+++ b/composables/useMigrate.ts
@@ -56,6 +56,12 @@ type CollectionsReady = {
     }[]
     nfts?: {
       id: string
+      name?: string
+      currentOwner?: string
+      meta?: {
+        id: string
+        image: string
+      }
     }[]
   }[]
 }
diff --git a/queries/subsquid/general/collectionMigrateReady.graphql b/queries/subsquid/general/collectionMigrateReady.graphql
index e5368b9388..dda51b9fe1 100644
--- a/queries/subsquid/general/collectionMigrateReady.graphql
+++ b/queries/subsquid/general/collectionMigrateReady.graphql
@@ -18,6 +18,12 @@ query collectionMigrateReady($account: String!) {
     }
     nfts(where: { burned_not_eq: true }) {
       id
+      name
+      currentOwner
+      meta {
+        id
+        image
+      }
     }
   }
 }

From 5701409bfb0cd0c0d059223ed53854124ce2d8a2 Mon Sep 17 00:00:00 2001
From: Jarsen <31397967+Jarsen136@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:27:29 +0800
Subject: [PATCH 19/85] fix: Loader design

---
 libs/ui/src/components/NeoButton/NeoButton.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/ui/src/components/NeoButton/NeoButton.scss b/libs/ui/src/components/NeoButton/NeoButton.scss
index 6f8bacfab3..0eaaf81577 100644
--- a/libs/ui/src/components/NeoButton/NeoButton.scss
+++ b/libs/ui/src/components/NeoButton/NeoButton.scss
@@ -160,12 +160,12 @@
   &.loading-with-label.o-btn--loading {
     @apply text-k-grey #{!important};
 
-    :deep(.o-btn__label) {
-      @apply my-0 mx-[3px] #{!important};
+    .o-btn__label {
+      @apply mr-3 #{!important};
     }
 
     &::after {
-        @apply relative left-0 border-2 border-k-grey rounded-full border-r-transparent border-t-transparent my-0 ml-1 mx-[3px] h-[1em] w-[1em] #{!important};
+      @apply relative left-0 border-2 border-k-grey rounded-full border-r-transparent border-t-transparent h-[1em] w-[1em] #{!important};
     }
   }
 

From 51dcce6372ed5e1cc2590b8d4319e161184fe4f2 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:02:58 +0700
Subject: [PATCH 20/85] Fix collectionOwner query parameter bug

---
 components/migrate/steps/Review.vue      |  1 -
 components/migrate/steps/Sign.vue        |  7 ++++++-
 components/migrate/steps/SignLoader1.vue |  3 ++-
 components/migrate/steps/SignLoader2.vue | 24 ++++++++++++++++++++++--
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/components/migrate/steps/Review.vue b/components/migrate/steps/Review.vue
index 6528993338..7e0e656865 100644
--- a/components/migrate/steps/Review.vue
+++ b/components/migrate/steps/Review.vue
@@ -260,7 +260,6 @@ const destination = availablePrefixWithIcon().find(
 const itemCount = parseInt(route.query.itemCount?.toString() || '0')
 const fromAccountId = route.query.accountId?.toString()
 const collectionOwner = route.query.collectionOwner?.toString()
-
 const collectionId = route.query.collectionId
 
 // a collection where the owner is myself
diff --git a/components/migrate/steps/Sign.vue b/components/migrate/steps/Sign.vue
index 944d390731..7e85134c9a 100644
--- a/components/migrate/steps/Sign.vue
+++ b/components/migrate/steps/Sign.vue
@@ -31,6 +31,7 @@ const { setUrlPrefix } = usePrefix()
 const route = useRoute()
 
 const to = route.query.destination as Prefix
+const collectionOwner = route.query.collectionOwner?.toString()
 
 setUrlPrefix(to)
 
@@ -43,7 +44,11 @@ provide('steps', {
 })
 
 const signTransactions = async () => {
-  steps.value = 'step1'
+  if (collectionOwner) {
+    steps.value = 'step2'
+  } else {
+    steps.value = 'step1'
+  }
 }
 </script>
 
diff --git a/components/migrate/steps/SignLoader1.vue b/components/migrate/steps/SignLoader1.vue
index 66e6edfa13..feb7e752a6 100644
--- a/components/migrate/steps/SignLoader1.vue
+++ b/components/migrate/steps/SignLoader1.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="mb-5">
+  <div v-if="!collectionOwner" class="mb-5">
     <div class="is-flex is-align-items-center mb-4">
       <div class="mr-5">
         <NeoIcon v-bind="whichIcon()" class="fa-2x" />
@@ -85,6 +85,7 @@ const to = route.query.destination as Prefix
 const from = route.query.source as Prefix
 const fromAccountId = route.query.accountId?.toString()
 const itemCount = route.query.itemCount?.toString()
+const collectionOwner = route.query.collectionOwner?.toString()
 
 const api = await apiInstance.value
 const { steps, updateSteps } = inject('steps') as {
diff --git a/components/migrate/steps/SignLoader2.vue b/components/migrate/steps/SignLoader2.vue
index d287daa30e..28414110e5 100644
--- a/components/migrate/steps/SignLoader2.vue
+++ b/components/migrate/steps/SignLoader2.vue
@@ -61,10 +61,13 @@ const { apiInstance } = useApi()
 const { howAboutToExecute, status } = useMetaTransaction()
 const { $consola } = useNuxtApp()
 const route = useRoute()
+const router = useRouter()
 
 const from = route.query.source as Prefix
 const fromAccountId = route.query.accountId?.toString()
 const itemCount = route.query.itemCount?.toString()
+const collectionOwner = route.query.collectionOwner?.toString()
+const collectionId = route.query.collectionId
 
 const { collections } = await useCollectionReady(from, fromAccountId)
 const fromCollection = collections.value.find(
@@ -106,17 +109,25 @@ const itemLeftIcons = (index) => {
 }
 
 const startStep2 = async () => {
+  let nextCollectionId
   try {
     // eslint-disable-next-line no-restricted-syntax
     for (let index = 0; index < iterations.value; index++) {
+      const fromCollectionId = collectionOwner
+        ? collectionId
+        : fromCollection?.id
       const checkSign = await waifuApi(
-        `/relocations/${from}/${fromCollection?.id}/iterations/${index}`,
+        `/relocations/${from}/${fromCollectionId}/iterations/${index}`,
         {
           method: 'PUT',
         },
       )
 
-      const presigned = checkSign.data.map((item) => {
+      const ownerSign = checkSign.data.filter(
+        (item) => item.account === accountId.value,
+      )
+      nextCollectionId = ownerSign.to_collection
+      const presigned = ownerSign.map((item) => {
         const preSignInfo = api.createType('PalletNftsPreSignedMint', item.data)
         const create = api.tx.nfts.mintPreSigned(
           preSignInfo,
@@ -132,6 +143,15 @@ const startStep2 = async () => {
       batchPresigned[index] = presigned
     }
 
+    if (collectionOwner) {
+      router.push({
+        query: {
+          ...route.query,
+          nextCollectionId,
+        },
+      })
+    }
+
     executeStep2()
   } catch (error) {
     $consola.error('error step2', error)

From 859747909b91c472d6fd1ffa9f0408094fc5f71e Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:52:37 +0700
Subject: [PATCH 21/85] Refactor conditional rendering in Ready.vue and
 Waiting.vue

---
 components/migrate/landing/content/Ready.vue   | 9 ++++++++-
 components/migrate/landing/content/Waiting.vue | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/components/migrate/landing/content/Ready.vue b/components/migrate/landing/content/Ready.vue
index 7be442f8f5..56f7b67bad 100644
--- a/components/migrate/landing/content/Ready.vue
+++ b/components/migrate/landing/content/Ready.vue
@@ -9,7 +9,7 @@
       {{ $t('migrate.ready.desc') }}
     </div>
 
-    <div class="collection">
+    <div v-if="collections.length" class="collection">
       <div
         v-for="collection in collections"
         :key="collection.id"
@@ -59,6 +59,13 @@
         </div>
       </div>
     </div>
+    <div v-else class="text-center mt-8">
+      <p class="is-size-4 has-text-weight-bold">Nothing to Migrate</p>
+      <p>
+        It looks like you have no collections or items ready for migration at
+        this time.
+      </p>
+    </div>
   </div>
 </template>
 
diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index 5a1d52230f..c55cdf545e 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -9,7 +9,7 @@
       {{ $t('migrate.waiting.desc') }}
     </div>
 
-    <div class="collection">
+    <div v-if="collections.length" class="collection">
       <div
         v-for="collection in collections"
         :key="collection.id"
@@ -67,6 +67,13 @@
         </div>
       </div>
     </div>
+    <div v-else class="text-center mt-8">
+      <p class="is-size-4 has-text-weight-bold">Nothing to Migrate</p>
+      <p>
+        It looks like you have no collections or items ready for migration at
+        this time.
+      </p>
+    </div>
   </div>
 </template>
 

From a5f8ab58325899ac61a2240002deaa74f12a2f4d Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 18:14:41 +0700
Subject: [PATCH 22/85] * fix(Waiting.vue): fix condition for displaying
 collection cards based on entities object keys * feat(Waiting.vue): add
 filtering of migrated items based on collection id

---
 .../migrate/landing/content/Waiting.vue       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index c55cdf545e..2c2defe26a 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -9,11 +9,12 @@
       {{ $t('migrate.waiting.desc') }}
     </div>
 
-    <div v-if="collections.length" class="collection">
+    <div v-if="Object.keys(entities).length" class="collection">
       <div
         v-for="collection in collections"
         :key="collection.id"
-        class="collection-card">
+        class="collection-card"
+        :class="{ hidden: !entities[collection.id]?.migrated[0]?.issuer }">
         <div
           class="collection-card-banner"
           :style="{
@@ -126,13 +127,15 @@ watchEffect(() => {
       collection as unknown as MinimalNFT,
       urlPrefix.value,
     )
-    const migrated = await waifuApi(
-      `/relocations/owners/${collection.currentOwner}`,
-    )
+    const migrated = (
+      await waifuApi(`/relocations/owners/${collection.currentOwner}`)
+    ).filter((item) => item.collection === collection.id)
 
-    entities[collection.id] = {
-      ...metadata,
-      migrated: migrated.filter((item) => item.collection === collection.id),
+    if (migrated.length) {
+      entities[collection.id] = {
+        ...metadata,
+        migrated,
+      }
     }
   })
 })

From 16872de17cf19674f2fa6af3189599032f1fcadf Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 18:16:04 +0700
Subject: [PATCH 23/85] * fix(Waiting.vue): remove unnecessary condition for
 displaying issuer information * refactor(Waiting.vue): remove unnecessary
 condition for displaying issuer information

---
 components/migrate/landing/content/Waiting.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index 2c2defe26a..b65a641464 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -28,7 +28,7 @@
 
         <div class="collection-card-info">
           <p class="is-size-5 has-text-weight-bold">{{ collection.name }}</p>
-          <p v-if="entities[collection.id]?.migrated[0]?.issuer" class="flex">
+          <p class="flex">
             <span class="has-text-grey mr-2">
               {{ $t('migrate.waiting.status') }}
             </span>
@@ -51,7 +51,7 @@
                   $t('migrate.waiting.own', [collection.nfts?.length])
                 "></p>
             </div>
-            <div v-if="entities[collection.id]?.migrated[0]?.issuer">
+            <div>
               <NeoButton
                 variant="pill"
                 @click="

From e7597d10563f068fa59ec48b9e4c167c678fbaee Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 18:23:08 +0700
Subject: [PATCH 24/85] * feat(useMigrate.ts): add toReview function for
 navigating to the review page * fix(Ready.vue): remove duplicate import of
 toReview function * fix(Waiting.vue): remove duplicate import of toReview
 function

---
 components/migrate/landing/content/Ready.vue  |  3 +-
 .../migrate/landing/content/Waiting.vue       |  2 +-
 composables/useMigrate.ts                     | 34 ++++++++++---------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/components/migrate/landing/content/Ready.vue b/components/migrate/landing/content/Ready.vue
index 56f7b67bad..c736107be2 100644
--- a/components/migrate/landing/content/Ready.vue
+++ b/components/migrate/landing/content/Ready.vue
@@ -71,11 +71,10 @@
 
 <script setup lang="ts">
 import { NeoButton } from '@kodadot1/brick'
-import { useCollectionReady } from '@/composables/useMigrate'
+import { toReview, useCollectionReady } from '@/composables/useMigrate'
 import waifuApi from '@/services/waifu'
 
 const { accountId } = useAuth()
-const { toReview } = useMigrate()
 const { collections } = await useCollectionReady()
 
 const { urlPrefix } = usePrefix()
diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index b65a641464..7df541c79e 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -82,8 +82,8 @@
 import { NeoButton } from '@kodadot1/brick'
 import collectionMigrateWaiting from '@/queries/subsquid/general/collectionMigrateWaiting.graphql'
 import waifuApi from '@/services/waifu'
+import { toReview } from '@/composables/useMigrate'
 
-const { toReview } = useMigrate()
 const { accountId } = useAuth()
 const { client } = usePrefix()
 
diff --git a/composables/useMigrate.ts b/composables/useMigrate.ts
index 37982ebac4..6a414ed740 100644
--- a/composables/useMigrate.ts
+++ b/composables/useMigrate.ts
@@ -202,12 +202,29 @@ const useDestinationSelected = () =>
     availablePrefixWithIcon().find((item) => item.value === 'ahp'),
   )
 
+export const toReview = (collectionId, itemCount, collectionOwner = '') => {
+  const sourceSelected = useSourceSelected()
+  const destinationSelected = useDestinationSelected()
+  const { accountId } = useAuth()
+
+  navigateTo({
+    path: '/migrate/review',
+    query: {
+      accountId: accountId.value,
+      collectionId: collectionId,
+      source: sourceSelected.value?.value,
+      destination: destinationSelected.value?.value,
+      itemCount,
+      collectionOwner,
+    },
+  })
+}
+
 // default composables
 export default function useMigrate() {
   const sourceSelected = useSourceSelected()
   const destinationSelected = useDestinationSelected()
   const { urlPrefix, setUrlPrefix } = usePrefix()
-  const { accountId } = useAuth()
 
   watchEffect(() => {
     const chain = sourceSelected.value?.value
@@ -229,25 +246,10 @@ export default function useMigrate() {
     }
   })
 
-  const toReview = (collectionId, itemCount, collectionOwner = '') => {
-    navigateTo({
-      path: '/migrate/review',
-      query: {
-        accountId: accountId.value,
-        collectionId: collectionId,
-        source: sourceSelected.value?.value,
-        destination: destinationSelected.value?.value,
-        itemCount,
-        collectionOwner,
-      },
-    })
-  }
-
   return {
     source,
     sourceSelected,
     destination,
     destinationSelected,
-    toReview,
   }
 }

From b7b1fd5e897cf12a40627a804009328ce5ad1a14 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 20:47:28 +0700
Subject: [PATCH 25/85] * fix(Ready.vue): update click event to use
 collection.nfts instead of collection.nftsOwned * fix(SignLoader1.vue):
 remove unused itemCount variable * fix(SignLoader2.vue): update condition to
 check for collectionOwner instead of itemCount * fix(SignLoader3.vue): update
 condition to check for steps.value being 'step3' in addition to 'step3-burn'

---
 components/migrate/landing/content/Ready.vue | 2 +-
 components/migrate/steps/SignLoader1.vue     | 8 +-------
 components/migrate/steps/SignLoader2.vue     | 2 +-
 components/migrate/steps/SignLoader3.vue     | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/components/migrate/landing/content/Ready.vue b/components/migrate/landing/content/Ready.vue
index c736107be2..64d0976bb4 100644
--- a/components/migrate/landing/content/Ready.vue
+++ b/components/migrate/landing/content/Ready.vue
@@ -51,7 +51,7 @@
             <div>
               <NeoButton
                 variant="pill"
-                @click="toReview(collection.id, collection.nftsOwned?.length)">
+                @click="toReview(collection.id, collection.nfts?.length)">
                 {{ $t('migrate.ready.cta') }}
               </NeoButton>
             </div>
diff --git a/components/migrate/steps/SignLoader1.vue b/components/migrate/steps/SignLoader1.vue
index feb7e752a6..ec505ff82b 100644
--- a/components/migrate/steps/SignLoader1.vue
+++ b/components/migrate/steps/SignLoader1.vue
@@ -84,7 +84,6 @@ const router = useRouter()
 const to = route.query.destination as Prefix
 const from = route.query.source as Prefix
 const fromAccountId = route.query.accountId?.toString()
-const itemCount = route.query.itemCount?.toString()
 const collectionOwner = route.query.collectionOwner?.toString()
 
 const api = await apiInstance.value
@@ -170,12 +169,7 @@ const validationStep1 = async () => {
       body: relocationsBody.value,
     })
 
-    // skip step2 if no items
-    if (itemCount === '0') {
-      updateSteps('step3-burn')
-    } else {
-      updateSteps('step2')
-    }
+    updateSteps('step2')
   } catch (error) {
     $consola.log(error)
   }
diff --git a/components/migrate/steps/SignLoader2.vue b/components/migrate/steps/SignLoader2.vue
index 28414110e5..2abe9682af 100644
--- a/components/migrate/steps/SignLoader2.vue
+++ b/components/migrate/steps/SignLoader2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="itemCount !== '0'" class="mb-5">
+  <div v-if="!collectionOwner" class="mb-5">
     <div class="is-flex is-align-items-center mb-4">
       <div class="mr-5">
         <NeoIcon v-if="iterations === 0" v-bind="iconSuccess" class="fa-2x" />
diff --git a/components/migrate/steps/SignLoader3.vue b/components/migrate/steps/SignLoader3.vue
index bf3e15865f..8d6e752ce3 100644
--- a/components/migrate/steps/SignLoader3.vue
+++ b/components/migrate/steps/SignLoader3.vue
@@ -145,7 +145,7 @@ watchEffect(() => {
   }
 
   // skip burn at the moment
-  if (steps.value === 'step3-burn') {
+  if (steps.value === 'step3-burn' || steps.value === 'step3') {
     congratsPage()
   }
 })

From 7b653e2b7bd5ad809c1e028bf17ac57af3cfe0e9 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 20:55:28 +0700
Subject: [PATCH 26/85] * refactor(WalletAssetNfts.vue): replace anchor tag
 with NuxtLink component for recent NFTs rendering

---
 components/common/ConnectWallet/WalletAssetNfts.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/common/ConnectWallet/WalletAssetNfts.vue b/components/common/ConnectWallet/WalletAssetNfts.vue
index 865b924381..37eeab55d2 100644
--- a/components/common/ConnectWallet/WalletAssetNfts.vue
+++ b/components/common/ConnectWallet/WalletAssetNfts.vue
@@ -3,14 +3,14 @@
     <hr class="my-4" />
     <p class="has-text-grey is-size-7 mb-2">Recent NFTs</p>
     <div class="nfts">
-      <a
+      <NuxtLink
         v-for="nft in nfts"
         :key="nft?.id"
-        v-safe-href="`/${urlPrefix}/gallery/${nft?.id}`">
+        :to="`/${urlPrefix}/gallery/${nft?.id}`">
         <BaseMediaItem
           :src="sanitizeIpfsUrl(nft?.meta.image)"
           :mime-type="nft?.type" />
-      </a>
+      </NuxtLink>
     </div>
   </div>
 </template>

From f076bcfe0e6db3c1d77618538db179cd11c9f23f Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Wed, 29 Nov 2023 11:04:47 -0300
Subject: [PATCH 27/85] creatnft test readability

---
 tests/e2e/createnft.spec.ts | 69 ++++++++++++++++++++++++-------------
 1 file changed, 46 insertions(+), 23 deletions(-)

diff --git a/tests/e2e/createnft.spec.ts b/tests/e2e/createnft.spec.ts
index 957189cdbb..7648d53632 100644
--- a/tests/e2e/createnft.spec.ts
+++ b/tests/e2e/createnft.spec.ts
@@ -2,48 +2,57 @@ import { expect, test } from './fixtures'
 
 test('Create NFT', async ({ page, Commands }) => {
   const numOfCopies = 5
-  await Commands.e2elogin()
-  //await page.goto('/ahk/create')
-  await page.goto('/ksm/create')
-  await page.getByTestId('create-landing-nft-button').click()
-  await expect(page).toHaveURL('/ksm/create?select=nft')
-  //Single NFT
-  await test.step('Single NFT', async () => {
+  //Login and navigation
+  await test.step('Login and navigate trough create single nft menus', async () => {
+    await Commands.e2elogin()
+    await page.goto('/ksm/create')
     await Commands.acceptCookies()
-    //select single nft creation
+    await page.getByTestId('create-landing-nft-button').click()
+    await expect(page).toHaveURL('/ksm/create?select=nft')
     await page.getByTestId('create-landing-single-nft-button').click()
-    //upload NFT image
+  })
+
+  //image upload
+  await test.step('Upload image into dropupload', async () => {
     await page.setInputFiles(
       'input[type="file"]',
       'tests/e2e/unsplash-image.jpg',
     )
-    //set name
+  })
+
+  //Fill fields
+  await test.step('Fill name, description and select Ahk on chain dropdown', async () => {
     await page
       .getByTestId('create-nft-input-name')
       .fill('Parametric NFT divergencies')
-    //set description
     await page
       .getByTestId('create-nft-input-description')
       .fill('Testing purpose NFT description using Playwright')
-    //select AHK chain on dropdown
     await page
       .getByTestId('create-nft-dropdown-select')
       .selectOption('KusamaHub')
     await expect(page.getByTestId('chain')).toHaveText('ahk')
-    //list for sale switch
+  })
+
+  //List for sale
+  await test.step('Activates list for sale switch and set a price on the input ', async () => {
     await page.getByTestId('create-nft-sale-switch').click()
-    //set price
     await page.getByTestId('create-nft-input-list-value').fill('5.5')
-    //set number of copies
+  })
+
+  //Copies
+  await test.step('Set number of copies and verifies if hashtag switch is present and click it', async () => {
     await page
       .getByTestId('create-nft-input-copies')
       .fill(numOfCopies.toString())
     await expect(
       page.getByTestId('create-nft-input-copies-switch'),
     ).toBeVisible()
-    //activate hastag switch
     await page.getByTestId('create-nft-input-copies-switch').click()
-    // - - NFT attributes interactions - -
+  })
+
+  //NFT attributes
+  await test.step('Create, fill and delete NFT attributes', async () => {
     //open NFT attribute section
     await page.getByTestId('create-nft-properties').click()
     //add new attribute
@@ -71,26 +80,37 @@ test('Create NFT', async ({ page, Commands }) => {
     //remove last attribute
     await page.getByTestId('attribute-button-remove').last().click()
     await expect(page.getByTestId('attr-1')).not.toBeVisible()
-    //royalty
+  })
+
+  //Royalty
+  await test.step('Sets a royalty percentage, activate the custom royalty switch and verifies its existance', async () => {
     const royaltyFields = page
       .getByTestId('royalty-form-input-percentage')
       .locator('input')
     await royaltyFields.fill('5')
     //royalty switch
     await page.getByTestId('royalty-form-switch').click()
-    //get user address
     const royaltyCustom = page
       .getByTestId('royalty-form-custom-address')
       .locator('input')
     await expect(royaltyCustom).toBeVisible()
-    //NSFW switch
+  })
+
+  //NSFW switch
+  await test.step('Activates NSFW switch', async () => {
     await page.getByTestId('create-nft-nsfw-switch').click()
-    //deposit check
+  })
+
+  //Deposit
+  await test.step('Check if deposits are loaded and properly calculated', async () => {
     const expectedDeposit = `${0.0077 * numOfCopies} KSM`
     await expect(
       page.getByTestId('create-nft-deposit-amount-token'),
     ).toHaveText(expectedDeposit, { timeout: 30000 })
-    //preview box
+  })
+
+  //preview box
+  await test.step('Verifies if contents of the preview box match fields from form', async () => {
     await expect(page.getByTestId('create-nft-preview-box')).toBeVisible()
     expect(
       (await page.getByTestId('nft-preview-name').innerText()).valueOf(),
@@ -98,7 +118,10 @@ test('Create NFT', async ({ page, Commands }) => {
     expect(
       (await page.getByTestId('nft-preview-price').innerText()).valueOf(),
     ).toContain('5.5')
-    //learn more link
+  })
+
+  //learn more link
+  await test.step('Click on the Learn More link and check if new tab has proper URL', async () => {
     await expect(page.getByTestId('create-nft-learn-more-link')).toBeVisible()
     await Commands.checkNewTab(
       'https://hello.kodadot.xyz/multi-chain/fees',

From 8491313a3ce2a275d73d85b5a846109968111c72 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 21:21:19 +0700
Subject: [PATCH 28/85] * fix(Ready.vue): fix variable assignment for migrated
 and hide * fix(Waiting.vue): fix API endpoint for fetching migrated items *
 refactor(collectionMigrateWaiting.graphql): rename query to
 collectionMigrateWaiting

---
 components/migrate/landing/content/Ready.vue    | 17 ++++++++++-------
 components/migrate/landing/content/Waiting.vue  |  2 +-
 .../general/collectionMigrateWaiting.graphql    |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/components/migrate/landing/content/Ready.vue b/components/migrate/landing/content/Ready.vue
index 64d0976bb4..cd41b2b1be 100644
--- a/components/migrate/landing/content/Ready.vue
+++ b/components/migrate/landing/content/Ready.vue
@@ -74,22 +74,25 @@ import { NeoButton } from '@kodadot1/brick'
 import { toReview, useCollectionReady } from '@/composables/useMigrate'
 import waifuApi from '@/services/waifu'
 
-const { accountId } = useAuth()
+const { urlPrefix } = usePrefix()
 const { collections } = await useCollectionReady()
 
-const { urlPrefix } = usePrefix()
 const entities = reactive({})
 watchEffect(async () => {
-  const migrated = await waifuApi(`/relocations/owners/${accountId.value}`)
-
   collections.value.forEach(async (collection) => {
     const metadata = await getNftMetadata(
       collection as unknown as MinimalNFT,
       urlPrefix.value,
     )
-    const hide = migrated?.some((item) => {
-      return item.collection === collection.id
-    })
+    const migrated = await waifuApi(
+      `/relocations/${urlPrefix.value}-${collection.id}`,
+    )
+
+    let hide = false
+
+    if (migrated) {
+      hide = Boolean(migrated)
+    }
 
     entities[collection.id] = {
       ...metadata,
diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index 7df541c79e..61b7831ada 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -128,7 +128,7 @@ watchEffect(() => {
       urlPrefix.value,
     )
     const migrated = (
-      await waifuApi(`/relocations/owners/${collection.currentOwner}`)
+      await waifuApi(`/relocations/owners/${accountId.value}`)
     ).filter((item) => item.collection === collection.id)
 
     if (migrated.length) {
diff --git a/queries/subsquid/general/collectionMigrateWaiting.graphql b/queries/subsquid/general/collectionMigrateWaiting.graphql
index fd15a29b94..b80835385a 100644
--- a/queries/subsquid/general/collectionMigrateWaiting.graphql
+++ b/queries/subsquid/general/collectionMigrateWaiting.graphql
@@ -1,4 +1,4 @@
-query collectionByAccount($account: String!) {
+query collectionMigrateWaiting($account: String!) {
   collectionEntities(
     where: { nfts_some: { currentOwner_eq: $account }, issuer_not_eq: $account }
   ) {

From 97954bba00c4e3732dd09380e00ad4b4bc157fed Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Wed, 29 Nov 2023 22:10:18 +0700
Subject: [PATCH 29/85] * feat(Ready.vue): update click event to pass an object
 with collectionId and itemCount parameters to toReview function *
 feat(Waiting.vue): update click event to pass an object with collectionId,
 itemCount, collectionOwner, and setDestination parameters to toReview
 function * fix(SignLoader2.vue): add conditional check for nextCollectionId
 before assigning value * feat(useMigrate.ts): update toReview function to
 accept an object with collectionId, itemCount, collectionOwner, and
 setDestination parameters

---
 components/migrate/landing/content/Ready.vue   |  7 ++++++-
 components/migrate/landing/content/Waiting.vue | 13 ++++++++-----
 components/migrate/steps/SignLoader2.vue       | 10 +++++++---
 composables/useMigrate.ts                      |  9 +++++++--
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/components/migrate/landing/content/Ready.vue b/components/migrate/landing/content/Ready.vue
index cd41b2b1be..e0473b73e8 100644
--- a/components/migrate/landing/content/Ready.vue
+++ b/components/migrate/landing/content/Ready.vue
@@ -51,7 +51,12 @@
             <div>
               <NeoButton
                 variant="pill"
-                @click="toReview(collection.id, collection.nfts?.length)">
+                @click="
+                  toReview({
+                    collectionId: collection.id,
+                    itemCount: collection.nfts?.length,
+                  })
+                ">
                 {{ $t('migrate.ready.cta') }}
               </NeoButton>
             </div>
diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index 61b7831ada..56f6c53c10 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -55,11 +55,14 @@
               <NeoButton
                 variant="pill"
                 @click="
-                  toReview(
-                    collection.id,
-                    collection.nfts?.length,
-                    entities[collection.id]?.migrated[0]?.issuer,
-                  )
+                  toReview({
+                    collectionId: collection.id,
+                    itemCount: collection.nfts?.length,
+                    collectionOwner:
+                      entities[collection.id]?.migrated[0]?.issuer,
+                    setDestination:
+                      entities[collection.id]?.migrated[0]?.to_chain,
+                  })
                 ">
                 {{ $t('migrate.waiting.cta') }}
               </NeoButton>
diff --git a/components/migrate/steps/SignLoader2.vue b/components/migrate/steps/SignLoader2.vue
index 2abe9682af..5f42ab0f5a 100644
--- a/components/migrate/steps/SignLoader2.vue
+++ b/components/migrate/steps/SignLoader2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!collectionOwner" class="mb-5">
+  <div class="mb-5">
     <div class="is-flex is-align-items-center mb-4">
       <div class="mr-5">
         <NeoIcon v-if="iterations === 0" v-bind="iconSuccess" class="fa-2x" />
@@ -126,7 +126,11 @@ const startStep2 = async () => {
       const ownerSign = checkSign.data.filter(
         (item) => item.account === accountId.value,
       )
-      nextCollectionId = ownerSign.to_collection
+
+      if (!nextCollectionId) {
+        nextCollectionId = ownerSign[0]?.to_collection
+      }
+
       const presigned = ownerSign.map((item) => {
         const preSignInfo = api.createType('PalletNftsPreSignedMint', item.data)
         const create = api.tx.nfts.mintPreSigned(
@@ -143,7 +147,7 @@ const startStep2 = async () => {
       batchPresigned[index] = presigned
     }
 
-    if (collectionOwner) {
+    if (collectionOwner && nextCollectionId) {
       router.push({
         query: {
           ...route.query,
diff --git a/composables/useMigrate.ts b/composables/useMigrate.ts
index 6a414ed740..4c38ac5e39 100644
--- a/composables/useMigrate.ts
+++ b/composables/useMigrate.ts
@@ -202,7 +202,12 @@ const useDestinationSelected = () =>
     availablePrefixWithIcon().find((item) => item.value === 'ahp'),
   )
 
-export const toReview = (collectionId, itemCount, collectionOwner = '') => {
+export const toReview = ({
+  collectionId,
+  itemCount,
+  collectionOwner = '',
+  setDestination = '',
+}) => {
   const sourceSelected = useSourceSelected()
   const destinationSelected = useDestinationSelected()
   const { accountId } = useAuth()
@@ -213,7 +218,7 @@ export const toReview = (collectionId, itemCount, collectionOwner = '') => {
       accountId: accountId.value,
       collectionId: collectionId,
       source: sourceSelected.value?.value,
-      destination: destinationSelected.value?.value,
+      destination: setDestination || destinationSelected.value?.value,
       itemCount,
       collectionOwner,
     },

From ac227197e476ebab83462bbccbd5fceff2397fc3 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Wed, 29 Nov 2023 14:42:10 -0300
Subject: [PATCH 30/85] transfer tests readability

---
 tests/e2e/transfer.spec.ts | 137 ++++++++++++++++++++++---------------
 1 file changed, 82 insertions(+), 55 deletions(-)

diff --git a/tests/e2e/transfer.spec.ts b/tests/e2e/transfer.spec.ts
index 777bb25597..18deb012cb 100644
--- a/tests/e2e/transfer.spec.ts
+++ b/tests/e2e/transfer.spec.ts
@@ -1,15 +1,34 @@
 import { expect, test } from './fixtures'
 
 test('Transfer Page Functionality', async ({ page, Commands }) => {
-  await Commands.e2elogin()
-  await page.goto('/dot/transfer')
-  const UserAddress = await page
-    .getByTestId('avatar-identity-icon')
-    .getAttribute('data-key')
-  await page.getByTestId('transfer-copy-sender-address').click()
-  await Commands.copyText(`${UserAddress}`)
-  await page.getByTestId('global-address-input').fill('0xwer6544443653444422')
-  await expect(page.getByTestId('addresschecker-infobox-invalid')).toBeVisible()
+  await test.step('Login and go to page', async () => {
+    await Commands.e2elogin()
+    await page.goto('/dot/transfer')
+  })
+
+  const UserAddress =
+    await test.step('Gets user address via attribute', async () => {
+      const UserAddress = await page
+        .getByTestId('avatar-identity-icon')
+        .getAttribute('data-key')
+      return UserAddress
+    })
+
+  //Copy address
+  await test.step('Copy user address and verifies clipboard content', async () => {
+    await page.getByTestId('transfer-copy-sender-address').click()
+    await Commands.copyText(`${UserAddress}`)
+  })
+
+  //Wrong address format
+  await test.step('Inserts invalid address and verifies if error message appears', async () => {
+    await page.getByTestId('global-address-input').fill('0xwer6544443653444422')
+    await expect(
+      page.getByTestId('addresschecker-infobox-invalid'),
+    ).toBeVisible()
+  })
+
+  //Fill form
   await test.step('Add and Fill input recipients', async () => {
     await page.getByTestId('global-address-input').nth(0).fill(`${UserAddress}`)
     await page.getByTestId('transfer-input-amount-token').nth(0).fill('1')
@@ -19,57 +38,65 @@ test('Transfer Page Functionality', async ({ page, Commands }) => {
     await page.getByTestId('global-address-input').nth(1).fill(`${UserAddress}`)
     await page.getByTestId('transfer-input-amount-token').nth(1).fill('5')
   })
-  //triggers switch to send same amount
-  await page.getByTestId('transfer-switch-same').click()
-  //checks if second address input converted itself according to same amount switch
-  await expect(
-    page.getByTestId('transfer-input-amount-token').nth(1),
-  ).toHaveValue('1')
+
+  //Send same amount Switch
+  await test.step('Enables same amount switch and verifies its content', async () => {
+    await page.getByTestId('transfer-switch-same').click()
+    //checks if second address input converted itself according to same amount switch
+    await expect(
+      page.getByTestId('transfer-input-amount-token').nth(1),
+    ).toHaveValue('1')
+  })
+
   await test.step('Test if total sums up', async () => {
     const total = (
       await page.getByTestId('transfer-total-amount').innerText()
     ).valueOf()
     const totalNumber = +total.split(' ')[0]
     expect(totalNumber).toBeGreaterThan(0)
-    await test.step('Recurring Payment Button', async () => {
-      await page.getByTestId('transfer-tab-usd').click()
-      await page.getByTestId('transfer-input-amount-usd').nth(0).fill('5')
-      await page.getByTestId('transfer-button-options').click()
-      await page.getByTestId('transfer-dropdown-recurring').click()
-      Commands.copyText(
-        `http://localhost:9090/dot/transfer?target=${UserAddress}&target1=${UserAddress}&usdamount=5`,
-      )
-    })
-    //removes last transfer recipient
-    await page.getByTestId('transfer-remove-recipient').last().click()
-    await test.step('Pay me Button', async () => {
-      await page.getByTestId('transfer-input-amount-usd').fill('4')
-      await page.getByTestId('transfer-button-options').click()
-      await page.getByTestId('transfer-dropdown-pay-me').click()
-      Commands.copyText(
-        `http://localhost:9090/dot/transfer?target=${UserAddress}&usdamount=4`,
-      )
-    })
-    //verify if network fee is present
-    await expect(page.getByTestId('transfer-network-fee')).toBeVisible()
-    //last step
-    await test.step('Switch to KSM and convert address to proper chain', async () => {
-      //change to KSM chain
-      await page
-        .getByTestId('transfer-token-tabs-container')
-        .getByText('KSM')
-        .click()
-      await page
-        .getByTestId('global-address-input')
-        .nth(0)
-        .fill(`${UserAddress}`)
-      await expect(
-        page.getByTestId('addresschecker-infobox-invalid'),
-      ).toBeVisible()
-      await page.getByTestId('addresschecker-button-change-to').click()
-      await expect(
-        page.getByTestId('addresschecker-infobox-convertion-success'),
-      ).toBeVisible()
-    })
+  })
+
+  //Recurring payment
+  await test.step('Switchs to USD tab, fill inputs and verifies if total sums up', async () => {
+    await page.getByTestId('transfer-tab-usd').click()
+    await page.getByTestId('transfer-input-amount-usd').nth(0).fill('5')
+    await page.getByTestId('transfer-button-options').click()
+    await page.getByTestId('transfer-dropdown-recurring').click()
+    Commands.copyText(
+      `http://localhost:9090/dot/transfer?target=${UserAddress}&target1=${UserAddress}&usdamount=5`,
+    )
+  })
+
+  //removes last transfer recipient
+  await page.getByTestId('transfer-remove-recipient').last().click()
+
+  //Pay me
+  await test.step('Verifies if pay me button provides correct clipboard format', async () => {
+    await page.getByTestId('transfer-input-amount-usd').fill('4')
+    await page.getByTestId('transfer-button-options').click()
+    await page.getByTestId('transfer-dropdown-pay-me').click()
+    Commands.copyText(
+      `http://localhost:9090/dot/transfer?target=${UserAddress}&usdamount=4`,
+    )
+  })
+
+  //verify if network fee is present
+  await expect(page.getByTestId('transfer-network-fee')).toBeVisible()
+
+  //Address conversion
+  await test.step('Switch to KSM and convert address to proper chain', async () => {
+    //change to KSM chain
+    await page
+      .getByTestId('transfer-token-tabs-container')
+      .getByText('KSM')
+      .click()
+    await page.getByTestId('global-address-input').nth(0).fill(`${UserAddress}`)
+    await expect(
+      page.getByTestId('addresschecker-infobox-invalid'),
+    ).toBeVisible()
+    await page.getByTestId('addresschecker-button-change-to').click()
+    await expect(
+      page.getByTestId('addresschecker-infobox-convertion-success'),
+    ).toBeVisible()
   })
 })

From 702b08450fd2855dcce8ffd03f5f963bbf8fa7d4 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Wed, 29 Nov 2023 14:52:58 -0300
Subject: [PATCH 31/85] prefix test readability

---
 tests/e2e/prefix.spec.ts | 53 ++++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/tests/e2e/prefix.spec.ts b/tests/e2e/prefix.spec.ts
index 471f9e415b..2da02662de 100644
--- a/tests/e2e/prefix.spec.ts
+++ b/tests/e2e/prefix.spec.ts
@@ -1,32 +1,48 @@
 import { expect, test } from './fixtures'
 
 test('Switch network', async ({ page }) => {
-  await page.goto('/')
-  await page.waitForLoadState()
+  await test.step('Go to Landing and wait for load state', async () => {
+    await page.goto('/')
+    await page.waitForLoadState()
+  })
+
   //BSX
-  await page.getByTestId('chain-select').click()
-  await page.getByTestId('chain-dropdown-bsx').click()
-  await expect(page.getByTestId('chain')).toHaveText('bsx')
+  await test.step('Switching to BSX', async () => {
+    await page.getByTestId('chain-select').click()
+    await page.getByTestId('chain-dropdown-bsx').click()
+    await expect(page.getByTestId('chain')).toHaveText('bsx')
+  })
+
   //AHP
-  await page.getByTestId('chain-select').click()
-  await page.getByTestId('chain-dropdown-ahp').click()
-  await expect(page.getByTestId('chain')).toHaveText('ahp')
+  await test.step('Switching to AHP', async () => {
+    await page.getByTestId('chain-select').click()
+    await page.getByTestId('chain-dropdown-ahp').click()
+    await expect(page.getByTestId('chain')).toHaveText('ahp')
+  })
+
   //AHK
-  await page.getByTestId('chain-select').click()
-  await page.getByTestId('chain-dropdown-ahk').click()
-  await expect(page.getByTestId('chain')).toHaveText('ahk')
+  await test.step('Switching to AHK', async () => {
+    await page.getByTestId('chain-select').click()
+    await page.getByTestId('chain-dropdown-ahk').click()
+    await expect(page.getByTestId('chain')).toHaveText('ahk')
+  })
+
   //RMRK2
-  await page.getByTestId('chain-select').click()
-  await page.getByTestId('chain-dropdown-ksm').click()
-  await expect(page.getByTestId('chain')).toHaveText('rmrk2')
+  await test.step('Switching to RMRK2', async () => {
+    await page.getByTestId('chain-select').click()
+    await page.getByTestId('chain-dropdown-ksm').click()
+    await expect(page.getByTestId('chain')).toHaveText('rmrk2')
+  })
+
   //RMRK1
-  await page.getByTestId('chain-select').click()
-  await page.getByTestId('chain-dropdown-rmrk').click()
-  await expect(page.getByTestId('chain')).toHaveText('rmrk')
+  await test.step('Switching to RMRK1', async () => {
+    await page.getByTestId('chain-select').click()
+    await page.getByTestId('chain-dropdown-rmrk').click()
+    await expect(page.getByTestId('chain')).toHaveText('rmrk')
+  })
 })
 
 test('Check if RMRK2 NFT URL is correct', async ({ page }) => {
-  //RMRK2
   await page.goto('/ksm/explore/items?listed=false&search=Spirit+Key+%232112')
   await page.locator('[class="infinite-scroll-item"]').click()
   await expect(page).toHaveURL(
@@ -35,7 +51,6 @@ test('Check if RMRK2 NFT URL is correct', async ({ page }) => {
 })
 
 test('Check if Ahk NFT URL is correct', async ({ page }) => {
-  //AHK
   await page.goto('/ahk/explore/items?listed=false&search=Susanne')
   await page.locator('[class="infinite-scroll-item"]').click()
   await expect(page).toHaveURL('/ahk/gallery/111-2')

From 555ccccd81ca47f5b5f7f5372036ca533a50af4b Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Wed, 29 Nov 2023 15:21:30 -0300
Subject: [PATCH 32/85] search readability and improvements

---
 tests/e2e/search.spec.ts | 57 +++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/tests/e2e/search.spec.ts b/tests/e2e/search.spec.ts
index b626568ee9..3305d14054 100644
--- a/tests/e2e/search.spec.ts
+++ b/tests/e2e/search.spec.ts
@@ -1,31 +1,40 @@
 import { expect, test } from './fixtures'
 
-function imagesHaveLoaded() {
-  return Array.from(document.images).every((i) => i.complete)
-}
-
 test('Check if search provide results', async ({ page }) => {
-  //page.route('**', route => route.continue())
-  await page.goto('/ksm')
-  const searchBar = page.getByTestId('search-bar')
-  await searchBar.locator('input').fill('waifu')
-  await page.locator('.search-suggestion-container').hover()
+  await test.step('Go to landing within Kusama chain', async () => {
+    await page.goto('/ksm')
+  })
+
+  //Search term
+  await test.step('Search for the term Waifu and hover over results', async () => {
+    const searchBar = page.getByTestId('search-bar')
+    await searchBar.locator('input').fill('waifu')
+    await page.locator('.search-suggestion-container').hover()
+  })
+
   //check contents of Collection Tab
-  const tabCollection = page.getByTestId('collection-tab')
-  await expect(tabCollection.locator('.neo-skeleton-item').first()).toBeVisible(
-    { timeout: 30000 },
-  )
-  await expect(
-    tabCollection.locator('.search-result-item').first(),
-  ).toBeVisible({ timeout: 30000 })
-  await expect(tabCollection.locator('.link-item').first()).toBeVisible({
-    timeout: 30000,
+  await test.step('Switches to Collection tab and wait for results to load', async () => {
+    const tabCollection = page.getByTestId('collection-tab')
+    await expect(
+      tabCollection.locator('.neo-skeleton-item').first(),
+    ).not.toBeVisible({ timeout: 30000 })
+    await expect(
+      tabCollection.locator('.search-result-item').first(),
+    ).toBeVisible({ timeout: 30000 })
+    await expect(tabCollection.locator('.link-item').first()).toBeVisible({
+      timeout: 30000,
+    })
   })
-  await page.waitForFunction(imagesHaveLoaded, { timeout: 30000 })
-  //switchs and check NFT results
-  await page.locator('div[aria-controls="NFTs-content"]').click()
-  const tabNft = page.getByTestId('nft-tab')
-  await expect(tabNft.locator('.search-result-item').first()).toBeVisible({
-    timeout: 30000,
+
+  //Switchs to NFT tab
+  await test.step('Switches to NFT tab and wait for results to load', async () => {
+    await page.locator('div[aria-controls="NFTs-content"]').click()
+    const tabNft = page.getByTestId('nft-tab')
+    await expect(tabNft.locator('.neo-skeleton-item').first()).not.toBeVisible({
+      timeout: 30000,
+    })
+    await expect(tabNft.locator('.search-result-item').first()).toBeVisible({
+      timeout: 30000,
+    })
   })
 })

From 4438df265ee94dca3818dad9bd0f5157403fdc6c Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Wed, 29 Nov 2023 16:01:55 -0300
Subject: [PATCH 33/85] redirect test readability and additions

---
 tests/e2e/redirect.spec.ts | 46 +++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/tests/e2e/redirect.spec.ts b/tests/e2e/redirect.spec.ts
index 9a50bc6ed3..9a34c3b632 100644
--- a/tests/e2e/redirect.spec.ts
+++ b/tests/e2e/redirect.spec.ts
@@ -1,17 +1,37 @@
 import { expect, test } from './fixtures'
 
-test('Should redirect from rmrk2 prefix to ksm', async ({ page }) => {
-  await page.goto(
-    '/rmrk2/gallery/17842583-22708b368d163c8007-CITY-LOWER_ART_DISTRICT-00000006',
-  )
-  // expects gallery redirection to occur
-  await expect(page).toHaveURL(
-    '/ksm/gallery/17842583-22708b368d163c8007-CITY-LOWER_ART_DISTRICT-00000006',
-  )
+test('Redirections', async ({ page }) => {
+  //Gallery
+  await test.step('Expect gallery Item url to be properly redirected', async () => {
+    await page.goto(
+      '/rmrk2/gallery/17842583-22708b368d163c8007-CITY-LOWER_ART_DISTRICT-00000006',
+    )
+    await expect(page).toHaveURL(
+      '/ksm/gallery/17842583-22708b368d163c8007-CITY-LOWER_ART_DISTRICT-00000006',
+    )
+  })
 
-  await page.goto('/rmrk2/explore/items?listed=true&sort=updatedAt_DESC')
-  // expects item redirection to occur
-  await expect(page).toHaveURL(
-    '/ksm/explore/items?listed=true&sort=updatedAt_DESC',
-  )
+  //Explore Collections
+  await test.step('Expect Explore url to be properly redirected', async () => {
+    await page.goto('/ksm/explore/collections')
+    await expect(page).toHaveURL('/ksm/explore/collectibles')
+  })
+
+  //Collection
+  await test.step('Expect collection url to be properly redirected', async () => {
+    await page.goto('/ahk/explore/gallery')
+    await expect(page).toHaveURL('/ahk/explore/items')
+  })
+
+  //Statemine
+  await test.step('Expect url with stmn to be properly redirected', async () => {
+    await page.goto('/stmn/explore/items')
+    await expect(page).toHaveURL('/ahk/explore/items')
+  })
+
+  //Transfer
+  await test.step('Expect collection that has /transfer', async () => {
+    await page.goto('/transfer')
+    await expect(page).toHaveURL('/ksm/transfer')
+  })
 })

From 936f086b51bc34841fe0448513020df6db23e744 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Wed, 29 Nov 2023 16:10:05 -0300
Subject: [PATCH 34/85] language readability

---
 tests/e2e/language.spec.ts | 82 +++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 36 deletions(-)

diff --git a/tests/e2e/language.spec.ts b/tests/e2e/language.spec.ts
index fb951172d1..dcc31626ac 100644
--- a/tests/e2e/language.spec.ts
+++ b/tests/e2e/language.spec.ts
@@ -1,42 +1,52 @@
 import { expect, test } from './fixtures'
 
-test('Check Language translations', async ({ page, Commands }) => {
-  await Commands.e2elogin()
-  await page.goto('')
+test('Translations', async ({ page, Commands }) => {
+  await test.step('Login and go to', async () => {
+    await Commands.e2elogin()
+    await page.goto('')
+  })
+
   //DE
-  await page.getByTestId('navbar-profile-dropdown').click()
-  await page.getByTestId('sidebar-language').click()
-  await expect(page.getByRole('menu')).toBeVisible()
-  //await expect(page.getByTestId('skeleton-multiple-balances')).toHaveCount(0)
-  await page.getByTestId('sidebar-language-de').click()
-  await expect(
-    page.getByTestId('create').filter({ has: page.getByText('Erstellen') }),
-  ).toHaveCount(1)
-  await expect(
-    page
-      .getByTestId('latest-sales')
-      .filter({ has: page.getByText('Letzte Verkäufe') }),
-  ).toHaveCount(1)
+  await test.step('Check German Translation', async () => {
+    await page.getByTestId('navbar-profile-dropdown').click()
+    await page.getByTestId('sidebar-language').click()
+    await expect(page.getByRole('menu')).toBeVisible()
+    await page.getByTestId('sidebar-language-de').click()
+    await expect(
+      page.getByTestId('create').filter({ has: page.getByText('Erstellen') }),
+    ).toHaveCount(1)
+    await expect(
+      page
+        .getByTestId('latest-sales')
+        .filter({ has: page.getByText('Letzte Verkäufe') }),
+    ).toHaveCount(1)
+  })
+
   //FR
-  await page.getByTestId('sidebar-language').click()
-  await page.getByTestId('sidebar-language-fr').click()
-  await expect(
-    page.getByTestId('create').filter({ has: page.getByText('Créer') }),
-  ).toHaveCount(1)
-  await expect(
-    page
-      .getByTestId('latest-sales')
-      .filter({ has: page.getByText('Dernières ventes') }),
-  ).toHaveCount(1)
+  await test.step('Check French translation', async () => {
+    await page.getByTestId('sidebar-language').click()
+    await page.getByTestId('sidebar-language-fr').click()
+    await expect(
+      page.getByTestId('create').filter({ has: page.getByText('Créer') }),
+    ).toHaveCount(1)
+    await expect(
+      page
+        .getByTestId('latest-sales')
+        .filter({ has: page.getByText('Dernières ventes') }),
+    ).toHaveCount(1)
+  })
+
   //ES
-  await page.getByTestId('sidebar-language').click()
-  await page.getByTestId('sidebar-language-es').click()
-  await expect(
-    page.getByTestId('create').filter({ has: page.getByText('Crear') }),
-  ).toHaveCount(1)
-  await expect(
-    page
-      .getByTestId('latest-sales')
-      .filter({ has: page.getByText('Ventas más recientes') }),
-  ).toHaveCount(1)
+  await test.step('Check Spanish translation', async () => {
+    await page.getByTestId('sidebar-language').click()
+    await page.getByTestId('sidebar-language-es').click()
+    await expect(
+      page.getByTestId('create').filter({ has: page.getByText('Crear') }),
+    ).toHaveCount(1)
+    await expect(
+      page
+        .getByTestId('latest-sales')
+        .filter({ has: page.getByText('Ventas más recientes') }),
+    ).toHaveCount(1)
+  })
 })

From 1698bdf135b60dadd8091a7efdad815fbca7db72 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Wed, 29 Nov 2023 17:10:59 -0300
Subject: [PATCH 35/85] explore test improvement

---
 components/shared/gallery/NeoTag.vue |   1 +
 tests/e2e/explore.spec.ts            | 143 ++++++++++++++++-----------
 2 files changed, 87 insertions(+), 57 deletions(-)

diff --git a/components/shared/gallery/NeoTag.vue b/components/shared/gallery/NeoTag.vue
index b89722b720..b1c0baf04a 100644
--- a/components/shared/gallery/NeoTag.vue
+++ b/components/shared/gallery/NeoTag.vue
@@ -4,6 +4,7 @@
     attached
     closable
     class="tag"
+    data-testid="neo-tag-component"
     :class="[`tag--${variant}`, `tag-size--${size}`]">
     <slot></slot>
     <NeoIcon
diff --git a/tests/e2e/explore.spec.ts b/tests/e2e/explore.spec.ts
index db2c992b2e..ffa7310a61 100644
--- a/tests/e2e/explore.spec.ts
+++ b/tests/e2e/explore.spec.ts
@@ -1,65 +1,94 @@
 import { expect, test } from './fixtures'
 
-test('Explore collections at ahk and sort by newest', async ({
-  page,
-  Commands,
-}) => {
-  await page.goto('/ahk/explore/collectibles')
-  const tabs = page.getByTestId('gallery-explore-tabs').nth(1)
-  await expect(tabs.getByText('Collections')).toBeVisible()
-  await expect(tabs.getByText('Items')).toBeVisible()
-  const sortDropdown = page.getByTestId('explore-sort-dropdown').nth(1)
-  await sortDropdown.click()
-  await sortDropdown.getByText('Newest').click()
-  await page.keyboard.press('Escape')
-  await Commands.scrollDownAndStop()
-  await page.waitForFunction(() => {
-    const images = Array.from(document.querySelectorAll('img'))
-    return images.every((img) => img.complete)
+test('Explore collections', async ({ page, Commands }) => {
+  await test.step('Goto explore collections', async () => {
+    await page.goto('/ahk/explore/collectibles')
   })
-  await expect(page.getByTestId('collection-index-0').first()).toBeVisible({
-    timeout: 10000,
+
+  //Tabs
+  await test.step('Verify tab existance', async () => {
+    const tabs = page.getByTestId('gallery-explore-tabs').nth(1)
+    await expect(tabs.getByText('Collections')).toBeVisible()
+    await expect(tabs.getByText('Items')).toBeVisible()
+  })
+
+  //Sort Dropdown
+  await test.step('Sort by Newest using filter', async () => {
+    const sortDropdown = page.getByTestId('explore-sort-dropdown').nth(1)
+    await sortDropdown.click()
+    await sortDropdown.getByText('Newest').click()
+    await page.keyboard.press('Escape')
+  })
+
+  //Lazy loading mitigation
+  await test.step('Scroll down and wait for images to load', async () => {
+    await Commands.scrollDownAndStop()
+    await page.waitForFunction(() => {
+      const images = Array.from(document.querySelectorAll('img'))
+      return images.every((img) => img.complete)
+    })
+  })
+
+  //Results
+  await test.step('Verify if explore results have loaded accordingly', async () => {
+    await expect(page.getByTestId('collection-index-0').first()).toBeVisible({
+      timeout: 10000,
+    })
+    expect(
+      page.locator('[class="collection-detail__name"]').first().innerText,
+    ).not.toContain('')
   })
-  expect(
-    page.locator('[class="collection-detail__name"]').first().innerText,
-  ).not.toContain('')
 })
 
-test('Explore Items on ahk, sort by ascending price and filter by minimum 100 KSM', async ({
-  page,
-  Commands,
-}) => {
-  await page.goto('/ahk/explore/items?page=1')
-  const tabs = page.getByTestId('gallery-explore-tabs').nth(1)
-  await expect(tabs.getByText('Collections')).toBeVisible()
-  await expect(tabs.getByText('Items')).toBeVisible()
-  const expandSearch = page.getByTestId('sidebar-price-filter')
-  await expandSearch.click()
-  const inputMin = expandSearch.getByTestId('input-min')
-  await inputMin.fill('100')
-  const btnApply = expandSearch.getByTestId('apply').first()
-  await Promise.all([
-    page.waitForResponse(
-      (resp) => resp.url().includes('imagedelivery.net') && resp.ok(),
-    ),
-    btnApply.click(),
-  ])
-  const exploreSort = page.getByTestId('explore-sort-dropdown').nth(1)
-  await exploreSort.click()
-  await page.getByTestId('price_ASC').nth(1).click()
-  const btnAsc = await page.$('[value="price_ASC"]')
-  await btnAsc?.click()
-  await page.keyboard.press('Escape')
-  //active and deactive buy now, since its buggy
-  await page.getByTestId('filter-checkbox-buynow').nth(1).click()
-  await page.getByTestId('filter-checkbox-buynow').nth(1).click()
-  await Commands.scrollDownAndStop()
-  await expect(page.getByTestId('card-money').first()).toBeVisible({
-    timeout: 10000,
+test('Explore Items', async ({ page, Commands }) => {
+  await test.step('Go to explore items', async () => {
+    await page.goto('/ahk/explore/items?page=1')
+  })
+
+  //Tabs
+  await test.step('Verify tab existance', async () => {
+    const tabs = page.getByTestId('gallery-explore-tabs').nth(1)
+    await expect(tabs.getByText('Collections')).toBeVisible()
+    await expect(tabs.getByText('Items')).toBeVisible()
+  })
+
+  //Filter
+  await test.step('Apply filter of 100 KSM minium on results', async () => {
+    const expandSearch = page.getByTestId('sidebar-price-filter')
+    await expandSearch.click()
+    const inputMin = expandSearch.getByTestId('input-min')
+    await inputMin.fill('100')
+    const btnApply = expandSearch.getByTestId('apply').first()
+    await btnApply.click()
+  })
+
+  //Sort Results
+  await test.step('Sort results by price, ascending', async () => {
+    const exploreSort = page.getByTestId('explore-sort-dropdown').nth(1)
+    await exploreSort.click()
+    await page.getByTestId('price_ASC').nth(1).click()
+    const btnAsc = await page.$('[value="price_ASC"]')
+    await btnAsc?.click()
+    await page.keyboard.press('Escape')
+  })
+
+  //mitigate lazy loading
+  await test.step('Scroll down, verify first card and filter tag existance', async () => {
+    await Commands.scrollDownAndStop()
+    await expect(page.getByTestId('card-money').first()).toBeVisible({
+      timeout: 10000,
+    })
+    await expect(page.getByTestId('neo-tag-component').nth(0)).toBeVisible()
+    await expect(page.getByTestId('neo-tag-component').nth(1)).toBeVisible({
+      timeout: 10000,
+    })
+  })
+
+  //Listing price
+  await test.step('Checks if first NFT card is listed and its value is equal or greater than 100 KSM', async () => {
+    const firstCardMoney = page.getByTestId('card-money').first()
+    const moneyStr = await firstCardMoney.innerText()
+    const money = +moneyStr.split(' ')[0]
+    expect(money).toBeGreaterThanOrEqual(100)
   })
-  const firstCardMoney = page.getByTestId('card-money').first()
-  await expect(firstCardMoney).not.toBeEmpty()
-  const moneyStr = await firstCardMoney.innerText()
-  const money = +moneyStr.split(' ')[0]
-  expect(money).toBeGreaterThanOrEqual(100)
 })

From c4f9577fe7e63fb98cc56aa5c405d09bd851c03a Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Wed, 29 Nov 2023 17:11:54 -0300
Subject: [PATCH 36/85] galleryitem refactor

---
 tests/e2e/galleryitem.spec.ts | 162 ++++++++++++++++++----------------
 1 file changed, 88 insertions(+), 74 deletions(-)

diff --git a/tests/e2e/galleryitem.spec.ts b/tests/e2e/galleryitem.spec.ts
index 41318c11dd..b35daac9e2 100644
--- a/tests/e2e/galleryitem.spec.ts
+++ b/tests/e2e/galleryitem.spec.ts
@@ -1,80 +1,94 @@
 import { expect, test } from './fixtures'
 
-test('Element existance verification', async ({ page }) => {
-  await page.goto('/ahk/gallery/6-10')
-  //activity tab
-  await page
-    .getByTestId('gallery-item-tabs')
-    .locator('[aria-controls="1-content"]')
-    .click()
-  await page.getByTestId('gallery-item-activity-filter-all').click()
-  await expect(
-    page.getByTestId('gallery-item-activity-table').locator('td').first(),
-  ).toBeVisible()
-  //details tab
-  await page
-    .getByTestId('gallery-item-description-neotabs')
-    .locator('[aria-controls="2-content"]')
-    .click()
-  await expect(
-    page.getByTestId('gallery-item-details-tab-content'),
-  ).toBeVisible()
-  //chart tab
-  await page
-    .getByTestId('gallery-item-tabs')
-    .locator('[aria-controls="2-content"]')
-    .click()
-  await expect(page.getByTestId('gallery-item-chart')).toBeVisible()
-  //checks if page redirects properly to collection
-  await page.getByTestId('gallery-item-collection-link').click()
-  await expect(page).toHaveURL('/ahk/collection/6')
-})
+test('Gallery item Interactions', async ({ page }) => {
+  await test.step('Goto Ahk gallery item', async () => {
+    await page.goto('/ahk/gallery/6-10')
+  })
 
-test('Share Button Functionality', async ({ page }) => {
-  await page.goto('/ahk/gallery/6-10')
-  const shareBtn = page.getByTestId('gallery-item-share-button')
-  await shareBtn.click()
-  //Copy Link
-  await shareBtn.getByText('Copy Link').click()
-  const clipboardText1 = await page.evaluate('navigator.clipboard.readText()')
-  expect(clipboardText1).toContain('/ahk/gallery/6-10')
-  //Twitter
-  await shareBtn.click()
-  await shareBtn.getByTestId('gallery-item-share-dropdown-twitter').click()
-  const newTabPromise = page.waitForEvent('popup')
-  const newTab = await newTabPromise
-  await newTab.waitForLoadState()
-  await expect(newTab).toHaveURL(
-    'https://twitter.com/i/flow/login?redirect_after_login=%2Fintent%2Ftweet%3Ftext%3DCheck%2520out%2520this%2520awesome%2520NFT%2520on%2520KodaDot%26via%3DKodaDot%26url%3Dhttp%3A%2F%2Flocalhost%3A9090%2Fahk%2Fgallery%2F6-10',
-  )
-  await newTab.close()
-  //QR Code
-  await shareBtn.click()
-  await shareBtn.getByText('QR Code').click()
-  await expect(
-    page.getByTestId('gallery-item-share-dropdown-qrcode'),
-  ).toBeVisible()
-})
+  //Activity tab
+  await test.step('Verifies if activity tab has content', async () => {
+    await page
+      .getByTestId('gallery-item-tabs')
+      .locator('[aria-controls="1-content"]')
+      .click()
+    await page.getByTestId('gallery-item-activity-filter-all').click()
+    await expect(
+      page.getByTestId('gallery-item-activity-table').locator('td').first(),
+    ).toBeVisible()
+  })
 
-test('More Button Functionality', async ({ page }) => {
-  await page.goto('/ahk/gallery/6-10')
-  //more button
-  await page.getByTestId('gallery-item-more-button').click()
-  const downloadPromise = page.waitForEvent('download')
-  await page.getByTestId('gallery-item-more-dropdown-download').click()
-  await downloadPromise
-})
+  //Details tab
+  await test.step('Verifies if content inside details tab is visible', async () => {
+    await page
+      .getByTestId('gallery-item-description-neotabs')
+      .locator('[aria-controls="2-content"]')
+      .click()
+    await expect(
+      page.getByTestId('gallery-item-details-tab-content'),
+    ).toBeVisible()
+  })
+
+  //Chart tab
+  await test.step('Verify chart visibility', async () => {
+    await page
+      .getByTestId('gallery-item-tabs')
+      .locator('[aria-controls="2-content"]')
+      .click()
+    await expect(page.getByTestId('gallery-item-chart')).toBeVisible()
+  })
+
+  //Share Button
+  await test.step('Verify if share button options work accordingly', async () => {
+    const shareBtn = page.getByTestId('gallery-item-share-button')
+    await shareBtn.click()
+    //Copy Link
+    await shareBtn.getByText('Copy Link').click()
+    const clipboardText1 = await page.evaluate('navigator.clipboard.readText()')
+    expect(clipboardText1).toContain('/ahk/gallery/6-10')
+    //Twitter
+    await shareBtn.click()
+    await shareBtn.getByTestId('gallery-item-share-dropdown-twitter').click()
+    const newTabPromise = page.waitForEvent('popup')
+    const newTab = await newTabPromise
+    await newTab.waitForLoadState()
+    await expect(newTab).toHaveURL(
+      'https://twitter.com/i/flow/login?redirect_after_login=%2Fintent%2Ftweet%3Ftext%3DCheck%2520out%2520this%2520awesome%2520NFT%2520on%2520KodaDot%26via%3DKodaDot%26url%3Dhttp%3A%2F%2Flocalhost%3A9090%2Fahk%2Fgallery%2F6-10',
+    )
+    await newTab.close()
+    //QR Code
+    await shareBtn.click()
+    await shareBtn.getByText('QR Code').click()
+    await expect(
+      page.getByTestId('gallery-item-share-dropdown-qrcode'),
+    ).toBeVisible()
+    await page.keyboard.press('Escape')
+  })
+
+  //More Button
+  await test.step('More Button Functionality', async () => {
+    await page.getByTestId('gallery-item-more-button').click()
+    const downloadPromise = page.waitForEvent('download')
+    await page.getByTestId('gallery-item-more-dropdown-download').click()
+    await downloadPromise
+  })
+
+  //Description tab
+  await test.step('Verifies if the right text shows on the description tab', async () => {
+    await page
+      .getByTestId('gallery-item-description-neotabs')
+      .locator('[aria-controls="0-content"]')
+      .click()
+    await expect(
+      page.getByTestId('gallery-item-description-tab-content'),
+    ).toBeVisible()
+    await expect(
+      page.getByTestId('gallery-item-description-tab-content'),
+    ).toContainText('This anime waifu loves')
+  })
 
-test('Description tab', async ({ page }) => {
-  await page.goto('/ahk/gallery/6-10')
-  await page
-    .getByTestId('gallery-item-description-neotabs')
-    .locator('[aria-controls="0-content"]')
-    .click()
-  await expect(
-    page.getByTestId('gallery-item-description-tab-content'),
-  ).toBeVisible()
-  await expect(
-    page.getByTestId('gallery-item-description-tab-content'),
-  ).toContainText('This anime waifu loves')
+  //Redirection
+  await test.step('Clicks on collection link on gallery item and checks redirection', async () => {
+    await page.getByTestId('gallery-item-collection-link').click()
+    await expect(page).toHaveURL('/ahk/collection/6')
+  })
 })

From 3a8d51a842f40bc48760ea5646723d65454cf79f Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Wed, 29 Nov 2023 17:12:18 -0300
Subject: [PATCH 37/85] create collection readability

---
 tests/e2e/createcollection.spec.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/createcollection.spec.ts b/tests/e2e/createcollection.spec.ts
index eb93df8253..50b3724dc9 100644
--- a/tests/e2e/createcollection.spec.ts
+++ b/tests/e2e/createcollection.spec.ts
@@ -57,10 +57,15 @@ test('Check if chain change works using the dropdown', async ({
     await Commands.e2elogin()
     await page.goto('/create/collection')
   })
-  expect(page.getByTestId('collection-chain')).toBeVisible()
-  await page.getByTestId('collection-chain').selectOption('KusamaHub')
+
+  //Chain dropdown
+  await test.step('Wait for chain dropdown to be visible and select Kusamahub', async () => {
+    expect(page.getByTestId('collection-chain')).toBeVisible()
+    await page.getByTestId('collection-chain').selectOption('KusamaHub')
+  })
+
+  //Deposits and Balance
   await test.step('Verify if balances are loaded', async () => {
-    //Check if balances and deposits shows
     await expect(page.getByTestId('collection-deposit')).toBeVisible({
       timeout: 30000,
     })
@@ -68,6 +73,8 @@ test('Check if chain change works using the dropdown', async ({
       timeout: 30000,
     })
   })
+
+  //Dropdown change to RMRK2
   await test.step('Changes to RMRK2 and verifies if chain changed', async () => {
     await page.getByTestId('collection-chain').selectOption('RMRK2')
     await expect(page.getByTestId('chain')).toContainText('rmrk2')

From 857dddc12519062095898bab8f71071bcfecbe2e Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Wed, 29 Nov 2023 17:12:32 -0300
Subject: [PATCH 38/85] small details

---
 tests/e2e/opengraph.ts    | 107 --------------------------------------
 tests/e2e/sidebar.spec.ts |   6 ++-
 2 files changed, 4 insertions(+), 109 deletions(-)
 delete mode 100644 tests/e2e/opengraph.ts

diff --git a/tests/e2e/opengraph.ts b/tests/e2e/opengraph.ts
deleted file mode 100644
index 8974ac365b..0000000000
--- a/tests/e2e/opengraph.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { expect, test } from '@playwright/test'
-
-//checks collection metadata
-test('should render correct twitter opengraph on collection page', async ({
-  page,
-}) => {
-  await page.goto('/ahk/collection/165')
-  await expect(page.locator('[property="og:site_name"]')).toHaveAttribute(
-    'content',
-    'KodaDot - Polkadot / Kusama NFT explorer',
-  )
-  await expect(page.locator('[property="twitter:site"]')).toHaveAttribute(
-    'content',
-    '@KodaDot',
-  )
-  await expect(page.locator('[property="twitter:card"]')).toHaveAttribute(
-    'content',
-    'summary_large_image',
-  )
-  await expect(page.locator('[property="twitter:url"]')).toHaveAttribute(
-    'content',
-    'http://localhost:9090/ahk/collection/165',
-  )
-  await expect(page.locator('[property="twitter:title"]')).toHaveAttribute(
-    'content',
-    'Berlin (Generative) Waifus',
-  )
-  await expect(
-    page.locator('[property="twitter:description"]'),
-  ).toHaveAttribute('content', 'Amazing collection of generative AI waifus ❤️ ')
-  await expect(page.locator('[property="twitter:image"]')).toHaveAttribute(
-    'content',
-    'https://og-image-green-seven.vercel.app/Berlin%20(Generative)%20Waifus.jpeg?price=Items%3A1&image=https%3A%2F%2Fimage-beta.w.kodadot.xyz%2Fipfs%2Fbafybeicaq3tyi5z3uj2oqkern656y2cqnvbu6yjmzo5b23vnilndh7kezq',
-  )
-})
-
-test('Search for duplicated meta tags on collection', async ({ page }) => {
-  await page.goto('/ahk/collection/165')
-  await expect(page.locator('[property="og:site_name"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:site"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:card"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:url"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:title"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:description"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:image"]')).toHaveCount(1)
-})
-
-//checks Item metadata
-test('should render correct twitter opengraph on item page', async ({
-  page,
-}) => {
-  const waifuDescription = `Konnichiwa! I am your sweet anime waifu character generated by artificial intelligence during Berlin Blockchain Week.
-    Spring is already here and even summer is getting closer.
-    Let me tell you a secret about this picture:
-    This spring picture that you see is a medium-shot charcoal painting of me.
-  As you can see, I have rabbit ears.
-I am wearing flower t-shirt.
-The nostalgic lighting gives me more positive attitude towards life.
-`
-  await page.goto('/ahk/gallery/165-2')
-  await expect(page.getByTestId('metadata-link')).toHaveAttribute(
-    'href',
-    'https://image-beta.w.kodadot.xyz/ipfs/bafkreicpxyw67alyt53ql4sq5mo5vj23633igsxxyqowbui2qg4322e4wi',
-  )
-  await expect(page.locator('[property="og:site_name"]')).toHaveAttribute(
-    'content',
-    'KodaDot - Polkadot / Kusama NFT explorer',
-  )
-  await expect(page.locator('[property="twitter:site"]')).toHaveAttribute(
-    'content',
-    '@KodaDot',
-  )
-  await expect(page.locator('[property="twitter:card"]')).toHaveAttribute(
-    'content',
-    'summary_large_image',
-  )
-  await expect(page.locator('[property="twitter:url"]')).toHaveAttribute(
-    'content',
-    'http://localhost:9090/ahk/gallery/165-2',
-  )
-  await expect(page.locator('[property="twitter:title"]')).toHaveAttribute(
-    'content',
-    'Berlin summer waifu',
-  )
-  await expect(
-    page.locator('[property="twitter:description"]'),
-  ).toHaveAttribute('content', waifuDescription)
-  await expect(page.locator('[property="twitter:image"]')).toHaveAttribute(
-    'content',
-    'https://og-image-green-seven.vercel.app/Berlin%20summer%20waifu.jpeg?image=https%3A%2F%2Fimage-beta.w.kodadot.xyz%2Fipfs%2Fbafybeifjk7i2o4xycsbg2dhiciwp4idqzarhschiuimznyrj6cb77a2pry&mime=image%2Fpng',
-  )
-})
-
-test('Search for duplicated meta tags on item', async ({ page }) => {
-  await page.goto('/ahk/gallery/165-2')
-  await expect(page.getByTestId('metadata-link')).toHaveAttribute(
-    'href',
-    'https://image-beta.w.kodadot.xyz/ipfs/bafkreicpxyw67alyt53ql4sq5mo5vj23633igsxxyqowbui2qg4322e4wi',
-  )
-  await expect(page.locator('[property="og:site_name"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:site"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:card"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:url"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:title"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:description"]')).toHaveCount(1)
-  await expect(page.locator('[property="twitter:image"]')).toHaveCount(1)
-})
diff --git a/tests/e2e/sidebar.spec.ts b/tests/e2e/sidebar.spec.ts
index 1ba4ff83f6..247f49ac35 100644
--- a/tests/e2e/sidebar.spec.ts
+++ b/tests/e2e/sidebar.spec.ts
@@ -1,9 +1,11 @@
 import { expect, test } from './fixtures'
 
-test('Sidebar Interactions', async ({ page, Commands }) => {
+test('Switches trough sidebars and check if they overlap each other', async ({
+  page,
+  Commands,
+}) => {
   await Commands.e2elogin()
   await page.goto('/ahk')
-  //checks if sidebar closes when clicking another sidebar
   //profile
   await page.getByTestId('navbar-profile-dropdown').click()
   await expect(page.getByTestId('sidebar-wallet-container')).toBeVisible()

From ab126cc7f1b1b8dd4019508ec307e43a1411cdfd Mon Sep 17 00:00:00 2001
From: daiagi <daiagi@gmail.com>
Date: Thu, 30 Nov 2023 14:59:42 +0700
Subject: [PATCH 39/85] assetHub works

---
 composables/massmint/useMassMint.ts           | 155 +-----------------
 .../massMintTokens/constructDirectoryMeta.ts  | 129 +++++++++++++++
 .../mintToken/transactionMintStatemine.ts     | 140 +++++++++++-----
 composables/transaction/mintToken/utils.ts    |  24 +++
 services/nftStorage.ts                        |  16 ++
 5 files changed, 274 insertions(+), 190 deletions(-)
 create mode 100644 composables/transaction/massMintTokens/constructDirectoryMeta.ts

diff --git a/composables/massmint/useMassMint.ts b/composables/massmint/useMassMint.ts
index 23137a2d01..5e7ac500d3 100644
--- a/composables/massmint/useMassMint.ts
+++ b/composables/massmint/useMassMint.ts
@@ -4,15 +4,12 @@ import { unwrapSafe } from '@/utils/uniquery'
 import resolveQueryPath from '@/utils/queryPathResolver'
 import { NFTToMint, Status } from '@/components/massmint/types'
 import { Interaction } from '@kodadot1/minimark/v1'
-import { MintedCollection, TokenToMint } from '@/composables/transaction/types'
+import { MintedCollection } from '@/composables/transaction/types'
 import {
   createTokensToMint,
   kusamaMintAndList,
   subscribeToCollectionLengthUpdates,
 } from './massMintHelpers'
-import nftStorageApi from '~/services/nftStorage'
-import { createMetadata, unSanitizeIpfsUrl } from '@kodadot1/minimark/utils'
-import { FetchError } from 'ofetch'
 
 export const statusTranslation = (status?: Status): string => {
   const { $i18n } = useNuxtApp()
@@ -144,8 +141,8 @@ export const useMassMint = (
       isError.value = mintAndListResults.isError.value
     })
   } else {
-    // simpleMint()
-    constructMeta(tokens)
+    simpleMint()
+    // constructMeta(tokens)
   }
   return {
     blockNumber,
@@ -155,149 +152,3 @@ export const useMassMint = (
     isError,
   }
 }
-
-function getFileSuffix(filename: string): string {
-  return filename.split('.').pop() as string
-}
-
-export const pinDirectory = async (files: File[]): Promise<string> => {
-  const formData = new FormData()
-  files.forEach((file) => formData.append('file', file, file.name))
-
-  const response = await nftStorageApi('/pinFile', {
-    method: 'POST',
-    body: formData,
-  }).catch((error: FetchError) => {
-    throw new Error(
-      `[NFT::STORAGE] Unable to PIN Directory for reasons ${error.data}`,
-    )
-  })
-
-  const directoryCid = response.value.cid
-  return directoryCid
-}
-
-function createFilesFromTokens(tokensToMint: TokenToMint[]): File[] {
-  return tokensToMint.map((token, index) => {
-    if (!token.file) {
-      throw new ReferenceError('No file found for token index ' + index)
-    }
-    const suffix = getFileSuffix(token.file.name)
-    return new File([token.file], `${index}.${suffix}`)
-  })
-}
-
-function batchFiles(files: File[], maxBatchSize: number): File[][] {
-  let currentBatch: File[] = []
-  let currentBatchSize = 0
-  const batches: File[][] = []
-
-  const startNewBatch = (file: File) => {
-    currentBatch = [file]
-    currentBatchSize = file.size
-  }
-
-  for (const file of files) {
-    if (currentBatchSize + file.size > maxBatchSize) {
-      batches.push(currentBatch)
-      startNewBatch(file)
-    } else {
-      currentBatch.push(file)
-      currentBatchSize += file.size
-    }
-  }
-
-  if (currentBatch.length > 0) {
-    batches.push(currentBatch)
-  }
-
-  return batches
-}
-
-export async function uploadImages(
-  tokensToMint: TokenToMint[],
-): Promise<string[]> {
-  const MAX_BATCH_SIZE = 100 * 1024 * 1024 // 100 MB in bytes
-  const files = createFilesFromTokens(tokensToMint)
-  const fileBatches = batchFiles(files, MAX_BATCH_SIZE)
-
-  const directoryCIDs = await Promise.all(fileBatches.map(pinDirectory))
-
-  return directoryCIDs.flatMap((directoryCid, batchIndex) =>
-    fileBatches[batchIndex].map(
-      (file, fileIndex) =>
-        `ipfs://${directoryCid}/${fileIndex}.${getFileSuffix(file.name)}`,
-    ),
-  )
-}
-
-function createTokenMetadata(
-  token: TokenToMint,
-  primaryHash: string,
-  enableCarbonOffset: boolean,
-  index: number,
-): File {
-  const preferencesStore = usePreferencesStore()
-  const { name, description, tags, nsfw, file } = token
-  const attributes = [
-    ...(tags || []),
-    ...nsfwAttribute(nsfw),
-    ...(enableCarbonOffset
-      ? offsetAttribute(preferencesStore.getHasCarbonOffset)
-      : []),
-  ]
-
-  const meta = createMetadata(
-    name,
-    description,
-    primaryHash,
-    undefined,
-    attributes,
-    'https://kodadot.xyz',
-    (file as File).type,
-  )
-
-  return new File([JSON.stringify(meta, null, 2)], `${index}.json`, {
-    type: 'application/json',
-  })
-}
-
-async function preheatAndUploadFiles(
-  token: TokenToMint,
-  primaryHash: string,
-): Promise<void> {
-  const { $consola } = useNuxtApp()
-  preheatFileFromIPFS(primaryHash)
-  const filePair: [File, File | null] = [token.file as File, null]
-  const hashPair: [string, string | undefined] = [primaryHash, undefined]
-  await uploadDirectWhenMultiple(filePair, hashPair).catch($consola.warn)
-}
-
-export async function constructMeta(
-  tokensToMint: TokenToMint[],
-  options?: {
-    enableCarbonOffset?: boolean
-  },
-): Promise<string[]> {
-  const { enableCarbonOffset = false } = options || {}
-  const imageHashes = await uploadImages(tokensToMint)
-
-  // Create metadata files
-  const metadataFiles = tokensToMint.map((token, index) => {
-    const imageHash = imageHashes[index]
-    return createTokenMetadata(token, imageHash, enableCarbonOffset, index)
-  })
-
-  // Upload all metadata files as a directory
-  const metaDirectoryCid = await pinDirectory(metadataFiles)
-
-  // Preheat and upload files
-  for (const [index, token] of tokensToMint.entries()) {
-    const imageHash = imageHashes[index]
-    await preheatAndUploadFiles(token, imageHash)
-  }
-
-  return metadataFiles.map((_, index) =>
-    unSanitizeIpfsUrl(`ipfs://${metaDirectoryCid}/${index}.json`),
-  )
-}
diff --git a/composables/transaction/massMintTokens/constructDirectoryMeta.ts b/composables/transaction/massMintTokens/constructDirectoryMeta.ts
new file mode 100644
index 0000000000..8397441e02
--- /dev/null
+++ b/composables/transaction/massMintTokens/constructDirectoryMeta.ts
@@ -0,0 +1,129 @@
+import { createMetadata, unSanitizeIpfsUrl } from '@kodadot1/minimark/utils'
+import { TokenToMint } from '../types'
+import { pinDirectory } from '@/services/nftStorage'
+
+export const constructDirectoryMeta = async (
+  tokensToMint: TokenToMint[],
+  options?: {
+    enableCarbonOffset?: boolean
+  },
+): Promise<string[]> => {
+  if (tokensToMint.map(({ file }) => file).some((file) => !file)) {
+    throw new ReferenceError('No file found for token')
+  }
+  const tokens = tokensToMint.filter((token) => Boolean(token.file))
+  const tokensMedia = tokens.map((token) => token.file) as File[]
+  const { enableCarbonOffset = false } = options ?? {}
+  const imageHashes = await uploadMediaFiles(tokensMedia)
+
+  // Create metadata files
+  const metadataFiles = tokens.map((token, index) =>
+    createTokenMetadata(token, imageHashes[index], enableCarbonOffset, index),
+  )
+
+  // Upload all metadata files as a directory
+  const metaDirectoryCid = await pinDirectory(metadataFiles)
+
+  // Preheat and upload files
+  await Promise.all(
+    tokensMedia.map((media, index) =>
+      preheatAndDirectUpload(media, imageHashes[index]),
+    ),
+  )
+
+  return metadataFiles.map((_, index) =>
+    unSanitizeIpfsUrl(`ipfs://${metaDirectoryCid}/${index}.json`),
+  )
+}
+
+const getFileSuffix = (filename: string) => filename.split('.').pop() as string
+
+const mapToSerial = (files: File[]): File[] =>
+  files.map((file, index) => {
+    const suffix = getFileSuffix(file.name)
+    return new File([file], `${index}.${suffix}`)
+  })
+
+const batchFiles = (files: File[], maxBatchSize: number): File[][] => {
+  let currentBatch: File[] = []
+  let currentBatchSize = 0
+  const batches: File[][] = []
+
+  const startNewBatch = (file: File) => {
+    currentBatch = [file]
+    currentBatchSize = file.size
+  }
+
+  for (const file of files) {
+    if (currentBatchSize + file.size > maxBatchSize) {
+      batches.push(currentBatch)
+      startNewBatch(file)
+    } else {
+      currentBatch.push(file)
+      currentBatchSize += file.size
+    }
+  }
+
+  if (currentBatch.length > 0) {
+    batches.push(currentBatch)
+  }
+
+  return batches
+}
+
+const uploadMediaFiles = async (files: File[]): Promise<string[]> => {
+  const MAX_BATCH_SIZE = 100 * 1024 * 1024 // 100 MB in bytes
+  const serialFiles = mapToSerial(files)
+  const fileBatches = batchFiles(serialFiles, MAX_BATCH_SIZE)
+
+  const directoryCIDs = await Promise.all(fileBatches.map(pinDirectory))
+
+  return directoryCIDs.flatMap((directoryCid, batchIndex) =>
+    fileBatches[batchIndex].map(
+      (file, fileIndex) =>
+        `ipfs://${directoryCid}/${fileIndex}.${getFileSuffix(file.name)}`,
+    ),
+  )
+}
+
+const createTokenMetadata = (
+  token: TokenToMint,
+  primaryHash: string,
+  enableCarbonOffset: boolean,
+  index: number,
+): File => {
+  const preferencesStore = usePreferencesStore()
+  const { name, description, tags, nsfw, file } = token
+  const attributes = [
+    ...(tags || []),
+    ...nsfwAttribute(nsfw),
+    ...(enableCarbonOffset
+      ? offsetAttribute(preferencesStore.getHasCarbonOffset)
+      : []),
+  ]
+
+  const meta = createMetadata(
+    name,
+    description,
+    primaryHash,
+    undefined,
+    attributes,
+    'https://kodadot.xyz',
+    (file as File).type,
+  )
+
+  return new File([JSON.stringify(meta, null, 2)], `${index}.json`, {
+    type: 'application/json',
+  })
+}
+
+const preheatAndDirectUpload = async (
+  media: File,
+  primaryHash: string,
+): Promise<void> => {
+  const { $consola } = useNuxtApp()
+  preheatFileFromIPFS(primaryHash)
+  const filePair: [File, File | null] = [media, null]
+  const hashPair: [string, string | undefined] = [primaryHash, undefined]
+  await uploadDirectWhenMultiple(filePair, hashPair).catch($consola.warn)
+}
diff --git a/composables/transaction/mintToken/transactionMintStatemine.ts b/composables/transaction/mintToken/transactionMintStatemine.ts
index 3dd83a36cc..5dab388f23 100644
--- a/composables/transaction/mintToken/transactionMintStatemine.ts
+++ b/composables/transaction/mintToken/transactionMintStatemine.ts
@@ -2,30 +2,18 @@ import { BaseMintedCollection } from '@/components/base/types'
 import type { ActionMintToken, MintedCollection } from '../types'
 import { TokenToMint } from '../types'
 import { constructMeta } from './constructMeta'
-import { calculateFees, expandCopies, transactionFactory } from './utils'
+import {
+  Id,
+  assignIds,
+  calculateFees,
+  expandCopies,
+  lastIndexUsed,
+  transactionFactory,
+} from './utils'
 import { canSupport } from '@/utils/support'
+import { constructDirectoryMeta } from '../massMintTokens/constructDirectoryMeta'
 
-type id = { id: number }
-
-export const assignIds = <T extends TokenToMint>(
-  tokens: T[],
-  lastTokenId: number,
-): (T & id)[] => {
-  let lastId = lastTokenId || 0
-
-  return tokens.map((token) => {
-    const { lastIndexUsed } = token.selectedCollection as MintedCollection
-
-    lastId = Math.max(lastIndexUsed, lastId)
-
-    return {
-      ...token,
-      id: ++lastId,
-    }
-  })
-}
-
-export const prepareTokenMintArgs = async (token: TokenToMint & id, api) => {
+export const singleTokenTxs = async (token: TokenToMint & Id, api) => {
   const { id: collectionId } = token.selectedCollection as BaseMintedCollection
   const { price, id: nextId, hasRoyalty, royalty } = token
 
@@ -79,17 +67,69 @@ export const prepareTokenMintArgs = async (token: TokenToMint & id, api) => {
   return txs
 }
 
-export const prepTokens = async (item: ActionMintToken, api) => {
-  const tokens = Array.isArray(item.token) ? item.token : [item.token]
+export const MultipleTokensTxs = async (
+  tokens: (TokenToMint & Id)[],
+  metadata: string[],
+  api,
+) => {
+  const { id: collectionId } = tokens[0]
+    .selectedCollection as BaseMintedCollection
+
+  const { accountId } = useAuth()
+
+  return tokens.flatMap((token, index) => {
+    const { price, id: nextId, hasRoyalty, royalty } = token
+    const tokenMetadata = metadata[index]
+
+    const create = api.tx.nfts.mint(
+      collectionId,
+      nextId,
+      accountId.value,
+      undefined,
+    )
+
+    const meta = api.tx.nfts.setMetadata(collectionId, nextId, tokenMetadata)
+
+    const list =
+      Number(price) > 0
+        ? [api.tx.nfts.setPrice(collectionId, nextId, price, undefined)]
+        : []
+
+    const txs = [create, meta, ...list]
+
+    if (royalty && isRoyaltyValid(royalty) && hasRoyalty) {
+      const setRoyaltyAmount = api.tx.nfts.setAttribute(
+        collectionId,
+        nextId,
+        'ItemOwner',
+        'royalty',
+        royalty.amount,
+      )
+
+      const setRoyaltyRecipient = api.tx.nfts.setAttribute(
+        collectionId,
+        nextId,
+        'ItemOwner',
+        'recipient',
+        royalty.address,
+      )
+      txs.push(setRoyaltyAmount, setRoyaltyRecipient)
+    }
 
-  const lastTokenId = await getNextTokenIdOnChain(
+    return txs
+  })
+}
+
+export const expandCopiesWithsIds = async (item: ActionMintToken, api) => {
+  const tokens = [item.token as TokenToMint]
+
+  const lastTokenId = await lastIndexUsed(
+    tokens[0].selectedCollection as MintedCollection,
     api,
-    (tokens[0].selectedCollection as MintedCollection).id,
   )
   const expandedTokens = expandCopies(tokens)
 
-  const tokensWithIds = assignIds(expandedTokens, lastTokenId)
-  return tokensWithIds
+  return assignIds(expandedTokens, lastTokenId)
 }
 
 export const getSupportInteraction = (
@@ -106,18 +146,42 @@ export const getSupportInteraction = (
   return canSupport(api, enabledFees, totalFees)
 }
 
-const getNextTokenIdOnChain = async (api, collectionId) => {
-  return await api.query.nfts
-    .collection(collectionId)
-    .then((res) => Number(res.toHuman().items) || 0)
-}
-
 const getArgs = async (item: ActionMintToken, api) => {
-  const tokens = await prepTokens(item, api)
-  const arg = await Promise.all(
-    tokens.map((token) => prepareTokenMintArgs(token, api)),
+  const { $consola } = useNuxtApp()
+
+  if (!Array.isArray(item.token)) {
+    const tokens = await expandCopiesWithsIds(item, api)
+    const arg = await Promise.all(
+      tokens.map((token) => singleTokenTxs(token, api)),
+    )
+    const { enabledFees, feeMultiplier } = calculateFees()
+    const supportInteraction = await getSupportInteraction(
+      item,
+      enabledFees,
+      feeMultiplier,
+      api,
+    )
+
+    return [[...arg.flat(), ...supportInteraction]]
+  }
+
+  // multiple tokens (mass mint)
+
+  const lastTokenId = await lastIndexUsed(
+    item.token[0].selectedCollection as MintedCollection,
+    api,
   )
+
+  const tokensWithIds = assignIds(item.token, lastTokenId)
+  const metadata = await constructDirectoryMeta(tokensWithIds).catch((e) => {
+    $consola.error('Error while constructing metadata for tokens:\n', e)
+    throw e
+  })
+
+  const arg = await MultipleTokensTxs(tokensWithIds, metadata, api)
+
   const { enabledFees, feeMultiplier } = calculateFees()
+
   const supportInteraction = await getSupportInteraction(
     item,
     enabledFees,
@@ -125,7 +189,7 @@ const getArgs = async (item: ActionMintToken, api) => {
     api,
   )
 
-  return [[...arg.flat(), ...supportInteraction]]
+  return [[...arg, ...supportInteraction]]
 }
 
 export const execMintStatemine = transactionFactory(getArgs)
diff --git a/composables/transaction/mintToken/utils.ts b/composables/transaction/mintToken/utils.ts
index b2d613d1b7..605f52a78e 100644
--- a/composables/transaction/mintToken/utils.ts
+++ b/composables/transaction/mintToken/utils.ts
@@ -80,3 +80,27 @@ export const expandCopies = <T extends TokenToMint>(tokens: T[]): T[] => {
       })
   })
 }
+export type Id = { id: number }
+
+export const assignIds = <T extends TokenToMint>(
+  tokens: T[],
+  lastTokenId: number,
+): (T & Id)[] =>
+  tokens.map((token, index) => {
+    const nextId = lastTokenId + 1 + index
+    return {
+      ...token,
+      id: nextId,
+    }
+  })
+
+export const lastIndexUsed = async (collection: MintedCollection, api) => {
+  const { id, lastIndexUsed } = collection
+  const lastOnChainIndex = await getNextTokenIdOnChain(api, id)
+  return Math.max(lastIndexUsed, lastOnChainIndex)
+}
+
+const getNextTokenIdOnChain = (api, collectionId) =>
+  api.query.nfts
+    .collection(collectionId)
+    .then((res) => Number(res.toHuman().items) || 0)
diff --git a/services/nftStorage.ts b/services/nftStorage.ts
index dfb6070fa5..8f829c63a9 100644
--- a/services/nftStorage.ts
+++ b/services/nftStorage.ts
@@ -80,4 +80,20 @@ export const pinFileToIPFS = async (file: Blob): Promise<string> => {
   return value.cid
 }
 
+export const pinDirectory = async (files: File[]): Promise<string> => {
+  const formData = new FormData()
+  files.forEach((file) => formData.append('file', file, file.name))
+
+  const response = await nftStorageApi('/pinFile', {
+    method: 'POST',
+    body: formData,
+  }).catch((error: FetchError) => {
+    throw new Error(
+      `[NFT::STORAGE] Unable to PIN Directory for reasons ${error.data}`,
+    )
+  })
+
+  return response.value.cid
+}
+
 export default nftStorageApi

From 0e6ff7479309f5ac9d9e9f55e85cf1f6926a8fc7 Mon Sep 17 00:00:00 2001
From: daiagi <daiagi@gmail.com>
Date: Thu, 30 Nov 2023 15:15:03 +0700
Subject: [PATCH 40/85] assetHub works

---
 composables/massmint/useMassMint.ts           | 156 +-----------------
 .../massMintTokens/constructDirectoryMeta.ts  | 129 +++++++++++++++
 .../mintToken/transactionMintStatemine.ts     | 141 +++++++++++-----
 composables/transaction/mintToken/utils.ts    |  24 +++
 services/nftStorage.ts                        |  16 ++
 5 files changed, 274 insertions(+), 192 deletions(-)
 create mode 100644 composables/transaction/massMintTokens/constructDirectoryMeta.ts

diff --git a/composables/massmint/useMassMint.ts b/composables/massmint/useMassMint.ts
index 23137a2d01..6f2c65b55d 100644
--- a/composables/massmint/useMassMint.ts
+++ b/composables/massmint/useMassMint.ts
@@ -1,18 +1,13 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
 import { unwrapSafe } from '@/utils/uniquery'
 import resolveQueryPath from '@/utils/queryPathResolver'
 import { NFTToMint, Status } from '@/components/massmint/types'
 import { Interaction } from '@kodadot1/minimark/v1'
-import { MintedCollection, TokenToMint } from '@/composables/transaction/types'
+import { MintedCollection } from '@/composables/transaction/types'
 import {
   createTokensToMint,
   kusamaMintAndList,
   subscribeToCollectionLengthUpdates,
 } from './massMintHelpers'
-import nftStorageApi from '~/services/nftStorage'
-import { createMetadata, unSanitizeIpfsUrl } from '@kodadot1/minimark/utils'
-import { FetchError } from 'ofetch'
 
 export const statusTranslation = (status?: Status): string => {
   const { $i18n } = useNuxtApp()
@@ -144,8 +139,7 @@ export const useMassMint = (
       isError.value = mintAndListResults.isError.value
     })
   } else {
-    // simpleMint()
-    constructMeta(tokens)
+    simpleMint()
   }
   return {
     blockNumber,
@@ -155,149 +149,3 @@ export const useMassMint = (
     isError,
   }
 }
-
-function getFileSuffix(filename: string): string {
-  return filename.split('.').pop() as string
-}
-
-export const pinDirectory = async (files: File[]): Promise<string> => {
-  const formData = new FormData()
-  files.forEach((file) => formData.append('file', file, file.name))
-
-  const response = await nftStorageApi('/pinFile', {
-    method: 'POST',
-    body: formData,
-  }).catch((error: FetchError) => {
-    throw new Error(
-      `[NFT::STORAGE] Unable to PIN Directory for reasons ${error.data}`,
-    )
-  })
-
-  const directoryCid = response.value.cid
-  return directoryCid
-}
-
-function createFilesFromTokens(tokensToMint: TokenToMint[]): File[] {
-  return tokensToMint.map((token, index) => {
-    if (!token.file) {
-      throw new ReferenceError('No file found for token index ' + index)
-    }
-    const suffix = getFileSuffix(token.file.name)
-    return new File([token.file], `${index}.${suffix}`)
-  })
-}
-
-function batchFiles(files: File[], maxBatchSize: number): File[][] {
-  let currentBatch: File[] = []
-  let currentBatchSize = 0
-  const batches: File[][] = []
-
-  const startNewBatch = (file: File) => {
-    currentBatch = [file]
-    currentBatchSize = file.size
-  }
-
-  for (const file of files) {
-    if (currentBatchSize + file.size > maxBatchSize) {
-      batches.push(currentBatch)
-      startNewBatch(file)
-    } else {
-      currentBatch.push(file)
-      currentBatchSize += file.size
-    }
-  }
-
-  if (currentBatch.length > 0) {
-    batches.push(currentBatch)
-  }
-
-  return batches
-}
-
-export async function uploadImages(
-  tokensToMint: TokenToMint[],
-): Promise<string[]> {
-  const MAX_BATCH_SIZE = 100 * 1024 * 1024 // 100 MB in bytes
-  const files = createFilesFromTokens(tokensToMint)
-  const fileBatches = batchFiles(files, MAX_BATCH_SIZE)
-
-  const directoryCIDs = await Promise.all(fileBatches.map(pinDirectory))
-
-  return directoryCIDs.flatMap((directoryCid, batchIndex) =>
-    fileBatches[batchIndex].map(
-      (file, fileIndex) =>
-        `ipfs://${directoryCid}/${fileIndex}.${getFileSuffix(file.name)}`,
-    ),
-  )
-}
-
-function createTokenMetadata(
-  token: TokenToMint,
-  primaryHash: string,
-  enableCarbonOffset: boolean,
-  index: number,
-): File {
-  const preferencesStore = usePreferencesStore()
-  const { name, description, tags, nsfw, file } = token
-  const attributes = [
-    ...(tags || []),
-    ...nsfwAttribute(nsfw),
-    ...(enableCarbonOffset
-      ? offsetAttribute(preferencesStore.getHasCarbonOffset)
-      : []),
-  ]
-
-  const meta = createMetadata(
-    name,
-    description,
-    primaryHash,
-    undefined,
-    attributes,
-    'https://kodadot.xyz',
-    (file as File).type,
-  )
-
-  return new File([JSON.stringify(meta, null, 2)], `${index}.json`, {
-    type: 'application/json',
-  })
-}
-
-async function preheatAndUploadFiles(
-  token: TokenToMint,
-  primaryHash: string,
-): Promise<void> {
-  const { $consola } = useNuxtApp()
-  preheatFileFromIPFS(primaryHash)
-  const filePair: [File, File | null] = [token.file as File, null]
-  const hashPair: [string, string | undefined] = [primaryHash, undefined]
-  await uploadDirectWhenMultiple(filePair, hashPair).catch($consola.warn)
-}
-
-export async function constructMeta(
-  tokensToMint: TokenToMint[],
-  options?: {
-    enableCarbonOffset?: boolean
-  },
-): Promise<string[]> {
-  const { enableCarbonOffset = false } = options || {}
-  const imageHashes = await uploadImages(tokensToMint)
-
-  // Create metadata files
-  const metadataFiles = tokensToMint.map((token, index) => {
-    const imageHash = imageHashes[index]
-    return createTokenMetadata(token, imageHash, enableCarbonOffset, index)
-  })
-
-  // Upload all metadata files as a directory
-  const metaDirectoryCid = await pinDirectory(metadataFiles)
-
-  // Preheat and upload files
-  for (const [index, token] of tokensToMint.entries()) {
-    const imageHash = imageHashes[index]
-    await preheatAndUploadFiles(token, imageHash)
-  }
-
-  return metadataFiles.map((_, index) =>
-    unSanitizeIpfsUrl(`ipfs://${metaDirectoryCid}/${index}.json`),
-  )
-}
diff --git a/composables/transaction/massMintTokens/constructDirectoryMeta.ts b/composables/transaction/massMintTokens/constructDirectoryMeta.ts
new file mode 100644
index 0000000000..8397441e02
--- /dev/null
+++ b/composables/transaction/massMintTokens/constructDirectoryMeta.ts
@@ -0,0 +1,129 @@
+import { createMetadata, unSanitizeIpfsUrl } from '@kodadot1/minimark/utils'
+import { TokenToMint } from '../types'
+import { pinDirectory } from '@/services/nftStorage'
+
+export const constructDirectoryMeta = async (
+  tokensToMint: TokenToMint[],
+  options?: {
+    enableCarbonOffset?: boolean
+  },
+): Promise<string[]> => {
+  if (tokensToMint.map(({ file }) => file).some((file) => !file)) {
+    throw new ReferenceError('No file found for token')
+  }
+  const tokens = tokensToMint.filter((token) => Boolean(token.file))
+  const tokensMedia = tokens.map((token) => token.file) as File[]
+  const { enableCarbonOffset = false } = options ?? {}
+  const imageHashes = await uploadMediaFiles(tokensMedia)
+
+  // Create metadata files
+  const metadataFiles = tokens.map((token, index) =>
+    createTokenMetadata(token, imageHashes[index], enableCarbonOffset, index),
+  )
+
+  // Upload all metadata files as a directory
+  const metaDirectoryCid = await pinDirectory(metadataFiles)
+
+  // Preheat and upload files
+  await Promise.all(
+    tokensMedia.map((media, index) =>
+      preheatAndDirectUpload(media, imageHashes[index]),
+    ),
+  )
+
+  return metadataFiles.map((_, index) =>
+    unSanitizeIpfsUrl(`ipfs://${metaDirectoryCid}/${index}.json`),
+  )
+}
+
+const getFileSuffix = (filename: string) => filename.split('.').pop() as string
+
+const mapToSerial = (files: File[]): File[] =>
+  files.map((file, index) => {
+    const suffix = getFileSuffix(file.name)
+    return new File([file], `${index}.${suffix}`)
+  })
+
+const batchFiles = (files: File[], maxBatchSize: number): File[][] => {
+  let currentBatch: File[] = []
+  let currentBatchSize = 0
+  const batches: File[][] = []
+
+  const startNewBatch = (file: File) => {
+    currentBatch = [file]
+    currentBatchSize = file.size
+  }
+
+  for (const file of files) {
+    if (currentBatchSize + file.size > maxBatchSize) {
+      batches.push(currentBatch)
+      startNewBatch(file)
+    } else {
+      currentBatch.push(file)
+      currentBatchSize += file.size
+    }
+  }
+
+  if (currentBatch.length > 0) {
+    batches.push(currentBatch)
+  }
+
+  return batches
+}
+
+const uploadMediaFiles = async (files: File[]): Promise<string[]> => {
+  const MAX_BATCH_SIZE = 100 * 1024 * 1024 // 100 MB in bytes
+  const serialFiles = mapToSerial(files)
+  const fileBatches = batchFiles(serialFiles, MAX_BATCH_SIZE)
+
+  const directoryCIDs = await Promise.all(fileBatches.map(pinDirectory))
+
+  return directoryCIDs.flatMap((directoryCid, batchIndex) =>
+    fileBatches[batchIndex].map(
+      (file, fileIndex) =>
+        `ipfs://${directoryCid}/${fileIndex}.${getFileSuffix(file.name)}`,
+    ),
+  )
+}
+
+const createTokenMetadata = (
+  token: TokenToMint,
+  primaryHash: string,
+  enableCarbonOffset: boolean,
+  index: number,
+): File => {
+  const preferencesStore = usePreferencesStore()
+  const { name, description, tags, nsfw, file } = token
+  const attributes = [
+    ...(tags || []),
+    ...nsfwAttribute(nsfw),
+    ...(enableCarbonOffset
+      ? offsetAttribute(preferencesStore.getHasCarbonOffset)
+      : []),
+  ]
+
+  const meta = createMetadata(
+    name,
+    description,
+    primaryHash,
+    undefined,
+    attributes,
+    'https://kodadot.xyz',
+    (file as File).type,
+  )
+
+  return new File([JSON.stringify(meta, null, 2)], `${index}.json`, {
+    type: 'application/json',
+  })
+}
+
+const preheatAndDirectUpload = async (
+  media: File,
+  primaryHash: string,
+): Promise<void> => {
+  const { $consola } = useNuxtApp()
+  preheatFileFromIPFS(primaryHash)
+  const filePair: [File, File | null] = [media, null]
+  const hashPair: [string, string | undefined] = [primaryHash, undefined]
+  await uploadDirectWhenMultiple(filePair, hashPair).catch($consola.warn)
+}
diff --git a/composables/transaction/mintToken/transactionMintStatemine.ts b/composables/transaction/mintToken/transactionMintStatemine.ts
index 3dd83a36cc..63768b8fd4 100644
--- a/composables/transaction/mintToken/transactionMintStatemine.ts
+++ b/composables/transaction/mintToken/transactionMintStatemine.ts
@@ -2,30 +2,18 @@ import { BaseMintedCollection } from '@/components/base/types'
 import type { ActionMintToken, MintedCollection } from '../types'
 import { TokenToMint } from '../types'
 import { constructMeta } from './constructMeta'
-import { calculateFees, expandCopies, transactionFactory } from './utils'
+import {
+  Id,
+  assignIds,
+  calculateFees,
+  expandCopies,
+  lastIndexUsed,
+  transactionFactory,
+} from './utils'
 import { canSupport } from '@/utils/support'
+import { constructDirectoryMeta } from '../massMintTokens/constructDirectoryMeta'
 
-type id = { id: number }
-
-export const assignIds = <T extends TokenToMint>(
-  tokens: T[],
-  lastTokenId: number,
-): (T & id)[] => {
-  let lastId = lastTokenId || 0
-
-  return tokens.map((token) => {
-    const { lastIndexUsed } = token.selectedCollection as MintedCollection
-
-    lastId = Math.max(lastIndexUsed, lastId)
-
-    return {
-      ...token,
-      id: ++lastId,
-    }
-  })
-}
-
-export const prepareTokenMintArgs = async (token: TokenToMint & id, api) => {
+export const singleTokenTxs = async (token: TokenToMint & Id, api) => {
   const { id: collectionId } = token.selectedCollection as BaseMintedCollection
   const { price, id: nextId, hasRoyalty, royalty } = token
 
@@ -79,17 +67,69 @@ export const prepareTokenMintArgs = async (token: TokenToMint & id, api) => {
   return txs
 }
 
-export const prepTokens = async (item: ActionMintToken, api) => {
-  const tokens = Array.isArray(item.token) ? item.token : [item.token]
+export const multipleTokensTxs = async (
+  tokens: (TokenToMint & Id)[],
+  metadata: string[],
+  api,
+) => {
+  const { id: collectionId } = tokens[0]
+    .selectedCollection as BaseMintedCollection
+
+  const { accountId } = useAuth()
+
+  return tokens.flatMap((token, index) => {
+    const { price, id: nextId, hasRoyalty, royalty } = token
+    const tokenMetadata = metadata[index]
+
+    const create = api.tx.nfts.mint(
+      collectionId,
+      nextId,
+      accountId.value,
+      undefined,
+    )
+
+    const meta = api.tx.nfts.setMetadata(collectionId, nextId, tokenMetadata)
+
+    const list =
+      Number(price) > 0
+        ? [api.tx.nfts.setPrice(collectionId, nextId, price, undefined)]
+        : []
+
+    const txs = [create, meta, ...list]
+
+    if (royalty && isRoyaltyValid(royalty) && hasRoyalty) {
+      const setRoyaltyAmount = api.tx.nfts.setAttribute(
+        collectionId,
+        nextId,
+        'ItemOwner',
+        'royalty',
+        royalty.amount,
+      )
+
+      const setRoyaltyRecipient = api.tx.nfts.setAttribute(
+        collectionId,
+        nextId,
+        'ItemOwner',
+        'recipient',
+        royalty.address,
+      )
+      txs.push(setRoyaltyAmount, setRoyaltyRecipient)
+    }
 
-  const lastTokenId = await getNextTokenIdOnChain(
+    return txs
+  })
+}
+
+export const expandCopiesWithsIds = async (item: ActionMintToken, api) => {
+  const tokens = [item.token as TokenToMint]
+
+  const lastTokenId = await lastIndexUsed(
+    tokens[0].selectedCollection as MintedCollection,
     api,
-    (tokens[0].selectedCollection as MintedCollection).id,
   )
   const expandedTokens = expandCopies(tokens)
 
-  const tokensWithIds = assignIds(expandedTokens, lastTokenId)
-  return tokensWithIds
+  return assignIds(expandedTokens, lastTokenId)
 }
 
 export const getSupportInteraction = (
@@ -106,18 +146,43 @@ export const getSupportInteraction = (
   return canSupport(api, enabledFees, totalFees)
 }
 
-const getNextTokenIdOnChain = async (api, collectionId) => {
-  return await api.query.nfts
-    .collection(collectionId)
-    .then((res) => Number(res.toHuman().items) || 0)
-}
-
 const getArgs = async (item: ActionMintToken, api) => {
-  const tokens = await prepTokens(item, api)
-  const arg = await Promise.all(
-    tokens.map((token) => prepareTokenMintArgs(token, api)),
+  const { $consola } = useNuxtApp()
+
+  if (!Array.isArray(item.token)) {
+    // single token (with possible copies)
+    const tokens = await expandCopiesWithsIds(item, api)
+    const arg = await Promise.all(
+      tokens.map((token) => singleTokenTxs(token, api)),
+    )
+    const { enabledFees, feeMultiplier } = calculateFees()
+    const supportInteraction = await getSupportInteraction(
+      item,
+      enabledFees,
+      feeMultiplier,
+      api,
+    )
+
+    return [[...arg.flat(), ...supportInteraction]]
+  }
+
+  // multiple tokens (mass mint)
+
+  const lastTokenId = await lastIndexUsed(
+    item.token[0].selectedCollection as MintedCollection,
+    api,
   )
+
+  const tokensWithIds = assignIds(item.token, lastTokenId)
+  const metadata = await constructDirectoryMeta(tokensWithIds).catch((e) => {
+    $consola.error('Error while constructing metadata for tokens:\n', e)
+    throw e
+  })
+
+  const arg = await multipleTokensTxs(tokensWithIds, metadata, api)
+
   const { enabledFees, feeMultiplier } = calculateFees()
+
   const supportInteraction = await getSupportInteraction(
     item,
     enabledFees,
@@ -125,7 +190,7 @@ const getArgs = async (item: ActionMintToken, api) => {
     api,
   )
 
-  return [[...arg.flat(), ...supportInteraction]]
+  return [[...arg, ...supportInteraction]]
 }
 
 export const execMintStatemine = transactionFactory(getArgs)
diff --git a/composables/transaction/mintToken/utils.ts b/composables/transaction/mintToken/utils.ts
index b2d613d1b7..605f52a78e 100644
--- a/composables/transaction/mintToken/utils.ts
+++ b/composables/transaction/mintToken/utils.ts
@@ -80,3 +80,27 @@ export const expandCopies = <T extends TokenToMint>(tokens: T[]): T[] => {
       })
   })
 }
+export type Id = { id: number }
+
+export const assignIds = <T extends TokenToMint>(
+  tokens: T[],
+  lastTokenId: number,
+): (T & Id)[] =>
+  tokens.map((token, index) => {
+    const nextId = lastTokenId + 1 + index
+    return {
+      ...token,
+      id: nextId,
+    }
+  })
+
+export const lastIndexUsed = async (collection: MintedCollection, api) => {
+  const { id, lastIndexUsed } = collection
+  const lastOnChainIndex = await getNextTokenIdOnChain(api, id)
+  return Math.max(lastIndexUsed, lastOnChainIndex)
+}
+
+const getNextTokenIdOnChain = (api, collectionId) =>
+  api.query.nfts
+    .collection(collectionId)
+    .then((res) => Number(res.toHuman().items) || 0)
diff --git a/services/nftStorage.ts b/services/nftStorage.ts
index dfb6070fa5..8f829c63a9 100644
--- a/services/nftStorage.ts
+++ b/services/nftStorage.ts
@@ -80,4 +80,20 @@ export const pinFileToIPFS = async (file: Blob): Promise<string> => {
   return value.cid
 }
 
+export const pinDirectory = async (files: File[]): Promise<string> => {
+  const formData = new FormData()
+  files.forEach((file) => formData.append('file', file, file.name))
+
+  const response = await nftStorageApi('/pinFile', {
+    method: 'POST',
+    body: formData,
+  }).catch((error: FetchError) => {
+    throw new Error(
+      `[NFT::STORAGE] Unable to PIN Directory for reasons ${error.data}`,
+    )
+  })
+
+  return response.value.cid
+}
+
 export default nftStorageApi

From 5eed7f7585dbee3d1be917de70a204d026d6285b Mon Sep 17 00:00:00 2001
From: daiagi <daiagi@gmail.com>
Date: Thu, 30 Nov 2023 15:22:49 +0700
Subject: [PATCH 41/85] order!!

---
 .../{massMintTokens => mintToken}/constructDirectoryMeta.ts     | 0
 composables/transaction/mintToken/transactionMintStatemine.ts   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename composables/transaction/{massMintTokens => mintToken}/constructDirectoryMeta.ts (100%)

diff --git a/composables/transaction/massMintTokens/constructDirectoryMeta.ts b/composables/transaction/mintToken/constructDirectoryMeta.ts
similarity index 100%
rename from composables/transaction/massMintTokens/constructDirectoryMeta.ts
rename to composables/transaction/mintToken/constructDirectoryMeta.ts
diff --git a/composables/transaction/mintToken/transactionMintStatemine.ts b/composables/transaction/mintToken/transactionMintStatemine.ts
index 63768b8fd4..119fd68f19 100644
--- a/composables/transaction/mintToken/transactionMintStatemine.ts
+++ b/composables/transaction/mintToken/transactionMintStatemine.ts
@@ -11,7 +11,7 @@ import {
   transactionFactory,
 } from './utils'
 import { canSupport } from '@/utils/support'
-import { constructDirectoryMeta } from '../massMintTokens/constructDirectoryMeta'
+import { constructDirectoryMeta } from './constructDirectoryMeta'
 
 export const singleTokenTxs = async (token: TokenToMint & Id, api) => {
   const { id: collectionId } = token.selectedCollection as BaseMintedCollection

From e861bbaee137898fce020d0910d2e1b65836e1f0 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Thu, 30 Nov 2023 15:33:43 +0700
Subject: [PATCH 42/85] * fix(Ready.vue): change condition for checking if
 entities should be hidden based on the presence of an id property *
 feat(Ready.vue): add support for process.env.PORT environment variable *
 fix(Waiting.vue): change condition for checking if entities should be added
 based on the presence of migrated items and collection.nfts *
 fix(collectionMigrateWaiting.graphql): add condition to exclude burned nfts
 from the query

---
 components/migrate/landing/content/Ready.vue   | 18 ++++++------------
 components/migrate/landing/content/Waiting.vue |  2 +-
 .../general/collectionMigrateWaiting.graphql   |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/components/migrate/landing/content/Ready.vue b/components/migrate/landing/content/Ready.vue
index e0473b73e8..cd771bcf4f 100644
--- a/components/migrate/landing/content/Ready.vue
+++ b/components/migrate/landing/content/Ready.vue
@@ -9,14 +9,13 @@
       {{ $t('migrate.ready.desc') }}
     </div>
 
-    <div v-if="collections.length" class="collection">
+    <div v-if="Object.keys(entities).length" class="collection">
       <div
         v-for="collection in collections"
         :key="collection.id"
         class="collection-card"
         :class="{
-          'collection-card-empty':
-            !collection.nfts?.length || entities[collection.id]?.hide,
+          hidden: !entities[collection.id]?.id,
         }">
         <div
           class="collection-card-banner"
@@ -93,15 +92,10 @@ watchEffect(async () => {
       `/relocations/${urlPrefix.value}-${collection.id}`,
     )
 
-    let hide = false
-
-    if (migrated) {
-      hide = Boolean(migrated)
-    }
-
-    entities[collection.id] = {
-      ...metadata,
-      hide,
+    if (!migrated?.id && collection.nfts?.length) {
+      entities[collection.id] = {
+        ...metadata,
+      }
     }
   })
 })
diff --git a/components/migrate/landing/content/Waiting.vue b/components/migrate/landing/content/Waiting.vue
index 56f6c53c10..081fab4c46 100644
--- a/components/migrate/landing/content/Waiting.vue
+++ b/components/migrate/landing/content/Waiting.vue
@@ -134,7 +134,7 @@ watchEffect(() => {
       await waifuApi(`/relocations/owners/${accountId.value}`)
     ).filter((item) => item.collection === collection.id)
 
-    if (migrated.length) {
+    if (migrated.length && collection.nfts?.length) {
       entities[collection.id] = {
         ...metadata,
         migrated,
diff --git a/queries/subsquid/general/collectionMigrateWaiting.graphql b/queries/subsquid/general/collectionMigrateWaiting.graphql
index b80835385a..6625fd2ee5 100644
--- a/queries/subsquid/general/collectionMigrateWaiting.graphql
+++ b/queries/subsquid/general/collectionMigrateWaiting.graphql
@@ -5,7 +5,7 @@ query collectionMigrateWaiting($account: String!) {
     id
     name
     currentOwner
-    nfts(where: { currentOwner_eq: $account }) {
+    nfts(where: { currentOwner_eq: $account, burned_eq: false }) {
       id
     }
     metadata

From be42cbf03b5980a80d99a217ad460ea3a29c16b0 Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Thu, 30 Nov 2023 13:46:11 +0500
Subject: [PATCH 43/85] fix: k-grey light dark color

---
 libs/ui/src/scss/_theme.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/ui/src/scss/_theme.scss b/libs/ui/src/scss/_theme.scss
index 55201d6db2..46feb4a2b1 100644
--- a/libs/ui/src/scss/_theme.scss
+++ b/libs/ui/src/scss/_theme.scss
@@ -73,7 +73,7 @@ $themes: (
     'k-redaccent2': #390b0b,
     'k-grey': #cccccc,
     'k-grey-fix': #999999,
-    'k-grey-light': #ECECEC,
+    'k-grey-light': #454545,
     'k-pink': #7a2a68,
     'k-yellow': #363234,
     'k-blueaccent': #2e50a2,

From 7c6d7457649e0e9d78acb46b4073bb0595e4af07 Mon Sep 17 00:00:00 2001
From: daiagi <daiagi@gmail.com>
Date: Thu, 30 Nov 2023 18:58:01 +0700
Subject: [PATCH 44/85] fix unit tests

---
 .../mintToken/transactionMintStatemine.ts     |  2 +-
 tests/transactionMintStatemine.spec.ts        | 55 ++++++++++---------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/composables/transaction/mintToken/transactionMintStatemine.ts b/composables/transaction/mintToken/transactionMintStatemine.ts
index 119fd68f19..a1e164ea0b 100644
--- a/composables/transaction/mintToken/transactionMintStatemine.ts
+++ b/composables/transaction/mintToken/transactionMintStatemine.ts
@@ -121,7 +121,7 @@ export const multipleTokensTxs = async (
 }
 
 export const expandCopiesWithsIds = async (item: ActionMintToken, api) => {
-  const tokens = [item.token as TokenToMint]
+  const tokens = Array.isArray(item.token) ? item.token : [item.token]
 
   const lastTokenId = await lastIndexUsed(
     tokens[0].selectedCollection as MintedCollection,
diff --git a/tests/transactionMintStatemine.spec.ts b/tests/transactionMintStatemine.spec.ts
index 023664e526..1b8fbc08b8 100644
--- a/tests/transactionMintStatemine.spec.ts
+++ b/tests/transactionMintStatemine.spec.ts
@@ -1,9 +1,7 @@
-import {
-  assignIds,
-  prepTokens,
-} from '@/composables/transaction/mintToken/transactionMintStatemine'
+import { expandCopiesWithsIds } from '@/composables/transaction/mintToken/transactionMintStatemine'
 import { TokenToMint } from '@/composables/transaction/types'
 import {
+  assignIds,
   copiesToMint,
   expandCopies,
 } from '@/composables/transaction/mintToken/utils'
@@ -24,7 +22,7 @@ describe('transactionMintStatemine.ts functions', () => {
       const tokens: TokenToMint[] = [
         { selectedCollection: { lastIndexUsed: 4 } },
       ]
-      const result = assignIds(tokens)
+      const result = assignIds(tokens, 4)
       expect(result).toEqual([
         { selectedCollection: { lastIndexUsed: 4 }, id: 5 },
       ])
@@ -36,7 +34,7 @@ describe('transactionMintStatemine.ts functions', () => {
         { selectedCollection: { alreadyMinted: 2, lastIndexUsed: 2 } },
         { selectedCollection: { alreadyMinted: 2, lastIndexUsed: 2 } },
       ]
-      const result = assignIds(tokens)
+      const result = assignIds(tokens, 2)
       expect(result).toEqual([
         { selectedCollection: { alreadyMinted: 2, lastIndexUsed: 2 }, id: 3 },
         { selectedCollection: { alreadyMinted: 2, lastIndexUsed: 2 }, id: 4 },
@@ -243,7 +241,7 @@ describe('transactionMintStatemine.ts functions', () => {
       expect(result[2].name).toBe('test')
     })
   })
-  describe('prepTokens function', () => {
+  describe('expandCopiesWithsIds function', () => {
     it('should correctly prepare a single token with unique id', async () => {
       const token: TokenToMint = {
         name: 'test',
@@ -254,7 +252,7 @@ describe('transactionMintStatemine.ts functions', () => {
         token,
       }
 
-      const result = await prepTokens(item, MOCK_API)
+      const result = await expandCopiesWithsIds(item, MOCK_API)
 
       const expectedResult = [
         {
@@ -278,7 +276,7 @@ describe('transactionMintStatemine.ts functions', () => {
         token,
       }
 
-      const result = await prepTokens(item, MOCK_API)
+      const result = await expandCopiesWithsIds(item, MOCK_API)
 
       const expectedResult = [
         {
@@ -311,15 +309,15 @@ describe('transactionMintStatemine.ts functions', () => {
       const tokens: TokenToMint[] = [
         {
           name: 'test1',
-          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3 },
+          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3, id: 1234 },
         },
         {
           name: 'test2',
-          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3 },
+          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3, id: 1234 },
         },
         {
           name: 'test3',
-          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3 },
+          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3, id: 1234 },
         },
       ]
 
@@ -327,22 +325,22 @@ describe('transactionMintStatemine.ts functions', () => {
         token: tokens,
       }
 
-      const result = await prepTokens(item, MOCK_API)
+      const result = await expandCopiesWithsIds(item, MOCK_API)
 
       const expectedResult = [
         {
           name: 'test1',
-          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3 },
+          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3, id: 1234 },
           id: 4,
         },
         {
           name: 'test2',
-          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3 },
+          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3, id: 1234 },
           id: 5,
         },
         {
           name: 'test3',
-          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3 },
+          selectedCollection: { alreadyMinted: 2, lastIndexUsed: 3, id: 1234 },
           id: 6,
         },
       ]
@@ -351,22 +349,27 @@ describe('transactionMintStatemine.ts functions', () => {
     })
 
     it('should correctly prepare an array of tokens with unique ids and some have copies', async () => {
+      const selectedCollection = {
+        alreadyMinted: 6,
+        lastIndexUsed: 7,
+        id: 1234,
+      }
       const tokens: TokenToMint[] = [
         {
           name: 'test1',
           copies: 2,
           postfix: true,
-          selectedCollection: { alreadyMinted: 6, lastIndexUsed: 7 },
+          selectedCollection,
         },
         {
           name: 'test2',
-          selectedCollection: { alreadyMinted: 6, lastIndexUsed: 7 },
+          selectedCollection,
         },
         {
           name: 'test3',
           copies: 3,
           postfix: true,
-          selectedCollection: { alreadyMinted: 6, lastIndexUsed: 7 },
+          selectedCollection,
         },
       ]
 
@@ -374,47 +377,47 @@ describe('transactionMintStatemine.ts functions', () => {
         token: tokens,
       }
 
-      const result = await prepTokens(item, MOCK_API)
+      const result = await expandCopiesWithsIds(item, MOCK_API)
 
       const expectedResult = [
         {
           name: 'test1 #1',
           copies: 2,
           postfix: true,
-          selectedCollection: { alreadyMinted: 6, lastIndexUsed: 7 },
+          selectedCollection,
           id: 8,
         },
         {
           name: 'test1 #2',
           copies: 2,
           postfix: true,
-          selectedCollection: { alreadyMinted: 6, lastIndexUsed: 7 },
+          selectedCollection,
           id: 9,
         },
         {
           name: 'test2',
-          selectedCollection: { alreadyMinted: 6, lastIndexUsed: 7 },
+          selectedCollection,
           id: 10,
         },
         {
           name: 'test3 #1',
           copies: 3,
           postfix: true,
-          selectedCollection: { alreadyMinted: 6, lastIndexUsed: 7 },
+          selectedCollection,
           id: 11,
         },
         {
           name: 'test3 #2',
           copies: 3,
           postfix: true,
-          selectedCollection: { alreadyMinted: 6, lastIndexUsed: 7 },
+          selectedCollection,
           id: 12,
         },
         {
           name: 'test3 #3',
           copies: 3,
           postfix: true,
-          selectedCollection: { alreadyMinted: 6, lastIndexUsed: 7 },
+          selectedCollection,
           id: 13,
         },
       ]

From 6a3f0f8dc6dd1302d35274edef22b39cff75d36a Mon Sep 17 00:00:00 2001
From: daiagi <daiagi@gmail.com>
Date: Thu, 30 Nov 2023 19:11:18 +0700
Subject: [PATCH 45/85] refactor to reduce dupliaction and complexity

---
 .../mintToken/transactionMintStatemine.ts     | 119 ++++++++----------
 1 file changed, 55 insertions(+), 64 deletions(-)

diff --git a/composables/transaction/mintToken/transactionMintStatemine.ts b/composables/transaction/mintToken/transactionMintStatemine.ts
index a1e164ea0b..86a58526fe 100644
--- a/composables/transaction/mintToken/transactionMintStatemine.ts
+++ b/composables/transaction/mintToken/transactionMintStatemine.ts
@@ -12,37 +12,32 @@ import {
 } from './utils'
 import { canSupport } from '@/utils/support'
 import { constructDirectoryMeta } from './constructDirectoryMeta'
+import { ApiPromise } from '@polkadot/api'
+
+interface BuildTokenTxsParams {
+  token: TokenToMint
+  metadata: string
+  api: ApiPromise
+  accountId: string
+  collectionId: string
+}
 
-export const singleTokenTxs = async (token: TokenToMint & Id, api) => {
-  const { id: collectionId } = token.selectedCollection as BaseMintedCollection
+const buildTokenTxs = ({
+  token,
+  metadata,
+  api,
+  accountId,
+  collectionId,
+}: BuildTokenTxsParams) => {
   const { price, id: nextId, hasRoyalty, royalty } = token
 
-  const { accountId } = useAuth()
-  const { $consola } = useNuxtApp()
-
-  const metadata = await constructMeta(token).catch((e) => {
-    $consola.error(
-      'Error while constructing metadata for token:\n',
-      token,
-      '\n',
-      e,
-    )
-  })
-
-  const create = api.tx.nfts.mint(
-    collectionId,
-    nextId,
-    accountId.value,
-    undefined,
-  )
-
+  const create = api.tx.nfts.mint(collectionId, nextId, accountId, undefined)
   const meta = api.tx.nfts.setMetadata(collectionId, nextId, metadata)
 
   const list =
     Number(price) > 0
       ? [api.tx.nfts.setPrice(collectionId, nextId, price, undefined)]
       : []
-
   const txs = [create, meta, ...list]
 
   if (royalty && isRoyaltyValid(royalty) && hasRoyalty) {
@@ -53,7 +48,6 @@ export const singleTokenTxs = async (token: TokenToMint & Id, api) => {
       'royalty',
       royalty.amount,
     )
-
     const setRoyaltyRecipient = api.tx.nfts.setAttribute(
       collectionId,
       nextId,
@@ -67,6 +61,32 @@ export const singleTokenTxs = async (token: TokenToMint & Id, api) => {
   return txs
 }
 
+export const singleTokenTxs = async (token: TokenToMint & Id, api) => {
+  const { id: collectionId } = token.selectedCollection as BaseMintedCollection
+
+  const { accountId } = useAuth()
+  const { $consola } = useNuxtApp()
+
+  const metadata = await constructMeta(token).catch((e) => {
+    $consola.error(
+      'Error while constructing metadata for token:\n',
+      token,
+      '\n',
+      e,
+    )
+  })
+  if (!metadata) {
+    return
+  }
+  return buildTokenTxs({
+    token,
+    metadata,
+    api,
+    accountId: accountId.value,
+    collectionId,
+  })
+}
+
 export const multipleTokensTxs = async (
   tokens: (TokenToMint & Id)[],
   metadata: string[],
@@ -77,47 +97,15 @@ export const multipleTokensTxs = async (
 
   const { accountId } = useAuth()
 
-  return tokens.flatMap((token, index) => {
-    const { price, id: nextId, hasRoyalty, royalty } = token
-    const tokenMetadata = metadata[index]
-
-    const create = api.tx.nfts.mint(
+  return tokens.flatMap((token, index) =>
+    buildTokenTxs({
+      token,
+      metadata: metadata[index],
+      api,
+      accountId: accountId.value,
       collectionId,
-      nextId,
-      accountId.value,
-      undefined,
-    )
-
-    const meta = api.tx.nfts.setMetadata(collectionId, nextId, tokenMetadata)
-
-    const list =
-      Number(price) > 0
-        ? [api.tx.nfts.setPrice(collectionId, nextId, price, undefined)]
-        : []
-
-    const txs = [create, meta, ...list]
-
-    if (royalty && isRoyaltyValid(royalty) && hasRoyalty) {
-      const setRoyaltyAmount = api.tx.nfts.setAttribute(
-        collectionId,
-        nextId,
-        'ItemOwner',
-        'royalty',
-        royalty.amount,
-      )
-
-      const setRoyaltyRecipient = api.tx.nfts.setAttribute(
-        collectionId,
-        nextId,
-        'ItemOwner',
-        'recipient',
-        royalty.address,
-      )
-      txs.push(setRoyaltyAmount, setRoyaltyRecipient)
-    }
-
-    return txs
-  })
+    }),
+  )
 }
 
 export const expandCopiesWithsIds = async (item: ActionMintToken, api) => {
@@ -176,9 +164,12 @@ const getArgs = async (item: ActionMintToken, api) => {
   const tokensWithIds = assignIds(item.token, lastTokenId)
   const metadata = await constructDirectoryMeta(tokensWithIds).catch((e) => {
     $consola.error('Error while constructing metadata for tokens:\n', e)
-    throw e
   })
 
+  if (!metadata) {
+    return
+  }
+
   const arg = await multipleTokensTxs(tokensWithIds, metadata, api)
 
   const { enabledFees, feeMultiplier } = calculateFees()

From 4039f5cfa2b6852fc60a7d00cd6cfe7c371fedf4 Mon Sep 17 00:00:00 2001
From: Jarsen <31397967+Jarsen136@users.noreply.github.com>
Date: Thu, 30 Nov 2023 23:00:05 +0800
Subject: [PATCH 46/85] fix: Disabled claim till generate new

---
 components/collection/drop/GenerativePreview.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/collection/drop/GenerativePreview.vue b/components/collection/drop/GenerativePreview.vue
index cc73345639..66059389c5 100644
--- a/components/collection/drop/GenerativePreview.vue
+++ b/components/collection/drop/GenerativePreview.vue
@@ -77,9 +77,12 @@ const generativeImageUrl = ref(
 
 const isLoading = ref(false)
 
-watch([accountId], () => {
+const generateDefaultNft = () => {
   generateNft(true)
-})
+}
+onMounted(generateDefaultNft)
+watch(accountId, generateDefaultNft)
+
 const displayUrl = computed(() => {
   return generativeImageUrl.value || props.image
 })

From 0d44f58b97c42359718266e6e549aca0f98db8fc Mon Sep 17 00:00:00 2001
From: Jarsen <31397967+Jarsen136@users.noreply.github.com>
Date: Fri, 1 Dec 2023 01:43:14 +0800
Subject: [PATCH 47/85] fix: rotate center

---
 libs/ui/src/components/NeoButton/NeoButton.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/ui/src/components/NeoButton/NeoButton.scss b/libs/ui/src/components/NeoButton/NeoButton.scss
index 0eaaf81577..01c7c86deb 100644
--- a/libs/ui/src/components/NeoButton/NeoButton.scss
+++ b/libs/ui/src/components/NeoButton/NeoButton.scss
@@ -165,7 +165,7 @@
     }
 
     &::after {
-      @apply relative left-0 border-2 border-k-grey rounded-full border-r-transparent border-t-transparent h-[1em] w-[1em] #{!important};
+      @apply relative left-0 border-2 border-k-grey rounded-full border-r-transparent border-t-transparent h-[1em] w-[1.11em] #{!important};
     }
   }
 

From 96fdf9dc9452efa27a4d1119dd8da28f6ebbe194 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Thu, 30 Nov 2023 14:46:43 -0300
Subject: [PATCH 48/85] share button test

---
 tests/e2e/share.spec.ts | 62 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 tests/e2e/share.spec.ts

diff --git a/tests/e2e/share.spec.ts b/tests/e2e/share.spec.ts
new file mode 100644
index 0000000000..546f55d62c
--- /dev/null
+++ b/tests/e2e/share.spec.ts
@@ -0,0 +1,62 @@
+import { expect, test } from './fixtures'
+
+const ITEM_ADDRESS_PATH = '/ahk/gallery/6-10'
+const COLLECTION_ADDRESS_PATH = '/ahp/collection/38/'
+
+test('Share Button on Gallery Item', async ({ page, Commands }) => {
+  await page.goto(ITEM_ADDRESS_PATH)
+  const shareBtn = page.getByTestId('gallery-item-share-button')
+
+  //Copy Link
+  await test.step('Clicks on copy link and verifies clipboard', async () => {
+    await shareBtn.click()
+    await shareBtn.getByText('Copy Link').click()
+    const clipboardText1 = await page.evaluate('navigator.clipboard.readText()')
+    expect(clipboardText1).toContain('/ahk/gallery/6-10')
+  })
+
+  //Twitter
+  await test.step('Clicks on twitter and verify URL', async () => {
+    await shareBtn.click()
+    await Commands.checkNewTab(
+      'https://twitter.com',
+      await shareBtn.getByTestId('gallery-item-share-dropdown-twitter').click(),
+    )
+  })
+
+  //QR Code
+  await test.step('Clicks on QR code and verify its existance', async () => {
+    await shareBtn.click()
+    await shareBtn.getByText('QR Code').click()
+    await expect(
+      page.getByTestId('gallery-item-share-dropdown-qrcode'),
+    ).toBeVisible()
+    await page.keyboard.press('Escape')
+  })
+})
+
+test('Share Button on Collection', async ({ page, Commands }) => {
+  await page.goto(COLLECTION_ADDRESS_PATH)
+  const shareBtn = page.getByTestId('share-button').first()
+  await test.step('Share button functionality', async () => {
+    //Copy
+    await shareBtn.click()
+    await page.getByTestId('hero-copy-link-dropdown').first().click()
+    await Commands.copyText('http://localhost:9090/ahp/collection/38')
+  })
+  //QR
+  await test.step('Clicks on QR code and verify its existance', async () => {
+    await shareBtn.click()
+    await page.getByTestId('hero-share-QR-dropdown').first().click()
+    await expect(page.getByTestId('hero-share-qrcode-modal')).toBeVisible()
+    await page.keyboard.press('Escape')
+  })
+  //Twitter
+  await test.step('Clicks on twitter and verify URL', async () => {
+    await shareBtn.click()
+    await Commands.checkNewTab(
+      'https://twitter.com',
+      await page.getByTestId('hero-share-twitter-dropdown').first().click(),
+    )
+  })
+})

From 00252552954efbfb5da98f977c30c314c787a400 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Thu, 30 Nov 2023 14:48:19 -0300
Subject: [PATCH 49/85] variable name and location

---
 tests/e2e/collection.spec.ts       | 40 ++++++++----------------------
 tests/e2e/createcollection.spec.ts |  8 +++---
 tests/e2e/createnft.spec.ts        |  6 +++--
 tests/e2e/explore.spec.ts          | 11 ++++----
 tests/e2e/galleryitem.spec.ts      | 33 +++---------------------
 tests/e2e/language.spec.ts         |  6 ++---
 tests/e2e/prefix.spec.ts           |  6 ++---
 tests/e2e/profile.spec.ts          | 16 +++++++-----
 tests/e2e/search.spec.ts           |  6 ++---
 tests/e2e/settings.spec.ts         |  4 ++-
 tests/e2e/sidebar.spec.ts          |  4 ++-
 tests/e2e/transfer.spec.ts         |  8 +++---
 12 files changed, 54 insertions(+), 94 deletions(-)

diff --git a/tests/e2e/collection.spec.ts b/tests/e2e/collection.spec.ts
index a009c8f2cd..4c9e6d0398 100644
--- a/tests/e2e/collection.spec.ts
+++ b/tests/e2e/collection.spec.ts
@@ -1,16 +1,15 @@
 import { expect, test } from './fixtures'
 
-const collectionName = 'Pare1d0scope'
-const collectionAddress = '/ahp/collection/38/'
+const COLLECTION_ADDRESS_PATH = '/ahp/collection/38/'
+const COLLECTION_NAME = 'Pare1d0scope'
+const COLLECTION_OWNER = '15CoYMEnJhhWHvdEPXDuTBnZKXwrJzMQdcMwcHGsVx5kXYvW'
 
 test('Collection interactions', async ({ page, Commands }) => {
-  await test.step('Access collection address and scroll down', async () => {
-    await page.goto(collectionAddress)
-    await Commands.scrollDownAndStop()
-  })
+  await page.goto(COLLECTION_ADDRESS_PATH)
+  await Commands.scrollDownAndStop()
   await test.step('Check collection name and description', async () => {
     await expect(page.getByTestId('collection-banner-name')).toContainText(
-      collectionName,
+      COLLECTION_NAME,
     )
     //description show more
     await page.getByTestId('description-show-less-more-button').click()
@@ -20,23 +19,6 @@ test('Collection interactions', async ({ page, Commands }) => {
     )
   })
 
-  //Share Button
-  await test.step('Share button functionality', async () => {
-    const shareBtn = page.getByTestId('share-button').first()
-    await shareBtn.click()
-    await page.getByTestId('hero-copy-link-dropdown').first().click()
-    await Commands.copyText('http://localhost:9090/ahp/collection/38')
-    await shareBtn.click()
-    await page.getByTestId('hero-share-QR-dropdown').first().click()
-    await expect(page.getByTestId('hero-share-qrcode-modal')).toBeVisible()
-    await page.keyboard.press('Escape')
-    await shareBtn.click()
-    await Commands.checkNewTab(
-      'https://twitter.com',
-      await page.getByTestId('hero-share-twitter-dropdown').first().click(),
-    )
-  })
-
   //ITEMS TAB ----------------------------
   //Buy Now Filter
   await test.step('Verify if checking buy now filter only yield results with price ', async () => {
@@ -69,10 +51,10 @@ test('Collection interactions', async ({ page, Commands }) => {
     await page.getByTestId('navbar-button-cart').click()
     await expect(page.getByTestId('shopping-cart-modal')).toBeVisible()
     await expect(page.getByTestId('shopping-cart-item').nth(0)).toContainText(
-      collectionName,
+      COLLECTION_NAME,
     )
     await expect(page.getByTestId('shopping-cart-item').nth(1)).toContainText(
-      collectionName,
+      COLLECTION_NAME,
     )
     await page.getByTestId('modal-close-button').click()
   })
@@ -102,7 +84,7 @@ test('Collection interactions', async ({ page, Commands }) => {
     const holdersTab = page.getByTestId('collection-holders-container')
     //check if nft details on Holders tab has content
     await page.getByTestId('collection-holder-nft-details').first().click()
-    await expect(holdersTab).toContainText(collectionName)
+    await expect(holdersTab).toContainText(COLLECTION_NAME)
     //check if popover on Holders is present
     await expect(
       page.getByTestId('collection-nft-holder').first(),
@@ -138,8 +120,6 @@ test('Collection interactions', async ({ page, Commands }) => {
   //Creator link
   await test.step('Check if creator address redirects to proper page', async () => {
     await page.getByTestId('collection-creator-address').click()
-    await expect(page).toHaveURL(
-      '/ahp/u/15CoYMEnJhhWHvdEPXDuTBnZKXwrJzMQdcMwcHGsVx5kXYvW',
-    )
+    await expect(page).toHaveURL(`/ahp/u/${COLLECTION_OWNER}`)
   })
 })
diff --git a/tests/e2e/createcollection.spec.ts b/tests/e2e/createcollection.spec.ts
index 50b3724dc9..c3d5450107 100644
--- a/tests/e2e/createcollection.spec.ts
+++ b/tests/e2e/createcollection.spec.ts
@@ -1,11 +1,13 @@
 import { expect, test } from './fixtures'
 
+const CREATE_COLLECTION_PATH = '/create/collection'
+
 test('Fill fields to check if they work', async ({ page, Commands }) => {
   await test.step('Login and goto create collection ', async () => {
     //E2E connection
     await Commands.e2elogin()
     //Goto
-    await page.goto('/create/collection')
+    await page.goto(CREATE_COLLECTION_PATH)
   })
   await test.step('Upload image ', async () => {
     //upload image logo
@@ -55,7 +57,7 @@ test('Check if chain change works using the dropdown', async ({
 }) => {
   await test.step('Login and goto create collection', async () => {
     await Commands.e2elogin()
-    await page.goto('/create/collection')
+    await page.goto(CREATE_COLLECTION_PATH)
   })
 
   //Chain dropdown
@@ -82,7 +84,7 @@ test('Check if chain change works using the dropdown', async ({
 })
 
 test('Verifies error message if collection name is empty', async ({ page }) => {
-  await page.goto('/create/collection')
+  await page.goto(CREATE_COLLECTION_PATH)
   const collectionName = page.getByTestId('collection-name')
   await collectionName.locator('input').fill('Kodadot Warning Test')
   await collectionName.locator('input').fill('')
diff --git a/tests/e2e/createnft.spec.ts b/tests/e2e/createnft.spec.ts
index 7648d53632..5a310a72d8 100644
--- a/tests/e2e/createnft.spec.ts
+++ b/tests/e2e/createnft.spec.ts
@@ -1,14 +1,16 @@
 import { expect, test } from './fixtures'
 
+const CREATE_NFT_PATH = '/ksm/create'
+
 test('Create NFT', async ({ page, Commands }) => {
   const numOfCopies = 5
   //Login and navigation
   await test.step('Login and navigate trough create single nft menus', async () => {
     await Commands.e2elogin()
-    await page.goto('/ksm/create')
+    await page.goto(CREATE_NFT_PATH)
     await Commands.acceptCookies()
     await page.getByTestId('create-landing-nft-button').click()
-    await expect(page).toHaveURL('/ksm/create?select=nft')
+    await expect(page).toHaveURL(`${CREATE_NFT_PATH}?select=nft`)
     await page.getByTestId('create-landing-single-nft-button').click()
   })
 
diff --git a/tests/e2e/explore.spec.ts b/tests/e2e/explore.spec.ts
index ffa7310a61..c392e5e921 100644
--- a/tests/e2e/explore.spec.ts
+++ b/tests/e2e/explore.spec.ts
@@ -1,9 +1,10 @@
 import { expect, test } from './fixtures'
 
+const EXPLORE_COLLECTIONS_PATH = '/ahk/explore/collectibles'
+const EXPLORE_ITEMS_PATH = '/ahk/explore/items?page=1'
+
 test('Explore collections', async ({ page, Commands }) => {
-  await test.step('Goto explore collections', async () => {
-    await page.goto('/ahk/explore/collectibles')
-  })
+  await page.goto(EXPLORE_COLLECTIONS_PATH)
 
   //Tabs
   await test.step('Verify tab existance', async () => {
@@ -41,9 +42,7 @@ test('Explore collections', async ({ page, Commands }) => {
 })
 
 test('Explore Items', async ({ page, Commands }) => {
-  await test.step('Go to explore items', async () => {
-    await page.goto('/ahk/explore/items?page=1')
-  })
+  await page.goto(EXPLORE_ITEMS_PATH)
 
   //Tabs
   await test.step('Verify tab existance', async () => {
diff --git a/tests/e2e/galleryitem.spec.ts b/tests/e2e/galleryitem.spec.ts
index b35daac9e2..361cab1554 100644
--- a/tests/e2e/galleryitem.spec.ts
+++ b/tests/e2e/galleryitem.spec.ts
@@ -1,9 +1,9 @@
 import { expect, test } from './fixtures'
 
+const COLLECTION_ADDRESS_PATH = '/ahk/gallery/6-10'
+
 test('Gallery item Interactions', async ({ page }) => {
-  await test.step('Goto Ahk gallery item', async () => {
-    await page.goto('/ahk/gallery/6-10')
-  })
+  await page.goto(COLLECTION_ADDRESS_PATH)
 
   //Activity tab
   await test.step('Verifies if activity tab has content', async () => {
@@ -37,33 +37,6 @@ test('Gallery item Interactions', async ({ page }) => {
     await expect(page.getByTestId('gallery-item-chart')).toBeVisible()
   })
 
-  //Share Button
-  await test.step('Verify if share button options work accordingly', async () => {
-    const shareBtn = page.getByTestId('gallery-item-share-button')
-    await shareBtn.click()
-    //Copy Link
-    await shareBtn.getByText('Copy Link').click()
-    const clipboardText1 = await page.evaluate('navigator.clipboard.readText()')
-    expect(clipboardText1).toContain('/ahk/gallery/6-10')
-    //Twitter
-    await shareBtn.click()
-    await shareBtn.getByTestId('gallery-item-share-dropdown-twitter').click()
-    const newTabPromise = page.waitForEvent('popup')
-    const newTab = await newTabPromise
-    await newTab.waitForLoadState()
-    await expect(newTab).toHaveURL(
-      'https://twitter.com/i/flow/login?redirect_after_login=%2Fintent%2Ftweet%3Ftext%3DCheck%2520out%2520this%2520awesome%2520NFT%2520on%2520KodaDot%26via%3DKodaDot%26url%3Dhttp%3A%2F%2Flocalhost%3A9090%2Fahk%2Fgallery%2F6-10',
-    )
-    await newTab.close()
-    //QR Code
-    await shareBtn.click()
-    await shareBtn.getByText('QR Code').click()
-    await expect(
-      page.getByTestId('gallery-item-share-dropdown-qrcode'),
-    ).toBeVisible()
-    await page.keyboard.press('Escape')
-  })
-
   //More Button
   await test.step('More Button Functionality', async () => {
     await page.getByTestId('gallery-item-more-button').click()
diff --git a/tests/e2e/language.spec.ts b/tests/e2e/language.spec.ts
index dcc31626ac..3af01cf79f 100644
--- a/tests/e2e/language.spec.ts
+++ b/tests/e2e/language.spec.ts
@@ -1,10 +1,8 @@
 import { expect, test } from './fixtures'
 
 test('Translations', async ({ page, Commands }) => {
-  await test.step('Login and go to', async () => {
-    await Commands.e2elogin()
-    await page.goto('')
-  })
+  await Commands.e2elogin()
+  await page.goto('')
 
   //DE
   await test.step('Check German Translation', async () => {
diff --git a/tests/e2e/prefix.spec.ts b/tests/e2e/prefix.spec.ts
index 2da02662de..eb92807442 100644
--- a/tests/e2e/prefix.spec.ts
+++ b/tests/e2e/prefix.spec.ts
@@ -1,10 +1,8 @@
 import { expect, test } from './fixtures'
 
 test('Switch network', async ({ page }) => {
-  await test.step('Go to Landing and wait for load state', async () => {
-    await page.goto('/')
-    await page.waitForLoadState()
-  })
+  await page.goto('/')
+  await page.waitForLoadState()
 
   //BSX
   await test.step('Switching to BSX', async () => {
diff --git a/tests/e2e/profile.spec.ts b/tests/e2e/profile.spec.ts
index 14f334cfb0..f0c42d54ff 100644
--- a/tests/e2e/profile.spec.ts
+++ b/tests/e2e/profile.spec.ts
@@ -1,9 +1,11 @@
 import { expect, test } from './fixtures'
 
+const KSM_TEST_ADDRESS = 'CmWHiv7h4m9tEzKD94DH4mqwGTvsdYQe2nouWPF7ipmHpqA'
+
 test('Profile Interactions', async ({ page, Commands }) => {
-  const testAddress = 'CmWHiv7h4m9tEzKD94DH4mqwGTvsdYQe2nouWPF7ipmHpqA'
-  await page.goto(`ahk/u/${testAddress}?tab=owned`)
+  await page.goto(`ahk/u/${KSM_TEST_ADDRESS}?tab=owned`)
   await Commands.scrollDownSlow()
+
   //test step - will check if buy now has items that are not listed
   await test.step('Buy Now', async () => {
     await Commands.acceptCookies()
@@ -13,7 +15,8 @@ test('Profile Interactions', async ({ page, Commands }) => {
       await expect(li.getByText('KSM')).toBeVisible()
     }
   })
-  //test step
+
+  //Activity
   await test.step('Activity Tab', async () => {
     await page.getByTestId('profile-tabs').last().click()
     //usually sale and buy are active when you enter the page
@@ -52,14 +55,15 @@ test('Profile Interactions', async ({ page, Commands }) => {
     //ALL
     await page.getByTestId('profile-activity-button-all').click()
   })
-  //test step
+
+  //PROFILE LINKS
   await test.step('Profile Links', async () => {
     //copy address
     await page
       .getByTestId('profile-identity-buttons')
       .getByText('Copy Address')
       .click()
-    await Commands.copyText(testAddress)
+    await Commands.copyText(KSM_TEST_ADDRESS)
     //QR Code
     await page
       .getByTestId('profile-identity-buttons')
@@ -73,7 +77,7 @@ test('Profile Interactions', async ({ page, Commands }) => {
       .getByText('Transfer')
       .click()
     await expect(page).toHaveURL(
-      `/ahk/transfer?target=${testAddress}&usdamount=10&donation=true`,
+      `/ahk/transfer?target=${KSM_TEST_ADDRESS}&usdamount=10&donation=true`,
     )
   })
 })
diff --git a/tests/e2e/search.spec.ts b/tests/e2e/search.spec.ts
index 3305d14054..e682858ac3 100644
--- a/tests/e2e/search.spec.ts
+++ b/tests/e2e/search.spec.ts
@@ -1,9 +1,9 @@
 import { expect, test } from './fixtures'
 
+const LANDING_PATH = '/ksm'
+
 test('Check if search provide results', async ({ page }) => {
-  await test.step('Go to landing within Kusama chain', async () => {
-    await page.goto('/ksm')
-  })
+  await page.goto(LANDING_PATH)
 
   //Search term
   await test.step('Search for the term Waifu and hover over results', async () => {
diff --git a/tests/e2e/settings.spec.ts b/tests/e2e/settings.spec.ts
index f09c357731..cb7cc9d25e 100644
--- a/tests/e2e/settings.spec.ts
+++ b/tests/e2e/settings.spec.ts
@@ -1,8 +1,10 @@
 import { expect, test } from './fixtures'
 
+const LANDING_PATH = '/ahk'
+
 test('Settings', async ({ page, Commands }) => {
   await Commands.e2elogin()
-  await page.goto('/ahk')
+  await page.goto(LANDING_PATH)
   //click on settings and check if page redirects correctly
   await page.getByTestId('navbar-profile-dropdown').click()
   await page.getByTestId('sidebar-link-settings').click()
diff --git a/tests/e2e/sidebar.spec.ts b/tests/e2e/sidebar.spec.ts
index 247f49ac35..0ba44c6423 100644
--- a/tests/e2e/sidebar.spec.ts
+++ b/tests/e2e/sidebar.spec.ts
@@ -1,11 +1,13 @@
 import { expect, test } from './fixtures'
 
+const LANDING_PATH = '/ahk'
+
 test('Switches trough sidebars and check if they overlap each other', async ({
   page,
   Commands,
 }) => {
   await Commands.e2elogin()
-  await page.goto('/ahk')
+  await page.goto(LANDING_PATH)
   //profile
   await page.getByTestId('navbar-profile-dropdown').click()
   await expect(page.getByTestId('sidebar-wallet-container')).toBeVisible()
diff --git a/tests/e2e/transfer.spec.ts b/tests/e2e/transfer.spec.ts
index 18deb012cb..a298f9a433 100644
--- a/tests/e2e/transfer.spec.ts
+++ b/tests/e2e/transfer.spec.ts
@@ -1,10 +1,10 @@
 import { expect, test } from './fixtures'
 
+const TRANSFER_PATH = '/dot/transfer'
+
 test('Transfer Page Functionality', async ({ page, Commands }) => {
-  await test.step('Login and go to page', async () => {
-    await Commands.e2elogin()
-    await page.goto('/dot/transfer')
-  })
+  await Commands.e2elogin()
+  await page.goto(TRANSFER_PATH)
 
   const UserAddress =
     await test.step('Gets user address via attribute', async () => {

From 05139b34842ecee460fc34575a04efd534c0f69c Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Thu, 30 Nov 2023 15:13:40 -0300
Subject: [PATCH 50/85] prefix refactor

---
 tests/e2e/prefix.spec.ts | 67 +++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/tests/e2e/prefix.spec.ts b/tests/e2e/prefix.spec.ts
index eb92807442..a86bdd1b0d 100644
--- a/tests/e2e/prefix.spec.ts
+++ b/tests/e2e/prefix.spec.ts
@@ -1,43 +1,40 @@
 import { expect, test } from './fixtures'
 
+//const CHAINS2 = ['bsx', 'ahp', 'ahk', 'rmrk', 'rmrk2']
+
+const CHAINS = [
+  {
+    dropdownText: 'bsx',
+    chainIdText: 'bsx',
+  },
+  {
+    dropdownText: 'ahp',
+    chainIdText: 'ahp',
+  },
+  {
+    dropdownText: 'ahk',
+    chainIdText: 'ahk',
+  },
+  {
+    dropdownText: 'rmrk',
+    chainIdText: 'rmrk',
+  },
+  {
+    dropdownText: 'ksm',
+    chainIdText: 'rmrk2',
+  },
+]
+
 test('Switch network', async ({ page }) => {
   await page.goto('/')
   await page.waitForLoadState()
-
-  //BSX
-  await test.step('Switching to BSX', async () => {
-    await page.getByTestId('chain-select').click()
-    await page.getByTestId('chain-dropdown-bsx').click()
-    await expect(page.getByTestId('chain')).toHaveText('bsx')
-  })
-
-  //AHP
-  await test.step('Switching to AHP', async () => {
-    await page.getByTestId('chain-select').click()
-    await page.getByTestId('chain-dropdown-ahp').click()
-    await expect(page.getByTestId('chain')).toHaveText('ahp')
-  })
-
-  //AHK
-  await test.step('Switching to AHK', async () => {
-    await page.getByTestId('chain-select').click()
-    await page.getByTestId('chain-dropdown-ahk').click()
-    await expect(page.getByTestId('chain')).toHaveText('ahk')
-  })
-
-  //RMRK2
-  await test.step('Switching to RMRK2', async () => {
-    await page.getByTestId('chain-select').click()
-    await page.getByTestId('chain-dropdown-ksm').click()
-    await expect(page.getByTestId('chain')).toHaveText('rmrk2')
-  })
-
-  //RMRK1
-  await test.step('Switching to RMRK1', async () => {
-    await page.getByTestId('chain-select').click()
-    await page.getByTestId('chain-dropdown-rmrk').click()
-    await expect(page.getByTestId('chain')).toHaveText('rmrk')
-  })
+  for (const data of CHAINS) {
+    await test.step(`Switching to ${data.chainIdText}`, async () => {
+      await page.getByTestId('chain-select').click()
+      await page.getByTestId(`chain-dropdown-${data.dropdownText}`).click()
+      await expect(page.getByTestId('chain')).toHaveText(data.chainIdText)
+    })
+  }
 })
 
 test('Check if RMRK2 NFT URL is correct', async ({ page }) => {

From 4b70adf02ddace4a58efeafb5adbcc7e74a62da5 Mon Sep 17 00:00:00 2001
From: prury <yco.arq@gmail.com>
Date: Thu, 30 Nov 2023 15:14:02 -0300
Subject: [PATCH 51/85] remove comment

---
 tests/e2e/prefix.spec.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/e2e/prefix.spec.ts b/tests/e2e/prefix.spec.ts
index a86bdd1b0d..1db6ad3f18 100644
--- a/tests/e2e/prefix.spec.ts
+++ b/tests/e2e/prefix.spec.ts
@@ -1,7 +1,5 @@
 import { expect, test } from './fixtures'
 
-//const CHAINS2 = ['bsx', 'ahp', 'ahk', 'rmrk', 'rmrk2']
-
 const CHAINS = [
   {
     dropdownText: 'bsx',

From 99b77cfde76ff096ce0e955624726970b18d854b Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Fri, 1 Dec 2023 10:19:12 +0500
Subject: [PATCH 52/85] ref: update k grey light

---
 assets/styles/abstracts/_theme.scss | 4 ++--
 libs/ui/src/scss/_theme.scss        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/styles/abstracts/_theme.scss b/assets/styles/abstracts/_theme.scss
index cfe52f4565..e5305ede0f 100644
--- a/assets/styles/abstracts/_theme.scss
+++ b/assets/styles/abstracts/_theme.scss
@@ -22,7 +22,7 @@ $themes: (
     'k-redaccent2': #ffe6e6,
     'k-grey': #999999,
     'k-grey-fix': #999999,
-    'k-grey-light': #ECECEC,
+    'k-grey-light': #f5f5f5,
     'k-pink': #ffb6ef,
     'k-yellow': #feffb6,
     'warning-yellow': #fffbcc,
@@ -72,7 +72,7 @@ $themes: (
     'k-redaccent2': #390b0b,
     'k-grey': #cccccc,
     'k-grey-fix': #999999,
-    'k-grey-light': #ECECEC,
+    'k-grey-light': #1f1f1f,
     'k-pink': #7a2a68,
     'k-yellow': #363234,
     'warning-yellow': #3f3500,
diff --git a/libs/ui/src/scss/_theme.scss b/libs/ui/src/scss/_theme.scss
index 46feb4a2b1..9b36a07054 100644
--- a/libs/ui/src/scss/_theme.scss
+++ b/libs/ui/src/scss/_theme.scss
@@ -22,7 +22,7 @@ $themes: (
     'k-redaccent2': #ffe6e6,
     'k-grey': #999999,
     'k-grey-fix': #999999,
-    'k-grey-light': #ECECEC,
+    'k-grey-light': #f5f5f5,
     'k-pink': #ffb6ef,
     'k-yellow': #feffb6,
     'k-blueaccent': #b6cbff,
@@ -73,7 +73,7 @@ $themes: (
     'k-redaccent2': #390b0b,
     'k-grey': #cccccc,
     'k-grey-fix': #999999,
-    'k-grey-light': #454545,
+    'k-grey-light': #1f1f1f,
     'k-pink': #7a2a68,
     'k-yellow': #363234,
     'k-blueaccent': #2e50a2,

From db713a2cdf62625450457e4c2446bc2cb62639f7 Mon Sep 17 00:00:00 2001
From: daiagi <daiagi@gmail.com>
Date: Fri, 1 Dec 2023 14:49:53 +0700
Subject: [PATCH 53/85] refactor - easier to read

---
 .../mintToken/transactionMintStatemine.ts     | 186 +++++++++---------
 1 file changed, 91 insertions(+), 95 deletions(-)

diff --git a/composables/transaction/mintToken/transactionMintStatemine.ts b/composables/transaction/mintToken/transactionMintStatemine.ts
index 41d99a00e2..0315c7cde4 100644
--- a/composables/transaction/mintToken/transactionMintStatemine.ts
+++ b/composables/transaction/mintToken/transactionMintStatemine.ts
@@ -1,4 +1,3 @@
-import { BaseMintedCollection } from '@/components/base/types'
 import type { ActionMintToken, MintedCollection } from '../types'
 import { TokenToMint } from '../types'
 import { constructMeta } from './constructMeta'
@@ -18,20 +17,18 @@ interface BuildTokenTxsParams {
   token: TokenToMint & Id
   metadata: string
   api: ApiPromise
-  accountId: string
-  collectionId: string
 }
 
-const buildTokenTxs = ({
-  token,
-  metadata,
-  api,
-  accountId,
-  collectionId,
-}: BuildTokenTxsParams) => {
+const buildTokenTxs = ({ token, metadata, api }: BuildTokenTxsParams) => {
+  const { accountId } = useAuth()
+  const collectionId = token.selectedCollection?.id
   const { price, id: nextId, hasRoyalty, royalty } = token
-
-  const create = api.tx.nfts.mint(collectionId, nextId, accountId, undefined)
+  const create = api.tx.nfts.mint(
+    collectionId,
+    nextId,
+    accountId.value,
+    undefined,
+  )
   const meta = api.tx.nfts.setMetadata(collectionId, nextId, metadata)
 
   const list =
@@ -57,57 +54,33 @@ const buildTokenTxs = ({
     )
     txs.push(setRoyaltyAmount, setRoyaltyRecipient)
   }
-
   return txs
 }
 
-export const singleTokenTxs = async (token: TokenToMint & Id, api) => {
-  const { id: collectionId } = token.selectedCollection as BaseMintedCollection
-
-  const { accountId } = useAuth()
-  const { $consola } = useNuxtApp()
-
-  const metadata = await constructMeta(token).catch((e) => {
-    $consola.error(
-      'Error while constructing metadata for token:\n',
-      token,
-      '\n',
-      e,
-    )
-  })
-  if (!metadata) {
-    return
-  }
-  return buildTokenTxs({
+async function handleSingleToken(item: ActionMintToken, api: ApiPromise) {
+  const tokens = await expandCopiesWithsIds(item, api)
+  const metadataList = await Promise.all(
+    tokens.map((token) => constructMeta(token)),
+  )
+  return tokens.map((token, index) => ({
     token,
-    metadata,
-    api,
-    accountId: accountId.value,
-    collectionId,
-  })
+    metadata: metadataList[index],
+  }))
 }
 
-export const multipleTokensTxs = async (
-  tokens: (TokenToMint & Id)[],
-  metadata: string[],
-  api,
-) => {
-  const { id: collectionId } = tokens[0]
-    .selectedCollection as BaseMintedCollection
-
-  const { accountId } = useAuth()
-
-  return tokens.flatMap((token, index) =>
-    buildTokenTxs({
-      token,
-      metadata: metadata[index],
-      api,
-      accountId: accountId.value,
-      collectionId,
-    }),
+async function handleMultipleTokens(item: ActionMintToken, api: ApiPromise) {
+  const tokens = item.token as TokenToMint[]
+  const lastTokenId = await lastIndexUsed(
+    tokens[0].selectedCollection as MintedCollection,
+    api,
   )
+  const tokensWithIds = assignIds(tokens, lastTokenId)
+  const metadata = await constructDirectoryMeta(tokensWithIds)
+  return tokensWithIds.map((token, index) => ({
+    token,
+    metadata: metadata[index],
+  }))
 }
-
 export const expandCopiesWithsIds = async (item: ActionMintToken, api) => {
   const tokens = Array.isArray(item.token) ? item.token : [item.token]
 
@@ -135,45 +108,7 @@ export const getSupportInteraction = (
   return canSupport(api, enabledFees, totalFees, tokenSymbol)
 }
 
-const getArgs = async (item: ActionMintToken, api) => {
-  const { $consola } = useNuxtApp()
-
-  if (!Array.isArray(item.token)) {
-    // single token (with possible copies)
-    const tokens = await expandCopiesWithsIds(item, api)
-    const arg = await Promise.all(
-      tokens.map((token) => singleTokenTxs(token, api)),
-    )
-    const { enabledFees, feeMultiplier, token: tokenSymbol } = calculateFees()
-    const supportInteraction = await getSupportInteraction(
-      item,
-      enabledFees,
-      feeMultiplier,
-      api,
-      tokenSymbol,
-    )
-
-    return [[...arg.flat(), ...supportInteraction]]
-  }
-
-  // multiple tokens (mass mint)
-
-  const lastTokenId = await lastIndexUsed(
-    item.token[0].selectedCollection as MintedCollection,
-    api,
-  )
-
-  const tokensWithIds = assignIds(item.token, lastTokenId)
-  const metadata = await constructDirectoryMeta(tokensWithIds).catch((e) => {
-    $consola.error('Error while constructing metadata for tokens:\n', e)
-  })
-
-  if (!metadata) {
-    return
-  }
-
-  const arg = await multipleTokensTxs(tokensWithIds, metadata, api)
-
+const getArgs = async (item: ActionMintToken, api: ApiPromise) => {
   const { enabledFees, feeMultiplier, token: tokenSymbol } = calculateFees()
   const supportInteraction = await getSupportInteraction(
     item,
@@ -183,7 +118,68 @@ const getArgs = async (item: ActionMintToken, api) => {
     tokenSymbol,
   )
 
-  return [[...arg, ...supportInteraction]]
+  const tokenTxsArgs = Array.isArray(item.token)
+    ? await handleMultipleTokens(item, api)
+    : await handleSingleToken(item, api)
+
+  const arg = await Promise.all(
+    tokenTxsArgs.map(({ token, metadata }) =>
+      buildTokenTxs({ token, metadata, api }),
+    ),
+  )
+
+  return [[...arg.flat(), ...supportInteraction]]
 }
 
+// const getArgs = async (item: ActionMintToken, api) => {
+//   const { $consola } = useNuxtApp()
+
+//   if (!Array.isArray(item.token)) {
+//     // single token (with possible copies)
+//     const tokens = await expandCopiesWithsIds(item, api)
+//     const arg = await Promise.all(
+//       tokens.map((token) => singleTokenTxs(token, api)),
+//     )
+//     const { enabledFees, feeMultiplier, token: tokenSymbol } = calculateFees()
+//     const supportInteraction = await getSupportInteraction(
+//       item,
+//       enabledFees,
+//       feeMultiplier,
+//       api,
+//       tokenSymbol,
+//     )
+
+//     return [[...arg.flat(), ...supportInteraction]]
+//   }
+
+//   // multiple tokens (mass mint)
+
+//   const lastTokenId = await lastIndexUsed(
+//     item.token[0].selectedCollection as MintedCollection,
+//     api,
+//   )
+
+//   const tokensWithIds = assignIds(item.token, lastTokenId)
+//   const metadata = await constructDirectoryMeta(tokensWithIds).catch((e) => {
+//     $consola.error('Error while constructing metadata for tokens:\n', e)
+//   })
+
+//   if (!metadata) {
+//     return
+//   }
+
+//   const arg = await multipleTokensTxs(tokensWithIds, metadata, api)
+
+//   const { enabledFees, feeMultiplier, token: tokenSymbol } = calculateFees()
+//   const supportInteraction = await getSupportInteraction(
+//     item,
+//     enabledFees,
+//     feeMultiplier,
+//     api,
+//     tokenSymbol,
+//   )
+
+//   return [[...arg, ...supportInteraction]]
+// }
+
 export const execMintStatemine = transactionFactory(getArgs)

From e872935cd28c0faa24afa9844498a233d3e12f7f Mon Sep 17 00:00:00 2001
From: daiagi <daiagi@gmail.com>
Date: Fri, 1 Dec 2023 14:51:19 +0700
Subject: [PATCH 54/85] delete commented code

---
 .../mintToken/transactionMintStatemine.ts     | 51 -------------------
 1 file changed, 51 deletions(-)

diff --git a/composables/transaction/mintToken/transactionMintStatemine.ts b/composables/transaction/mintToken/transactionMintStatemine.ts
index 0315c7cde4..d710b3c58b 100644
--- a/composables/transaction/mintToken/transactionMintStatemine.ts
+++ b/composables/transaction/mintToken/transactionMintStatemine.ts
@@ -131,55 +131,4 @@ const getArgs = async (item: ActionMintToken, api: ApiPromise) => {
   return [[...arg.flat(), ...supportInteraction]]
 }
 
-// const getArgs = async (item: ActionMintToken, api) => {
-//   const { $consola } = useNuxtApp()
-
-//   if (!Array.isArray(item.token)) {
-//     // single token (with possible copies)
-//     const tokens = await expandCopiesWithsIds(item, api)
-//     const arg = await Promise.all(
-//       tokens.map((token) => singleTokenTxs(token, api)),
-//     )
-//     const { enabledFees, feeMultiplier, token: tokenSymbol } = calculateFees()
-//     const supportInteraction = await getSupportInteraction(
-//       item,
-//       enabledFees,
-//       feeMultiplier,
-//       api,
-//       tokenSymbol,
-//     )
-
-//     return [[...arg.flat(), ...supportInteraction]]
-//   }
-
-//   // multiple tokens (mass mint)
-
-//   const lastTokenId = await lastIndexUsed(
-//     item.token[0].selectedCollection as MintedCollection,
-//     api,
-//   )
-
-//   const tokensWithIds = assignIds(item.token, lastTokenId)
-//   const metadata = await constructDirectoryMeta(tokensWithIds).catch((e) => {
-//     $consola.error('Error while constructing metadata for tokens:\n', e)
-//   })
-
-//   if (!metadata) {
-//     return
-//   }
-
-//   const arg = await multipleTokensTxs(tokensWithIds, metadata, api)
-
-//   const { enabledFees, feeMultiplier, token: tokenSymbol } = calculateFees()
-//   const supportInteraction = await getSupportInteraction(
-//     item,
-//     enabledFees,
-//     feeMultiplier,
-//     api,
-//     tokenSymbol,
-//   )
-
-//   return [[...arg, ...supportInteraction]]
-// }
-
 export const execMintStatemine = transactionFactory(getArgs)

From 5ed63d96f55924cbd9d06f7f6e2aaaf20af489cd Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Fri, 1 Dec 2023 08:57:00 +0100
Subject: [PATCH 55/85] =?UTF-8?q?=F0=9F=94=A7=20tx=20SetCollectionMaxSuppl?=
 =?UTF-8?q?y?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/collection/CustomizeModal.vue      |  2 +-
 .../transactionSetCollectionMaxSupply.ts      | 27 +++++++++++++++++++
 composables/transaction/types.ts              | 10 +++++++
 composables/useTransaction.ts                 | 11 ++++++--
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 composables/transaction/transactionSetCollectionMaxSupply.ts

diff --git a/components/collection/CustomizeModal.vue b/components/collection/CustomizeModal.vue
index c03e9ed550..766b498994 100644
--- a/components/collection/CustomizeModal.vue
+++ b/components/collection/CustomizeModal.vue
@@ -1,7 +1,7 @@
 <template>
   <NeoModal :value="value" @close="value = false">
     <div class="py-4 px-5 limit-width">
-      <div class="is-flex mb-3 is-size-6">
+      <div class="is-flex mb-3 is-size-6 has-text-weight-bold">
         {{ 'Customize Collection' }}
       </div>
       <div class="has-text-grey is-size-7 mb-5">
diff --git a/composables/transaction/transactionSetCollectionMaxSupply.ts b/composables/transaction/transactionSetCollectionMaxSupply.ts
new file mode 100644
index 0000000000..2b2827a5cf
--- /dev/null
+++ b/composables/transaction/transactionSetCollectionMaxSupply.ts
@@ -0,0 +1,27 @@
+import { ActionSetCollectionMaxSupply, ExecuteTransactionParams } from './types'
+
+export async function execSetCollectionMaxSupply(
+  params: ActionSetCollectionMaxSupply,
+  api,
+  executeTransaction: ({
+    cb,
+    arg,
+    successMessage,
+    errorMessage,
+  }: ExecuteTransactionParams) => void,
+) {
+  const collectionId = params.collectionId.toString()
+  const maxSupply = params.max.toString()
+
+  try {
+    // item.urlPrefix === 'ahr'
+    if (params.urlPrefix === 'ahk' || params.urlPrefix === 'ahp') {
+      executeTransaction({
+        cb: api.tx.nfts.setCollectionMaxSupply,
+        arg: [collectionId, maxSupply],
+      })
+    }
+  } catch (error) {
+    warningMessage(error)
+  }
+}
diff --git a/composables/transaction/types.ts b/composables/transaction/types.ts
index c1d856d55e..919bd7cbd6 100644
--- a/composables/transaction/types.ts
+++ b/composables/transaction/types.ts
@@ -205,6 +205,15 @@ export interface ActionBurnMultipleNFTs {
   errorMessage?: string
 }
 
+export interface ActionSetCollectionMaxSupply {
+  interaction: Collections.SET_MAX_SUPPLY
+  collectionId: string
+  urlPrefix: string
+  max: number
+  successMessage?: string | ((blockNumber: string) => string)
+  errorMessage?: string
+}
+
 export type Actions =
   | ActionBuy
   | ActionList
@@ -216,3 +225,4 @@ export type Actions =
   | ActionMintCollection
   | ActionDeleteCollection
   | ActionBurnMultipleNFTs
+  | ActionSetCollectionMaxSupply
diff --git a/composables/useTransaction.ts b/composables/useTransaction.ts
index 4c4e7ee7ce..bf509c6f94 100644
--- a/composables/useTransaction.ts
+++ b/composables/useTransaction.ts
@@ -18,7 +18,8 @@ import { execMakeOfferTx } from './transaction/transactionOffer'
 import { execWithdrawOfferTx } from './transaction/transactionOfferWithdraw'
 import { execAcceptOfferTx } from './transaction/transactionOfferAccept'
 import { execMintToken } from './transaction/transactionMintToken'
-
+import { execMintCollection } from './transaction/transactionMintCollection'
+import { execSetCollectionMaxSupply } from './transaction/transactionSetCollectionMaxSupply'
 import {
   ActionAcceptOffer,
   ActionBurnMultipleNFTs,
@@ -30,6 +31,7 @@ import {
   ActionMintToken,
   ActionOffer,
   ActionSend,
+  ActionSetCollectionMaxSupply,
   ActionWithdrawOffer,
   Actions,
   Collections,
@@ -37,7 +39,6 @@ import {
   NFTs,
   ObjectMessage,
 } from './transaction/types'
-import { execMintCollection } from './transaction/transactionMintCollection'
 import { ApiPromise } from '@polkadot/api'
 import { isActionValid } from './transaction/utils'
 const { $consola } = useNuxtApp()
@@ -175,6 +176,12 @@ export const executeAction = ({
         api,
         executeTransaction,
       ),
+    [Collections.SET_MAX_SUPPLY]: () =>
+      execSetCollectionMaxSupply(
+        item as ActionSetCollectionMaxSupply,
+        api,
+        executeTransaction,
+      ),
     [NFTs.BURN_MULTIPLE]: () =>
       execBurnMultiple(item as ActionBurnMultipleNFTs, api, executeTransaction),
   }

From 29bedef85dbb4a0d5b282f5ab4cadb8838f6bfdd Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Fri, 1 Dec 2023 09:05:46 +0100
Subject: [PATCH 56/85] =?UTF-8?q?=F0=9F=94=A7=20tx=20SetCollectionMaxSuppl?=
 =?UTF-8?q?y?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/collection/CustomizeModal.vue      | 21 +++++++++++++++-
 .../HeroButtonCustomizeCollection.vue         | 24 +++----------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/components/collection/CustomizeModal.vue b/components/collection/CustomizeModal.vue
index 766b498994..5bcfaaca72 100644
--- a/components/collection/CustomizeModal.vue
+++ b/components/collection/CustomizeModal.vue
@@ -25,7 +25,7 @@
           class="has-text-weight-bold mr-4"
           variant="text"
           no-shadow
-          @click="emit('customize')">
+          @click="customizeCollection">
           <span class="has-text-k-green">
             {{ $t('Update') }}
           </span>
@@ -43,6 +43,12 @@
 
 <script setup lang="ts">
 import { NeoButton, NeoField, NeoInput, NeoModal } from '@kodadot1/brick'
+import { Collections } from '@/composables/transaction/types'
+
+const { $updateLoader } = useNuxtApp()
+const { transaction } = useTransaction()
+const { urlPrefix } = usePrefix()
+const route = useRoute()
 
 const props = defineProps<{
   modelValue: boolean
@@ -54,6 +60,19 @@ const value = useVModel(props, 'modelValue')
 
 const min = computed(() => props.min || 1)
 const max = ref(undefined)
+
+const customizeCollection = async () => {
+  $updateLoader(true)
+
+  await transaction({
+    interaction: Collections.SET_MAX_SUPPLY,
+    collectionId: route.params.id.toString(),
+    urlPrefix: urlPrefix.value,
+    max: Number(max.value),
+  })
+
+  emit('customize')
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/components/collection/HeroButtonCustomizeCollection.vue b/components/collection/HeroButtonCustomizeCollection.vue
index 2aca241755..1f0576d10e 100644
--- a/components/collection/HeroButtonCustomizeCollection.vue
+++ b/components/collection/HeroButtonCustomizeCollection.vue
@@ -6,11 +6,10 @@
   <CollectionCustomizeModal
     v-model="customizeCollectionModalActive"
     :min="min"
-    @customize="closeAndCustomize" />
+    @customize="closeModal" />
 </template>
 
 <script setup lang="ts">
-import { Collections } from '@/composables/transaction/types'
 import { NeoDropdownItem } from '@kodadot1/brick'
 
 withDefaults(
@@ -22,27 +21,10 @@ withDefaults(
   },
 )
 
-const route = useRoute()
-const { $i18n, $updateLoader } = useNuxtApp()
-const { transaction } = useTransaction()
-const { urlPrefix } = usePrefix()
-// const { accountId } = useAuth()
-
+const { $i18n } = useNuxtApp()
 const customizeCollectionModalActive = ref(false)
 
-const customizeCollection = async () => {
-  $updateLoader(true)
-  const id = route.params.id.toString()
-
-  await transaction({
-    interaction: Collections.SET_MAX_SUPPLY,
-    urlPrefix: urlPrefix.value,
-    collectionId: id,
-  })
-}
-
-const closeAndCustomize = () => {
+const closeModal = () => {
   customizeCollectionModalActive.value = false
-  customizeCollection()
 }
 </script>

From a17ccdd1dd2747d417194b67fcf6dd0b412e69ac Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Fri, 1 Dec 2023 09:10:26 +0100
Subject: [PATCH 57/85] =?UTF-8?q?=F0=9F=94=A7=20default=20set=20max?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/collection/CustomizeModal.vue                | 3 ++-
 components/collection/HeroButtonCustomizeCollection.vue | 3 +++
 components/collection/HeroButtons.vue                   | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/collection/CustomizeModal.vue b/components/collection/CustomizeModal.vue
index 5bcfaaca72..19bc85c2a8 100644
--- a/components/collection/CustomizeModal.vue
+++ b/components/collection/CustomizeModal.vue
@@ -53,13 +53,14 @@ const route = useRoute()
 const props = defineProps<{
   modelValue: boolean
   min: number
+  max: number
 }>()
 const emit = defineEmits(['update:value', 'customize'])
 
 const value = useVModel(props, 'modelValue')
 
 const min = computed(() => props.min || 1)
-const max = ref(undefined)
+const max = ref(props.max)
 
 const customizeCollection = async () => {
   $updateLoader(true)
diff --git a/components/collection/HeroButtonCustomizeCollection.vue b/components/collection/HeroButtonCustomizeCollection.vue
index 1f0576d10e..9403ceab3c 100644
--- a/components/collection/HeroButtonCustomizeCollection.vue
+++ b/components/collection/HeroButtonCustomizeCollection.vue
@@ -6,6 +6,7 @@
   <CollectionCustomizeModal
     v-model="customizeCollectionModalActive"
     :min="min"
+    :max="max"
     @customize="closeModal" />
 </template>
 
@@ -15,9 +16,11 @@ import { NeoDropdownItem } from '@kodadot1/brick'
 withDefaults(
   defineProps<{
     min: number
+    max: number
   }>(),
   {
     min: undefined,
+    max: undefined,
   },
 )
 
diff --git a/components/collection/HeroButtons.vue b/components/collection/HeroButtons.vue
index c70f08f1f3..9dc128700f 100644
--- a/components/collection/HeroButtons.vue
+++ b/components/collection/HeroButtons.vue
@@ -70,7 +70,8 @@
             <CollectionHeroButtonDeleteNfts />
             <CollectionHeroButtonDeleteCollection />
             <CollectionHeroButtonCustomizeCollection
-              :min="collectionNftCount" />
+              :min="collectionNftCount"
+              :max="collectionMaxCount" />
           </div>
           <NeoDropdownItem disabled>
             {{ $i18n.t('moreActions.reportCollection') }}
@@ -116,6 +117,7 @@ const { collection } = useCollectionMinimal({
 })
 const collectionIssuer = computed(() => collection.value?.issuer)
 const collectionNftCount = computed(() => collection.value?.nftCount)
+const collectionMaxCount = computed(() => collection.value?.max)
 
 const { twitter } = useIdentity({
   address: collectionIssuer,

From 2ccd763d6fcfbc25639040af6d916b953c140d77 Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Fri, 1 Dec 2023 09:12:48 +0100
Subject: [PATCH 58/85] =?UTF-8?q?=F0=9F=94=A7=20query=20collection=20max?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 queries/subsquid/general/collectionByIdMinimal.graphql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/queries/subsquid/general/collectionByIdMinimal.graphql b/queries/subsquid/general/collectionByIdMinimal.graphql
index 970e7afe89..595198a294 100644
--- a/queries/subsquid/general/collectionByIdMinimal.graphql
+++ b/queries/subsquid/general/collectionByIdMinimal.graphql
@@ -11,6 +11,7 @@ query collectionByIdMinimal($id: String!) {
       type
     }
     nftCount
+    max
     metadata
     name
     currentOwner

From 55e8ac276f4947bcb1964749d8e30c05961629a1 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Fri, 1 Dec 2023 17:22:18 +0700
Subject: [PATCH 59/85] Remove unused code and refactor startStep1 function

---
 components/migrate/steps/SignLoader1.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/components/migrate/steps/SignLoader1.vue b/components/migrate/steps/SignLoader1.vue
index ec505ff82b..e1673cad04 100644
--- a/components/migrate/steps/SignLoader1.vue
+++ b/components/migrate/steps/SignLoader1.vue
@@ -103,13 +103,6 @@ const fromCollection = collections.value.find(
   (collection) => collection.id === route.query.collectionId,
 )
 
-// const deleteRelocations = async () => {
-//   const relocationsId = `${from}-${fromAccountId}`
-//   return await waifuApi(`/relocations/${relocationsId}`, {
-//     method: 'DELETE',
-//   })
-// }
-
 const startStep1 = async () => {
   step1Iterations.value -= 1
   nextId.value = (await nextCollectionId())?.toString() || '0'
@@ -125,8 +118,6 @@ const startStep1 = async () => {
     issuer: fromAccountId, // accountId.value
   }
 
-  // await deleteRelocations()
-
   if (nextId.value && fromCollection?.metadata) {
     const createArgs = createArgsForNftPallet(accountId.value)
 

From 9d8e81e34cd937f23e1cfd72adaf92524784f49f Mon Sep 17 00:00:00 2001
From: daiagi <daiagi@gmail.com>
Date: Fri, 1 Dec 2023 18:03:50 +0700
Subject: [PATCH 60/85] add carbon offset

---
 .../transaction/mintToken/transactionMintStatemine.ts  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/composables/transaction/mintToken/transactionMintStatemine.ts b/composables/transaction/mintToken/transactionMintStatemine.ts
index d710b3c58b..8af64e0ac8 100644
--- a/composables/transaction/mintToken/transactionMintStatemine.ts
+++ b/composables/transaction/mintToken/transactionMintStatemine.ts
@@ -12,6 +12,7 @@ import {
 import { SupportTokens, canSupport } from '@/utils/support'
 import { constructDirectoryMeta } from './constructDirectoryMeta'
 import { ApiPromise } from '@polkadot/api'
+import { usePreferencesStore } from '@/stores/preferences'
 
 interface BuildTokenTxsParams {
   token: TokenToMint & Id
@@ -58,9 +59,11 @@ const buildTokenTxs = ({ token, metadata, api }: BuildTokenTxsParams) => {
 }
 
 async function handleSingleToken(item: ActionMintToken, api: ApiPromise) {
+  const enableCarbonOffset = usePreferencesStore().getHasCarbonOffset
+
   const tokens = await expandCopiesWithsIds(item, api)
   const metadataList = await Promise.all(
-    tokens.map((token) => constructMeta(token)),
+    tokens.map((token) => constructMeta(token, { enableCarbonOffset })),
   )
   return tokens.map((token, index) => ({
     token,
@@ -69,13 +72,16 @@ async function handleSingleToken(item: ActionMintToken, api: ApiPromise) {
 }
 
 async function handleMultipleTokens(item: ActionMintToken, api: ApiPromise) {
+  const enableCarbonOffset = usePreferencesStore().getHasCarbonOffset
   const tokens = item.token as TokenToMint[]
   const lastTokenId = await lastIndexUsed(
     tokens[0].selectedCollection as MintedCollection,
     api,
   )
   const tokensWithIds = assignIds(tokens, lastTokenId)
-  const metadata = await constructDirectoryMeta(tokensWithIds)
+  const metadata = await constructDirectoryMeta(tokensWithIds, {
+    enableCarbonOffset,
+  })
   return tokensWithIds.map((token, index) => ({
     token,
     metadata: metadata[index],

From 434e14faedab8beb68c8b063581a9f4fcfc5bf25 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Fri, 1 Dec 2023 18:22:08 +0700
Subject: [PATCH 61/85] * refactor(Review.vue): simplify code by removing
 unnecessary optional chaining and nullish coalescing operator

---
 components/migrate/steps/Review.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/migrate/steps/Review.vue b/components/migrate/steps/Review.vue
index 7e0e656865..72309d2861 100644
--- a/components/migrate/steps/Review.vue
+++ b/components/migrate/steps/Review.vue
@@ -40,11 +40,11 @@
 
       <hr />
 
-      <div class="is-flex is-justify-content-space-between mb-5">
+      <div
+        v-if="collection?.nftsOwned && collection.nfts"
+        class="is-flex is-justify-content-space-between mb-5">
         <p>{{ $t('migrate.ready.status') }}</p>
-        <p>
-          {{ collection?.nftsOwned?.length }}/{{ collection?.nfts?.length }}
-        </p>
+        <p>{{ collection.nftsOwned.length }}/{{ collection.nfts.length }}</p>
       </div>
 
       <div class="border border-k-shade p-2 is-flex is-size-7 has-text-grey">

From 5fb83e4a0ca51b033fd1d38a852d17f1e69419b1 Mon Sep 17 00:00:00 2001
From: Preschian Febryantara <preschian@users.noreply.github.com>
Date: Fri, 1 Dec 2023 18:22:33 +0700
Subject: [PATCH 62/85] Fix conditional rendering bug in Review.vue

---
 components/migrate/steps/Review.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/migrate/steps/Review.vue b/components/migrate/steps/Review.vue
index 72309d2861..2bd02f4a9d 100644
--- a/components/migrate/steps/Review.vue
+++ b/components/migrate/steps/Review.vue
@@ -41,7 +41,7 @@
       <hr />
 
       <div
-        v-if="collection?.nftsOwned && collection.nfts"
+        v-if="collection?.nftsOwned && collection?.nfts"
         class="is-flex is-justify-content-space-between mb-5">
         <p>{{ $t('migrate.ready.status') }}</p>
         <p>{{ collection.nftsOwned.length }}/{{ collection.nfts.length }}</p>

From a0d0d2291122addcf3948388483647bed8a26d49 Mon Sep 17 00:00:00 2001
From: Jarsen <31397967+Jarsen136@users.noreply.github.com>
Date: Fri, 1 Dec 2023 21:14:47 +0800
Subject: [PATCH 63/85] chore: wathc method

---
 components/collection/drop/GenerativePreview.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/components/collection/drop/GenerativePreview.vue b/components/collection/drop/GenerativePreview.vue
index 66059389c5..fef2c54c21 100644
--- a/components/collection/drop/GenerativePreview.vue
+++ b/components/collection/drop/GenerativePreview.vue
@@ -77,12 +77,6 @@ const generativeImageUrl = ref(
 
 const isLoading = ref(false)
 
-const generateDefaultNft = () => {
-  generateNft(true)
-}
-onMounted(generateDefaultNft)
-watch(accountId, generateDefaultNft)
-
 const displayUrl = computed(() => {
   return generativeImageUrl.value || props.image
 })
@@ -96,6 +90,16 @@ const generateNft = (isDefault: boolean = false) => {
     isLoading.value = false
   }, 3000)
 }
+
+watch(
+  accountId,
+  () => {
+    generateNft(true)
+  },
+  {
+    immediate: true,
+  },
+)
 </script>
 
 <style scoped lang="scss">

From 47da901162400fa8ae636b1682d929d2f3f4f0ac Mon Sep 17 00:00:00 2001
From: Danil Shashkov <shashkovdanil@gmail.com>
Date: Fri, 1 Dec 2023 15:31:19 +0000
Subject: [PATCH 64/85] Migrated NeoAutocomplete to tailwindcss

---
 .../NeoAutocomplete/NeoAutocomplete.scss          | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss b/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
index 6d7d102ff6..95d2144e96 100644
--- a/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
+++ b/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
@@ -2,21 +2,12 @@
 @import '@oruga-ui/oruga-next/src/scss/utilities/variables.scss';
 @import '@oruga-ui/oruga-next/src/scss/utilities/animations.scss';
 @import '@oruga-ui/oruga-next/src/scss/utilities/helpers.scss';
-@import '../../scss/variable.scss';
 
-
-.o-acp{
+.o-acp {
   &__item {
-    white-space: normal;
+    @apply whitespace-normal;
   }
   &__menu {
-    margin-top: 1rem;
-    padding: 0;
-    @include ktheme() {
-      box-shadow: theme('primary-shadow');
-      border: 1px solid theme('border-color');
-      color: theme('text-color');
-      background: theme('background-color');
-    }
+    @apply mt-4 p-0 shadow-primary border border-border-color text-text-color bg-background-color;
   }
 }

From 641158eaa6eea4cea522e5c43e6fc00163fba48c Mon Sep 17 00:00:00 2001
From: Danil Shashkov <shashkovdanil@gmail.com>
Date: Fri, 1 Dec 2023 15:38:49 +0000
Subject: [PATCH 65/85] Fixed border class

---
 libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss b/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
index 95d2144e96..223b848d1e 100644
--- a/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
+++ b/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
@@ -8,6 +8,6 @@
     @apply whitespace-normal;
   }
   &__menu {
-    @apply mt-4 p-0 shadow-primary border border-border-color text-text-color bg-background-color;
+    @apply mt-4 p-0 shadow-primary border-default border-border-color text-text-color bg-background-color;
   }
 }

From b310d58a4faadf8c104d86f84f9565deaa44d090 Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Sat, 2 Dec 2023 10:17:47 +0500
Subject: [PATCH 66/85] add: hover white button

---
 components/collection/drop/DropConfirmModal.vue | 2 +-
 libs/ui/src/scss/tailwind.scss                  | 3 +++
 libs/ui/tailwind.config.js                      | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/collection/drop/DropConfirmModal.vue b/components/collection/drop/DropConfirmModal.vue
index 1ea79e9515..12897ec971 100644
--- a/components/collection/drop/DropConfirmModal.vue
+++ b/components/collection/drop/DropConfirmModal.vue
@@ -99,7 +99,7 @@ const confirm = () => {
   &:not(:disabled) {
     @include shineEffect(var(--k-accent-light-3), lightgrey);
     &:hover {
-      color: var(--k-accent) !important;
+      color: var(--k-accent2) !important;
     }
   }
 }
diff --git a/libs/ui/src/scss/tailwind.scss b/libs/ui/src/scss/tailwind.scss
index e5947797c1..bba9631c31 100644
--- a/libs/ui/src/scss/tailwind.scss
+++ b/libs/ui/src/scss/tailwind.scss
@@ -18,6 +18,7 @@
     --background-color-inverse: #191718;
     --link-hover: #6b6b6b;
     --k-accent: #ff7ac3;
+    --k-accent2: #ff7ac3;
     --k-accent-light: #ffe5f3;
     --k-accent-hover: #ffe5f3;
     --k-accent-light-2: #ffe5f3;
@@ -68,6 +69,7 @@
       --link-hover: #cccccc;
       --border-color: var(--white);
       --k-accent: #191718;
+      --k-accent2: var(--white);
       --k-accent-hover: #363234;
       --k-accent-light-2: #363234;
       --k-accent-light-2-dark: var(--white);
@@ -110,6 +112,7 @@
     --link-hover: #cccccc;
     --border-color: var(--white);
     --k-accent: #191718;
+    --k-accent2: var(--white);
     --k-accent-hover: #363234;
     --k-accent-light-2: #363234;
     --k-accent-light-2-dark: var(--white);
diff --git a/libs/ui/tailwind.config.js b/libs/ui/tailwind.config.js
index 87039c6e1e..d90acded66 100644
--- a/libs/ui/tailwind.config.js
+++ b/libs/ui/tailwind.config.js
@@ -11,6 +11,7 @@ module.exports = {
         'background-color-inverse': 'var(--background-color-inverse)',
         'link-hover': 'var(--link-hover)',
         'k-accent': 'var(--k-accent)',
+        'k-accent2': 'var(--k-accent2)',
         'k-accent-light': 'var(--k-accent-light)',
         'k-accent-hover': 'var(--k-accent-hover)',
         'k-accent-light-2': 'var(--k-accent-light-2)',

From 854d471d71c56f305079b8bfe0b9be176c63bee9 Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Sat, 2 Dec 2023 12:05:45 +0500
Subject: [PATCH 67/85] fix: shine over text

---
 assets/styles/abstracts/_animations.scss        | 11 +++++++++--
 components/collection/drop/DropConfirmModal.vue |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/assets/styles/abstracts/_animations.scss b/assets/styles/abstracts/_animations.scss
index 72a2137d4d..9e869c4bc2 100644
--- a/assets/styles/abstracts/_animations.scss
+++ b/assets/styles/abstracts/_animations.scss
@@ -105,7 +105,8 @@
   animation: dots 1.5s infinite;
 }
 
-@mixin shineEffect($shineColor, $shineHover) {
+@mixin shineEffect($shineColor, $shineHover, $overChild: true) {
+  position: relative;
   overflow: hidden;
 
   &::before,
@@ -117,7 +118,7 @@
     background-color: $shineColor;
     transform: skewX(-30deg);
     transition: background-color 0.3s;
-    z-index: 0;
+    z-index: 1;
   }
 
   &::before {
@@ -138,6 +139,12 @@
       background-color: $shineHover
     }
   }
+
+  @if not $overChild {
+    > :first-child {
+      z-index: 2;
+    }
+  }
 }
 
 @keyframes shine1 {
diff --git a/components/collection/drop/DropConfirmModal.vue b/components/collection/drop/DropConfirmModal.vue
index 12897ec971..12c79aebe0 100644
--- a/components/collection/drop/DropConfirmModal.vue
+++ b/components/collection/drop/DropConfirmModal.vue
@@ -97,7 +97,7 @@ const confirm = () => {
 
 .shine {
   &:not(:disabled) {
-    @include shineEffect(var(--k-accent-light-3), lightgrey);
+    @include shineEffect(var(--k-accent-light-3), lightgrey, false);
     &:hover {
       color: var(--k-accent2) !important;
     }

From e0fbe5db427ee2249211dbbf71d3bdb19dde00eb Mon Sep 17 00:00:00 2001
From: Shashkov Danil <shashkovdanil@gmail.com>
Date: Sat, 2 Dec 2023 16:41:29 +0000
Subject: [PATCH 68/85] added import

---
 libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss b/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
index 223b848d1e..76e75a35de 100644
--- a/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
+++ b/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
@@ -2,6 +2,7 @@
 @import '@oruga-ui/oruga-next/src/scss/utilities/variables.scss';
 @import '@oruga-ui/oruga-next/src/scss/utilities/animations.scss';
 @import '@oruga-ui/oruga-next/src/scss/utilities/helpers.scss';
+@import '../../scss/tailwind.scss';
 
 .o-acp {
   &__item {

From 7636c04dbc7bce908042dd0982f10cda9a4f90f5 Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Sun, 3 Dec 2023 10:32:09 +0500
Subject: [PATCH 69/85] add: listing fees

---
 assets/styles/global.scss                     |  6 ++++
 .../autoTeleport/AutoTeleportActionButton.vue |  2 +-
 .../common/listingCart/ListingCartModal.vue   | 32 ++++++++++++++-----
 .../autoTeleport/useAutoTeleportTransition.ts |  2 ++
 .../useAutoTeleportTransitionDetails.ts       |  1 +
 locales/en.json                               |  1 +
 utils/teleport.ts                             |  1 +
 7 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/assets/styles/global.scss b/assets/styles/global.scss
index 98bf9938a3..68739e1511 100644
--- a/assets/styles/global.scss
+++ b/assets/styles/global.scss
@@ -342,6 +342,12 @@ a.has-text-grey {
   }
 }
 
+.border-bottom-k-shade {
+  @include ktheme() {
+    border-bottom: 1px solid theme('k-shade');
+  }
+}
+
 .has-text-k-shade {
   @include ktheme() {
     color: theme('k-shade');
diff --git a/components/common/autoTeleport/AutoTeleportActionButton.vue b/components/common/autoTeleport/AutoTeleportActionButton.vue
index fc5ae972e8..d6766632b4 100644
--- a/components/common/autoTeleport/AutoTeleportActionButton.vue
+++ b/components/common/autoTeleport/AutoTeleportActionButton.vue
@@ -293,7 +293,7 @@ watchSyncEffect(() => {
   }
 })
 
-defineExpose({ hasBalances })
+defineExpose({ hasBalances, optimalTransition })
 </script>
 
 <style lang="scss" scoped>
diff --git a/components/common/listingCart/ListingCartModal.vue b/components/common/listingCart/ListingCartModal.vue
index 296398c644..5b87ac8d75 100644
--- a/components/common/listingCart/ListingCartModal.vue
+++ b/components/common/listingCart/ListingCartModal.vue
@@ -30,14 +30,21 @@
             @setFixedPrice="setFixedPrice" />
         </div>
 
-        <div
-          class="is-flex border-top is-justify-content-space-between py-4 px-6">
-          {{ $t('listingCart.potentialEarnings') }}
-          <div class="is-flex">
-            <span class="ml-2 has-text-grey"
-              >{{ totalNFTsPrice.toFixed(4) }} {{ chainSymbol }}</span
-            >
-            <span class="has-text-weight-bold ml-2"> ${{ priceUSD }} </span>
+        <div class="border-top pt-5 pb-4 px-6">
+          <div class="is-flex is-justify-content-space-between">
+            {{ $t('listingCart.potentialEarnings') }}
+            <div class="is-flex">
+              <span class="ml-2 has-text-grey"
+                >{{ totalNFTsPrice.toFixed(4) }} {{ chainSymbol }}</span
+              >
+              <span class="has-text-weight-bold ml-2"> ${{ priceUSD }} </span>
+            </div>
+          </div>
+
+          <div
+            class="is-flex is-justify-content-space-between has-text-grey pb-4 mt-3 border-bottom-k-shade">
+            <span>{{ $t('listingCart.listingFees') }}</span>
+            <span class="ml-2">{{ teleportTransitionTxFees }}</span>
           </div>
         </div>
 
@@ -63,6 +70,7 @@ import { usePreferencesStore } from '@/stores/preferences'
 import { TokenToList } from '@/composables/transaction/types'
 import { ListCartItem, useListingCartStore } from '@/stores/listingCart'
 import { calculateBalance } from '@/utils/format/balance'
+import format from '@/utils/format/balance'
 import { warningMessage } from '@/utils/notification'
 import { useFiatStore } from '@/stores/fiat'
 import { calculateExactUsdFromToken } from '@/utils/calculation'
@@ -94,6 +102,14 @@ const loadingAutoTeleport = computed(
   () => !autoteleportButton.value?.hasBalances,
 )
 
+const teleportTransitionTxFees = computed(() =>
+  format(
+    autoteleportButton.value?.optimalTransition.txFees || 0,
+    decimals.value,
+    chainSymbol.value,
+  ),
+)
+
 function setFixedPrice() {
   const rate = Number(fixedPrice.value) || 0
 
diff --git a/composables/autoTeleport/useAutoTeleportTransition.ts b/composables/autoTeleport/useAutoTeleportTransition.ts
index 43f5b2f5a3..5e56595341 100644
--- a/composables/autoTeleport/useAutoTeleportTransition.ts
+++ b/composables/autoTeleport/useAutoTeleportTransition.ts
@@ -29,6 +29,7 @@ export default function ({
     hasEnoughInRichestChain,
     sourceChain,
     chainSymbol,
+    txFees,
   } = useAutoTeleportTransitionDetails(actions, neededAmount, fees)
 
   const { formatted: amountFormatted, usd: amountUsd } = useAmount(
@@ -66,6 +67,7 @@ export default function ({
       amountFormatted: amountFormatted.value,
       amountUsd: amountUsd.value,
       token: chainSymbol.value as string,
+      txFees: txFees.value,
     }
   })
 
diff --git a/composables/autoTeleport/useAutoTeleportTransitionDetails.ts b/composables/autoTeleport/useAutoTeleportTransitionDetails.ts
index 46fe99720f..b0a9f44dc9 100644
--- a/composables/autoTeleport/useAutoTeleportTransitionDetails.ts
+++ b/composables/autoTeleport/useAutoTeleportTransitionDetails.ts
@@ -205,6 +205,7 @@ export default function (
     hasEnoughInCurrentChain,
     hasEnoughInRichestChain,
     sourceChain: richestChain,
+    txFees: totalFees,
     chainSymbol,
   }
 }
diff --git a/locales/en.json b/locales/en.json
index a847260539..f6145d0d5b 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1452,6 +1452,7 @@
     "fixedPrice": "Fixed Price",
     "collectionFloorPrice": "Collection Floor Price",
     "potentialEarnings": "Potential Earnings",
+    "listingFees": "Listing Fees",
     "listForSale": "List For Sale",
     "chooseAPrice": "Choose a price",
     "floorPrice": "Floor Price",
diff --git a/utils/teleport.ts b/utils/teleport.ts
index 44b19f9e7e..af0f58bde9 100644
--- a/utils/teleport.ts
+++ b/utils/teleport.ts
@@ -49,6 +49,7 @@ export type TeleportTransition = {
   amountFormatted: string
   amountUsd: string
   token: string
+  txFees: number
 }
 
 export const allowedTransitions = {

From 9e1b36155c9cc2007844eb3b88a7ed861262822c Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Sun, 3 Dec 2023 10:32:51 +0500
Subject: [PATCH 70/85] fix: modal width class

---
 components/common/listingCart/ListingCartModal.vue | 1 -
 components/shared/modals/ModalBody.vue             | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/common/listingCart/ListingCartModal.vue b/components/common/listingCart/ListingCartModal.vue
index 5b87ac8d75..67e2dc0998 100644
--- a/components/common/listingCart/ListingCartModal.vue
+++ b/components/common/listingCart/ListingCartModal.vue
@@ -5,7 +5,6 @@
       :value="preferencesStore.listingCartModalOpen"
       scroll="clip"
       append-to-body
-      container-class="modal-width"
       @close="onClose">
       <ModalBody
         modal-max-height="70vh"
diff --git a/components/shared/modals/ModalBody.vue b/components/shared/modals/ModalBody.vue
index 497e3e7b8d..275b899a3a 100644
--- a/components/shared/modals/ModalBody.vue
+++ b/components/shared/modals/ModalBody.vue
@@ -91,6 +91,7 @@ withDefaults(
   }>(),
   {
     modalWidth: '25rem',
+    modalMaxWidth: '30rem',
     modalMaxHeight: '70vh',
     scrollable: true,
     contentClass: 'pt-4 pb-5 px-6',
@@ -108,7 +109,8 @@ $t-padding: 1.5rem;
 $b-padding: 1.25rem;
 
 .modal-width {
-  min-width: v-bind(modalWidth);
+  width: v-bind(modalWidth);
+  max-width: v-bind(modalMaxHeight);
 }
 
 .limit-height {

From 43d8f0e11a4f558c6aa4c26125940fb10ba06b48 Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Sun, 3 Dec 2023 10:37:05 +0500
Subject: [PATCH 71/85] removed: duplicate import

---
 components/common/listingCart/ListingCartModal.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/common/listingCart/ListingCartModal.vue b/components/common/listingCart/ListingCartModal.vue
index 67e2dc0998..0d0928bce6 100644
--- a/components/common/listingCart/ListingCartModal.vue
+++ b/components/common/listingCart/ListingCartModal.vue
@@ -68,8 +68,7 @@ import ModalBody from '@/components/shared/modals/ModalBody.vue'
 import { usePreferencesStore } from '@/stores/preferences'
 import { TokenToList } from '@/composables/transaction/types'
 import { ListCartItem, useListingCartStore } from '@/stores/listingCart'
-import { calculateBalance } from '@/utils/format/balance'
-import format from '@/utils/format/balance'
+import format, { calculateBalance } from '@/utils/format/balance'
 import { warningMessage } from '@/utils/notification'
 import { useFiatStore } from '@/stores/fiat'
 import { calculateExactUsdFromToken } from '@/utils/calculation'

From add3a7eb7372d030ff6c39845cd5accaa6fb72ef Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Mon, 4 Dec 2023 10:17:45 +0500
Subject: [PATCH 72/85] add: shop voucher icon

---
 .../collection/drop/DropConfirmModal.vue      | 24 +++++++++++++++++++
 components/landing/SignupBanner.vue           |  7 ++----
 composables/useShopVoucherIcon.ts             |  9 +++++++
 locales/en.json                               |  5 +++-
 4 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 composables/useShopVoucherIcon.ts

diff --git a/components/collection/drop/DropConfirmModal.vue b/components/collection/drop/DropConfirmModal.vue
index 1ea79e9515..629a32ffd9 100644
--- a/components/collection/drop/DropConfirmModal.vue
+++ b/components/collection/drop/DropConfirmModal.vue
@@ -15,6 +15,22 @@
         {{ $t('drops.subscribe') }}
       </p>
 
+      <div class="mb-5">
+        <div class="is-capitalized is-flex is-align-items-center">
+          <span>{{ $t('drops.plusGetA') }}</span>
+
+          <div class="voucher px-2 is-flex is-align-items-center">
+            <img :src="voucherIcon" alt="shop voucher" />
+          </div>
+
+          <span>{{ $t('drops.voucherToOurShop') }}</span>
+        </div>
+
+        <p class="has-text-k-grey is-capitalized mt-3 is-size-7">
+          ({{ $t('drops.justConfirmSubscriptionViaEmail') }})
+        </p>
+      </div>
+
       <form @submit.prevent="confirm">
         <NeoInput
           ref="emailInput"
@@ -55,6 +71,8 @@ const props = defineProps<{ modelValue: boolean }>()
 
 const isModalActive = useVModel(props, 'modelValue')
 
+const { voucherIcon } = useShopVoucherIcon()
+
 const emailInput = ref()
 const email = ref()
 const agree = ref(false)
@@ -95,6 +113,12 @@ const confirm = () => {
   width: 25rem;
 }
 
+.voucher {
+  img {
+    width: 58px;
+  }
+}
+
 .shine {
   &:not(:disabled) {
     @include shineEffect(var(--k-accent-light-3), lightgrey);
diff --git a/components/landing/SignupBanner.vue b/components/landing/SignupBanner.vue
index a8c38c9ace..20fe030174 100644
--- a/components/landing/SignupBanner.vue
+++ b/components/landing/SignupBanner.vue
@@ -7,7 +7,7 @@
         </h3>
 
         <div class="ml-4 is-relative signup-banner-voucher is-flex-shrink-0">
-          <img :src="logoSrc" alt="signup voucher" />
+          <img :src="voucherIcon" alt="signup voucher" />
           <img
             src="/signup-voucher-blur.svg"
             alt="signup voucher blur"
@@ -48,11 +48,8 @@ import { usePreferencesStore } from '@/stores/preferences'
 
 const { $i18n } = useNuxtApp()
 const preferencesStore = usePreferencesStore()
-const { isDarkMode } = useTheme()
 
-const logoSrc = computed(() =>
-  isDarkMode.value ? '/signup-voucher-dark.svg' : '/signup-voucher.svg',
-)
+const { voucherIcon } = useShopVoucherIcon()
 
 const email = ref()
 const loading = ref(false)
diff --git a/composables/useShopVoucherIcon.ts b/composables/useShopVoucherIcon.ts
new file mode 100644
index 0000000000..a6d45eae4a
--- /dev/null
+++ b/composables/useShopVoucherIcon.ts
@@ -0,0 +1,9 @@
+export const useShopVoucherIcon = () => {
+  const { isDarkMode } = useTheme()
+
+  const voucherIcon = computed(() =>
+    isDarkMode.value ? '/signup-voucher-dark.svg' : '/signup-voucher.svg',
+  )
+
+  return { voucherIcon }
+}
diff --git a/locales/en.json b/locales/en.json
index a847260539..d3b14a858f 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1417,7 +1417,10 @@
     "enterValidEmail": "Enter valid email address",
     "subscribeAndClaim": "Subscribe & Claim your NFT",
     "agreeToProceed": "Agree to proceed",
-    "consent": "I consent to receive updates."
+    "consent": "I consent to receive updates.",
+    "plusGetA": "+ Get a",
+    "voucherToOurShop": "Voucher to our shop",
+    "justConfirmSubscriptionViaEmail": "Just confirm your subscription via email"
   },
   "confirmPurchase": {
     "action": "Confirm Purchase",

From 6c71295fe7431d7dee5ced143372516e569d6ca1 Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Mon, 4 Dec 2023 10:32:37 +0500
Subject: [PATCH 73/85] ref: icon composables

---
 components/collection/drop/DropConfirmModal.vue    |  4 ++--
 components/collection/unlockable/UnlockableTag.vue |  4 ++--
 components/gallery/UnlockableTag.vue               |  4 ++--
 components/landing/SignupBanner.vue                |  4 ++--
 composables/useIcon.ts                             | 12 +++++++++++-
 composables/useNft.ts                              |  2 +-
 composables/useShopVoucherIcon.ts                  |  9 ---------
 composables/useUnlockableIcon.ts                   |  8 --------
 8 files changed, 20 insertions(+), 27 deletions(-)
 delete mode 100644 composables/useShopVoucherIcon.ts
 delete mode 100644 composables/useUnlockableIcon.ts

diff --git a/components/collection/drop/DropConfirmModal.vue b/components/collection/drop/DropConfirmModal.vue
index 629a32ffd9..2ca54ff7cb 100644
--- a/components/collection/drop/DropConfirmModal.vue
+++ b/components/collection/drop/DropConfirmModal.vue
@@ -20,7 +20,7 @@
           <span>{{ $t('drops.plusGetA') }}</span>
 
           <div class="voucher px-2 is-flex is-align-items-center">
-            <img :src="voucherIcon" alt="shop voucher" />
+            <img :src="signUpVoucherIcon" alt="shop voucher" />
           </div>
 
           <span>{{ $t('drops.voucherToOurShop') }}</span>
@@ -71,7 +71,7 @@ const props = defineProps<{ modelValue: boolean }>()
 
 const isModalActive = useVModel(props, 'modelValue')
 
-const { voucherIcon } = useShopVoucherIcon()
+const { signUpVoucherIcon } = useIcon()
 
 const emailInput = ref()
 const email = ref()
diff --git a/components/collection/unlockable/UnlockableTag.vue b/components/collection/unlockable/UnlockableTag.vue
index 9f8060bd7b..21d766d454 100644
--- a/components/collection/unlockable/UnlockableTag.vue
+++ b/components/collection/unlockable/UnlockableTag.vue
@@ -19,9 +19,9 @@
 
 <script lang="ts" setup>
 import { NeoTooltip } from '@kodadot1/brick'
-import { useUnlockableIcon } from '@/composables/useUnlockableIcon'
+import { useIcon } from '@/composables/useIcon'
 
-const { unlockableIcon } = useUnlockableIcon()
+const { unlockableIcon } = useIcon()
 
 const props = defineProps({
   collectionId: {
diff --git a/components/gallery/UnlockableTag.vue b/components/gallery/UnlockableTag.vue
index c6bc76c279..0301babada 100644
--- a/components/gallery/UnlockableTag.vue
+++ b/components/gallery/UnlockableTag.vue
@@ -33,7 +33,7 @@
 import { NeoTooltip } from '@kodadot1/brick'
 import { NFT } from '@/components/rmrk/service/scheme'
 import { useWindowSize } from '@vueuse/core'
-import { useUnlockableIcon } from '@/composables/useUnlockableIcon'
+import { useIcon } from '@/composables/useIcon'
 
 const props = defineProps<{
   nft: NFT | undefined
@@ -42,7 +42,7 @@ const props = defineProps<{
 
 const { isCurrentOwner } = useAuth()
 const isMobile = computed(() => useWindowSize().width.value < 768)
-const { unlockableIcon } = useUnlockableIcon()
+const { unlockableIcon } = useIcon()
 
 const isOwner = computed(() => isCurrentOwner(props.nft?.currentOwner))
 </script>
diff --git a/components/landing/SignupBanner.vue b/components/landing/SignupBanner.vue
index 20fe030174..e1fbb011d4 100644
--- a/components/landing/SignupBanner.vue
+++ b/components/landing/SignupBanner.vue
@@ -7,7 +7,7 @@
         </h3>
 
         <div class="ml-4 is-relative signup-banner-voucher is-flex-shrink-0">
-          <img :src="voucherIcon" alt="signup voucher" />
+          <img :src="signUpVoucherIcon" alt="signup voucher" />
           <img
             src="/signup-voucher-blur.svg"
             alt="signup voucher blur"
@@ -49,7 +49,7 @@ import { usePreferencesStore } from '@/stores/preferences'
 const { $i18n } = useNuxtApp()
 const preferencesStore = usePreferencesStore()
 
-const { voucherIcon } = useShopVoucherIcon()
+const { signUpVoucherIcon } = useIcon()
 
 const email = ref()
 const loading = ref(false)
diff --git a/composables/useIcon.ts b/composables/useIcon.ts
index 1e1a5f6be2..47bc1b28f9 100644
--- a/composables/useIcon.ts
+++ b/composables/useIcon.ts
@@ -1,4 +1,6 @@
 export const useIcon = () => {
+  const { isDarkMode } = useTheme()
+
   const getTokenIconBySymbol = (token: string) => {
     switch (token.toLowerCase()) {
       case 'bsx':
@@ -12,5 +14,13 @@ export const useIcon = () => {
     }
   }
 
-  return { getTokenIconBySymbol }
+  const signUpVoucherIcon = computed(() =>
+    isDarkMode.value ? '/signup-voucher-dark.svg' : '/signup-voucher.svg',
+  )
+
+  const unlockableIcon = computed(() =>
+    isDarkMode.value ? '/unlockable-dark.svg' : '/unlockable.svg',
+  )
+
+  return { getTokenIconBySymbol, signUpVoucherIcon, unlockableIcon }
 }
diff --git a/composables/useNft.ts b/composables/useNft.ts
index 8d1ebd068c..996c657b84 100644
--- a/composables/useNft.ts
+++ b/composables/useNft.ts
@@ -97,7 +97,7 @@ export function useNftCardIcon<
   },
 >(nft: Ref<T>) {
   const isAudio = ref(false)
-  const { unlockableIcon } = useUnlockableIcon()
+  const { unlockableIcon } = useIcon()
 
   const cardIcon = computed(() => {
     if (isAudio) {
diff --git a/composables/useShopVoucherIcon.ts b/composables/useShopVoucherIcon.ts
deleted file mode 100644
index a6d45eae4a..0000000000
--- a/composables/useShopVoucherIcon.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export const useShopVoucherIcon = () => {
-  const { isDarkMode } = useTheme()
-
-  const voucherIcon = computed(() =>
-    isDarkMode.value ? '/signup-voucher-dark.svg' : '/signup-voucher.svg',
-  )
-
-  return { voucherIcon }
-}
diff --git a/composables/useUnlockableIcon.ts b/composables/useUnlockableIcon.ts
deleted file mode 100644
index 6b35d206b2..0000000000
--- a/composables/useUnlockableIcon.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export const useUnlockableIcon = () => {
-  const { isDarkMode } = useTheme()
-  const unlockableIcon = computed(() =>
-    isDarkMode.value ? '/unlockable-dark.svg' : '/unlockable.svg',
-  )
-
-  return { unlockableIcon }
-}

From cee27e4214db266bf068ff3498a516ba952ef9ba Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Mon, 4 Dec 2023 08:46:23 +0100
Subject: [PATCH 74/85] =?UTF-8?q?=F0=9F=92=85=20collection=20max=20supply?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/collection/CollectionInfo.vue             | 5 +++++
 components/collection/utils/types.ts                 | 1 +
 components/collection/utils/useCollectionDetails.ts  | 1 +
 locales/en.json                                      | 4 +++-
 queries/subsquid/general/collectionStatsById.graphql | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/components/collection/CollectionInfo.vue b/components/collection/CollectionInfo.vue
index 09552aa925..eb9e2242ff 100644
--- a/components/collection/CollectionInfo.vue
+++ b/components/collection/CollectionInfo.vue
@@ -34,6 +34,10 @@
             :value="stats.uniqueOwners" />
         </div>
         <div>
+          <CollectionInfoLine
+            v-if="isAssetHub"
+            :title="$t('activity.totalSupply')"
+            :value="stats.maxSupply || $t('unlimited')" />
           <CollectionInfoLine :title="$t('activity.floor')">
             <CommonTokenMoney
               :value="stats.collectionFloorPrice"
@@ -71,6 +75,7 @@ import {
 const route = useRoute()
 const { urlPrefix } = usePrefix()
 const { availableChains } = useChain()
+const { isAssetHub } = useIsChain(urlPrefix)
 const collectionId = computed(() => route.params.id)
 const chain = computed(
   () =>
diff --git a/components/collection/utils/types.ts b/components/collection/utils/types.ts
index 93b9664853..478ecfdd31 100644
--- a/components/collection/utils/types.ts
+++ b/components/collection/utils/types.ts
@@ -8,6 +8,7 @@ export type Stats = {
   uniqueOwners?: number
   uniqueOwnersPercent?: string
   collectionTradedVolumeNumber?: string | number
+  maxSupply?: number
 }
 
 export type CollectionEntityMinimal = {
diff --git a/components/collection/utils/useCollectionDetails.ts b/components/collection/utils/useCollectionDetails.ts
index e8cb1c17f0..379df9d173 100644
--- a/components/collection/utils/useCollectionDetails.ts
+++ b/components/collection/utils/useCollectionDetails.ts
@@ -49,6 +49,7 @@ export const useCollectionDetails = ({ collectionId }) => {
       const listedNfts = data.value.stats.listed
 
       stats.value = {
+        maxSupply: data.value.stats.max,
         listedCount: data.value.stats.listed.length,
         collectionLength: data.value.stats.base.length,
         collectionFloorPrice:
diff --git a/locales/en.json b/locales/en.json
index a847260539..353ae1b527 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -869,6 +869,7 @@
     "totalItems": "Σ Items",
     "todayTraded": "24H",
     "totalTraded": "Σ VOLUME TRADED",
+    "totalSupply": "Total Supply",
     "highestSale": "HIGHEST SALE",
     "totalBuys": "Σ BUYS",
     "unique": "UNIQUE",
@@ -992,7 +993,8 @@
       "copy": "Kodadot link successfully copied"
     },
     "builtOn": "Built on",
-    "signStuckText": "Stuck? Make sure to check for any popups and SIGN the transaction."
+    "signStuckText": "Stuck? Make sure to check for any popups and SIGN the transaction.",
+    "unlimited": "Unlimited"
   },
   "cookies": {
     "notice": "We use cookies for better service",
diff --git a/queries/subsquid/general/collectionStatsById.graphql b/queries/subsquid/general/collectionStatsById.graphql
index 442269cd35..e9aa7b80d6 100644
--- a/queries/subsquid/general/collectionStatsById.graphql
+++ b/queries/subsquid/general/collectionStatsById.graphql
@@ -1,6 +1,7 @@
 query collectionStatsById($id: String!) {
   stats: collectionEntityById(id: $id) {
     id
+    max
     base: nfts(where: { burned_eq: false }) {
       id
       currentOwner

From 105df75e05d831d363c9e9e8018e613577619863 Mon Sep 17 00:00:00 2001
From: Shashkov Danil <shashkovdanil@gmail.com>
Date: Mon, 4 Dec 2023 11:47:34 +0000
Subject: [PATCH 75/85] removed unneeded import style

---
 libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss b/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
index 76e75a35de..223b848d1e 100644
--- a/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
+++ b/libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
@@ -2,7 +2,6 @@
 @import '@oruga-ui/oruga-next/src/scss/utilities/variables.scss';
 @import '@oruga-ui/oruga-next/src/scss/utilities/animations.scss';
 @import '@oruga-ui/oruga-next/src/scss/utilities/helpers.scss';
-@import '../../scss/tailwind.scss';
 
 .o-acp {
   &__item {

From afd98cdbf874395da4eacd72eb7a8b9f57128e39 Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Mon, 4 Dec 2023 13:22:26 +0100
Subject: [PATCH 76/85] Update components/collection/CollectionInfo.vue

Co-authored-by: Ramo <36627808+prury@users.noreply.github.com>
---
 components/collection/CollectionInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/collection/CollectionInfo.vue b/components/collection/CollectionInfo.vue
index eb9e2242ff..c20d405f4e 100644
--- a/components/collection/CollectionInfo.vue
+++ b/components/collection/CollectionInfo.vue
@@ -37,7 +37,7 @@
           <CollectionInfoLine
             v-if="isAssetHub"
             :title="$t('activity.totalSupply')"
-            :value="stats.maxSupply || $t('unlimited')" />
+            :value="stats.maxSupply || $t('helper.unlimited')" />
           <CollectionInfoLine :title="$t('activity.floor')">
             <CommonTokenMoney
               :value="stats.collectionFloorPrice"

From 27a56a399322fa66ea4adb56508e5b4ad0fb00e3 Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Mon, 4 Dec 2023 17:42:28 +0500
Subject: [PATCH 77/85] fix: no shone on hover

---
 components/collection/drop/DropConfirmModal.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/components/collection/drop/DropConfirmModal.vue b/components/collection/drop/DropConfirmModal.vue
index 12c79aebe0..33a477e873 100644
--- a/components/collection/drop/DropConfirmModal.vue
+++ b/components/collection/drop/DropConfirmModal.vue
@@ -95,12 +95,11 @@ const confirm = () => {
   width: 25rem;
 }
 
-.shine {
-  &:not(:disabled) {
-    @include shineEffect(var(--k-accent-light-3), lightgrey, false);
-    &:hover {
-      color: var(--k-accent2) !important;
-    }
+.shine:not(:hover):not(:disabled) {
+  @include shineEffect(var(--k-accent-light-3), lightgrey, false);
+
+  &:hover {
+    color: var(--k-accent2) !important;
   }
 }
 </style>

From 85d81fe89212951739c6c0d916545e63bcf9ed17 Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Mon, 4 Dec 2023 17:51:17 +0500
Subject: [PATCH 78/85] reF: use inline width property

---
 components/collection/drop/DropConfirmModal.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/components/collection/drop/DropConfirmModal.vue b/components/collection/drop/DropConfirmModal.vue
index 2ca54ff7cb..ce5376ba77 100644
--- a/components/collection/drop/DropConfirmModal.vue
+++ b/components/collection/drop/DropConfirmModal.vue
@@ -19,8 +19,8 @@
         <div class="is-capitalized is-flex is-align-items-center">
           <span>{{ $t('drops.plusGetA') }}</span>
 
-          <div class="voucher px-2 is-flex is-align-items-center">
-            <img :src="signUpVoucherIcon" alt="shop voucher" />
+          <div class="px-2 is-flex is-align-items-center">
+            <img width="58" :src="signUpVoucherIcon" alt="shop voucher" />
           </div>
 
           <span>{{ $t('drops.voucherToOurShop') }}</span>
@@ -113,12 +113,6 @@ const confirm = () => {
   width: 25rem;
 }
 
-.voucher {
-  img {
-    width: 58px;
-  }
-}
-
 .shine {
   &:not(:disabled) {
     @include shineEffect(var(--k-accent-light-3), lightgrey);

From 7dddc6c68b680ea28cc476f945f5ea28a64d50f4 Mon Sep 17 00:00:00 2001
From: hassnian <hassnianxd@gmail.com>
Date: Mon, 4 Dec 2023 17:54:32 +0500
Subject: [PATCH 79/85] =?UTF-8?q?ref:=20getTokenIconBySymbol=C2=A0useIcon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composables/useIcon.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/composables/useIcon.ts b/composables/useIcon.ts
index 47bc1b28f9..f03e6f9a86 100644
--- a/composables/useIcon.ts
+++ b/composables/useIcon.ts
@@ -1,19 +1,19 @@
+const getTokenIconBySymbol = (token: string) => {
+  switch (token.toLowerCase()) {
+    case 'bsx':
+      return '/token/bsx.svg'
+    case 'dot':
+      return '/token/dot.svg'
+    case 'ksm':
+      return '/token/ksm.svg'
+    default:
+      return '/token/ksm.svg'
+  }
+}
+
 export const useIcon = () => {
   const { isDarkMode } = useTheme()
 
-  const getTokenIconBySymbol = (token: string) => {
-    switch (token.toLowerCase()) {
-      case 'bsx':
-        return '/token/bsx.svg'
-      case 'dot':
-        return '/token/dot.svg'
-      case 'ksm':
-        return '/token/ksm.svg'
-      default:
-        return '/token/ksm.svg'
-    }
-  }
-
   const signUpVoucherIcon = computed(() =>
     isDarkMode.value ? '/signup-voucher-dark.svg' : '/signup-voucher.svg',
   )

From cd142d9f658fe4be4dc53ef63a0866506d5fa99c Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Mon, 4 Dec 2023 14:45:49 +0100
Subject: [PATCH 80/85] =?UTF-8?q?=F0=9F=94=A7=20collection=20set=20max?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composables/transaction/transactionSetCollectionMaxSupply.ts | 2 +-
 composables/transaction/utils.ts                             | 3 +++
 composables/useTransaction.ts                                | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/composables/transaction/transactionSetCollectionMaxSupply.ts b/composables/transaction/transactionSetCollectionMaxSupply.ts
index 2b2827a5cf..dee43ddf38 100644
--- a/composables/transaction/transactionSetCollectionMaxSupply.ts
+++ b/composables/transaction/transactionSetCollectionMaxSupply.ts
@@ -1,6 +1,6 @@
 import { ActionSetCollectionMaxSupply, ExecuteTransactionParams } from './types'
 
-export async function execSetCollectionMaxSupply(
+export function execSetCollectionMaxSupply(
   params: ActionSetCollectionMaxSupply,
   api,
   executeTransaction: ({
diff --git a/composables/transaction/utils.ts b/composables/transaction/utils.ts
index 31c4eb6e6e..fcc233ce49 100644
--- a/composables/transaction/utils.ts
+++ b/composables/transaction/utils.ts
@@ -11,6 +11,7 @@ import {
   ActionMintToken,
   ActionOffer,
   ActionSend,
+  ActionSetCollectionMaxSupply,
   ActionWithdrawOffer,
   Actions,
   Collections,
@@ -71,6 +72,8 @@ export function isActionValid(action: Actions): boolean {
       Boolean(action.collection),
     [Collections.DELETE]: (action: ActionDeleteCollection) =>
       Boolean(action.collectionId),
+    [Collections.SET_MAX_SUPPLY]: (action: ActionSetCollectionMaxSupply) =>
+      Boolean(action.collectionId),
     [NFTs.BURN_MULTIPLE]: (action: ActionBurnMultipleNFTs) =>
       hasContent(action.nftIds),
   }
diff --git a/composables/useTransaction.ts b/composables/useTransaction.ts
index bf509c6f94..bed97bbdc5 100644
--- a/composables/useTransaction.ts
+++ b/composables/useTransaction.ts
@@ -188,6 +188,7 @@ export const executeAction = ({
 
   if (!isActionValid(item)) {
     $consola.warn(`Invalid action: ${JSON.stringify(item)}`)
+    console.log(item)
     throw createError({
       statusCode: 404,
       statusMessage: 'Interaction Not Found',

From dea78295f453f8d74f252cf775c5c41118d3c6fd Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Mon, 4 Dec 2023 15:01:49 +0100
Subject: [PATCH 81/85] =?UTF-8?q?=F0=9F=94=A7=20collection=20set=20max=20l?=
 =?UTF-8?q?oader?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/collection/CustomizeModal.vue | 2 ++
 composables/useTransaction.ts            | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/collection/CustomizeModal.vue b/components/collection/CustomizeModal.vue
index 19bc85c2a8..eafc7a98ce 100644
--- a/components/collection/CustomizeModal.vue
+++ b/components/collection/CustomizeModal.vue
@@ -71,6 +71,8 @@ const customizeCollection = async () => {
     urlPrefix: urlPrefix.value,
     max: Number(max.value),
   })
+    .then(() => $updateLoader(false))
+    .catch(() => $updateLoader(false))
 
   emit('customize')
 }
diff --git a/composables/useTransaction.ts b/composables/useTransaction.ts
index bed97bbdc5..bf509c6f94 100644
--- a/composables/useTransaction.ts
+++ b/composables/useTransaction.ts
@@ -188,7 +188,6 @@ export const executeAction = ({
 
   if (!isActionValid(item)) {
     $consola.warn(`Invalid action: ${JSON.stringify(item)}`)
-    console.log(item)
     throw createError({
       statusCode: 404,
       statusMessage: 'Interaction Not Found',

From 21b68c5be6dd8210ad969fd5ce792d6d21456ceb Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Mon, 4 Dec 2023 15:20:04 +0100
Subject: [PATCH 82/85] =?UTF-8?q?=F0=9F=94=A7=20collection=20set=20max=20d?=
 =?UTF-8?q?isabled=20quick=20and=20dirty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/collection/CustomizeModal.vue                | 9 +++++----
 components/collection/HeroButtonCustomizeCollection.vue | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/components/collection/CustomizeModal.vue b/components/collection/CustomizeModal.vue
index eafc7a98ce..9343755ed2 100644
--- a/components/collection/CustomizeModal.vue
+++ b/components/collection/CustomizeModal.vue
@@ -46,7 +46,7 @@ import { NeoButton, NeoField, NeoInput, NeoModal } from '@kodadot1/brick'
 import { Collections } from '@/composables/transaction/types'
 
 const { $updateLoader } = useNuxtApp()
-const { transaction } = useTransaction()
+const { transaction, status } = useTransaction()
 const { urlPrefix } = usePrefix()
 const route = useRoute()
 
@@ -63,6 +63,7 @@ const min = computed(() => props.min || 1)
 const max = ref(props.max)
 
 const customizeCollection = async () => {
+  emit('customize')
   $updateLoader(true)
 
   await transaction({
@@ -71,10 +72,10 @@ const customizeCollection = async () => {
     urlPrefix: urlPrefix.value,
     max: Number(max.value),
   })
-    .then(() => $updateLoader(false))
-    .catch(() => $updateLoader(false))
 
-  emit('customize')
+  if (status.value === TransactionStatus.Finalized) {
+    $updateLoader(false)
+  }
 }
 </script>
 
diff --git a/components/collection/HeroButtonCustomizeCollection.vue b/components/collection/HeroButtonCustomizeCollection.vue
index 9403ceab3c..a236c0f621 100644
--- a/components/collection/HeroButtonCustomizeCollection.vue
+++ b/components/collection/HeroButtonCustomizeCollection.vue
@@ -1,5 +1,7 @@
 <template>
-  <NeoDropdownItem @click="customizeCollectionModalActive = true">
+  <NeoDropdownItem
+    :disabled="max"
+    @click="customizeCollectionModalActive = true">
     {{ $i18n.t('moreActions.customize') }}
   </NeoDropdownItem>
 

From e0f22ca024b323634da4d37ab03006690cc51cf4 Mon Sep 17 00:00:00 2001
From: Danil Shashkov <shashkovdanil@gmail.com>
Date: Mon, 4 Dec 2023 14:43:45 +0000
Subject: [PATCH 83/85] Fixed NeoAvatar size bug

---
 .../components/MediaItem/type/ImageMedia.vue  | 22 +++++++++++++++++--
 .../ui/src/components/NeoAvatar/NeoAvatar.vue |  7 ++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/libs/ui/src/components/MediaItem/type/ImageMedia.vue b/libs/ui/src/components/MediaItem/type/ImageMedia.vue
index 04330b9927..e95ea6ada6 100644
--- a/libs/ui/src/components/MediaItem/type/ImageMedia.vue
+++ b/libs/ui/src/components/MediaItem/type/ImageMedia.vue
@@ -7,7 +7,7 @@
     <TheImage
       v-if="status === 'ok'"
       :image-component="imageComponent"
-      :image-component-props="{ sizes }"
+      :image-component-props="imageComponentProps"
       :src="src"
       :alt="alt"
       class="block rounded-none"
@@ -35,13 +35,18 @@
 
 <script lang="ts" setup>
 import consola from 'consola'
+import { computed, defineProps, withDefaults } from 'vue'
 
 import TheImage from '../../TheImage/TheImage.vue'
-import type { ImageComponent } from '../../TheImage/TheImage.vue'
+import type {
+  ImageComponent,
+  ImageComponentProps,
+} from '../../TheImage/TheImage.vue'
 
 const props = withDefaults(
   defineProps<{
     imageComponent?: ImageComponent
+    imageComponentProps?: ImageComponentProps
     sizes?: string
     src: string
     alt?: string
@@ -50,6 +55,7 @@ const props = withDefaults(
   }>(),
   {
     imageComponent: 'img',
+    imageComponentProps: undefined,
     sizes: '450px md:350px lg:270px',
     src: '',
     alt: '',
@@ -63,4 +69,16 @@ const onError = async (phase: Status) => {
   consola.log('[KODADOT::IMAGE] unable to load:', `${phase}:`, props.src)
   status.value = phase
 }
+
+// Ignore sizes if width and height are provided
+const sizes = computed(() =>
+  props.imageComponentProps?.width && props.imageComponentProps?.height
+    ? undefined
+    : props.sizes,
+)
+
+const imageComponentProps = computed(() => ({
+  ...(props.imageComponentProps || {}),
+  sizes: sizes.value,
+}))
 </script>
diff --git a/libs/ui/src/components/NeoAvatar/NeoAvatar.vue b/libs/ui/src/components/NeoAvatar/NeoAvatar.vue
index 54d26433a2..f12c297f95 100644
--- a/libs/ui/src/components/NeoAvatar/NeoAvatar.vue
+++ b/libs/ui/src/components/NeoAvatar/NeoAvatar.vue
@@ -3,11 +3,14 @@
     v-if="avatar"
     :placeholder="placeholder"
     :image-component="imageComponent"
+    :image-component-props="{
+      width: size,
+      height: size,
+      fit: 'cover',
+    }"
     :src="avatar"
     :alt="name"
     class="border neo-avatar"
-    :width="size"
-    :height="size"
     :style="customStyle"
     :original="true" />
   <img

From 10d4b192a8ad6edf2157a345dd7e8ef22328c878 Mon Sep 17 00:00:00 2001
From: roiLeo <medina.leo42@gmail.com>
Date: Mon, 4 Dec 2023 16:45:06 +0100
Subject: [PATCH 84/85] =?UTF-8?q?=F0=9F=94=A7=20NeoCheckbox=20story?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/NeoCheckbox/NeoCheckbox.story.vue   | 10 ++++++++--
 libs/ui/src/components/NeoCheckbox/NeoCheckbox.vue     |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libs/ui/src/components/NeoCheckbox/NeoCheckbox.story.vue b/libs/ui/src/components/NeoCheckbox/NeoCheckbox.story.vue
index 5fbd6e171d..d78ecd890a 100644
--- a/libs/ui/src/components/NeoCheckbox/NeoCheckbox.story.vue
+++ b/libs/ui/src/components/NeoCheckbox/NeoCheckbox.story.vue
@@ -1,8 +1,14 @@
 <template>
-  <Story title="NeoButton" :layout="{ type: 'grid', width: '200px' }">
-    <Variant title="small neo button">
+  <Story title="NeoCheckbox" :layout="{ type: 'grid', width: '200px' }">
+    <Variant title="Small NeoCheckbox">
+      <NeoCheckbox size="small"> {{ label }} </NeoCheckbox>
+    </Variant>
+    <Variant title="Default NeoCheckbox">
       <NeoCheckbox> {{ label }} </NeoCheckbox>
     </Variant>
+    <Variant title="Large NeoCheckbox">
+      <NeoCheckbox size="large"> {{ label }} </NeoCheckbox>
+    </Variant>
   </Story>
 </template>
 
diff --git a/libs/ui/src/components/NeoCheckbox/NeoCheckbox.vue b/libs/ui/src/components/NeoCheckbox/NeoCheckbox.vue
index 0a5cffb123..18d99fdeb8 100644
--- a/libs/ui/src/components/NeoCheckbox/NeoCheckbox.vue
+++ b/libs/ui/src/components/NeoCheckbox/NeoCheckbox.vue
@@ -5,6 +5,7 @@
     :native-value="checkboxValue"
     :disabled="disabled"
     :label-class="labelClass"
+    :size="size"
     @update:modelValue="updateValue">
     <slot />
   </o-checkbox>
@@ -17,6 +18,7 @@ const props = defineProps<{
   disabled?: boolean
   modelValue: boolean
   labelClass?: string
+  size?: string
 }>()
 
 const emit = defineEmits(['update:modelValue'])

From 997c16b6a67256e1bbe46b5907d8c47c8ed21284 Mon Sep 17 00:00:00 2001
From: Danil Shashkov <shashkovdanil@gmail.com>
Date: Mon, 4 Dec 2023 16:00:26 +0000
Subject: [PATCH 85/85] Remove unneeded margins

---
 components/massmint/OverviewTable.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/massmint/OverviewTable.vue b/components/massmint/OverviewTable.vue
index 8742a34e5b..56aea77383 100644
--- a/components/massmint/OverviewTable.vue
+++ b/components/massmint/OverviewTable.vue
@@ -196,4 +196,8 @@ useIntersectionObserver(sentinel, handleIntersection, { threshold: 0.66 })
   white-space: nowrap;
   max-width: 90%;
 }
+
+.column figure {
+  margin: 0;
+}
 </style>