Merge remote-tracking branch 'origin/main' into quick-fixes-drop

kodadot · Dec 15, 2023 · dc706ac · dc706ac
2 parents 191a783 + 587085b
commit dc706ac
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/components/collection/drop/HolderOfGenerative.vue b/components/collection/drop/HolderOfGenerative.vue
@@ -37,8 +37,10 @@
             <UnlockableSlider :value="mintedCount / maxCount" />
           </div>
           <div class="my-5">
-            <div class="is-flex is-justify-content-space-between">
-              <!-- <div v-if="hasUserMinted" class="is-flex is-align-items-center">
+            <div
+              v-if="hasUserMinted"
+              class="is-flex is-justify-content-flex-end is-align-items-center">
+              <div class="is-flex is-align-items-center">
                 <div class="mr-2">
                   {{ $t('mint.unlockable.nftAlreadyMinted') }}
                 </div>
@@ -50,8 +52,10 @@
                   class="my-2 mint-button"
                   :tag="NuxtLink"
                   :label="$t('mint.unlockable.seeYourNft')"
-                  :to="`/${urlPrefix}/u/${accountId}`" />
-              </div> -->
+                  :to="`/${urlPrefix}/gallery/${hasUserMinted}`" />
+              </div>
+            </div>
+            <div v-else class="is-flex is-justify-content-space-between">
               <div class="mt-4">
                 <CollectionDropHolderOfCollection
                   :is-holder="isHolderOfTargetCollection"
@@ -70,6 +74,7 @@
                     class="minimum-funds-description" />
                 </div>
               </div>
+
               <div class="is-flex">
                 <NeoButton
                   ref="root"
@@ -135,6 +140,8 @@ import Loader from '@/components/shared/Loader.vue'
 
 const holderOfCollectionId = '50' // ChaosFlakes | todo: mock for testing, should be fetched from backend
 
+const NuxtLink = resolveComponent('NuxtLink')
+
 const props = defineProps({
   drop: {
     type: Object,
@@ -163,13 +170,14 @@ const disabledByBackend = computed(() => props.drop?.disabled)
 const defaultImage = computed(() => props.drop?.image)
 const defaultName = computed(() => props.drop?.name)
 const defaultMax = computed(() => props.drop?.max || 255)
-const { mintedDropCount, fetchDropStatus } = useDropStatus(props.drop.alias)
+const { currentAccountMintedToken, mintedDropCount, fetchDropStatus } =
+  useDropStatus(props.drop.alias)
 const instance = getCurrentInstance()
 const mintNftSN = ref('0')
 const { doAfterLogin } = useDoAfterlogin(instance)
 const { $i18n, $consola } = useNuxtApp()
 const root = ref()
-
+const { urlPrefix } = usePrefix()
 const { toast } = useToast()
 const { accountId, isLogIn } = useAuth()
 
@@ -246,11 +254,11 @@ const maxCount = computed(
   () => collectionData.value?.collectionEntity?.max || defaultMax.value,
 )
 
-// const hasUserMinted = computed(() =>
-//   currentAccountMintedToken.value
-//     ? `${collectionId.value}-${currentAccountMintedToken.value.id}`
-//     : mintedNft.value?.id,
-// )
+const hasUserMinted = computed(() =>
+  currentAccountMintedToken.value
+    ? `${collectionId.value}-${currentAccountMintedToken.value.id}`
+    : mintedNft.value?.id,
+)
 
 const mintedCount = computed(() =>
   Math.min(mintedDropCount.value, maxCount.value),