feat: 🎸 souvenir form validation, contracts updated

Author: oleggrib

poap/contract/contracts/Poap.sol

@@ -3,7 +3,6 @@
 	import context from './lib/context';
 	import NotFound from './routes/NotFound.svelte';
 	import MintSouvenir from './routes/MintSouvenir.svelte';
-	import TLinkRequired from './routes/TLinkRequired.svelte';
 	import CreateSouvenir from './routes/CreateSouvenir.svelte';
 	import './styles.css';
 

poap/src/App.svelte

@@ -10,15 +10,15 @@
 	let eventName = '';
 	let description = '';
 	let imageUrl = '';
-	let imageUrlValid = '';
+	let imageUrlValid = false;
 	let selectedFile = null;
 	let fileInput = null;
 	let startDate = '';
-	let startDateValid = '';
+	let startDateValid = false;
 	let endDate = '';
-	let endDateValid = '';
+	let endDateValid = false;
 	let attendees = '';
-	let attendeesValid = '';
+	let attendeesValid = false;
 	let mintCondition = 'public';
 	let secret = '';
 	let tlink = '';
@@ -41,19 +41,7 @@
 			return;
 		}
 		// Handle form submission
-		tlink = await getTlink(
-			{
-				name: eventName,
-				description,
-				imageUrl,
-				startDate,
-				endDate,
-				attendees,
-				mintCondition,
-				secret
-			},
-			selectedFile
-		);
+		tlink = await getTlink();
 	}
 
 	$: {
@@ -96,15 +84,15 @@
 			missingRequirement += 'Private minting require secret word. ';
 		}
 
-		if (attendees >= 25  && totalBalance < 100n * 10n**18n) {
+		if (parseInt(attendees || "0") >= 25  && totalBalance < 100n * 10n**18n) {
 			missingRequirement += 'You need to hold at least 100 SLN to create souvenir with 25+ attendees. ';
 		}
 	}
 	$: {
 		startDateValid = !endDate || startDate <= endDate
 		endDateValid = endDate >= new Date().toISOString().split("T")[0]
-		attendeesValid = attendees > 0
-		imageUrlValid = !imageUrl || uriPattern.test(imageUrl)
+		attendeesValid = parseInt(attendees || "0") > 0
+		imageUrlValid = imageUrl && uriPattern.test(imageUrl)
 		
 	}
 	function getSLNTotalBalance() {
@@ -134,7 +122,7 @@
 		const signature = (await tokenscript.personal.sign({ data: msgToSign })) as string;
 
 		// TODO fix coinBase smartwalletSignature
-		console.log({ msgToSign, signature });
+		// console.log({ msgToSign, signature });
 
 		tokenscript.action.showLoader();
 

poap/src/routes/CreateSouvenir.svelte

@@ -93,7 +93,6 @@
 	}
 
 	async function handleSouvenirChange() {
-		console.log('...handleSouvenirChange');
 		try {
 			let status = await getPoapStatus(poapId);
 			console.log({ status });
@@ -112,8 +111,6 @@
 			tokenscript.action.showMessageToast('error', 'Failed to prepare Minting', error.message);
 		}
 	}
-
-	// TODO update link for "Make My Own"
 </script>
 
 <div
@@ -210,7 +207,7 @@
 		<div class="text-white/80 hover:text-white text-sm transition-colors mt-2">
 			<a
 				target="_blank"
-				href="https://viewer-staging.tokenscript.org/?chain=11155111&contract=0xcddcdc3231d062de953c94f59a335b1a4911ffdc&scriptId=7738_49#card=CreateSouvenir"
+				href={`https://viewer${env.CONTRACT_CHAIN == "11155111" ? "-staging" : ""}.tokenscript.org/?chain=${env.CONTRACT_CHAIN}&contract=${env.CONTRACT_ADDRESS}&scriptId=7738_${env.SCRIPT_ID}#card=CreateSouvenir`}
 				>Make My Own</a
 			>
 		</div>