Skip to content

Hooked up REEDEEM to Kinnected API call from wallet.html with new SUC… #755

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

Hooked up REEDEEM to Kinnected API call from wallet.html with new SUC… #755

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: 100 additions & 0 deletions assets/js/ofid-main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,4 +331,104 @@ 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;
}
});
});
}
});
142 changes: 98 additions & 44 deletions assets/js/webapp/wallet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@ function setWalletState(isConnected, publicKey = null, method = null) {
window.connectionMethod = connectionMethod;

// 2. Persist to LocalStorage
if (isConnected && connectedWallet) {
localStorage.setItem('wallet_address', connectedWallet);
localStorage.setItem('connection_method', connectionMethod);
if (isConnected && connectedWallet) {
localStorage.setItem('wallet_address', connectedWallet);
localStorage.setItem('connection_method', connectionMethod);

// === NEW: Also expose to window for swapUtils.js ===
window.connectionMethod = connectionMethod;
// === NEW: Also expose to window for swapUtils.js ===
window.connectionMethod = connectionMethod;

} else {
localStorage.removeItem('wallet_address');
localStorage.removeItem('connection_method');
window.connectionMethod = null;
}
} else {
localStorage.removeItem('wallet_address');
localStorage.removeItem('connection_method');
window.connectionMethod = null;
}

// 3. UI Elements
const navText = document.getElementById('walletBtnText');
Expand Down Expand Up @@ -418,7 +418,7 @@ function closeModal(modalId) {
function resetRedeemForm() {
const input = document.getElementById('redeem-input');
const msg = document.getElementById('redeem-message');
const btn = document.querySelector('#redeem-form button');
const btn = document.getElementById('redeem-submit-btn'); // ← Fixed: targets correct button

if (input) input.value = '';
if (msg) {
Expand All @@ -427,7 +427,7 @@ function resetRedeemForm() {
}
if (btn) {
btn.classList.remove('success', 'failure');
btn.textContent = 'Redeem';
btn.textContent = 'REDEEM';
btn.disabled = false;
}
}
Expand Down Expand Up @@ -520,7 +520,7 @@ document.addEventListener('click', (e) => {
if (addBtn && walletDropdown &&
!addBtn.contains(e.target) &&
!walletDropdown.contains(e.target)) {

walletDropdown.classList.add('hidden');
const mainChevron = document.getElementById('chevron');
if (mainChevron) mainChevron.classList.remove('rotate-180');
Expand All @@ -541,7 +541,7 @@ function initShareWalletButton() {
}

// 2. Updated: share only the address
const shareText = address;
const shareText = address;

// 3. Try native share
if (navigator.share) {
Expand All @@ -560,15 +560,15 @@ function initShareWalletButton() {
// 4. Fallback: Copy address to clipboard
try {
await navigator.clipboard.writeText(address);

// Visual feedback
const originalIcon = shareBtn.innerHTML;
shareBtn.innerHTML = `<i class="fas fa-check text-emerald-400"></i>`;

setTimeout(() => {
shareBtn.innerHTML = originalIcon;
}, 1500);

} catch (err) {
prompt("Copy your wallet address:", address);
}
Expand Down Expand Up @@ -668,7 +668,7 @@ async function handleCreateWallet() {

if (publicKey) {
console.log("✅ [Google] Wallet address received:", publicKey);

// Kill URL params to stop OAuth loop
clearUrlParams();

Expand Down Expand Up @@ -743,7 +743,7 @@ async function handleAppleSignIn() {

if (publicKey) {
console.log("✅ [Apple] Wallet address received:", publicKey);

// Kill URL params to stop OAuth loop
clearUrlParams();

Expand Down Expand Up @@ -1151,7 +1151,7 @@ async function confirmValueLock() {
setTimeout(() => { if (connectedWallet) updateWalletBalances(); }, 1500);
} catch (e) {
console.log(`[Swap Status] ${e.message === "USER_REJECTED" ? "Swap cancelled" : "Swap failed"}`);

if (e.message !== "USER_REJECTED") {
console.error(e);
alert(`❌ Swap failed: ${e.message}`);
Expand Down Expand Up @@ -1213,7 +1213,7 @@ async function confirmGiddySwap() {

} catch (e) {
console.log(`[Swap Status] ${e.message === "USER_REJECTED" ? "Swap cancelled" : "Swap failed"}`);

if (e.message !== "USER_REJECTED") {
console.error(e);
alert(`❌ Swap failed: ${e.message}`);
Expand Down Expand Up @@ -1303,48 +1303,99 @@ document.addEventListener('DOMContentLoaded', () => {
}
});

// ====================== REDEEM IN KINNECTED BUTTON LOGIC ======================
const kinnectedBtn = document.querySelector('button[onclick="redeemInKinnected()"]');
const redeemForm = document.getElementById('redeem-form');

if (redeemForm) {
redeemForm.addEventListener('submit', (e) => {
redeemForm.addEventListener('submit', async (e) => {
e.preventDefault();
const input = document.getElementById('redeem-input').value.trim();

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

messageDiv.textContent = '';
messageDiv.style.color = '#2ecc71';
button.classList.remove('success', 'failure');
messageDiv.style.color = '';

if (!input) {
messageDiv.textContent = 'Please enter a code.';
if (!linkId || !/^\d{13}$/.test(linkId)) {
messageDiv.textContent = !linkId ? 'Please enter a code.' : 'Invalid code: Must be exactly 13 digits.';
messageDiv.style.color = '#e74c3c';
button.classList.add('failure');
return;
}

if (!/^\d{13}$/.test(input)) {
messageDiv.textContent = 'Invalid code: Must be exactly 13 digits.';
if (!destinationWallet) {
messageDiv.textContent = 'Please enter or add a wallet address.';
messageDiv.style.color = '#e74c3c';
button.classList.add('failure');
button.textContent = 'INVALID';
return;
}

messageDiv.textContent = 'Validating code — redirecting to Kinnected!';
button.textContent = 'Checking...';
button.disabled = true;
const originalText = kinnectedBtn ? kinnectedBtn.textContent : 'Redeem';
if (kinnectedBtn) {
kinnectedBtn.textContent = 'Checking...';
kinnectedBtn.disabled = true;
}

setTimeout(() => {
window.location.href = `https://kinnected-links.com/k7m9x2qw8e4r5t6y/pay.html?id=${input}`;
}, 800);
await window.performRedeem(linkId, destinationWallet, {
onSuccess: (data) => {
// Show the nice modal instead of redirect
showRedeemSuccessModal(data);
},
onError: (msg) => {
messageDiv.style.color = '#e74c3c';
messageDiv.textContent = msg;
if (kinnectedBtn) {
kinnectedBtn.textContent = originalText;
kinnectedBtn.disabled = false;
}
}
});
});
}

const addBtn = document.getElementById('addWalletBtn');
if (addBtn) addBtn.addEventListener('click', toggleWalletDropdown);
// Show Success Modal (reused from redeem.html)
function showRedeemSuccessModal(data) {
const txHash = data.transaction_hash || "";
const shortHash = txHash ? txHash.slice(0, 8) + "..." + txHash.slice(-6) : "";
const solscanLink = txHash ? `https://solscan.io/tx/${txHash}` : "#";

document.getElementById('redeem-result-details').innerHTML = `
<div class="flex justify-between" style="color: var(--text-color);">
<span style="color: var(--text-muted, #a1a1aa);">Amount</span>
<span class="font-bold" style="color: var(--text-color);">${data.amount || "—"} ${data.token_name || ""}</span>
</div>
<div class="flex justify-between" style="color: var(--text-color);">
<span style="color: var(--text-muted, #a1a1aa);">Model</span>
<span class="font-medium" style="color: var(--text-color);">${data.model || "escrow"}</span>
</div>
<div class="flex justify-between items-center" style="color: var(--text-color);">
<span style="color: var(--text-muted, #a1a1aa);">Transaction</span>
<a href="${solscanLink}" target="_blank" class="font-mono text-emerald-400 hover:text-emerald-300 text-xs break-all" style="color: var(--accent-color, #4ade80);">
${shortHash || "—"}
</a>
</div>
`;

provider = window.phantom?.solana || window.solana;
setWalletState(false);
document.getElementById('redeem-solscan-link').href = solscanLink;

const modal = document.getElementById('redeem-success-modal');
modal.style.display = 'flex';
modal.classList.add('show');
}

function closeRedeemSuccessModal() {
const modal = document.getElementById('redeem-success-modal');
modal.style.display = 'none';
modal.classList.remove('show');
}

function closeRedeemSuccessModal() {
const modal = document.getElementById('redeem-success-modal');
if (modal) {
modal.style.display = 'none';
modal.classList.remove('show');
}
}

// ====================== LEGACY PHANTOM INIT (FIRST-TIME POPUP CONTROL) ======================
if (provider && provider.isPhantom) {
Expand Down Expand Up @@ -1486,4 +1537,7 @@ window.showTxSuccess = showTxSuccess;
window.closeTxSuccessModal = closeTxSuccessModal;

window.getPhantomSDK = getPhantomSDK;
window.isMobileDevice = isMobileDevice;
window.isMobileDevice = isMobileDevice;

// Kinnected Redeem
window.closeRedeemSuccessModal = closeRedeemSuccessModal;
Loading
Loading