Status: ${statusText}
+Currently active offers/bids: ${count}
+ `; + + const statusParagraph = subheaderTooltip.querySelector('p:first-child'); + const countParagraph = subheaderTooltip.querySelector('p:last-child'); + + if (statusParagraph && countParagraph) { + statusParagraph.innerHTML = `Status: ${statusText}`; + countParagraph.innerHTML = `Currently active offers/bids: ${count}`; + debugLog(`Updated AMM subheader tooltip paragraphs: status=${statusText}, count=${count}`); + } else { + subheaderTooltip.innerHTML = newContent; + debugLog(`Replaced AMM subheader tooltip content: status=${statusText}, count=${count}`); + } + + refreshTooltipInstances('tooltip-amm-subheader', newContent); + } else { + debugLog('AMM subheader tooltip element not found - checking all tooltip elements'); + const allTooltips = document.querySelectorAll('[id*="tooltip"]'); + debugLog('All tooltip elements found:', Array.from(allTooltips).map(el => el.id)); + } + } + + function refreshTooltipInstances(tooltipId, newContent) { + const triggers = document.querySelectorAll(`[data-tooltip-target="${tooltipId}"]`); + + triggers.forEach(trigger => { + if (trigger._tippy) { + trigger._tippy.setContent(newContent); + debugLog(`Updated Tippy instance content for ${tooltipId}`); + } else { + if (window.TooltipManager && typeof window.TooltipManager.create === 'function') { + window.TooltipManager.create(trigger, newContent, { + placement: trigger.getAttribute('data-tooltip-placement') || 'top' + }); + debugLog(`Created new Tippy instance for ${tooltipId}`); + } + } + }); + + if (window.TooltipManager && typeof window.TooltipManager.refreshTooltip === 'function') { + window.TooltipManager.refreshTooltip(tooltipId, newContent); + debugLog(`Refreshed tooltip via TooltipManager for ${tooltipId}`); + } + + if (window.TooltipManager && typeof window.TooltipManager.initializeTooltips === 'function') { + setTimeout(() => { + window.TooltipManager.initializeTooltips(`[data-tooltip-target="${tooltipId}"]`); + debugLog(`Re-initialized tooltips for ${tooltipId}`); + }, 50); + } + } + + function fetchAmmStatus() { + debugLog('Fetching AMM status...'); + + let url = config.ammStatusEndpoint; + if (isDebugEnabled()) { + url += '?debug=true'; + } + + return fetch(url, { + headers: { + 'Accept': 'application/json', + 'Cache-Control': 'no-cache', + 'Pragma': 'no-cache' + } + }) + .then(response => { + if (!response.ok) { + throw new Error(`HTTP error! Status: ${response.status}`); + } + return response.json(); + }) + .then(data => { + lastAmmStatus = data; + debugLog('AMM status data received:', data); + updateAmmCounter(data.amm_active_count, data.status); + fetchRetryCount = 0; + return data; + }) + .catch(error => { + if (isDebugEnabled()) { + console.error('[AmmCounter] AMM status fetch error:', error); + } + + if (fetchRetryCount < config.maxRetries) { + fetchRetryCount++; + debugLog(`Retrying AMM status fetch (${fetchRetryCount}/${config.maxRetries}) in ${config.retryDelay/1000}s`); + + return new Promise(resolve => { + setTimeout(() => { + resolve(fetchAmmStatus()); + }, config.retryDelay); + }); + } else { + fetchRetryCount = 0; + throw error; + } + }); + } + + function startRefreshTimer() { + stopRefreshTimer(); + + debugLog('Starting AMM status refresh timer'); + + fetchAmmStatus() + .then(() => {}) + .catch(() => {}); + + refreshTimer = setInterval(() => { + fetchAmmStatus() + .then(() => {}) + .catch(() => {}); + }, config.refreshInterval); + } + + function stopRefreshTimer() { + if (refreshTimer) { + debugLog('Stopping AMM status refresh timer'); + clearInterval(refreshTimer); + refreshTimer = null; + } + } + + function setupWebSocketHandler() { + if (window.WebSocketManager && typeof window.WebSocketManager.addMessageHandler === 'function') { + debugLog('Setting up WebSocket handler for AMM status updates'); + window.WebSocketManager.addMessageHandler('message', (data) => { + if (data && data.event) { + debugLog('WebSocket event received, refreshing AMM status'); + fetchAmmStatus() + .then(() => {}) + .catch(() => {}); + } + }); + } + } + + function setupDebugListener() { + const debugCheckbox = document.getElementById('amm_debug'); + if (debugCheckbox) { + debugLog('Found AMM debug checkbox, setting up listener'); + + localStorage.setItem('amm_debug_enabled', debugCheckbox.checked ? 'true' : 'false'); + + debugCheckbox.addEventListener('change', function() { + localStorage.setItem('amm_debug_enabled', this.checked ? 'true' : 'false'); + debugLog(`Debug mode ${this.checked ? 'enabled' : 'disabled'}`); + }); + } + } + + const publicAPI = { + initialize: function(options = {}) { + Object.assign(config, options); + + setupWebSocketHandler(); + setupDebugListener(); + startRefreshTimer(); + + debugLog('AMM Counter Manager initialized'); + + if (window.CleanupManager) { + window.CleanupManager.registerResource('ammCounterManager', this, (mgr) => mgr.dispose()); + } + + return this; + }, + + fetchAmmStatus: fetchAmmStatus, + + updateCounter: updateAmmCounter, + + updateTooltips: updateAmmTooltips, + + startRefreshTimer: startRefreshTimer, + + stopRefreshTimer: stopRefreshTimer, + + dispose: function() { + debugLog('Disposing AMM Counter Manager'); + stopRefreshTimer(); + } + }; + + return publicAPI; +})(); + +document.addEventListener('DOMContentLoaded', function() { + if (!window.ammCounterManagerInitialized) { + window.AmmCounterManager = AmmCounterManager.initialize(); + window.ammCounterManagerInitialized = true; + } +}); diff --git a/basicswap/static/js/amm_tables.js b/basicswap/static/js/amm_tables.js new file mode 100644 index 0000000..bac643f --- /dev/null +++ b/basicswap/static/js/amm_tables.js @@ -0,0 +1,2367 @@ +const AmmTablesManager = (function() { + const config = { + refreshInterval: 30000, + debug: false + }; + + let refreshTimer = null; + let stateData = null; + let coinData = {}; + + const offersTab = document.getElementById('offers-tab'); + const bidsTab = document.getElementById('bids-tab'); + const offersContent = document.getElementById('offers-content'); + const bidsContent = document.getElementById('bids-content'); + const offersCount = document.getElementById('offers-count'); + const bidsCount = document.getElementById('bids-count'); + const offersBody = document.getElementById('amm-offers-body'); + const bidsBody = document.getElementById('amm-bids-body'); + const refreshButton = document.getElementById('refreshAmmTables'); + + function isDebugEnabled() { + return localStorage.getItem('amm_debug_enabled') === 'true' || config.debug; + } + + function debugLog(message, data) { + // if (isDebugEnabled()) { + // if (data) { + // console.log(`[AmmTables] ${message}`, data); + // } else { + // console.log(`[AmmTables] ${message}`); + // } + // } + } + + function initializeTabs() { + if (offersTab && bidsTab && offersContent && bidsContent) { + offersTab.addEventListener('click', function() { + offersContent.classList.remove('hidden'); + offersContent.classList.add('block'); + bidsContent.classList.add('hidden'); + bidsContent.classList.remove('block'); + + offersTab.classList.add('bg-gray-100', 'text-gray-900', 'dark:bg-gray-600', 'dark:text-white'); + bidsTab.classList.remove('bg-gray-100', 'text-gray-900', 'dark:bg-gray-600', 'dark:text-white'); + }); + + bidsTab.addEventListener('click', function() { + offersContent.classList.add('hidden'); + offersContent.classList.remove('block'); + bidsContent.classList.remove('hidden'); + bidsContent.classList.add('block'); + + bidsTab.classList.add('bg-gray-100', 'text-gray-900', 'dark:bg-gray-600', 'dark:text-white'); + offersTab.classList.remove('bg-gray-100', 'text-gray-900', 'dark:bg-gray-600', 'dark:text-white'); + }); + + offersTab.click(); + } + } + + function getImageFilename(coinSymbol) { + if (!coinSymbol) return 'Unknown.png'; + + const coinNameToSymbol = { + 'bitcoin': 'BTC', + 'monero': 'XMR', + 'particl': 'PART', + 'particl anon': 'PART_ANON', + 'particl blind': 'PART_BLIND', + 'litecoin': 'LTC', + 'bitcoincash': 'BCH', + 'bitcoin cash': 'BCH', + 'firo': 'FIRO', + 'zcoin': 'FIRO', + 'pivx': 'PIVX', + 'dash': 'DASH', + 'ethereum': 'ETH', + 'dogecoin': 'DOGE', + 'decred': 'DCR', + 'namecoin': 'NMC', + 'zano': 'ZANO', + 'wownero': 'WOW' + }; + + let normalizedInput = coinSymbol.toLowerCase(); + + if (coinNameToSymbol[normalizedInput]) { + normalizedInput = coinNameToSymbol[normalizedInput]; + } + + const normalizedSymbol = normalizedInput.toUpperCase(); + + if (normalizedSymbol === 'FIRO' || normalizedSymbol === 'ZCOIN') return 'Firo.png'; + if (normalizedSymbol === 'BCH' || normalizedSymbol === 'BITCOINCASH') return 'Bitcoin-Cash.png'; + if (normalizedSymbol === 'PART_ANON' || normalizedSymbol === 'PARTICL_ANON') return 'Particl.png'; + if (normalizedSymbol === 'PART_BLIND' || normalizedSymbol === 'PARTICL_BLIND') return 'Particl.png'; + + if (window.CoinManager && window.CoinManager.getCoinBySymbol) { + const coin = window.CoinManager.getCoinBySymbol(normalizedSymbol); + if (coin && coin.image) return coin.image; + } + + const coinImages = { + 'BTC': 'Bitcoin.png', + 'XMR': 'Monero.png', + 'PART': 'Particl.png', + 'LTC': 'Litecoin.png', + 'FIRO': 'Firo.png', + 'PIVX': 'PIVX.png', + 'DASH': 'Dash.png', + 'ETH': 'Ethereum.png', + 'DOGE': 'Dogecoin.png', + 'DCR': 'Decred.png', + 'NMC': 'Namecoin.png', + 'ZANO': 'Zano.png', + 'WOW': 'Wownero.png' + }; + + const result = coinImages[normalizedSymbol] || 'Unknown.png'; + debugLog(`Coin symbol: ${coinSymbol}, normalized: ${normalizedSymbol}, image: ${result}`); + return result; + } + + function getCoinDisplayName(coinId) { + if (config.debug) { + console.log('[AMM Tables] getCoinDisplayName called with:', coinId, typeof coinId); + } + + if (typeof coinId === 'string') { + const lowerCoinId = coinId.toLowerCase(); + + if (lowerCoinId === 'part_anon' || + lowerCoinId === 'particl_anon' || + lowerCoinId === 'particl anon') { + if (config.debug) { + console.log('[AMM Tables] Matched Particl Anon variant:', coinId); + } + return 'Particl Anon'; + } + + if (lowerCoinId === 'part_blind' || + lowerCoinId === 'particl_blind' || + lowerCoinId === 'particl blind') { + if (config.debug) { + console.log('[AMM Tables] Matched Particl Blind variant:', coinId); + } + return 'Particl Blind'; + } + + if (lowerCoinId === 'ltc_mweb' || + lowerCoinId === 'litecoin_mweb' || + lowerCoinId === 'litecoin mweb') { + if (config.debug) { + console.log('[AMM Tables] Matched Litecoin MWEB variant:', coinId); + } + return 'Litecoin MWEB'; + } + } + + if (window.CoinManager && window.CoinManager.getDisplayName) { + const displayName = window.CoinManager.getDisplayName(coinId); + if (displayName) { + if (config.debug) { + console.log('[AMM Tables] CoinManager returned:', displayName); + } + return displayName; + } + } + + if (config.debug) { + console.log('[AMM Tables] Returning coin name as-is:', coinId); + } + return coinId; + } + + function createSwapColumn(coinFrom, coinTo) { + const fromImage = getImageFilename(coinFrom); + const toImage = getImageFilename(coinTo); + const fromDisplayName = getCoinDisplayName(coinFrom); + const toDisplayName = getCoinDisplayName(coinTo); + + return ` +
+
+
+
+ 
+
+ No offers configured
+Edit the AMM configuration to add offers
+No bids configured
+Edit the AMM configuration to add bids
+Total offers: ${data.num_sent_offers || 0}
+Active offers: ${data.num_sent_active_offers || 0}
+ `; + + const totalParagraph = yourOffersTooltip.querySelector('p:first-child'); + const activeParagraph = yourOffersTooltip.querySelector('p:last-child'); + + debugLog('Found paragraphs:', { totalParagraph, activeParagraph }); + + if (totalParagraph && activeParagraph) { + totalParagraph.innerHTML = `Total offers: ${data.num_sent_offers || 0}`; + activeParagraph.innerHTML = `Active offers: ${data.num_sent_active_offers || 0}`; + debugLog(`Updated Your Offers tooltip paragraphs: total=${data.num_sent_offers}, active=${data.num_sent_active_offers}`); + } else { + yourOffersTooltip.innerHTML = newContent; + debugLog(`Replaced Your Offers tooltip content: total=${data.num_sent_offers}, active=${data.num_sent_active_offers}`); + } + + refreshTooltipInstances('tooltip-your-offers', newContent); + } else { + debugLog('Your Offers tooltip element not found - checking all tooltip elements'); + const allTooltips = document.querySelectorAll('[id*="tooltip"]'); + debugLog('All tooltip elements found:', Array.from(allTooltips).map(el => el.id)); + } + + const bidsTooltip = document.getElementById('tooltip-bids'); + if (bidsTooltip) { + const newBidsContent = ` +Sent bids: ${data.num_sent_bids || 0} (${data.num_sent_active_bids || 0} active)
+Received bids: ${data.num_recv_bids || 0} (${data.num_recv_active_bids || 0} active)
+ `; + + const sentParagraph = bidsTooltip.querySelector('p:first-child'); + const recvParagraph = bidsTooltip.querySelector('p:last-child'); + + if (sentParagraph && recvParagraph) { + sentParagraph.innerHTML = `Sent bids: ${data.num_sent_bids || 0} (${data.num_sent_active_bids || 0} active)`; + recvParagraph.innerHTML = `Received bids: ${data.num_recv_bids || 0} (${data.num_recv_active_bids || 0} active)`; + debugLog(`Updated Bids tooltip: sent=${data.num_sent_bids}(${data.num_sent_active_bids}), recv=${data.num_recv_bids}(${data.num_recv_active_bids})`); + } else { + bidsTooltip.innerHTML = newBidsContent; + debugLog(`Replaced Bids tooltip content: sent=${data.num_sent_bids}(${data.num_sent_active_bids}), recv=${data.num_recv_bids}(${data.num_recv_active_bids})`); + } + + refreshTooltipInstances('tooltip-bids', newBidsContent); + } else { + debugLog('Bids tooltip element not found'); + } + } + + function refreshTooltipInstances(tooltipId, newContent) { + const triggers = document.querySelectorAll(`[data-tooltip-target="${tooltipId}"]`); + + triggers.forEach(trigger => { + if (trigger._tippy) { + trigger._tippy.setContent(newContent); + debugLog(`Updated Tippy instance content for ${tooltipId}`); + } else { + if (window.TooltipManager && typeof window.TooltipManager.create === 'function') { + window.TooltipManager.create(trigger, newContent, { + placement: trigger.getAttribute('data-tooltip-placement') || 'top' + }); + debugLog(`Created new Tippy instance for ${tooltipId}`); + } + } + }); + + if (window.TooltipManager && typeof window.TooltipManager.refreshTooltip === 'function') { + window.TooltipManager.refreshTooltip(tooltipId, newContent); + debugLog(`Refreshed tooltip via TooltipManager for ${tooltipId}`); + } + + if (window.TooltipManager && typeof window.TooltipManager.initializeTooltips === 'function') { + setTimeout(() => { + window.TooltipManager.initializeTooltips(`[data-tooltip-target="${tooltipId}"]`); + debugLog(`Re-initialized tooltips for ${tooltipId}`); + }, 50); + } + } + + function debugLog(message) { + if (config.debug && console && console.log) { + console.log(`[SummaryManager] ${message}`); + } + } + function cacheSummaryData(data) { if (!data) return; @@ -303,6 +401,14 @@ const SummaryManager = (function() { }); }, + updateTooltips: function(data) { + updateTooltips(data || lastSuccessfulData); + }, + + updateUI: function(data) { + updateUIFromData(data || lastSuccessfulData); + }, + startRefreshTimer: function() { startRefreshTimer(); }, diff --git a/basicswap/static/js/offers.js b/basicswap/static/js/offers.js index 18ba205..37bc082 100644 --- a/basicswap/static/js/offers.js +++ b/basicswap/static/js/offers.js @@ -217,8 +217,8 @@ function filterAndSortData() { const sentFromFilter = filters.sent_from || 'any'; filteredData = filteredData.filter(offer => { - const isMatch = sentFromFilter === 'public' ? offer.is_public : - sentFromFilter === 'private' ? !offer.is_public : + const isMatch = sentFromFilter === 'public' ? offer.is_public : + sentFromFilter === 'private' ? !offer.is_public : true; return isMatch; }); @@ -232,7 +232,7 @@ function filterAndSortData() { const coinToSelect = document.getElementById('coin_to'); const selectedOption = coinToSelect?.querySelector(`option[value="${filters.coin_to}"]`); const coinName = selectedOption?.textContent.trim(); - + if (coinName && !coinMatches(offer.coin_to, coinName)) { return false; } @@ -254,13 +254,13 @@ function filterAndSortData() { let statusMatch = false; switch (filters.status) { - case 'active': + case 'active': statusMatch = !isExpired && !isRevoked; break; - case 'expired': + case 'expired': statusMatch = isExpired && !isRevoked; break; - case 'revoked': + case 'revoked': statusMatch = isRevoked; break; } @@ -275,7 +275,7 @@ function filterAndSortData() { if (currentSortColumn === 7) { const offersWithPercentages = []; - + for (const offer of filteredData) { const fromAmount = parseFloat(offer.amount_from) || 0; const toAmount = parseFloat(offer.amount_to) || 0; @@ -293,7 +293,7 @@ function filterAndSortData() { if (fromPriceUSD && toPriceUSD && !isNaN(fromPriceUSD) && !isNaN(toPriceUSD)) { const fromValueUSD = fromAmount * fromPriceUSD; const toValueUSD = toAmount * toPriceUSD; - + if (fromValueUSD && toValueUSD) { if (offer.is_own_offer || isSentOffers) { percentDiff = ((toValueUSD / fromValueUSD) - 1) * 100; @@ -302,7 +302,7 @@ function filterAndSortData() { } } } - + offersWithPercentages.push({ offer: offer, percentDiff: percentDiff @@ -353,7 +353,7 @@ function filterAndSortData() { const bRate = parseFloat(b.rate) || 0; const aPriceUSD = latestPrices && aSymbol ? latestPrices[aSymbol]?.usd : null; const bPriceUSD = latestPrices && bSymbol ? latestPrices[bSymbol]?.usd : null; - + aValue = aPriceUSD && !isNaN(aPriceUSD) ? aRate * aPriceUSD : 0; bValue = bPriceUSD && !isNaN(bPriceUSD) ? bRate * bPriceUSD : 0; break; @@ -367,8 +367,8 @@ function filterAndSortData() { } if (typeof aValue === 'string' && typeof bValue === 'string') { - return currentSortDirection === 'asc' - ? aValue.localeCompare(bValue) + return currentSortDirection === 'asc' + ? aValue.localeCompare(bValue) : bValue.localeCompare(aValue); } @@ -395,7 +395,7 @@ async function calculateProfitLoss(fromCoin, toCoin, fromAmount, toAmount, isOwn normalizedCoin = window.CoinManager.getPriceKey(coin) || normalizedCoin; } else { if (normalizedCoin === 'zcoin') normalizedCoin = 'firo'; - if (normalizedCoin === 'bitcoincash' || normalizedCoin === 'bitcoin cash') + if (normalizedCoin === 'bitcoincash' || normalizedCoin === 'bitcoin cash') normalizedCoin = 'bitcoin-cash'; if (normalizedCoin.includes('particl')) normalizedCoin = 'particl'; } @@ -481,6 +481,29 @@ async function fetchOffers() { } const data = await offersResponse.json(); + + if (data.error) { + if (data.locked) { + if (typeof ui !== 'undefined' && ui.displayErrorMessage) { + ui.displayErrorMessage(data.error); + } else { + offersBody.innerHTML = ` +
+ 
+ + Automatically create offers and bids based on your configuration. +
+|
+
+ Name
+
+ |
+
+
+ Swap
+
+ |
+
+
+ Amount & Min
+
+ |
+
+
+ Rate & Receive
+
+ |
+
+
+ Settings
+
+ |
+
+
+ Status
+
+ |
+
+
+ Actions
+
+ |
+
|---|---|---|---|---|---|---|
| + Loading offers data... + | +||||||
|
+
+ Name
+
+ |
+
+
+ Swap
+
+ |
+
+
+ Amount & Balance
+
+ |
+
+
+ Rate & Send
+
+ |
+
+
+ Settings
+
+ |
+
+
+ Status
+
+ |
+
+
+ Actions
+
+ |
+
|---|---|---|---|---|---|---|
| + Loading bids data... + | +||||||
+ AMM Directory: {{ amm_dir }} +
++ Config File: {{ config_path }} + {% if config_exists %} + Exists + {% else %} + Missing + {% endif %} +
++ State File: {{ state_path }} + {% if state_exists %} + Exists + {% else %} + Will be created + {% endif %} +
++ Script Module: {{ script_path }} + Integrated +
+
+
+ + Help keep BasicSwap free and open-source. Your donations directly fund development, security audits, and community growth. +
++ BasicSwap is completely free and open-source software that charges no fees for its use. The project is entirely funded by generous community donations from users who believe in decentralized, censorship-resistant trading. +
++ Your donations are vital to keeping this project alive, accelerating development, and expanding our reach to more users who value financial freedom and privacy. +
+ +New features and improvements
+Testing and security infrastructure
+Educational resources and guides
+Outreach and adoption initiatives
++ Together, we're building financial tools that empower individuals and resist censorship. Thank you for being part of this movement toward true financial freedom. +
+|
+
+ Cryptocurrency
+
+ |
+
+
+ Donation Address
+
+ |
+
|---|---|
+
+ 
+
+ Monero (XMR)
+ |
+ + + | +
+
+ 
+
+ Litecoin (LTC)
+ |
+ + + | +
+
+ 
+
+ Litecoin MWEB
+ |
+ + + | +
+
+ 
+
+ Bitcoin (BTC)
+ |
+ + + | +
+
+ 
+
+ Particl (PART)
+ |
+ + + | +
+ Every contribution helps make decentralized trading more accessible to everyone. +
+
© 2025~ (BSX) BasicSwap
BSX: v{{ version }}
-GUI: v3.2.1
+GUI: v3.2.2
Made with
{{ love_svg | safe }}This action will shut down the application. Are you sure you want to proceed?
- - @@ -136,7 +136,7 @@