Fix modal popup problem

BTI-US · May 5, 2024 · b5c5668 · b5c5668
1 parent d426c27
commit b5c5668
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/js/claim-airdrop.js b/js/claim-airdrop.js
@@ -224,13 +224,6 @@ async function initiateTransaction() {
     displayMessage('Waiting for user confirmation', 'info');
 
     try {
-        // Ensuring activeNetwork is valid
-        if (!['baseSepolia', 'baseMainnet', 'sepolia'].includes(activeNetwork)) {
-            console.log('Invalid network selection');
-            displayMessage('Invalid network selection', 'error');
-            return;
-        }
-
         // Acquire full address from the DOM element
         const fullAddress = document.getElementById('address').getAttribute('data-full-address');
         console.log('Full Address:', fullAddress);
@@ -341,10 +334,6 @@ async function confirmTransaction() {
             // Show the modal
             bootstrapModal.show();
 
-            // Set a timeout to close the modal after 5 seconds
-            setTimeout(function() {
-                bootstrapModal.hide();
-            }, 5000);
             // Show fireworks animation for 10 seconds
             startFireworksForDuration(10000);
         } else {

diff --git a/js/cookie-consent.js b/js/cookie-consent.js
@@ -1,3 +1,4 @@
+/* global $ */
 $(document).ready(function() {
     function checkCookieConsent() {
         if (!localStorage.getItem('cookieConsent')) {

diff --git a/js/get-promotion-code.js b/js/get-promotion-code.js
@@ -1,5 +1,3 @@
-let authWebAddress = null;
-
 function checkPromotionCode(event) {
     event.preventDefault();
 
@@ -74,8 +72,9 @@ function escapeHtml(str) {
                 .replace(/'/g, "&#039;");
 }
 
-// Reset the promotionCodeInfo to empty after refreshing the webpage
-document.addEventListener('DOMContentLoaded', function() {
+/* global $ */
+$(document).on('show.bs.modal','#connectModal2', function () {
+    // Reset the promotionCodeInfo to empty after popup is shown
     document.getElementById('promotionCodeInfo').innerHTML = '';
 
     fetch('../contract-config.json')
@@ -87,14 +86,15 @@ document.addEventListener('DOMContentLoaded', function() {
         })
         .then(jsonConfig => {
             // Access properties
-            authWebAddress = jsonConfig.authWebAddress;
+            let authWebAddress = jsonConfig.authWebAddress;
 
             // Additional validation can be performed here as needed
             if (!authWebAddress) {
                 throw new Error("Required configuration values (authWebAddress) are missing.");
             }
 
             document.getElementById('generatePromotionButton').addEventListener('click', function() {
+                console.log('Generating promotion code...');
                 const address = getFullAddress();
                 if (address) {
                     // Construct the URL with the address query parameter
@@ -111,6 +111,7 @@ document.addEventListener('DOMContentLoaded', function() {
                         // Handle the response to display the promotion code
                         .then(response => {
                             const promotionCode = response.data.promotion_code;
+                            console.log('Promotion code:', promotionCode);
                             // Assuming the response returns the promotion code directly
                             let promotionCodeHtml = '<div class="address-container code-container">';
                             promotionCodeHtml += '<input id="promotionCode" type="text" value="' + escapeHtml(promotionCode) + '" readonly data-full-code="' + escapeHtml(promotionCode) + '">';