Skip to content

Fixed close REDEEM modal button not workin. Removed global handler fo… #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OFiDCrypt merged 1 commit into from
Jun 24, 2026
Merged

Fixed close REDEEM modal button not workin. Removed global handler fo… #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 0 additions & 100 deletions assets/js/ofid-main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,104 +331,4 @@ document.addEventListener('DOMContentLoaded', () => {
}
}
});
});

// ====================== GLOBAL REDEEM HANDLER (Shared across wallet + redeem.html) ======================

/**
* performRedeem - Reusable redemption function
* @param {string} linkId - 13-digit code
* @param {string} destinationWallet - Solana wallet address
* @param {object} options - onSuccess, onError, loadingText, etc.
*/
window.performRedeem = async function(linkId, destinationWallet, options = {}) {
const {
onSuccess = null,
onError = null,
loadingText = "Redeeming...",
successMessage = "Redirecting to Kinnected..."
} = options;

if (!linkId || !destinationWallet) {
const msg = "⚠️ Please fill in both fields.";
if (onError) onError(msg);
return { success: false, message: msg };
}

// Try Railway first, then localhost
const possibleUrls = [
"https://giddy-key-swaps-production.up.railway.app/api/secure-redeem",
"http://127.0.0.1:5000/api/secure-redeem",
"http://localhost:5000/api/secure-redeem"
];

let data = null;
let lastError = null;

for (const url of possibleUrls) {
try {
console.log("🔄 Trying backend:", url);
const response = await fetch(url, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ linkId, destinationWallet })
});

data = await response.json();
console.log("✅ Success with:", url);
break;
} catch (e) {
lastError = e;
console.log("❌ Failed:", url);
}
}

if (!data) {
const msg = "Network error: " + (lastError?.message || "All backends failed");
if (onError) onError(msg);
return { success: false, message: msg };
}

if (data.success) {
if (onSuccess) onSuccess(data);
} else {
if (onError) onError(data.message || "Redemption failed");
}

return data;
};

// ====================== WALLET MODAL REDEEM IN KINNECTED BUTTON ======================
document.addEventListener('DOMContentLoaded', () => {
const kinnectedBtn = document.querySelector('button[onclick="redeemInKinnected()"]');

if (kinnectedBtn) {
kinnectedBtn.addEventListener('click', async (e) => {
e.preventDefault();

const linkId = document.getElementById('redeem-input').value.trim();
const destinationWallet = document.getElementById('wallet-address').value.trim();
const messageDiv = document.getElementById('redeem-message');

// Reset
messageDiv.textContent = '';
messageDiv.style.color = '';

const result = await window.performRedeem(linkId, destinationWallet, {
loadingText: "Checking...",
onSuccess: (data) => {
messageDiv.style.color = '#2ecc71';
messageDiv.textContent = 'Success! Redirecting...';

setTimeout(() => {
window.location.href = `https://kinnected-links.com/k7m9x2qw8e4r5t6y/pay.html?id=${linkId}`;
}, 800);
},
onError: (msg) => {
messageDiv.style.color = '#e74c3c';
messageDiv.textContent = msg;
}
});
});
}
});
Loading
Loading