Merge pull request #10859 from kodadot/main

(beta/fix): Mid-August 2024 Tiger 🐅

.github/push_release_beta.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# experimental 
-# https://github.com/kodadot/nft-gallery/issues/5770 
+# experimental
+# https://github.com/kodadot/nft-gallery/issues/5770
 
-gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "Beta Update \n"}{ print}' $1 | gh pr create -t "beta update" -d -H main -B beta -l beta --body-file -
+gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "Beta Update \n"}{ print}' $1 | gh pr create -t "(beta): $(date +"%B %Y")" -d -H main -B beta -l beta --body-file -

.github/push_release_production.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# experimental 
-# https://github.com/kodadot/nft-gallery/issues/5770 
+# experimental
+# https://github.com/kodadot/nft-gallery/issues/5770
 
-gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "Release Update \n"}{ print}' $1 | gh pr create -t "release update" -d -H beta -B production -l release --body-file -
+gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "Release Update \n"}{ print}' $1 | gh pr create -t "(prod): $(date +"%B %Y")" -d -H beta -B production -l release --body-file -

components/collection/drop/GenerativePreview.vue

@@ -53,15 +53,26 @@
         <span v-else>{{ $t('free') }}</span>
       </div>
       <div class="flex justify-end items-center">
-        <div class="mr-4 text-neutral-7">
+        <div
+          v-if="!isUnlimited"
+          class="mr-4 text-neutral-7"
+        >
           {{ mintedPercent }}% ~
         </div>
         <div
           v-if="drop.minted >= 0 && drop.max"
-          class="font-bold"
+          class="font-bold flex gap-2"
         >
-          {{ drop.minted }}/{{ drop.max }}
-          {{ $t('statsOverview.minted') }}
+          <span>{{ drop.minted }}</span>
+          <span>/</span>
+          <span v-if="isUnlimited">
+            <NeoIcon
+              icon="infinity"
+              pack="fas"
+            />
+          </span>
+          <span v-else>{{ drop.max }}</span>
+          <span>{{ $t('statsOverview.minted') }}</span>
         </div>
         <div v-else>
           <NeoSkeleton width="100" />
@@ -111,6 +122,7 @@ const { formatted: formattedPrice } = useAmount(
 )
 
 const emit = defineEmits(['generation:start', 'generation:end', 'mint'])
+const isUnlimited = computed(() => drop.value.max !== undefined && drop.value.max > Number.MAX_SAFE_INTEGER)
 
 const { start: startTimer } = useTimeoutFn(() => {
   // quick fix: ensure that even if the completed event is not received, the loading state of the drop can be cleared

components/collection/drop/MintButton.vue

@@ -95,6 +95,10 @@ const label = computed(() => {
     return $i18n.t('mint.unlockable.notEligibility')
   }
 
+  if (isMintNotLive.value) {
+    return $i18n.t('mint.unlockable.mintingNotLive')
+  }
+
   switch (drop.value.type) {
     case 'free':
       return $i18n.t('drops.mintForFree')

components/drops/BasicDropCard.vue

@@ -43,12 +43,21 @@
             </div>
           </div>
           <div
-            class="h-[28px] flex justify-between items-center flex-wrap gap-y-4 gap-x-2"
+            class="h-[28px] flex justify-between items-center gap-y-4 gap-x-2"
           >
-            <div class="flex gap-4">
+            <div
+              v-if="dropStatus !== 'scheduled_soon'"
+              class="flex gap-4"
+            >
               <slot name="supply">
                 <div>
-                  <span>{{ minted }}</span><span class="text-k-grey text-xs">/{{ dropMax }}</span>
+                  <span>{{ minted }}</span><span class="text-k-grey text-xs">/
+                    <span v-if="isUnlimited"><NeoIcon
+                      icon="infinity"
+                      pack="fas"
+                    /></span>
+                    <span v-else>{{ dropMax }}</span>
+                  </span>
                 </div>
               </slot>
               <div
@@ -86,6 +95,7 @@
 </template>
 
 <script setup lang="ts">
+import { NeoIcon } from '@kodadot1/brick'
 import type { Prefix } from '@kodadot1/static'
 import type { DropStatus } from '@/components/drops/useDrops'
 import { chainPropListOf } from '@/utils/config/chain.config'
@@ -123,6 +133,7 @@ const props = withDefaults(
 )
 
 const { placeholder } = useTheme()
+const isUnlimited = computed(() => props.dropMax > Number.MAX_SAFE_INTEGER)
 
 const chainPropList = chainPropListOf(props.dropPrefix)
 const { usd: formattedPrice } = useAmount(

components/profile/activityTab/History.vue

@@ -178,6 +178,7 @@ const createTable = (): void => {
     const nftId = newEvent['nft'] ? newEvent['nft']['id'] : 'id'
     // Type
     switch (newEvent['interaction']) {
+      case Interaction.MINT:
       case Interaction.MINTNFT:
         event['From'] = newEvent['caller']
         event['To'] = ''

locales/en.json

@@ -688,7 +688,8 @@
       "readyToMint": "Ready to Mint: {0} NFTs Remaining",
       "requirementsNotMet": "Requirements not met",
       "holderOfWarning1": "Each {0} collection NFT allows you to <strong>mint one</strong> new NFT.",
-      "holderOfWarning2": "After a claim, that NFT <strong>can't be</strong> used for another mint."
+      "holderOfWarning2": "After a claim, that NFT <strong>can't be</strong> used for another mint.",
+      "mintingNotLive": "Minting Not Started Yet"
     },
     "blockchain": {
       "label": "Select Blockchain",

nuxt.config.ts

@@ -410,7 +410,7 @@ export default defineNuxtConfig({
       transakEnvironment: process.env.TRANSAK_ENV || 'PRODUCTION',
       walletConnectProjectId:
         process.env.WALLET_CONNECT_PROJECT_ID
-        || '3fcc6bba6f1de962d911bb5b5c3dba68', // WalletConnect project ID from `https://wagmi.sh/core/api/connectors/walletConnect#projectid`
+        || '4483dd2f5c3049479618d611e8a1087a', // WalletConnect project ID from `https://wagmi.sh/core/api/connectors/walletConnect#projectid`
     },
   },