1.00000000 BTC → 
15.50000000 XMR',
+ 'New Network Offer',
'new_offer',
{
offerId: '000000006873f4ef17d4f220730400f4fdd57157492289c5d414ea66',
- subtitle: 'New offer • Rate: 1 BTC = 15.50000000 XMR',
+ subtitle: `
1.00000000 BTC → 
15.50000000 XMR
`;
}
-
let clickAction = '';
let cursorStyle = 'cursor-default';
@@ -585,10 +626,10 @@ function ensureToastContainer() {
messages.appendChild(message);
if (!isPersistent) {
- setTimeout(() => {
+ CleanupManager.setTimeout(() => {
if (message.parentNode) {
message.classList.add('toast-slide-out');
- setTimeout(() => {
+ CleanupManager.setTimeout(() => {
if (message.parentNode) {
message.parentNode.removeChild(message);
}
@@ -613,12 +654,12 @@ function ensureToastContainer() {
const amountTo = formatCoinAmount(data.amount_to, data.coin_to);
const coinFromIcon = getCoinIcon(coinFromName);
const coinToIcon = getCoinIcon(coinToName);
- toastTitle = `
${amountFrom} ${coinFromName} → 
${amountTo} ${coinToName}`;
- toastOptions.subtitle = `New offer • Rate: 1 ${coinFromName} = ${(data.amount_to / data.amount_from).toFixed(8)} ${coinToName}`;
+ toastTitle = `New Network Offer`;
+ toastOptions.subtitle = `Transaction Status
@@ -1256,6 +1257,12 @@ const createTableRow = async (bid) => {Loading bids...
Rates
' + JSON.stringify(obj, null, ' ') + 'Rates
Updating...
'; + } + + this.xhr_rates.open('POST', '/json/rates'); + this.xhr_rates.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); + this.xhr_rates.send(`coin_from=${coin_from}&coin_to=${coin_to}`); + }, + + resetForm: function() { + const bidAmountSendInput = document.getElementById('bid_amount_send'); + const bidAmountInput = document.getElementById('bid_amount'); + const bidRateInput = document.getElementById('bid_rate'); + const validMinsInput = document.querySelector('input[name="validmins"]'); + const amtVar = document.getElementById('amt_var')?.value === 'True'; + + if (bidAmountSendInput) { + bidAmountSendInput.value = amtVar ? '' : bidAmountSendInput.getAttribute('max'); + } + if (bidAmountInput) { + bidAmountInput.value = amtVar ? '' : bidAmountInput.getAttribute('max'); + } + if (bidRateInput && !bidRateInput.disabled) { + const defaultRate = document.getElementById('offer_rate')?.value || ''; + bidRateInput.value = defaultRate; + } + if (validMinsInput) { + validMinsInput.value = "60"; + } + if (!amtVar) { + this.updateBidParams('rate'); + } + this.updateModalValues(); + + const errorMessages = document.querySelectorAll('.error-message'); + errorMessages.forEach(msg => msg.remove()); + + const inputs = document.querySelectorAll('input'); + inputs.forEach(input => { + input.classList.remove('border-red-500', 'focus:border-red-500'); + }); + }, + + roundUpToDecimals: function(value, decimals) { + const factor = Math.pow(10, decimals); + return Math.ceil(value * factor) / factor; + }, + + updateBidParams: function(value_changed) { + const coin_from = document.getElementById('coin_from')?.value; + const coin_to = document.getElementById('coin_to')?.value; + const coin_from_exp = parseInt(document.getElementById('coin_from_exp')?.value || '8'); + const coin_to_exp = parseInt(document.getElementById('coin_to_exp')?.value || '8'); + const amt_var = document.getElementById('amt_var')?.value; + const rate_var = document.getElementById('rate_var')?.value; + const bidAmountInput = document.getElementById('bid_amount'); + const bidAmountSendInput = document.getElementById('bid_amount_send'); + const bidRateInput = document.getElementById('bid_rate'); + const offerRateInput = document.getElementById('offer_rate'); + + if (!coin_from || !coin_to || !amt_var || !rate_var) return; + + const rate = rate_var === 'True' && bidRateInput ? + parseFloat(bidRateInput.value) || 0 : + parseFloat(offerRateInput?.value || '0'); + + if (!rate) return; + + if (value_changed === 'rate') { + if (bidAmountSendInput && bidAmountInput) { + const sendAmount = parseFloat(bidAmountSendInput.value) || 0; + const receiveAmount = (sendAmount / rate).toFixed(coin_from_exp); + bidAmountInput.value = receiveAmount; + } + } else if (value_changed === 'sending') { + if (bidAmountSendInput && bidAmountInput) { + const sendAmount = parseFloat(bidAmountSendInput.value) || 0; + const receiveAmount = (sendAmount / rate).toFixed(coin_from_exp); + bidAmountInput.value = receiveAmount; + } + } else if (value_changed === 'receiving') { + if (bidAmountInput && bidAmountSendInput) { + const receiveAmount = parseFloat(bidAmountInput.value) || 0; + const sendAmount = this.roundUpToDecimals(receiveAmount * rate, coin_to_exp).toFixed(coin_to_exp); + bidAmountSendInput.value = sendAmount; + } + } + + this.validateAmountsAfterChange(); + + this.xhr_bid_params.open('POST', '/json/rate'); + this.xhr_bid_params.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); + this.xhr_bid_params.send(`coin_from=${coin_from}&coin_to=${coin_to}&rate=${rate}&amt_from=${bidAmountInput?.value || '0'}`); + + this.updateModalValues(); + }, + + validateAmountsAfterChange: function() { + const bidAmountSendInput = document.getElementById('bid_amount_send'); + const bidAmountInput = document.getElementById('bid_amount'); + + if (bidAmountSendInput) { + const maxSend = parseFloat(bidAmountSendInput.getAttribute('max')); + this.validateMaxAmount(bidAmountSendInput, maxSend); + } + if (bidAmountInput) { + const maxReceive = parseFloat(bidAmountInput.getAttribute('max')); + this.validateMaxAmount(bidAmountInput, maxReceive); + } + }, + + validateMaxAmount: function(input, maxAmount) { + if (!input) return; + const value = parseFloat(input.value) || 0; + if (value > maxAmount) { + input.value = maxAmount; + } + }, + + showErrorModal: function(title, message) { + document.getElementById('errorTitle').textContent = title || 'Error'; + document.getElementById('errorMessage').textContent = message || 'An error occurred'; + const modal = document.getElementById('errorModal'); + if (modal) { + modal.classList.remove('hidden'); + } + }, + + hideErrorModal: function() { + const modal = document.getElementById('errorModal'); + if (modal) { + modal.classList.add('hidden'); + } + }, + + showConfirmModal: function() { + const bidAmountSendInput = document.getElementById('bid_amount_send'); + const bidAmountInput = document.getElementById('bid_amount'); + const validMinsInput = document.querySelector('input[name="validmins"]'); + const addrFromSelect = document.querySelector('select[name="addr_from"]'); + + let sendAmount = 0; + let receiveAmount = 0; + + if (bidAmountSendInput && bidAmountSendInput.value) { + sendAmount = parseFloat(bidAmountSendInput.value) || 0; + } + + if (bidAmountInput && bidAmountInput.value) { + receiveAmount = parseFloat(bidAmountInput.value) || 0; + } + + if (sendAmount <= 0 || receiveAmount <= 0) { + this.showErrorModal('Validation Error', 'Please enter valid amounts for both sending and receiving.'); + return false; + } + + const coinFrom = document.getElementById('coin_from_name')?.value || ''; + const coinTo = document.getElementById('coin_to_name')?.value || ''; + const tlaFrom = document.getElementById('tla_from')?.value || ''; + const tlaTo = document.getElementById('tla_to')?.value || ''; + + const validMins = validMinsInput ? validMinsInput.value : '60'; + + const addrFrom = addrFromSelect ? addrFromSelect.value : ''; + + const modalAmtReceive = document.getElementById('modal-amt-receive'); + const modalReceiveCurrency = document.getElementById('modal-receive-currency'); + const modalAmtSend = document.getElementById('modal-amt-send'); + const modalSendCurrency = document.getElementById('modal-send-currency'); + const modalAddrFrom = document.getElementById('modal-addr-from'); + const modalValidMins = document.getElementById('modal-valid-mins'); + + if (modalAmtReceive) modalAmtReceive.textContent = receiveAmount.toFixed(8); + if (modalReceiveCurrency) modalReceiveCurrency.textContent = ` ${tlaFrom}`; + if (modalAmtSend) modalAmtSend.textContent = sendAmount.toFixed(8); + if (modalSendCurrency) modalSendCurrency.textContent = ` ${tlaTo}`; + if (modalAddrFrom) modalAddrFrom.textContent = addrFrom || 'Default'; + if (modalValidMins) modalValidMins.textContent = validMins; + + const modal = document.getElementById('confirmModal'); + if (modal) { + modal.classList.remove('hidden'); + } + return false; + }, + + hideConfirmModal: function() { + const modal = document.getElementById('confirmModal'); + if (modal) { + modal.classList.add('hidden'); + } + return false; + }, + + updateModalValues: function() { + + }, + + handleBidsPageAddress: function() { + const selectElement = document.querySelector('select[name="addr_from"]'); + const STORAGE_KEY = 'lastUsedAddressBids'; + + if (!selectElement) return; + + const loadInitialAddress = () => { + const savedAddressJSON = localStorage.getItem(STORAGE_KEY); + if (savedAddressJSON) { + try { + const savedAddress = JSON.parse(savedAddressJSON); + selectElement.value = savedAddress.value; + } catch (e) { + selectFirstAddress(); + } + } else { + selectFirstAddress(); + } + }; + + const selectFirstAddress = () => { + if (selectElement.options.length > 1) { + const firstOption = selectElement.options[1]; + if (firstOption) { + selectElement.value = firstOption.value; + this.saveAddress(firstOption.value, firstOption.text); + } + } + }; + + selectElement.addEventListener('change', (event) => { + this.saveAddress(event.target.value, event.target.selectedOptions[0].text); + }); + + loadInitialAddress(); + }, + + saveAddress: function(value, text) { + const addressData = { + value: value, + text: text + }; + localStorage.setItem('lastUsedAddressBids', JSON.stringify(addressData)); + }, + + confirmPopup: function() { + return confirm("Are you sure?"); + }, + + handleCancelClick: function(event) { + if (event) event.preventDefault(); + const pathParts = window.location.pathname.split('/'); + const offerId = pathParts[pathParts.indexOf('offer') + 1]; + window.location.href = `/offer/${offerId}`; + }, + + cleanup: function() { + } + }; + + document.addEventListener('DOMContentLoaded', function() { + OfferPage.init(); + + if (window.CleanupManager) { + CleanupManager.registerResource('offerPage', OfferPage, (page) => { + if (page.cleanup) page.cleanup(); + }); + } + }); + + window.OfferPage = OfferPage; + window.lookup_rates = OfferPage.lookup_rates.bind(OfferPage); + window.resetForm = OfferPage.resetForm.bind(OfferPage); + window.updateBidParams = OfferPage.updateBidParams.bind(OfferPage); + window.validateMaxAmount = OfferPage.validateMaxAmount.bind(OfferPage); + window.showConfirmModal = OfferPage.showConfirmModal.bind(OfferPage); + window.hideConfirmModal = OfferPage.hideConfirmModal.bind(OfferPage); + window.showErrorModal = OfferPage.showErrorModal.bind(OfferPage); + window.hideErrorModal = OfferPage.hideErrorModal.bind(OfferPage); + window.confirmPopup = OfferPage.confirmPopup.bind(OfferPage); + window.handleBidsPageAddress = OfferPage.handleBidsPageAddress.bind(OfferPage); + +})(); diff --git a/basicswap/static/js/offers.js b/basicswap/static/js/pages/offers-page.js similarity index 89% rename from basicswap/static/js/offers.js rename to basicswap/static/js/pages/offers-page.js index ffedd66..6d86d31 100644 --- a/basicswap/static/js/offers.js +++ b/basicswap/static/js/pages/offers-page.js @@ -5,8 +5,8 @@ let jsonData = []; let originalJsonData = []; let currentSortColumn = 0; let currentSortDirection = 'desc'; -let filterTimeout = null; let isPaginationInProgress = false; +let autoRefreshInterval = null; const isSentOffers = window.offersTableConfig.isSentOffers; const CACHE_DURATION = window.config.cacheConfig.defaultTTL; @@ -28,6 +28,9 @@ window.tableRateModule = { processedOffers: new Set(), getCachedValue(key) { + if (window.CacheManager) { + return window.CacheManager.get(key); + } const cachedItem = localStorage.getItem(key); if (cachedItem) { const parsedItem = JSON.parse(cachedItem); @@ -41,6 +44,14 @@ window.tableRateModule = { }, setCachedValue(key, value, resourceType = null) { + if (window.CacheManager) { + const ttl = resourceType ? + window.config.cacheConfig.ttlSettings[resourceType] || + window.config.cacheConfig.defaultTTL : + 900000; + window.CacheManager.set(key, value, ttl); + return; + } const ttl = resourceType ? window.config.cacheConfig.ttlSettings[resourceType] || window.config.cacheConfig.defaultTTL : @@ -65,26 +76,6 @@ window.tableRateModule = { return true; }, - formatUSD(value) { - if (Math.abs(value) < 0.000001) { - return value.toExponential(8) + ' USD'; - } else if (Math.abs(value) < 0.01) { - return value.toFixed(8) + ' USD'; - } else { - return value.toFixed(2) + ' USD'; - } - }, - - formatNumber(value, decimals) { - if (Math.abs(value) < 0.000001) { - return value.toExponential(decimals); - } else if (Math.abs(value) < 0.01) { - return value.toFixed(decimals); - } else { - return value.toFixed(Math.min(2, decimals)); - } - }, - getFallbackValue(coinSymbol) { if (!coinSymbol) return null; const normalizedSymbol = coinSymbol.toLowerCase() === 'part' ? 'particl' : coinSymbol.toLowerCase(); @@ -151,6 +142,41 @@ function initializeTooltips() { } } +function initializeTooltipsInBatches() { + if (!window.TooltipManager) return; + + const tooltipElements = document.querySelectorAll('[data-tooltip-target]'); + const BATCH_SIZE = 5; + let currentIndex = 0; + + function processBatch() { + const endIndex = Math.min(currentIndex + BATCH_SIZE, tooltipElements.length); + + for (let i = currentIndex; i < endIndex; i++) { + const element = tooltipElements[i]; + const targetId = element.getAttribute('data-tooltip-target'); + if (!targetId) continue; + + const tooltipContent = document.getElementById(targetId); + if (tooltipContent) { + window.TooltipManager.create(element, tooltipContent.innerHTML, { + placement: element.getAttribute('data-tooltip-placement') || 'top' + }); + } + } + + currentIndex = endIndex; + + if (currentIndex < tooltipElements.length) { + CleanupManager.setTimeout(processBatch, 0); + } + } + + if (tooltipElements.length > 0) { + CleanupManager.setTimeout(processBatch, 0); + } +} + function getValidOffers() { if (!jsonData) { return []; @@ -180,7 +206,6 @@ function saveFilterSettings() { })); } - function getSelectedCoins(filterType) { const dropdown = document.getElementById(`${filterType}_dropdown`); @@ -188,7 +213,6 @@ function getSelectedCoins(filterType) { return ['any']; } - const allCheckboxes = dropdown.querySelectorAll('input[type="checkbox"]'); const selected = []; @@ -252,7 +276,6 @@ function updateFilterButtonText(filterType) { textSpan.textContent = `Filter ${filterLabel} (${selected.length} selected)`; } - button.style.width = '210px'; } @@ -270,7 +293,6 @@ function updateCoinBadges(filterType) { const coinName = getCoinNameFromValue(coinValue, filterType); const badge = document.createElement('span'); - const isBidsFilter = filterType === 'coin_to' && !isSentOffers; const isOffersFilter = filterType === 'coin_from' && !isSentOffers; const isReceivingFilter = filterType === 'coin_to' && isSentOffers; @@ -285,7 +307,6 @@ function updateCoinBadges(filterType) { badge.className = badgeClass + ' cursor-pointer hover:opacity-80'; - const coinImage = getCoinImage(coinName); badge.innerHTML = ` @@ -350,13 +371,7 @@ function coinMatches(offerCoin, filterCoins) { return true; } - if ((normalizedOfferCoin === 'firo' || normalizedOfferCoin === 'zcoin') && - (normalizedFilterCoin === 'firo' || normalizedFilterCoin === 'zcoin')) { - return true; - } - - if ((normalizedOfferCoin === 'bitcoincash' && normalizedFilterCoin === 'bitcoin cash') || - (normalizedOfferCoin === 'bitcoin cash' && normalizedFilterCoin === 'bitcoincash')) { + if (window.CoinUtils && window.CoinUtils.isSameCoin(normalizedOfferCoin, normalizedFilterCoin)) { return true; } @@ -467,7 +482,6 @@ function removeCoinFilter(filterType, coinValue) { if (checkbox) { checkbox.checked = false; - updateFilterButtonText(filterType); updateCoinBadges(filterType); applyFilters(); @@ -475,7 +489,6 @@ function removeCoinFilter(filterType, coinValue) { } } - window.removeCoinFilter = removeCoinFilter; function filterAndSortData() { @@ -510,7 +523,6 @@ function filterAndSortData() { return false; } - if (selectedCoinTo.length > 0 && !(selectedCoinTo.length === 1 && selectedCoinTo[0] === 'any')) { const coinNames = selectedCoinTo.map(value => getCoinNameFromValue(value, 'coin_to')); const matches = coinMatches(offer.coin_to, coinNames); @@ -519,7 +531,6 @@ function filterAndSortData() { } } - if (selectedCoinFrom.length > 0 && !(selectedCoinFrom.length === 1 && selectedCoinFrom[0] === 'any')) { const coinNames = selectedCoinFrom.map(value => getCoinNameFromValue(value, 'coin_from')); const matches = coinMatches(offer.coin_from, coinNames); @@ -674,10 +685,9 @@ async function calculateProfitLoss(fromCoin, toCoin, fromAmount, toAmount, isOwn if (window.CoinManager) { normalizedCoin = window.CoinManager.getPriceKey(coin) || normalizedCoin; } else { - if (normalizedCoin === 'zcoin') normalizedCoin = 'firo'; - if (normalizedCoin === 'bitcoincash' || normalizedCoin === 'bitcoin cash') - normalizedCoin = 'bitcoin-cash'; - if (normalizedCoin.includes('particl')) normalizedCoin = 'particl'; + if (window.CoinUtils) { + normalizedCoin = window.CoinUtils.normalizeCoinName(normalizedCoin, latestPrices); + } } let price = null; if (latestPrices && latestPrices[normalizedCoin]) { @@ -734,11 +744,38 @@ async function fetchLatestPrices() { } } +async function fetchPricesAsync() { + try { + const prices = await window.PriceManager.getPrices(false); + return prices; + } catch (error) { + console.error('Error fetching prices asynchronously:', error); + return null; + } +} + async function fetchOffers() { const refreshButton = document.getElementById('refreshOffers'); const refreshIcon = document.getElementById('refreshIcon'); const refreshText = document.getElementById('refreshText'); + const fetchWithRetry = async (url, maxRetries = 3) => { + for (let i = 0; i < maxRetries; i++) { + try { + const response = await fetch(url); + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + return response; + } catch (error) { + if (i === maxRetries - 1) throw error; + console.log(`Fetch retry ${i + 1}/${maxRetries} for ${url}`); + + await new Promise(resolve => CleanupManager.setTimeout(resolve, 100 * Math.pow(2, i))); + } + } + }; + try { if (!NetworkManager.isOnline()) { throw new Error('Network is offline'); @@ -751,15 +788,7 @@ async function fetchOffers() { refreshButton.classList.add('opacity-75', 'cursor-wait'); } - const [offersResponse, pricesData] = await Promise.all([ - fetch(isSentOffers ? '/json/sentoffers' : '/json/offers'), - fetchLatestPrices() - ]); - - if (!offersResponse.ok) { - throw new Error(`HTTP error! status: ${offersResponse.status}`); - } - + const offersResponse = await fetchWithRetry(isSentOffers ? '/json/sentoffers' : '/json/offers'); const data = await offersResponse.json(); if (data.error) { @@ -789,13 +818,20 @@ async function fetchOffers() { jsonData = formatInitialData(processedData); originalJsonData = [...jsonData]; - latestPrices = pricesData || getEmptyPriceData(); - CacheManager.set('offers_cached', jsonData, 'offers'); applyFilters(); updatePaginationInfo(); + fetchPricesAsync().then(prices => { + if (prices) { + latestPrices = prices; + updateProfitLossDisplays(); + } + }).catch(error => { + console.error('Error fetching prices after offers refresh:', error); + }); + } catch (error) { console.error('[Debug] Error fetching offers:', error); NetworkManager.handleNetworkError(error); @@ -871,27 +907,37 @@ function updateConnectionStatus(status) { } function updateRowTimes() { - requestAnimationFrame(() => { - const rows = document.querySelectorAll('[data-offer-id]'); - rows.forEach(row => { - const offerId = row.getAttribute('data-offer-id'); - const offer = jsonData.find(o => o.offer_id === offerId); - if (!offer) return; + + const rows = document.querySelectorAll('[data-offer-id]'); + const updates = []; - const newPostedTime = formatTime(offer.created_at, true); - const newExpiresIn = formatTimeLeft(offer.expire_at); + rows.forEach(row => { + const offerId = row.getAttribute('data-offer-id'); + const offer = jsonData.find(o => o.offer_id === offerId); + if (!offer) return; - const postedElement = row.querySelector('.text-xs:first-child'); - const expiresElement = row.querySelector('.text-xs:last-child'); + const newPostedTime = formatTime(offer.created_at, true); + const newExpiresIn = formatTimeLeft(offer.expire_at); - if (postedElement && postedElement.textContent !== `Posted: ${newPostedTime}`) { - postedElement.textContent = `Posted: ${newPostedTime}`; - } - if (expiresElement && expiresElement.textContent !== `Expires in: ${newExpiresIn}`) { - expiresElement.textContent = `Expires in: ${newExpiresIn}`; - } + const postedElement = row.querySelector('.text-xs:first-child'); + const expiresElement = row.querySelector('.text-xs:last-child'); + + updates.push({ + postedElement, + expiresElement, + newPostedTime, + newExpiresIn }); }); + + updates.forEach(({ postedElement, expiresElement, newPostedTime, newExpiresIn }) => { + if (postedElement && postedElement.textContent !== `Posted: ${newPostedTime}`) { + postedElement.textContent = `Posted: ${newPostedTime}`; + } + if (expiresElement && expiresElement.textContent !== `Expires in: ${newExpiresIn}`) { + expiresElement.textContent = `Expires in: ${newExpiresIn}`; + } + }); } function updateLastRefreshTime() { @@ -1097,8 +1143,13 @@ async function updateOffersTable(options = {}) { return; } + const isIncrementalUpdate = options.incremental === true; + if (!options.skipSkeleton && !isIncrementalUpdate && offersBody) { + offersBody.innerHTML = 'Loading offers...
+
+ `;
+ messageDiv.classList.remove('hidden');
+ },
+
+ hideNoDataMessage: function() {
+ const messageDiv = document.getElementById('chart-no-data-message');
+ if (messageDiv) {
+ messageDiv.classList.add('hidden');
+ }
+ },
+
cleanup: function() {
if (this.pendingAnimationFrame) {
cancelAnimationFrame(this.pendingAnimationFrame);
@@ -1199,11 +1171,11 @@ const app = {
if (coinData) {
coinData.displayName = coin.displayName || coin.symbol;
- const backendId = getCoinBackendId ? getCoinBackendId(coin.name) : coin.name;
- if (volumeData[backendId]) {
- coinData.total_volume = volumeData[backendId].total_volume;
- if (!coinData.price_change_percentage_24h && volumeData[backendId].price_change_percentage_24h) {
- coinData.price_change_percentage_24h = volumeData[backendId].price_change_percentage_24h;
+ const volumeKey = coin.symbol.toLowerCase();
+ if (volumeData[volumeKey]) {
+ coinData.total_volume = volumeData[volumeKey].total_volume;
+ if (!coinData.price_change_percentage_24h && volumeData[volumeKey].price_change_percentage_24h) {
+ coinData.price_change_percentage_24h = volumeData[volumeKey].price_change_percentage_24h;
}
}
@@ -1231,11 +1203,7 @@ const app = {
} else {
try {
ui.showCoinLoader(coin.symbol);
- if (coin.usesCoinGecko) {
- data = await api.fetchCoinGeckoDataXHR(coin.symbol);
- } else {
- data = await api.fetchCryptoCompareDataXHR(coin.symbol);
- }
+ data = await api.fetchCoinGeckoDataXHR(coin.symbol);
if (data.error) {
throw new Error(data.error);
}
@@ -1382,7 +1350,7 @@ const app = {
}
const timeUntilRefresh = nextRefreshTime - now;
app.nextRefreshTime = nextRefreshTime;
- app.autoRefreshInterval = setTimeout(() => {
+ app.autoRefreshInterval = CleanupManager.setTimeout(() => {
if (NetworkManager.isOnline()) {
app.refreshAllData();
} else {
@@ -1394,8 +1362,7 @@ const app = {
},
refreshAllData: async function() {
- //console.log('Price refresh started at', new Date().toLocaleTimeString());
-
+
if (app.isRefreshing) {
console.log('Refresh already in progress, skipping...');
return;
@@ -1415,7 +1382,7 @@ refreshAllData: async function() {
ui.displayErrorMessage(`Rate limit: Please wait ${seconds} seconds before refreshing`);
let remainingTime = seconds;
- const countdownInterval = setInterval(() => {
+ const countdownInterval = CleanupManager.setInterval(() => {
remainingTime--;
if (remainingTime > 0) {
ui.displayErrorMessage(`Rate limit: Please wait ${remainingTime} seconds before refreshing`);
@@ -1428,7 +1395,6 @@ refreshAllData: async function() {
return;
}
- //console.log('Starting refresh of all data...');
app.isRefreshing = true;
app.updateNextRefreshTime();
ui.showLoader();
@@ -1443,7 +1409,7 @@ refreshAllData: async function() {
console.warn('BTC price update failed, continuing with cached or default value');
}
- await new Promise(resolve => setTimeout(resolve, 1000));
+ await new Promise(resolve => CleanupManager.setTimeout(resolve, 1000));
const allCoinData = await api.fetchCoinGeckoDataXHR();
if (allCoinData.error) {
@@ -1468,11 +1434,11 @@ refreshAllData: async function() {
coinData.displayName = coin.displayName || coin.symbol;
- const backendId = getCoinBackendId ? getCoinBackendId(coin.name) : coin.name;
- if (volumeData[backendId]) {
- coinData.total_volume = volumeData[backendId].total_volume;
- if (!coinData.price_change_percentage_24h && volumeData[backendId].price_change_percentage_24h) {
- coinData.price_change_percentage_24h = volumeData[backendId].price_change_percentage_24h;
+ const volumeKey = coin.symbol.toLowerCase();
+ if (volumeData[volumeKey]) {
+ coinData.total_volume = volumeData[volumeKey].total_volume;
+ if (!coinData.price_change_percentage_24h && volumeData[volumeKey].price_change_percentage_24h) {
+ coinData.price_change_percentage_24h = volumeData[volumeKey].price_change_percentage_24h;
}
} else {
try {
@@ -1495,15 +1461,13 @@ refreshAllData: async function() {
const cacheKey = `coinData_${coin.symbol}`;
CacheManager.set(cacheKey, coinData, 'prices');
- //console.log(`Updated price for ${coin.symbol}: $${coinData.current_price}`);
-
} catch (coinError) {
console.warn(`Failed to update ${coin.symbol}: ${coinError.message}`);
failedCoins.push(coin.symbol);
}
}
- await new Promise(resolve => setTimeout(resolve, 1000));
+ await new Promise(resolve => CleanupManager.setTimeout(resolve, 1000));
if (chartModule.currentCoin) {
try {
@@ -1525,7 +1489,7 @@ refreshAllData: async function() {
let countdown = 5;
ui.displayErrorMessage(`${failureMessage} (${countdown}s)`);
- const countdownInterval = setInterval(() => {
+ const countdownInterval = CleanupManager.setInterval(() => {
countdown--;
if (countdown > 0) {
ui.displayErrorMessage(`${failureMessage} (${countdown}s)`);
@@ -1535,8 +1499,7 @@ refreshAllData: async function() {
}
}, 1000);
}
- //console.log(`Price refresh completed at ${new Date().toLocaleTimeString()}. Updated ${window.config.coins.length - failedCoins.length}/${window.config.coins.length} coins.`);
-
+
} catch (error) {
console.error('Critical error during refresh:', error);
NetworkManager.handleNetworkError(error);
@@ -1544,7 +1507,7 @@ refreshAllData: async function() {
let countdown = 10;
ui.displayErrorMessage(`Refresh failed: ${error.message}. Please try again later. (${countdown}s)`);
- const countdownInterval = setInterval(() => {
+ const countdownInterval = CleanupManager.setInterval(() => {
countdown--;
if (countdown > 0) {
ui.displayErrorMessage(`Refresh failed: ${error.message}. Please try again later. (${countdown}s)`);
@@ -1566,7 +1529,6 @@ refreshAllData: async function() {
app.scheduleNextRefresh();
}
- //console.log(`Refresh process finished at ${new Date().toLocaleTimeString()}, next refresh scheduled: ${app.isAutoRefreshEnabled ? 'yes' : 'no'}`);
}
},
@@ -1590,7 +1552,7 @@ refreshAllData: async function() {
const svg = document.querySelector('#toggle-auto-refresh svg');
if (svg) {
svg.classList.add('animate-spin');
- setTimeout(() => {
+ CleanupManager.setTimeout(() => {
svg.classList.remove('animate-spin');
}, 2000);
}
diff --git a/basicswap/static/js/pages/settings-page.js b/basicswap/static/js/pages/settings-page.js
new file mode 100644
index 0000000..4ef246e
--- /dev/null
+++ b/basicswap/static/js/pages/settings-page.js
@@ -0,0 +1,332 @@
+
+(function() {
+ 'use strict';
+
+ const SettingsPage = {
+ confirmCallback: null,
+ triggerElement: null,
+
+ init: function() {
+ this.setupTabs();
+ this.setupCoinHeaders();
+ this.setupConfirmModal();
+ this.setupNotificationSettings();
+ },
+
+ setupTabs: function() {
+ const tabButtons = document.querySelectorAll('.tab-button');
+ const tabContents = document.querySelectorAll('.tab-content');
+
+ const switchTab = (targetTab) => {
+ tabButtons.forEach(btn => {
+ if (btn.dataset.tab === targetTab) {
+ btn.className = 'tab-button border-b-2 border-blue-500 text-blue-600 dark:text-blue-400 py-4 px-1 text-sm font-medium focus:outline-none focus:ring-0';
+ } else {
+ btn.className = 'tab-button border-b-2 border-transparent text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 hover:border-gray-300 dark:hover:border-gray-600 py-4 px-1 text-sm font-medium focus:outline-none focus:ring-0';
+ }
+ });
+
+ tabContents.forEach(content => {
+ if (content.id === targetTab) {
+ content.classList.remove('hidden');
+ } else {
+ content.classList.add('hidden');
+ }
+ });
+ };
+
+ tabButtons.forEach(btn => {
+ btn.addEventListener('click', () => {
+ switchTab(btn.dataset.tab);
+ });
+ });
+ },
+
+ setupCoinHeaders: function() {
+ const coinHeaders = document.querySelectorAll('.coin-header');
+ coinHeaders.forEach(header => {
+ header.addEventListener('click', function() {
+ const coinName = this.dataset.coin;
+ const details = document.getElementById(`details-${coinName}`);
+ const arrow = this.querySelector('.toggle-arrow');
+
+ if (details.classList.contains('hidden')) {
+ details.classList.remove('hidden');
+ arrow.style.transform = 'rotate(180deg)';
+ } else {
+ details.classList.add('hidden');
+ arrow.style.transform = 'rotate(0deg)';
+ }
+ });
+ });
+ },
+
+ setupConfirmModal: function() {
+ const confirmYesBtn = document.getElementById('confirmYes');
+ if (confirmYesBtn) {
+ confirmYesBtn.addEventListener('click', () => {
+ if (typeof this.confirmCallback === 'function') {
+ this.confirmCallback();
+ }
+ this.hideConfirmDialog();
+ });
+ }
+
+ const confirmNoBtn = document.getElementById('confirmNo');
+ if (confirmNoBtn) {
+ confirmNoBtn.addEventListener('click', () => {
+ this.hideConfirmDialog();
+ });
+ }
+ },
+
+ showConfirmDialog: function(title, message, callback) {
+ this.confirmCallback = callback;
+ document.getElementById('confirmTitle').textContent = title;
+ document.getElementById('confirmMessage').textContent = message;
+ const modal = document.getElementById('confirmModal');
+ if (modal) {
+ modal.classList.remove('hidden');
+ }
+ return false;
+ },
+
+ hideConfirmDialog: function() {
+ const modal = document.getElementById('confirmModal');
+ if (modal) {
+ modal.classList.add('hidden');
+ }
+ this.confirmCallback = null;
+ return false;
+ },
+
+ confirmDisableCoin: function() {
+ this.triggerElement = document.activeElement;
+ return this.showConfirmDialog(
+ "Confirm Disable Coin",
+ "Are you sure you want to disable this coin?",
+ () => {
+ if (this.triggerElement) {
+ const form = this.triggerElement.form;
+ const hiddenInput = document.createElement('input');
+ hiddenInput.type = 'hidden';
+ hiddenInput.name = this.triggerElement.name;
+ hiddenInput.value = this.triggerElement.value;
+ form.appendChild(hiddenInput);
+ form.submit();
+ }
+ }
+ );
+ },
+
+ setupNotificationSettings: function() {
+ const notificationsTab = document.getElementById('notifications-tab');
+ if (notificationsTab) {
+ notificationsTab.addEventListener('click', () => {
+ CleanupManager.setTimeout(() => this.syncNotificationSettings(), 100);
+ });
+ }
+
+ document.addEventListener('change', (e) => {
+ if (e.target.closest('#notifications')) {
+ this.syncNotificationSettings();
+ }
+ });
+
+ this.syncNotificationSettings();
+ },
+
+ syncNotificationSettings: function() {
+ if (window.NotificationManager && typeof window.NotificationManager.updateSettings === 'function') {
+ const backendSettings = {
+ showNewOffers: document.getElementById('notifications_new_offers')?.checked || false,
+ showNewBids: document.getElementById('notifications_new_bids')?.checked || false,
+ showBidAccepted: document.getElementById('notifications_bid_accepted')?.checked || false,
+ showBalanceChanges: document.getElementById('notifications_balance_changes')?.checked || false,
+ showOutgoingTransactions: document.getElementById('notifications_outgoing_transactions')?.checked || false,
+ showSwapCompleted: document.getElementById('notifications_swap_completed')?.checked || false,
+ showUpdateNotifications: document.getElementById('check_updates')?.checked || false,
+ notificationDuration: parseInt(document.getElementById('notifications_duration')?.value || '5') * 1000
+ };
+
+ window.NotificationManager.updateSettings(backendSettings);
+ }
+ },
+
+ testUpdateNotification: function() {
+ if (window.NotificationManager) {
+ window.NotificationManager.createToast(
+ 'Update Available: v0.15.0',
+ 'update_available',
+ {
+ subtitle: 'Current: v0.14.6 • Click to view release (Test/Dummy)',
+ releaseUrl: 'https://github.com/basicswap/basicswap/releases/tag/v0.15.0',
+ releaseNotes: 'New version v0.15.0 is available. Click to view details on GitHub.'
+ }
+ );
+ }
+ },
+
+ testLiveUpdateCheck: function(event) {
+ const button = event?.target || event?.currentTarget || document.querySelector('[onclick*="testLiveUpdateCheck"]');
+ if (!button) return;
+
+ const originalText = button.textContent;
+ button.textContent = 'Checking...';
+ button.disabled = true;
+
+ fetch('/json/checkupdates', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ }
+ })
+ .then(response => response.json())
+ .then(data => {
+ if (window.NotificationManager) {
+ const currentVer = data.current_version || 'Unknown';
+ const latestVer = data.latest_version || currentVer;
+
+ if (data.update_available) {
+ window.NotificationManager.createToast(
+ `Live Update Available: v${latestVer}`,
+ 'update_available',
+ {
+ latest_version: latestVer,
+ current_version: currentVer,
+ subtitle: `Current: v${currentVer} • Click to view release`,
+ releaseUrl: `https://github.com/basicswap/basicswap/releases/tag/v${latestVer}`,
+ releaseNotes: 'This is a real update check from GitHub API.'
+ }
+ );
+ } else {
+ window.NotificationManager.createToast(
+ 'No Updates Available',
+ 'success',
+ {
+ subtitle: `Current version v${currentVer} is up to date`
+ }
+ );
+ }
+ }
+ })
+ .catch(error => {
+ console.error('Update check failed:', error);
+ if (window.NotificationManager) {
+ window.NotificationManager.createToast(
+ 'Update Check Failed',
+ 'error',
+ {
+ subtitle: 'Could not check for updates. See console for details.'
+ }
+ );
+ }
+ })
+ .finally(() => {
+ if (button) {
+ button.textContent = originalText;
+ button.disabled = false;
+ }
+ });
+ },
+
+ checkForUpdatesNow: function(event) {
+ const button = event?.target || event?.currentTarget || document.querySelector('[data-check-updates]');
+ if (!button) return;
+
+ const originalText = button.textContent;
+ button.textContent = 'Checking...';
+ button.disabled = true;
+
+ fetch('/json/checkupdates', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ }
+ })
+ .then(response => response.json())
+ .then(data => {
+ if (data.error) {
+ if (window.NotificationManager) {
+ window.NotificationManager.createToast(
+ 'Update Check Failed',
+ 'error',
+ {
+ subtitle: data.error
+ }
+ );
+ }
+ return;
+ }
+
+ if (window.NotificationManager) {
+ const currentVer = data.current_version || 'Unknown';
+ const latestVer = data.latest_version || currentVer;
+
+ if (data.update_available) {
+ window.NotificationManager.createToast(
+ `Update Available: v${latestVer}`,
+ 'update_available',
+ {
+ latest_version: latestVer,
+ current_version: currentVer,
+ subtitle: `Current: v${currentVer} • Click to view release`,
+ releaseUrl: `https://github.com/basicswap/basicswap/releases/tag/v${latestVer}`,
+ releaseNotes: `New version v${latestVer} is available. Click to view details on GitHub.`
+ }
+ );
+ } else {
+ window.NotificationManager.createToast(
+ 'You\'re Up to Date!',
+ 'success',
+ {
+ subtitle: `Current version v${currentVer} is the latest`
+ }
+ );
+ }
+ }
+ })
+ .catch(error => {
+ console.error('Update check failed:', error);
+ if (window.NotificationManager) {
+ window.NotificationManager.createToast(
+ 'Update Check Failed',
+ 'error',
+ {
+ subtitle: 'Network error. Please try again later.'
+ }
+ );
+ }
+ })
+ .finally(() => {
+ if (button) {
+ button.textContent = originalText;
+ button.disabled = false;
+ }
+ });
+ }
+ };
+
+ SettingsPage.cleanup = function() {
+ };
+
+ document.addEventListener('DOMContentLoaded', function() {
+ SettingsPage.init();
+
+ if (window.CleanupManager) {
+ CleanupManager.registerResource('settingsPage', SettingsPage, (page) => {
+ if (page.cleanup) page.cleanup();
+ });
+ }
+ });
+
+ window.SettingsPage = SettingsPage;
+ window.syncNotificationSettings = SettingsPage.syncNotificationSettings.bind(SettingsPage);
+ window.testUpdateNotification = SettingsPage.testUpdateNotification.bind(SettingsPage);
+ window.testLiveUpdateCheck = SettingsPage.testLiveUpdateCheck.bind(SettingsPage);
+ window.checkForUpdatesNow = SettingsPage.checkForUpdatesNow.bind(SettingsPage);
+ window.showConfirmDialog = SettingsPage.showConfirmDialog.bind(SettingsPage);
+ window.hideConfirmDialog = SettingsPage.hideConfirmDialog.bind(SettingsPage);
+ window.confirmDisableCoin = SettingsPage.confirmDisableCoin.bind(SettingsPage);
+
+})();
diff --git a/basicswap/static/js/swaps_in_progress.js b/basicswap/static/js/pages/swaps-page.js
similarity index 97%
rename from basicswap/static/js/swaps_in_progress.js
rename to basicswap/static/js/pages/swaps-page.js
index 3637dad..a825331 100644
--- a/basicswap/static/js/swaps_in_progress.js
+++ b/basicswap/static/js/pages/swaps-page.js
@@ -127,9 +127,9 @@ const getTimeStrokeColor = (expireTime) => {
const now = Math.floor(Date.now() / 1000);
const timeLeft = expireTime - now;
- if (timeLeft <= 300) return '#9CA3AF'; // 5 minutes or less
- if (timeLeft <= 1800) return '#3B82F6'; // 30 minutes or less
- return '#10B981'; // More than 30 minutes
+ if (timeLeft <= 300) return '#9CA3AF';
+ if (timeLeft <= 1800) return '#3B82F6';
+ return '#10B981';
};
const updateConnectionStatus = (status) => {
@@ -520,8 +520,6 @@ const createSwapTableRow = async (swap) => {
async function updateSwapsTable(options = {}) {
const { resetPage = false, refreshData = true } = options;
- //console.log('Updating swaps table:', { resetPage, refreshData });
-
if (state.refreshPromise) {
await state.refreshPromise;
return;
@@ -547,19 +545,17 @@ async function updateSwapsTable(options = {}) {
}
const data = await response.json();
- //console.log('Received swap data:', data);
-
+
state.swapsData = Array.isArray(data)
? data.filter(swap => {
const isActive = isActiveSwap(swap);
- //console.log(`Swap ${swap.bid_id}: ${isActive ? 'Active' : 'Inactive'}`, swap.bid_state);
+
return isActive;
})
: [];
- //console.log('Filtered active swaps:', state.swapsData);
} catch (error) {
- //console.error('Error fetching swap data:', error);
+
state.swapsData = [];
} finally {
state.refreshPromise = null;
@@ -585,8 +581,6 @@ async function updateSwapsTable(options = {}) {
const endIndex = startIndex + PAGE_SIZE;
const currentPageSwaps = state.swapsData.slice(startIndex, endIndex);
- //console.log('Current page swaps:', currentPageSwaps);
-
if (elements.swapsBody) {
if (currentPageSwaps.length > 0) {
const rowPromises = currentPageSwaps.map(swap => createSwapTableRow(swap));
@@ -607,7 +601,7 @@ async function updateSwapsTable(options = {}) {
});
}
} else {
- //console.log('No active swaps found, displaying empty state');
+
elements.swapsBody.innerHTML = `
No Price Data Available
+ Pending:
+ +${cleanPending} ${coinData.ticker || coinData.name} + `; + + pendingContainer.appendChild(pendingDiv); + + let initialUSD = '$0.00'; + if (window.WalletManager && window.WalletManager.coinPrices) { + const coinId = coinData.name.toLowerCase().replace(' ', '-'); + const price = window.WalletManager.coinPrices[coinId]; + if (price && price.usd) { + const usdValue = (parseFloat(cleanPending) * price.usd).toFixed(2); + initialUSD = `$${usdValue}`; + } + } + + const usdDiv = document.createElement('div'); + usdDiv.className = 'flex mb-2 justify-between items-center'; + usdDiv.innerHTML = ` +Pending USD value:
+${initialUSD}
+ `;
+
+ pendingContainer.appendChild(usdDiv);
+ },
+
+ removePendingDisplay: function(coinName) {
+ const walletContainer = this.findWalletContainer(coinName);
+ if (!walletContainer) return;
+
+ const pendingContainer = walletContainer.querySelector('.pending-container');
+ if (pendingContainer) {
+ pendingContainer.remove();
+ }
+ },
+
+ findWalletContainer: function(coinName) {
+ const balanceElements = document.querySelectorAll('.coinname-value[data-coinname]');
+ for (const element of balanceElements) {
+ if (element.getAttribute('data-coinname') === coinName) {
+ return element.closest('.bg-white, .dark\\:bg-gray-500');
+ }
+ }
+ return null;
+ },
+
+ removePendingBalance: function(coinName, balanceType) {
+ const balanceElements = document.querySelectorAll('.coinname-value[data-coinname]');
+
+ balanceElements.forEach(element => {
+ const elementCoinName = element.getAttribute('data-coinname');
+
+ if (elementCoinName === coinName) {
+ const parentDiv = element.closest('.flex.mb-2.justify-between.items-center');
+ const labelElement = parentDiv ? parentDiv.querySelector('h4') : null;
+
+ if (labelElement) {
+ const currentLabel = labelElement.textContent.trim();
+
+ if (currentLabel.includes('Pending:') || currentLabel.includes('Unconfirmed:')) {
+ const nextElement = parentDiv.nextElementSibling;
+ if (nextElement && nextElement.querySelector('h4')?.textContent.includes('USD value:')) {
+ nextElement.remove();
+ }
+ parentDiv.remove();
+ }
+ }
+ }
+ });
+ },
+
+ updatePendingBalance: function(coinName, balanceType, pendingAmount, ticker, pendingLabel, coinData) {
+ const balanceElements = document.querySelectorAll('.coinname-value[data-coinname]');
+ let targetElement = null;
+
+ balanceElements.forEach(element => {
+ const elementCoinName = element.getAttribute('data-coinname');
+ if (elementCoinName === coinName) {
+ const parentElement = element.closest('.flex.mb-2.justify-between.items-center');
+ if (parentElement) {
+ const labelElement = parentElement.querySelector('h4');
+ if (labelElement && labelElement.textContent.includes(balanceType)) {
+ targetElement = parentElement;
+ }
+ }
+ }
+ });
+
+ if (!targetElement) return;
+
+ let insertAfterElement = targetElement;
+ let nextElement = targetElement.nextElementSibling;
+ while (nextElement) {
+ const labelElement = nextElement.querySelector('h4');
+ if (labelElement) {
+ const labelText = labelElement.textContent;
+ if (labelText.includes('USD value:') && !labelText.includes('Pending') && !labelText.includes('Unconfirmed')) {
+ insertAfterElement = nextElement;
+ break;
+ }
+ if (labelText.includes('Balance:') || labelText.includes('Pending:') || labelText.includes('Unconfirmed:')) {
+ break;
+ }
+ }
+ nextElement = nextElement.nextElementSibling;
+ }
+
+ let pendingElement = insertAfterElement.nextElementSibling;
+ while (pendingElement && !pendingElement.querySelector('h4')?.textContent.includes(pendingLabel)) {
+ pendingElement = pendingElement.nextElementSibling;
+ if (pendingElement && pendingElement.querySelector('h4')?.textContent.includes('Balance:')) {
+ pendingElement = null;
+ break;
+ }
+ }
+
+ if (!pendingElement) {
+ const newPendingDiv = document.createElement('div');
+ newPendingDiv.className = 'flex mb-2 justify-between items-center';
+
+ const cleanPending = pendingAmount.toString().replace(/^\+/, '');
+
+ newPendingDiv.innerHTML = `
+ ${pendingLabel}
+ +${cleanPending} ${ticker} + `; + + insertAfterElement.parentNode.insertBefore(newPendingDiv, insertAfterElement.nextSibling); + + let initialUSD = '$0.00'; + if (window.WalletManager && window.WalletManager.coinPrices) { + const coinId = coinName.toLowerCase().replace(' ', '-'); + const price = window.WalletManager.coinPrices[coinId]; + if (price && price.usd) { + const usdValue = (parseFloat(cleanPending) * price.usd).toFixed(2); + initialUSD = `$${usdValue}`; + } + } + + const usdDiv = document.createElement('div'); + usdDiv.className = 'flex mb-2 justify-between items-center'; + usdDiv.innerHTML = ` +${pendingLabel.replace(':', '')} USD value:
+${initialUSD}
+ `;
+
+ newPendingDiv.parentNode.insertBefore(usdDiv, newPendingDiv.nextSibling);
+ } else {
+ const pendingSpan = pendingElement.querySelector('.coinname-value');
+ if (pendingSpan) {
+ const cleanPending = pendingAmount.toString().replace(/^\+/, '');
+ pendingSpan.textContent = `+${cleanPending} ${ticker}`;
+ }
+ }
+ }
+ };
+
+ document.addEventListener('DOMContentLoaded', function() {
+ WalletsPage.init();
+ });
+
+ window.WalletsPage = WalletsPage;
+
+})();
diff --git a/basicswap/static/js/ui/dropdown.js b/basicswap/static/js/ui/dropdown.js
index ed0ec86..70276e8 100644
--- a/basicswap/static/js/ui/dropdown.js
+++ b/basicswap/static/js/ui/dropdown.js
@@ -89,7 +89,7 @@
document.addEventListener('keydown', (e) => {
if (e.key === 'Escape') this.hide();
});
- window.addEventListener('scroll', this._handleScroll, true);
+ window.addEventListener('scroll', this._handleScroll, { passive: true, capture: true });
window.addEventListener('resize', this._handleResize);
}
@@ -170,7 +170,7 @@
destroy() {
document.removeEventListener('click', this._handleOutsideClick);
- window.removeEventListener('scroll', this._handleScroll, true);
+ window.removeEventListener('scroll', this._handleScroll, { passive: true, capture: true });
window.removeEventListener('resize', this._handleResize);
const index = dropdownInstances.indexOf(this);
diff --git a/basicswap/templates/404.html b/basicswap/templates/404.html
index b2529cb..dd4f668 100644
--- a/basicswap/templates/404.html
+++ b/basicswap/templates/404.html
@@ -1,21 +1,13 @@
{% include 'header.html' %}
-{% from 'style.html' import breadcrumb_line_svg %}
+{% from 'macros.html' import breadcrumb %}
-
-
- 
-
- 
-
-
-
-
-
-
-
-
- Swaps in Progress
-Monitor your currently active swap transactions.
-
-
-
-
-
-
-
-
-
-
-
-
- Automated Market Maker
-- Automatically create offers and bids based on your configuration. -
-
{% include 'inc_messages.html' %}
-
+
-
+