Merge branch 'main' into feat-art-kind

kodadot · Oct 12, 2024 · 1c5e08e · 1c5e08e
2 parents 92bf18b + f086fed
commit 1c5e08e
Show file tree

Hide file tree

Showing 77 changed files with 278 additions and 215 deletions.
diff --git a/.github/diagram.svg b/.github/diagram.svg
diff --git a/components/bsx/Create/RoyaltyForm.vue b/components/bsx/Create/RoyaltyForm.vue
@@ -11,19 +11,21 @@
       :max="99.99"
     />
 
-    <BasicSwitch
-      v-model="isMine"
-      label="mint.royalty.mine"
-      data-testid="royalty-form-switch"
-    />
-    <AddressInput
-      v-show="!isMine"
-      v-model="vAddress"
-      label="mint.royalty.receiver"
-      data-testid="royalty-form-custom-address"
-      :strict="false"
-      empty-on-error
-    />
+    <template v-if="Number(vRoyalty)">
+      <BasicSwitch
+        v-model="isMine"
+        :label="isMine ? 'mint.royalty.mine' : 'mint.royalty.custom'"
+        data-testid="royalty-form-switch"
+      />
+      <AddressInput
+        v-show="!isMine"
+        v-model="vAddress"
+        label="mint.royalty.receiver"
+        data-testid="royalty-form-custom-address"
+        :strict="false"
+        empty-on-error
+      />
+    </template>
   </div>
 </template>
 

diff --git a/components/buy/Buy.vue b/components/buy/Buy.vue
@@ -54,6 +54,7 @@ const { $i18n } = useNuxtApp()
 const { isTransactionSuccessful } = useTransactionSuccessful({
   status,
   isError,
+  isLoading,
 })
 
 const nftSubscription = reactive<{

diff --git a/components/carousel/CarouselTypeRelated.vue b/components/carousel/CarouselTypeRelated.vue
@@ -1,13 +1,9 @@
 <template>
-  <div>
-    <LoadLazily>
-      <CarouselIndex
-        v-if="nfts"
-        :title="`${$t('nft.related')}`"
-        :nfts="nfts"
-      />
-    </LoadLazily>
-  </div>
+  <LazyCarouselIndex
+    v-if="nfts"
+    :title="$t('nft.related')"
+    :nfts="nfts"
+  />
 </template>
 
 <script lang="ts" setup>

diff --git a/components/carousel/CarouselTypeVisited.vue b/components/carousel/CarouselTypeVisited.vue
@@ -1,7 +1,7 @@
 <template>
-  <CarouselIndex
+  <LazyCarouselIndex
     v-if="showCarousel"
-    :title="`${$t('nft.visited')}`"
+    :title="$t('nft.visited')"
     :nfts="nfts"
   />
 </template>

diff --git a/components/collection/CollectionCard.vue b/components/collection/CollectionCard.vue
@@ -42,7 +42,7 @@
 import { NeoSkeleton } from '@kodadot1/brick'
 import type { TokenMetadata } from '@kodadot1/hyperdata'
 import CollectionDetail from './CollectionDetail.vue'
-import type { CollectionWithMeta } from '@/components/rmrk/service/scheme'
+import type { CollectionWithMeta } from '@/types'
 import BasicImage from '@/components/shared/view/BasicImage.vue'
 import { processSingleMetadata } from '@/utils/cachingStrategy'
 import { sanitizeIpfsUrl } from '@/utils/ipfs'

diff --git a/components/collection/CollectionDetail.vue b/components/collection/CollectionDetail.vue
@@ -90,7 +90,7 @@
 
 <script lang="ts" setup>
 import { NeoSkeleton } from '@kodadot1/brick'
-import type { Interaction, NFT } from '@/components/rmrk/service/scheme'
+import type { Interaction, NFT } from '@/types'
 import { getVolume } from '@/utils/math'
 import BasicImage from '@/components/shared/view/BasicImage.vue'
 import CommonTokenMoney from '@/components/shared/CommonTokenMoney.vue'

diff --git a/components/collection/CollectionGrid.vue b/components/collection/CollectionGrid.vue
@@ -54,7 +54,7 @@
 
 <script lang="ts" setup>
 import isEqual from 'lodash/isEqual'
-import type { Collection } from '@/components/rmrk/service/scheme'
+import type { Collection } from '@/types'
 import type { SearchQuery } from '@/components/search/types'
 import collectionListWithSearch from '@/queries/subsquid/general/collectionListWithSearch.graphql'
 import collectionListWithSearchProfile from '@/queries/subsquid/general/collectionListWithSearchProfile.graphql'

diff --git a/components/collection/CollectionHeader/CollectionBanner.vue b/components/collection/CollectionHeader/CollectionBanner.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script setup lang="ts">
-import type { NFTMetadata } from '@/components/rmrk/service/scheme'
+import type { NFTMetadata } from '@/types'
 import { processSingleMetadata } from '@/utils/cachingStrategy'
 import { sanitizeIpfsUrl, toOriginalContentUrl } from '@/utils/ipfs'
 import HeroButtons from '@/components/collection/HeroButtons.vue'

diff --git a/components/collection/activity/ActivityChart.vue b/components/collection/activity/ActivityChart.vue
@@ -30,7 +30,7 @@ import {
   sortAsc,
   toDataPoint,
 } from './utils'
-import type { ActivityInteraction } from '@/components/rmrk/service/scheme'
+import type { ActivityInteraction } from '@/types'
 import PriceChart from '@/components/chart/PriceChart.vue'
 
 const { decimals } = useChain()

diff --git a/components/collection/activity/ownerInsightsTabs/NFTSDetailsDropdown/Flipper.vue b/components/collection/activity/ownerInsightsTabs/NFTSDetailsDropdown/Flipper.vue
@@ -46,7 +46,7 @@
 <script setup lang="ts">
 import { sanitizeIpfsUrl } from '@/utils/ipfs'
 import { processSingleMetadata } from '@/utils/cachingStrategy'
-import type { NFTMetadata } from '@/components/rmrk/service/scheme'
+import type { NFTMetadata } from '@/types'
 import Money from '@/components/shared/format/ChainMoney.vue'
 import type { FlipEvent } from '@/composables/collectionActivity/types'
 import { format } from '@/components/collection/activity/utils'

diff --git a/components/collection/activity/ownerInsightsTabs/NFTSDetailsDropdown/Holder.vue b/components/collection/activity/ownerInsightsTabs/NFTSDetailsDropdown/Holder.vue
@@ -34,7 +34,7 @@
 <script setup lang="ts">
 import { sanitizeIpfsUrl } from '@/utils/ipfs'
 import { processSingleMetadata } from '@/utils/cachingStrategy'
-import type { NFTMetadata } from '@/components/rmrk/service/scheme'
+import type { NFTMetadata } from '@/types'
 import type { NFTExcludingEvents } from '@/composables/collectionActivity/types'
 import BasicImage from '@/components/shared/view/BasicImage.vue'
 

diff --git a/components/collection/drop/HolderOfGenerative.vue b/components/collection/drop/HolderOfGenerative.vue
@@ -33,8 +33,6 @@
     v-if="isHolderOfWithPaidMint"
     v-model="isMintModalActive"
     :action="autoTeleportAction"
-    :status="status"
-    :is-error="isTransactionError"
     @confirm="mintNft"
     @close="closeMintModal"
     @list="handleList"

diff --git a/components/collection/drop/PaidGenerative.vue b/components/collection/drop/PaidGenerative.vue
@@ -4,8 +4,6 @@
   <CollectionDropModalPaidMint
     v-model="isMintModalActive"
     :action="autoTeleportAction"
-    :status="status"
-    :is-error="isError"
     @confirm="mintNft"
     @close="handleMintModalClose"
     @list="handleList"

diff --git a/components/collection/drop/modal/PaidMint.vue b/components/collection/drop/modal/PaidMint.vue
@@ -65,8 +65,6 @@ const emit = defineEmits(['confirm', 'update:modelValue', 'list', 'close'])
 const props = defineProps<{
   modelValue: boolean
   action: AutoTeleportAction
-  status: TransactionStatus
-  isError: boolean
 }>()
 
 const { canMint, canList } = useDropMassMintState()
@@ -86,6 +84,16 @@ const modalStep = ref<ModalStep>(ModalStep.OVERVIEW)
 const autoteleportCompleted = ref(false)
 const isModalOpen = useVModel(props, 'modelValue')
 
+const isError = computed(() => props.action.details.isError)
+const status = computed(() => props.action.details.status)
+const isLoading = computed(() => props.action.details.isLoading)
+
+const { isTransactionSuccessful } = useTransactionSuccessful({
+  status,
+  isError,
+  isLoading,
+})
+
 const isSingleMintNotReady = computed(
   () => amountToMint.value === 1 && !canMint.value,
 )
@@ -121,7 +129,8 @@ const moveSuccessfulDrop = computed<boolean>(
   () =>
     imagePreloadingCompleted.value
     && Boolean(mintingSession.value.items.length)
-    && Boolean(mintingSession.value.txHash),
+    && Boolean(mintingSession.value.txHash)
+    && isTransactionSuccessful.value,
 )
 
 const transactionStatus = computed(() => {

diff --git a/components/collection/utils/types.ts b/components/collection/utils/types.ts
@@ -1,4 +1,4 @@
-import type { CollectionMetadata } from '@/components/rmrk/service/scheme'
+import type { CollectionMetadata } from '@/types'
 
 export type Stats = {
   listedCount?: number

diff --git a/components/collection/utils/useCollectionDetails.ts b/components/collection/utils/useCollectionDetails.ts
@@ -1,7 +1,7 @@
 import { useQuery } from '@tanstack/vue-query'
 import type { Stats } from './types'
 import { getVolume } from '@/utils/math'
-import type { NFT, NFTMetadata } from '@/components/rmrk/service/scheme'
+import type { NFT, NFTMetadata } from '@/types'
 import type { NFTListSold } from '@/components/identity/utils/useIdentity'
 import { processSingleMetadata } from '@/utils/cachingStrategy'
 import collectionBuyEventStatsById from '@/queries/subsquid/general/collectionBuyEventStatsById.query'

diff --git a/components/common/autoTeleport/AutoTeleportModal.vue b/components/common/autoTeleport/AutoTeleportModal.vue
@@ -282,6 +282,7 @@ watch(
         const { isTransactionSuccessful } = useTransactionSuccessful({
           isError: action.isError,
           status: action.status,
+          isLoading: action.isLoading,
         })
 
         watch(

diff --git a/components/common/itemTransfer/ItemTransferModal.vue b/components/common/itemTransfer/ItemTransferModal.vue
@@ -115,7 +115,7 @@ import { NeoButton, NeoIcon, NeoModal } from '@kodadot1/brick'
 import { Interaction } from '@kodadot1/minimark/v1'
 import { toSubstrateAddress } from '@/services/profile'
 import ModalIdentityItem from '@/components/shared/ModalIdentityItem.vue'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import BasicImage from '@/components/shared/view/BasicImage.vue'
 import { parseNftAvatar } from '@/utils/nft'
 import AddressInput from '@/components/shared/AddressInput.vue'

diff --git a/components/common/listingCart/ListingCartModal.vue b/components/common/listingCart/ListingCartModal.vue
@@ -119,6 +119,7 @@ import useAutoTeleportActionButton from '@/composables/autoTeleport/useAutoTelep
 const { urlPrefix } = usePrefix()
 const preferencesStore = usePreferencesStore()
 const listingCartStore = useListingCartStore()
+const { closeListingCartModal } = useListingCartModal()
 const { $i18n } = useNuxtApp()
 const {
   transaction,
@@ -133,6 +134,7 @@ const {
 const { isTransactionSuccessful } = useTransactionSuccessful({
   status,
   isError,
+  isLoading,
 })
 
 const { chainSymbol, decimals } = useChain()
@@ -143,9 +145,7 @@ const floorPricePercentAdjustment = ref()
 const itemCount = ref(listingCartStore.count)
 const items = ref<ListCartItem[]>([])
 
-const isSuccessModalOpen = computed(
-  () => Boolean(items.value.length) && isTransactionSuccessful.value,
-)
+const isSuccessModalOpen = ref(false)
 
 const teleportTransitionTxFees = computed(() =>
   format(
@@ -283,29 +283,41 @@ async function confirm({ autoteleport }: AutoTeleportActionButtonConfirmEvent) {
       await submitListing()
     }
 
-    listingCartStore.clearListedItems()
     closeListingCartModal()
-    resetCartToDefaults()
+    onModalAnimation(() => {
+      listingCartStore.clearListedItems()
+      resetCartToDefaults()
+    })
   }
   catch (error) {
     warningMessage(error)
   }
 }
 
 const onClose = () => {
-  resetCartToDefaults()
   closeListingCartModal()
+  onModalAnimation(resetCartToDefaults)
 }
 
 const handleSuccessModalClose = () => {
-  items.value = []
+  isSuccessModalOpen.value = false
+  onModalAnimation(() => {
+    items.value = []
+    isTransactionSuccessful.value = false
+  })
 }
 
 const resetCartToDefaults = () => {
   fixedPrice.value = undefined
   floorPricePercentAdjustment.value = undefined
 }
 
+watch(computed(() => Boolean(items.value.length) && isTransactionSuccessful.value), (show) => {
+  if (show) {
+    isSuccessModalOpen.value = show
+  }
+})
+
 watch(
   () => listingCartStore.count,
   () => {
@@ -315,17 +327,10 @@ watch(
   },
 )
 
-watch(
-  () => preferencesStore.listingCartModalOpen,
-  (listingCartModalOpen) => {
-    if (!listingCartModalOpen) {
-      listingCartStore.clearDiscardedItems()
-    }
-  },
-)
-
-const closeListingCartModal = () =>
-  (preferencesStore.listingCartModalOpen = false)
+useModalIsOpenTracker({
+  isOpen: computed(() => preferencesStore.listingCartModalOpen),
+  onChange: () => listingCartStore.clearDiscardedItems(),
+})
 
 onBeforeMount(closeListingCartModal)
 onUnmounted(closeListingCartModal)

diff --git a/components/common/shoppingCart/types.ts b/components/common/shoppingCart/types.ts
@@ -2,7 +2,7 @@ import type {
   CollectionFloorPrice,
   EntityWithId,
   NFTMetadata,
-} from '@/components/rmrk/service/scheme'
+} from '@/types'
 
 import type { Royalty } from '@/utils/royalty'
 

diff --git a/components/common/shoppingCart/utils.ts b/components/common/shoppingCart/utils.ts
@@ -3,7 +3,7 @@ import { calculateExactUsdFromToken } from '@/utils/calculation'
 import type { ListCartItem, ListCartItemMediaUrl } from '@/stores/listingCart'
 import { useFiatStore } from '@/stores/fiat'
 import { sum } from '@/utils/math'
-import type { NFT, TokenId } from '@/components/rmrk/service/scheme'
+import type { NFT, TokenId } from '@/types'
 import { chainPropListOf } from '@/utils/config/chain.config'
 import type { MakingOfferItem } from '@/components/offer/types'
 

diff --git a/components/create/CreateCollection.vue b/components/create/CreateCollection.vue
@@ -248,8 +248,9 @@ const displaySuccessModal = ref(false)
 const { transaction, status, isLoading, isError, blockNumber, txHash }
   = useTransaction()
 const { isTransactionSuccessful } = useTransactionSuccessful({
-  isError: isError,
-  status: status,
+  status,
+  isError,
+  isLoading,
 })
 const { urlPrefix, setUrlPrefix } = usePrefix()
 const { $consola, $i18n } = useNuxtApp()

diff --git a/components/create/CreateNft.vue b/components/create/CreateNft.vue
@@ -299,6 +299,7 @@ import {
   NeoSelect,
   NeoSwitch,
 } from '@kodadot1/brick'
+import { toNFTId } from '@kodadot1/minimark/v2'
 import type { CreatedNFT } from '@kodadot1/minimark/v1'
 import { Interaction } from '@kodadot1/minimark/v1'
 import CreateNftPreview from './CreateNftPreview.vue'
@@ -313,7 +314,6 @@ import { availablePrefixes } from '@/utils/chain'
 import { balanceFrom } from '@/utils/balance'
 import { DETAIL_TIMEOUT } from '@/utils/constants'
 import { delay } from '@/utils/fetch'
-import { toNFTId } from '@/components/rmrk/service/scheme'
 import type { AutoTeleportAction } from '@/composables/autoTeleport/types'
 import type { AutoTeleportActionButtonConfirmEvent } from '@/components/common/autoTeleport/AutoTeleportActionButton.vue'
 

diff --git a/components/gallery/GalleryItem.vue b/components/gallery/GalleryItem.vue
@@ -178,8 +178,6 @@ import GalleryItemDescription from './GalleryItemDescription.vue'
 import GalleryItemTabsPanel from './GalleryItemTabsPanel/GalleryItemTabsPanel.vue'
 import UnlockableTag from './UnlockableTag.vue'
 import { useGalleryItem } from './useGalleryItem'
-import CarouselTypeRelated from '@/components/carousel/CarouselTypeRelated.vue'
-import CarouselTypeVisited from '@/components/carousel/CarouselTypeVisited.vue'
 import CollectionDetailsPopover from '@/components/collectionDetailsPopover/CollectionDetailsPopover.vue'
 import { MediaType } from '@/components/rmrk/types'
 import { usePreferencesStore } from '@/stores/preferences'

diff --git a/components/gallery/GalleryItemAction/GalleryItemAction.vue b/components/gallery/GalleryItemAction/GalleryItemAction.vue
@@ -29,7 +29,7 @@ import GalleryItemOffer from './GalleryItemActionType/GalleryItemOffer.vue'
 import GalleryItemPriceRelist from './GalleryItemActionType/GalleryItemRelist.vue'
 import { listVisible, offerVisible } from '@/utils/config/permission.config'
 import type { NFTOffer } from '@/composables/useNft'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 
 const props = defineProps<{
   nft: NFT | undefined

diff --git a/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemBuy.vue b/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemBuy.vue
@@ -56,7 +56,7 @@ import GalleryItemPriceSection from '../GalleryItemActionSection.vue'
 import { useShoppingCartStore } from '@/stores/shoppingCart'
 import { usePreferencesStore } from '@/stores/preferences'
 import { openShoppingCart } from '@/components/common/shoppingCart/ShoppingCartModalConfig'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import { nftToShoppingCartItem } from '@/components/common/shoppingCart/utils'
 import { doAfterCheckCurrentChainVM } from '@/components/common/ConnectWallet/openReconnectWalletModal'
 

diff --git a/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemOffer.vue b/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemOffer.vue
@@ -20,7 +20,7 @@
 
 <script setup lang="ts">
 import { NeoButton } from '@kodadot1/brick'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import { nftToOfferItem } from '@/components/common/shoppingCart/utils'
 import { usePreferencesStore } from '@/stores/preferences'
 import { useMakingOfferStore } from '@/stores/makeOffer'