Skip to content

Added smart address import to redeem modal. Added state refresh for r… #757

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 26, 2026
Merged

Added smart address import to redeem modal. Added state refresh for r… #757

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
Binary file added assets/images/webp/digital-gift-card-expb.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
165 changes: 153 additions & 12 deletions assets/js/webapp/wallet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,11 +398,29 @@ function sellToken() {
alert("Sell to Token / Exchange Loop Coming Soon...");
}

// ====================== QR / SCAN HELPER ======================
function scanQRCode() {
const helper = document.getElementById('scan-helper');

if (helper) {
helper.classList.toggle('hidden');

// Auto-hide after 4 seconds
setTimeout(() => {
if (helper) helper.classList.add('hidden');
}, 4000);
}

// Optional: future real QR scan would go here
console.log("📷 Scan & Send feature — coming soon");
}

// ====================== MODAL & REDEEM FUNCTIONS ======================
function openModal(modalId) {
if (modalId === 'redeem') {
document.getElementById('redeem-modal').style.display = 'flex';
resetRedeemForm();
populateRedeemAddress(); // Auto-populate + lock
}
}

Expand All @@ -416,7 +434,7 @@ function closeModal(modalId) {
function resetRedeemForm() {
const input = document.getElementById('redeem-input');
const msg = document.getElementById('redeem-message');
const btn = document.getElementById('redeem-submit-btn'); // ← Fixed: targets correct button
const btn = document.getElementById('redeem-submit-btn');

if (input) input.value = '';
if (msg) {
Expand All @@ -430,6 +448,65 @@ function resetRedeemForm() {
}
}

// ====================== SMART ADDRESS MODE (Locked by default) ======================
function populateRedeemAddress() {
const input = document.getElementById('wallet-address');
if (!input) return;

const connectedAddr = window.connectedWallet || localStorage.getItem('wallet_address');

if (connectedAddr) {
input.value = connectedAddr;
lockAddressField(input);
console.log("✅ Auto-populated and LOCKED:", connectedAddr);
} else {
unlockAddressField(input);
}
}

function lockAddressField(input) {
input.readOnly = true;
input.classList.add('locked-address');
updateAddressModeUI(true);
}

function unlockAddressField(input) {
input.readOnly = false;
input.value = ''; // Clear for safety
input.classList.remove('locked-address');
updateAddressModeUI(false);
}

function updateAddressModeUI(isLocked) {
const link = document.getElementById('manual-address-link');
if (!link) return;

if (isLocked) {
link.innerHTML = `✏️ <span>Use different address</span>`;
} else {
link.innerHTML = `➕ <span>Use connected wallet</span>`;
}
}

window.toggleAddressMode = function() {
const input = document.getElementById('wallet-address');
if (!input) return;

if (input.classList.contains('locked-address')) {
// Locked → unlock for manual
unlockAddressField(input);
} else {
// Unlocked → restore connected wallet
const connectedAddr = window.connectedWallet || localStorage.getItem('wallet_address');
if (connectedAddr) {
input.value = connectedAddr;
lockAddressField(input);
} else {
alert("No wallet is currently connected.");
}
}
};

// ====================== CENTRALIZED WALLET STATE + CLEAR LOGIC ======================
function clearBalancesOnDisconnect() {
const allTokens = ['SOL', 'USDC', 'EXPB', 'GIDDY', 'ONE', 'KIN', 'DOBBY', 'MYLO', 'DUNO', 'CPT', 'SINU'];
Expand Down Expand Up @@ -1364,7 +1441,7 @@ document.addEventListener('DOMContentLoaded', () => {
messageDiv.textContent = 'Invalid code: Must be exactly 13 digits.';
messageDiv.style.color = '#e74c3c';
if (mainBtn) mainBtn.classList.add('failure');
if (mainBtn) mainBtn.textContent = 'INVALID';
if (mainBtn) mainBtn.textContent = 'TRY AGAIN';
return;
}

Expand All @@ -1374,6 +1451,14 @@ document.addEventListener('DOMContentLoaded', () => {
return;
}

// ====================== SOLANA ADDRESS VALIDATION ======================
if (!isValidSolanaAddress(destinationWallet)) {
messageDiv.textContent = '❌ Invalid Solana address. Please check the format and try again.';
messageDiv.style.color = '#e74c3c';
if (mainBtn) mainBtn.classList.add('failure');
return;
}

// Show Checking... on main REDEEM button
const originalText = mainBtn ? mainBtn.textContent : 'REDEEM';
if (mainBtn) {
Expand Down Expand Up @@ -1410,7 +1495,6 @@ document.addEventListener('DOMContentLoaded', () => {
}

if (!data) {
// Error handling (same style as redeem.html)
messageDiv.style.color = '#e74c3c';
messageDiv.textContent = "Network error: " + (lastError?.message || "All backends failed");
if (mainBtn) {
Expand All @@ -1421,16 +1505,14 @@ document.addEventListener('DOMContentLoaded', () => {
}

if (data.success) {
// Success → show the nice modal (same as redeem.html)
showRedeemSuccessModal(data);
if (mainBtn) {
mainBtn.textContent = originalText;
mainBtn.disabled = false;
}
} else {
// Error from backend
messageDiv.style.color = '#e74c3c';
messageDiv.textContent = data.message || "Redemption failed";
messageDiv.textContent = data.message || "Invaild, expired or used code. Check or try another.";
if (mainBtn) {
mainBtn.textContent = originalText;
mainBtn.disabled = false;
Expand All @@ -1439,6 +1521,27 @@ document.addEventListener('DOMContentLoaded', () => {
});
}

// ====================== SOLANA ADDRESS VALIDATION HELPER ======================
function isValidSolanaAddress(address) {
if (!address || typeof address !== 'string') return false;
if (address.length < 32 || address.length > 44) return false;

// Basic base58 alphabet check
const base58Regex = /^[1-9A-HJ-NP-Za-km-z]+$/;
if (!base58Regex.test(address)) return false;

try {
// Use web3.js if available (most accurate)
if (typeof solanaWeb3 !== 'undefined' && solanaWeb3.PublicKey) {
new solanaWeb3.PublicKey(address);
return true;
}
return true; // fallback validation passed
} catch (e) {
return false;
}
}

// ====================== REDEEM IN KINNECTED BUTTON (Original Simple Flow) ======================
const kinnectedBtn = document.querySelector('button[onclick="redeemInKinnected()"]');

Expand Down Expand Up @@ -1466,7 +1569,7 @@ document.addEventListener('DOMContentLoaded', () => {
messageDiv.textContent = 'Invalid code: Must be exactly 13 digits.';
messageDiv.style.color = '#e74c3c';
button.classList.add('failure');
button.textContent = 'INVALID';
button.textContent = 'TRY AGAIN';
return;
}

Expand All @@ -1482,6 +1585,44 @@ document.addEventListener('DOMContentLoaded', () => {
});
}

// ====================== REFRESH REDEEM MODAL (Full Reset for Both Buttons) ======================
window.refreshRedeemModal = function() {
console.log("🔄 Full Refresh - Resetting all buttons...");

// Close modal
const modal = document.getElementById('redeem-modal');
if (modal) closeModal('redeem');

setTimeout(() => {
// Reset Main Redeem Button
const mainBtn = document.getElementById('redeem-submit-btn');
if (mainBtn) {
mainBtn.textContent = 'REDEEM';
mainBtn.disabled = false;
mainBtn.classList.remove('success', 'failure');
}

// Reset Kinnected Button
const kinnectedBtn = document.querySelector('button[onclick="redeemInKinnected()"]');
if (kinnectedBtn) {
kinnectedBtn.textContent = 'Redeem in Kinnected';
kinnectedBtn.disabled = false;
kinnectedBtn.classList.remove('success', 'failure');
}

// Clear messages
const messageDiv = document.getElementById('redeem-message');
if (messageDiv) {
messageDiv.textContent = '';
messageDiv.style.color = '';
}

// Re-open modal
openModal('redeem');
console.log("✅ Both buttons and modal fully reset");
}, 250);
};

// Wrapper for onclick in HTML
window.redeemInKinnected = function () {
const btn = document.querySelector('button[onclick="redeemInKinnected()"]');
Expand Down Expand Up @@ -1615,12 +1756,13 @@ window.dismissClaimBubble = dismissClaimBubble;
window.toggleCommunityTokens = toggleCommunityTokens;
window.toggleWorldwideCurrencies = toggleWorldwideCurrencies;

// Create / Sign In Modal (Updated)
// Create / Sign In Modal
window.openCreateSignInModal = openCreateSignInModal;
window.closeCreateSignInModal = closeCreateSignInModal;
window.handleCreateWalletFromModal = handleCreateWalletFromModal;
window.handleAppleSignInFromModal = handleAppleSignInFromModal;

// Modals
window.openValueLockModal = openValueLockModal;
window.closeValueLockModal = closeValueLockModal;
window.openGiddySwapModal = openGiddySwapModal;
Expand All @@ -1632,9 +1774,8 @@ window.selectSwapPercent = selectSwapPercent;
window.changeCurrency = changeCurrency;
window.showTxSuccess = showTxSuccess;
window.closeTxSuccessModal = closeTxSuccessModal;
window.closeRedeemSuccessModal = closeRedeemSuccessModal;
window.scanQRCode = scanQRCode;

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

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