Merge branch 'main' into issue-offer-reuse-nft

kodadot · Jan 2, 2025 · c663b01 · c663b01
2 parents 9ca79ac + e937678
commit c663b01
Show file tree

Hide file tree

Showing 48 changed files with 6,403 additions and 7,119 deletions.
diff --git a/components/base/BaseCollectionForm.vue b/components/base/BaseCollectionForm.vue
diff --git a/components/drops/CreateCalendarEventModal.vue b/components/drops/CreateCalendarEventModal.vue
@@ -71,7 +71,7 @@ const eventDetails = {
 const getNextDropDate = (): Date => {
   const currentDate = new Date()
   const daysUntilThursday = (11 - currentDate.getDay()) % 7
-  const millisecondsUntilThursday = daysUntilThursday * 24 * 60 * 60 * 1000
+  const millisecondsUntilThursday = daysUntilThursday * ONE_DAY_MS
   currentDate.setUTCHours(14, 0, 0, 0) // Set time to 3 PM CET
   const dropDate = new Date(currentDate.getTime() + millisecondsUntilThursday)
   dropDate.setHours(currentDate.getHours())

diff --git a/components/drops/utils.ts b/components/drops/utils.ts
@@ -62,7 +62,6 @@ export const parseCETDate = (datetime: string): Date => {
 
 export const dateHasTime = (datetime: string): boolean => /:/.test(datetime)
 
-const ONE_DAYH_IN_MS = 24 * 60 * 60 * 1000
 const getLocalDropStatus = (drop: Pick<DropItem, 'dropStartTime' | 'minted' | 'max' | 'disabled'>): DropStatus => {
   const now = new Date()
 
@@ -81,7 +80,7 @@ const getLocalDropStatus = (drop: Pick<DropItem, 'dropStartTime' | 'minted' | 'm
     return DropStatus.MINTING_LIVE
   }
 
-  if (drop.dropStartTime.valueOf() - now.valueOf() <= ONE_DAYH_IN_MS) {
+  if (drop.dropStartTime.valueOf() - now.valueOf() <= ONE_DAY_MS) {
     return DropStatus.SCHEDULED_SOON
   }
 

diff --git a/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemTrade.vue b/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemTrade.vue
@@ -86,26 +86,11 @@ const onMakeOfferClick = () => {
 const onSwapClick = () => {
   onTradeActionClick(() => {
     const nft = props.nft
-    const swap = swapStore.createSwap(nft.currentOwner)
-
-    swapStore.updateItem({
-      ...swap,
-      desired: [
-        {
-          id: nft.id,
-          collectionId: nft.collection.id,
-          sn: nft.sn,
-          name: nft.name,
-          meta: nft.meta,
-        },
-      ],
+    const swap = swapStore.createSwap(nft.currentOwner, {
+      desired: [nftToSwapItem(nft)],
     })
 
-    navigateTo({
-      name: 'prefix-swap-id',
-      params: { id: nft.currentOwner },
-      query: { swapId: swap.id },
-    })
+    navigateToSwap(swap)
   })
 }
 

diff --git a/components/gallery/useGalleryItem.ts b/components/gallery/useGalleryItem.ts
@@ -64,8 +64,12 @@ export const useGalleryItem = (nftId?: string): GalleryItem => {
     },
   })
 
-  const refreshToken = async () => {
+  const getIndexerToken = () => {
     refetch({ id })
+  }
+
+  const refreshToken = async () => {
+    getIndexerToken()
     getOdaToken()
   }
 
@@ -120,7 +124,8 @@ export const useGalleryItem = (nftId?: string): GalleryItem => {
         id
       }
     }`,
-    onChange: refetch,
+    onChange: getIndexerToken,
+    immediate: false,
   })
 
   useSubscriptionGraphql({

diff --git a/components/items/ItemsGrid/ItemsGrid.vue b/components/items/ItemsGrid/ItemsGrid.vue
@@ -43,6 +43,7 @@
               ? 'minimal'
               : 'primary'
           "
+          :link-target="linkTarget"
         />
         <ItemsGridImageTokenEntity
           v-else
@@ -51,6 +52,7 @@
           :hide-action="hideNFTHoverAction"
           :hide-listing="hideListing"
           hide-video-controls
+          :link-target="linkTarget"
           :lazy-loading="
             shouldLazyLoad({
               cols: slotProps.cols,
@@ -148,6 +150,7 @@ const props = defineProps<{
   hideHoverAction?: boolean
   collectionPopoverHide?: boolean
   hideListing?: boolean
+  linkTarget?: string
 }>()
 
 const emit = defineEmits(['total', 'loading'])

diff --git a/components/items/ItemsGrid/ItemsGridImage.vue b/components/items/ItemsGrid/ItemsGridImage.vue
@@ -16,6 +16,7 @@
     bind-key="to"
     :media-static-video="hideVideoControls"
     media-hover-on-cover-play
+    :link-target="linkTarget"
   >
     <template
       v-if="!hideAction"
@@ -106,6 +107,7 @@ const props = defineProps<{
   collectionPopoverHide?: boolean
   lazyLoading?: boolean
   skeletonVariant: string
+  linkTarget?: string
 }>()
 
 const {

diff --git a/components/items/ItemsGrid/ItemsGridImageTokenEntity.vue b/components/items/ItemsGrid/ItemsGridImageTokenEntity.vue
@@ -20,6 +20,7 @@
     :media-static-video="hideVideoControls"
     :lazy-loading="lazyLoading"
     media-hover-on-cover-play
+    :link-target="linkTarget"
   >
     <template
       v-if="!hideAction"
@@ -123,6 +124,7 @@ const props = defineProps<{
   lazyLoading?: boolean
   skeletonVariant: string
   hideListing?: boolean
+  linkTarget?: string
 }>()
 
 const {

diff --git a/components/rmrk/Create/CreateCollection.vue b/components/rmrk/Create/CreateCollection.vue