Simplet POAP fixes

Author: urko94

frontend/components/parts/airdrop/AirdropModal.vue

@@ -48,7 +48,7 @@ const methods = [
   },
 ];
 
-const availableNFTs = computed(() => maxSupply - userStore.users.length - items.value.length - 1000);
+const availableNFTs = computed(() => maxSupply - userStore.users.length - items.value.length);
 
 const isButtonDisabled = computed(() => {
   switch (uploadStep.value) {
@@ -150,7 +150,7 @@ async function deploy() {
   }
   userStore.balance = 0;
 
-  uploadStep.value = res ? Step.DEPLOYED : Step.REVIEW;
+  uploadStep.value = res ? Step.DEPLOYED : Step.DATA;
 }
 </script>
 

frontend/components/parts/form/Share.vue

@@ -35,7 +35,12 @@ onMounted(async () => {
         <p class="mb-4">{{ metadata.description }}</p>
 
         <!-- Transaction -->
-        <a v-if="txHash" :href="transactionLink(txHash)" class="hover:underline" target="_blank">
+        <a
+          v-if="txHash"
+          :href="transactionLink(txHash, config.public.CHAIN_ID)"
+          class="hover:underline"
+          target="_blank"
+        >
           Transaction: {{ shortHash(txHash) }}
         </a>
       </div>

frontend/components/parts/poap/PoapInfo.vue

@@ -7,7 +7,9 @@
         size="sm"
       />
     </div>
-    <n-checkbox v-model:checked="immediatelyShowQr" class="mt-2 mb-1"> Immediately show QR code </n-checkbox>
+    <n-checkbox v-if="Number(config.public.CLAIM_START) > 0" v-model:checked="immediatelyShowQr" class="mt-2 mb-1">
+      Immediately show QR code (for testing purposes)
+    </n-checkbox>
     <BtnLink
       :link="`${domain}/poap/scan-qr?immediatelyShowQr=${immediatelyShowQr}${stringifyQuery(currentRoute.query, '&')}`"
     />
@@ -24,9 +26,11 @@
 </template>
 
 <script lang="ts" setup>
+const config = useRuntimeConfig();
+const { currentRoute } = useRouter();
+
 const domain = window.location.origin;
 const immediatelyShowQr = ref(false);
-const { currentRoute } = useRouter();
 
 async function navigateToReserveDrop() {
   try {

frontend/composables/useClaim.ts

@@ -72,6 +72,14 @@ export default function useClaim() {
     const uri = await contract.value.read.tokenURI([id]);
     return await parseLink(uri);
   }
+  async function getTotalSupply(): Promise<number> {
+    if (!contractStore.totalSupply) {
+      await initContract();
+      const max = await contract.value.read.totalSupply([]);
+      contractStore.totalSupply = max >= maxUint32 ? Number.MAX_SAFE_INTEGER : Number(max);
+    }
+    return contractStore.totalSupply;
+  }
 
   async function isAutoIncrement(): Promise<boolean> {
     if (contractStore.autoIncrement === null) {
@@ -87,7 +95,11 @@ export default function useClaim() {
       if (!nftId) {
         const balance = await getBalance();
         if (Number(balance) === 0) return null;
+      } else {
+        const totalSupply = await getTotalSupply();
+        if (Number(nftId) > totalSupply) return null;
       }
+
       const id = nftId || (await getTokenOfOwner(0));
       const url = await getTokenUri(Number(id));
       const parsedUrl = await parseLink(url);
@@ -106,6 +118,7 @@ export default function useClaim() {
     await ensureCorrectNetwork();
     let success: any = false;
     const image = await parseLink(metadata?.image || '');
+    contractStore.totalSupply += 1;
 
     try {
       if (wallet.value && info.activeWallet?.address) {
@@ -193,6 +206,7 @@ export default function useClaim() {
     addNftId,
     contractError,
     getMaxSupply,
+    getTotalSupply,
     getName,
     isAutoIncrement,
     loadNft,

frontend/composables/useWalletConnect.ts

@@ -45,6 +45,7 @@ export default function useWalletConnect() {
   }
 
   async function login(admin = false) {
+    if (authStore.loggedIn && !admin) modalWalletVisible.value = false;
     if (loading.value || authStore.loggedIn || !admin) return;
 
     loading.value = true;

frontend/lib/misc/errors.ts

@@ -83,7 +83,7 @@ export const ErrorCodes = {
   422006: 'Captcha verification is required. Please solve the captcha.',
   422007: 'Captcha error. Please solve the captcha again.',
   422008: 'User has already minted. Duplicate minting is not allowed.',
-  422009: 'Wallet belongs to another user. Please log in with a different wallet.',
+  422009: 'User with this wallet address already exists. Please use a different wallet.',
   422013: 'Wallet address is not valid.',
   422014: 'Email or wallet address is required. Please provide one of them.',
 

frontend/pages/poap/reserve-nft.vue

@@ -79,7 +79,7 @@ const router = useRouter();
 const message = useMessage();
 
 const { query } = useRoute();
-const { loadNft } = useClaim();
+const { getTotalSupply, loadNft } = useClaim();
 const { parseLink } = useIpns();
 const { handleError } = useErrors();
 const { connected } = useWalletConnect();
@@ -90,6 +90,7 @@ const tokenValidityInPercent = ref(100);
 const dropReserved = ref(false);
 const nfts = ref<Array<string>>([]);
 const token = query.nftToken?.toString();
+const totalSupply = await getTotalSupply();
 
 let calcRemainingTimeInterval: any = null as any;
 
@@ -132,7 +133,7 @@ onMounted(() => {
     }
 
     const tokenIssueDate = Number(dayjs(decoded.iat * 1000));
-    isTokenValid.value = Number(dayjs()) - tokenIssueDate < 7000;
+    isTokenValid.value = Number(dayjs()) - tokenIssueDate < 12000;
 
     calcRemainingTimeInterval = setInterval(() => {
       const currDate = dayjs();
@@ -173,6 +174,8 @@ function loadImages() {
   [1, 2, 3, 4, 5].forEach(i => loadImage(i));
 }
 async function loadImage(i: number) {
+  if (i > totalSupply) return;
+
   const metadata = await loadNft(i);
 
   const image = await parseLink(metadata?.image || '');

frontend/stores/contract.ts

@@ -7,6 +7,7 @@ export const useContractStore = defineStore('contract', {
     balance: 0n,
     name: '',
     maxSupply: 0,
+    totalSupply: 0,
   }),
 
   getters: {},