-
${toAmount.toFixed(4)}
+
+
${toAmount.toFixed(4)}
${coinFrom}
@@ -955,7 +1816,7 @@ function createRateColumn(offer, coinFrom, coinTo) {
const inverseRate = 1 / rate;
const fromSymbol = getCoinSymbol(coinFrom);
const toSymbol = getCoinSymbol(coinTo);
-
+
const getPriceKey = (coin) => {
const lowerCoin = coin.toLowerCase();
if (lowerCoin === 'firo' || lowerCoin === 'zcoin') {
@@ -1004,7 +1865,26 @@ function createPercentageColumn(offer) {
`;
}
-function createActionColumn(offer, buttonClass, buttonText) {
+function createActionColumn(offer, isActuallyExpired = false) {
+ const isRevoked = Boolean(offer.is_revoked);
+ const isTreatedAsSentOffer = offer.is_own_offer;
+
+ let buttonClass, buttonText;
+
+ if (isRevoked) {
+ buttonClass = 'bg-red-500 text-white hover:bg-red-600 transition duration-200';
+ buttonText = 'Revoked';
+ } else if (isActuallyExpired && isSentOffers) {
+ buttonClass = 'bg-gray-400 text-white dark:border-gray-300 text-white hover:bg-red-700 transition duration-200';
+ buttonText = 'Expired';
+ } else if (isTreatedAsSentOffer) {
+ buttonClass = 'bg-gray-300 bold text-white bold hover:bg-green-600 transition duration-200';
+ buttonText = 'Edit';
+ } else {
+ buttonClass = 'bg-blue-500 text-white hover:bg-green-600 transition duration-200';
+ buttonText = 'Swap';
+ }
+
return `
@@ -1017,61 +1897,29 @@ function createActionColumn(offer, buttonClass, buttonText) {
`;
}
-function updateProfitLoss(row, fromCoin, toCoin, fromAmount, toAmount, isOwnOffer) {
- const profitLossElement = row.querySelector('.profit-loss');
- if (!profitLossElement) {
- console.warn('Profit loss element not found in row');
- return;
- }
-
- if (!fromCoin || !toCoin) {
- console.error(`Invalid coin names: fromCoin=${fromCoin}, toCoin=${toCoin}`);
- profitLossElement.textContent = 'Error';
- profitLossElement.className = 'profit-loss text-lg font-bold text-red-500';
- return;
- }
-
- calculateProfitLoss(fromCoin, toCoin, fromAmount, toAmount, isOwnOffer)
- .then(percentDiff => {
- if (percentDiff === null) {
- profitLossElement.textContent = 'N/A';
- profitLossElement.className = 'profit-loss text-lg font-bold text-gray-400';
- return;
- }
-
- const formattedPercentDiff = percentDiff.toFixed(2);
- const percentDiffDisplay = formattedPercentDiff === "0.00" ? "0.00" :
- (percentDiff > 0 ? `+${formattedPercentDiff}` : formattedPercentDiff);
-
- const colorClass = getProfitColorClass(percentDiff);
- profitLossElement.textContent = `${percentDiffDisplay}%`;
- profitLossElement.className = `profit-loss text-lg font-bold ${colorClass}`;
-
- const tooltipId = `percentage-tooltip-${row.getAttribute('data-offer-id')}`;
- const tooltipElement = document.getElementById(tooltipId);
- if (tooltipElement) {
- const tooltipContent = createTooltipContent(isSentOffers || isOwnOffer, fromCoin, toCoin, fromAmount, toAmount);
- tooltipElement.innerHTML = `
-
- ${tooltipContent}
-
-
- `;
- }
- })
- .catch(error => {
- console.error('Error in updateProfitLoss:', error);
- profitLossElement.textContent = 'Error';
- profitLossElement.className = 'profit-loss text-lg font-bold text-red-500';
- });
-}
-
-function createTooltips(offer, treatAsSentOffer, coinFrom, coinTo, fromAmount, toAmount, postedTime, expiresIn, isActuallyExpired, isRevoked) {
+// TOOLTIP FUNCTIONS
+function createTooltips(offer, treatAsSentOffer, coinFrom, coinTo, fromAmount, toAmount, postedTime, expiresIn, isActuallyExpired, isRevoked, identity = null) {
const rate = parseFloat(offer.rate);
const fromSymbol = getCoinSymbolLowercase(coinFrom);
const toSymbol = getCoinSymbolLowercase(coinTo);
const uniqueId = `${offer.offer_id}_${offer.created_at}`;
-
+
+ const addrFrom = offer.addr_from || '';
+ const identityInfo = getIdentityInfo(addrFrom, identity);
+
+ const totalBids = identity ? (
+ identityInfo.stats.sentBidsSuccessful +
+ identityInfo.stats.recvBidsSuccessful +
+ identityInfo.stats.sentBidsFailed +
+ identityInfo.stats.recvBidsFailed +
+ identityInfo.stats.sentBidsRejected +
+ identityInfo.stats.recvBidsRejected
+ ) : 0;
+
+ const successRate = totalBids ? (
+ ((identityInfo.stats.sentBidsSuccessful + identityInfo.stats.recvBidsSuccessful) / totalBids) * 100
+ ).toFixed(1) : 0;
+
const fromPriceUSD = latestPrices[fromSymbol]?.usd || 0;
const toPriceUSD = latestPrices[toSymbol]?.usd || 0;
const rateInUSD = rate * toPriceUSD;
@@ -1120,19 +1968,14 @@ function createTooltips(offer, treatAsSentOffer, coinFrom, coinTo, fromAmount, t
+
+
-
+
-
-
+
+
-
+
+
+ ${createRecipientTooltip(uniqueId, identityInfo, identity, successRate, totalBids)}
`;
}
+function createRecipientTooltip(uniqueId, identityInfo, identity, successRate, totalBids) {
+
+ const getSuccessRateColor = (rate) => {
+ if (rate >= 80) return 'text-green-600';
+ if (rate >= 60) return 'text-yellow-600';
+ return 'text-red-600';
+ };
+
+
+ const truncateText = (text, maxLength) => {
+ if (text.length <= maxLength) return text;
+ return text.substring(0, maxLength) + '...';
+ };
+
+ return `
+ `;
+}
+
function createTooltipContent(isSentOffers, coinFrom, coinTo, fromAmount, toAmount, isOwnOffer) {
if (!coinFrom || !coinTo) {
- console.error(`Invalid coin names: coinFrom=${coinFrom}, coinTo=${coinTo}`);
+ //console.error(`Invalid coin names: coinFrom=${coinFrom}, coinTo=${coinTo}`);
return ` Unable to calculate profit/loss
Invalid coin data. `;
}
@@ -1197,7 +2123,7 @@ function createTooltipContent(isSentOffers, coinFrom, coinTo, fromAmount, toAmou
const marketRate = fromPriceUSD / toPriceUSD;
const offerRate = toAmount / fromAmount;
let percentDiff;
-
+
if (isSentOffers || isOwnOffer) {
percentDiff = ((toValueUSD / fromValueUSD) - 1) * 100;
} else {
@@ -1205,7 +2131,7 @@ function createTooltipContent(isSentOffers, coinFrom, coinTo, fromAmount, toAmou
}
const formattedPercentDiff = percentDiff.toFixed(2);
- const percentDiffDisplay = formattedPercentDiff === "0.00" ? "0.00" :
+ const percentDiffDisplay = formattedPercentDiff === "0.00" ? "0.00" :
(percentDiff > 0 ? `+${formattedPercentDiff}` : formattedPercentDiff);
const profitLabel = (isSentOffers || isOwnOffer) ? "Max Profit" : "Max Loss";
@@ -1218,8 +2144,8 @@ function createTooltipContent(isSentOffers, coinFrom, coinTo, fromAmount, toAmou
Percentage difference: ${percentDiffDisplay}%
${profitLabel}: ${profitUSD > 0 ? '' : '-'}$${Math.abs(profitUSD).toFixed(2)} USD
Calculation:
- Percentage = ${(isSentOffers || isOwnOffer) ?
- "((To Amount in USD / From Amount in USD) - 1) * 100" :
+ Percentage = ${(isSentOffers || isOwnOffer) ?
+ "((To Amount in USD / From Amount in USD) - 1) * 100" :
"((From Amount in USD / To Amount in USD) - 1) * 100"}
USD ${profitLabel} = To Amount in USD - From Amount in USD
Interpretation:
@@ -1230,8 +2156,8 @@ function createTooltipContent(isSentOffers, coinFrom, coinTo, fromAmount, toAmou
Positive percentage: You're buying below market rate (savings)
Negative percentage: You're buying above market rate (premium)
`}
- Note: ${(isSentOffers || isOwnOffer) ?
- "As a seller, a positive percentage means
you're selling for more than the current market value." :
+ Note: ${(isSentOffers || isOwnOffer) ?
+ "As a seller, a positive percentage means
you're selling for more than the current market value." :
"As a buyer, a positive percentage indicates potential savings compared to current market rates."}
Market Rate: 1 ${coinFrom} = ${marketRate.toFixed(8)} ${coinTo}
Offer Rate: 1 ${coinFrom} = ${offerRate.toFixed(8)} ${coinTo}
@@ -1241,7 +2167,7 @@ function createTooltipContent(isSentOffers, coinFrom, coinTo, fromAmount, toAmou
function createCombinedRateTooltip(offer, coinFrom, coinTo, isSentOffers, treatAsSentOffer) {
const rate = parseFloat(offer.rate);
const inverseRate = 1 / rate;
-
+
const getPriceKey = (coin) => {
const lowerCoin = coin.toLowerCase();
if (lowerCoin === 'firo' || lowerCoin === 'zcoin') {
@@ -1255,16 +2181,16 @@ function createCombinedRateTooltip(offer, coinFrom, coinTo, isSentOffers, treatA
const fromSymbol = getPriceKey(coinFrom);
const toSymbol = getPriceKey(coinTo);
-
+
const fromPriceUSD = latestPrices[fromSymbol]?.usd || 0;
const toPriceUSD = latestPrices[toSymbol]?.usd || 0;
const rateInUSD = rate * toPriceUSD;
const marketRate = fromPriceUSD / toPriceUSD;
-
+
const percentDiff = ((rate - marketRate) / marketRate) * 100;
const formattedPercentDiff = percentDiff.toFixed(2);
- const percentDiffDisplay = formattedPercentDiff === "0.00" ? "0.00" :
+ const percentDiffDisplay = formattedPercentDiff === "0.00" ? "0.00" :
(percentDiff > 0 ? `+${formattedPercentDiff}` : formattedPercentDiff);
const aboveOrBelow = percentDiff > 0 ? "above" : percentDiff < 0 ? "below" : "at";
@@ -1304,597 +2230,352 @@ function updateTooltipTargets(row, uniqueId) {
});
}
+// FILTER FUNCTIONS
+function applyFilters() {
+ if (filterTimeout) {
+ clearTimeout(filterTimeout);
+ filterTimeout = null;
+ }
+
+ try {
+ filterTimeout = setTimeout(() => {
+ jsonData = filterAndSortData();
+ updateOffersTable();
+ updateJsonView();
+ updatePaginationInfo();
+ updateClearFiltersButton();
+ filterTimeout = null;
+ }, 250);
+ } catch (error) {
+ console.error('Error in filter timeout:', error);
+ filterTimeout = null;
+ }
+}
+
function clearFilters() {
+
filterForm.reset();
+
+ const selectElements = filterForm.querySelectorAll('select');
+ selectElements.forEach(select => {
+ select.value = 'any';
+ // Trigger change event
+ const event = new Event('change', { bubbles: true });
+ select.dispatchEvent(event);
+ });
+
const statusSelect = document.getElementById('status');
if (statusSelect) {
statusSelect.value = 'any';
}
+
jsonData = [...originalJsonData];
currentPage = 1;
+
updateOffersTable();
updateJsonView();
updateCoinFilterImages();
updateClearFiltersButton();
}
-async function fetchLatestPrices() {
- const PRICES_CACHE_KEY = 'prices_coingecko';
- const cachedData = offerCache.get(PRICES_CACHE_KEY);
-
- if (cachedData) {
- latestPrices = cachedData.value;
- return cachedData.value;
- }
-
- const url = `${config.apiEndpoints.coinGecko}/simple/price?ids=bitcoin,bitcoin-cash,dash,dogecoin,decred,litecoin,particl,pivx,monero,zano,wownero,zcoin&vs_currencies=USD,BTC&api_key=${config.apiKeys.coinGecko}`;
-
- try {
- const data = await makePostRequest(url);
- if (data && Object.keys(data).length > 0) {
- latestPrices = data;
- offerCache.set(PRICES_CACHE_KEY, data, CACHE_DURATION);
-
- Object.entries(data).forEach(([coin, prices]) => {
- tableRateModule.setFallbackValue(coin, prices.usd);
- });
- return data;
- }
- } catch (error) {
- console.error('Error fetching prices:', error);
- return getFallbackPrices();
- }
-
- return getFallbackPrices();
-}
-
-function getFallbackPrices() {
- const fallbacks = {};
- const coins = ['bitcoin', 'bitcoin-cash', 'dash', 'dogecoin', 'decred', 'litecoin',
- 'particl', 'pivx', 'monero', 'zano', 'wownero', 'zcoin'];
-
- for (const coin of coins) {
- const fallbackValue = tableRateModule.getFallbackValue(coin);
- if (fallbackValue) {
- fallbacks[coin] = { usd: fallbackValue };
- }
- }
-
- return Object.keys(fallbacks).length > 0 ? fallbacks : null;
-}
-
-async function fetchOffers(manualRefresh = false) {
- setRefreshButtonLoading(true);
- const OFFERS_CACHE_KEY = `offers_${isSentOffers ? 'sent' : 'received'}`;
-
- if (!latestPrices || Object.keys(latestPrices).length === 0) {
- console.log('No price data available, initializing...');
- const priceInitSuccess = await initializePriceData();
- if (!priceInitSuccess) {
- console.error('Failed to initialize price data');
- ui.displayErrorMessage('Unable to load cryptocurrency prices. Some features may be limited.');
- }
- }
-
- if (!manualRefresh) {
- const cachedData = offerCache.get(OFFERS_CACHE_KEY);
- if (cachedData) {
- console.log('Using cached offers data');
- jsonData = cachedData.value;
- originalJsonData = [...cachedData.value];
- await updateOffersTable();
- updateJsonView();
- updatePaginationInfo();
- setRefreshButtonLoading(false);
- return;
- }
- }
-
- try {
- const endpoint = isSentOffers ? '/json/sentoffers' : '/json/offers';
- console.log(`[Debug] Fetching from endpoint: ${endpoint}`);
-
- const response = await fetch(endpoint);
- const data = await response.json();
-
- let newData = Array.isArray(data) ? data : Object.values(data);
- newData = newData.map(offer => ({
- ...offer,
- offer_id: String(offer.offer_id || ''),
- swap_type: String(offer.swap_type || 'N/A'),
- addr_from: String(offer.addr_from || ''),
- coin_from: String(offer.coin_from || ''),
- coin_to: String(offer.coin_to || ''),
- amount_from: String(offer.amount_from || '0'),
- amount_to: String(offer.amount_to || '0'),
- rate: String(offer.rate || '0'),
- created_at: Number(offer.created_at || 0),
- expire_at: Number(offer.expire_at || 0),
- is_own_offer: Boolean(offer.is_own_offer),
- amount_negotiable: Boolean(offer.amount_negotiable),
- is_revoked: Boolean(offer.is_revoked),
- unique_id: `${offer.offer_id}_${offer.created_at}_${offer.coin_from}_${offer.coin_to}`
- }));
-
- if (isInitialLoad || manualRefresh) {
- jsonData = newData;
- originalJsonData = [...newData];
- } else {
- const mergedData = mergeSentOffers(jsonData, newData);
- jsonData = mergedData;
- originalJsonData = [...mergedData];
- }
-
- offerCache.set(OFFERS_CACHE_KEY, jsonData, CACHE_DURATION);
-
- if (newEntriesCountSpan) {
- newEntriesCountSpan.textContent = jsonData.length;
- }
-
- await updateOffersTable();
- updateJsonView();
- updatePaginationInfo();
-
- } catch (error) {
- console.error('[Debug] Error fetching offers:', error);
- ui.displayErrorMessage('Failed to fetch offers. Please try again later.');
- } finally {
- setRefreshButtonLoading(false);
- }
-}
-
-function mergeSentOffers(existingOffers, newOffers) {
- console.log('[Debug] Merging offers:', {
- existing: existingOffers.length,
- new: newOffers.length
- });
-
- const offerMap = new Map();
- existingOffers.forEach(offer => {
- offerMap.set(offer.offer_id, offer);
- });
-
- newOffers.forEach(offer => {
- offerMap.set(offer.offer_id, offer);
- });
-
- const mergedOffers = Array.from(offerMap.values());
- console.log('[Debug] After merge:', mergedOffers.length);
-
- return mergedOffers;
-}
-
-function getValidOffers() {
- if (!jsonData) {
- console.warn('jsonData is undefined or null');
- return [];
- }
-
- const filteredData = filterAndSortData();
- console.log(`getValidOffers: Found ${filteredData.length} valid offers`);
- return filteredData;
-}
-
-function filterAndSortData() {
- console.log('[Debug] Starting filter with data length:', originalJsonData.length);
-
+function hasActiveFilters() {
const formData = new FormData(filterForm);
- const filters = Object.fromEntries(formData);
- console.log('[Debug] Active filters:', filters);
+ const filters = {
+ coin_to: formData.get('coin_to'),
+ coin_from: formData.get('coin_from'),
+ status: formData.get('status')
+ };
- if (filters.coin_to !== 'any') {
- filters.coin_to = coinIdToName[filters.coin_to] || filters.coin_to;
- }
- if (filters.coin_from !== 'any') {
- filters.coin_from = coinIdToName[filters.coin_from] || filters.coin_from;
- }
+ const selectElements = filterForm.querySelectorAll('select');
+ let hasChangedFilters = false;
- let filteredData = [...originalJsonData];
-
- filteredData = filteredData.filter(offer => {
- if (!isSentOffers && isOfferExpired(offer)) {
- return false;
+ selectElements.forEach(select => {
+ if (select.value !== 'any') {
+ hasChangedFilters = true;
}
-
- const coinFrom = (offer.coin_from || '').toLowerCase();
- const coinTo = (offer.coin_to || '').toLowerCase();
-
- if (filters.coin_to !== 'any') {
- if (!coinMatches(coinTo, filters.coin_to)) {
- return false;
- }
- }
-
- if (filters.coin_from !== 'any') {
- if (!coinMatches(coinFrom, filters.coin_from)) {
- return false;
- }
- }
-
- if (isSentOffers && filters.status && filters.status !== 'any') {
- const currentTime = Math.floor(Date.now() / 1000);
- const isExpired = offer.expire_at <= currentTime;
- const isRevoked = Boolean(offer.is_revoked);
-
- switch (filters.status) {
- case 'active':
- return !isExpired && !isRevoked;
- case 'expired':
- return isExpired && !isRevoked;
- case 'revoked':
- return isRevoked;
- default:
- return true;
- }
- }
-
- return true;
});
- if (currentSortColumn !== null) {
- filteredData.sort((a, b) => {
- let comparison = 0;
-
- switch(currentSortColumn) {
- case 0: // Time
- comparison = a.created_at - b.created_at;
- break;
- case 5: // Rate
- comparison = parseFloat(a.rate) - parseFloat(b.rate);
- break;
- case 6: // Market +/-
- // Calculate market differences for comparison
- const aFromSymbol = getCoinSymbolLowercase(a.coin_from);
- const aToSymbol = getCoinSymbolLowercase(a.coin_to);
- const bFromSymbol = getCoinSymbolLowercase(b.coin_from);
- const bToSymbol = getCoinSymbolLowercase(b.coin_to);
-
- const aFromPrice = latestPrices[aFromSymbol]?.usd || 0;
- const aToPrice = latestPrices[aToSymbol]?.usd || 0;
- const bFromPrice = latestPrices[bFromSymbol]?.usd || 0;
- const bToPrice = latestPrices[bToSymbol]?.usd || 0;
-
- const aMarketRate = aToPrice / aFromPrice;
- const bMarketRate = bToPrice / bFromPrice;
-
- const aOfferedRate = parseFloat(a.rate);
- const bOfferedRate = parseFloat(b.rate);
-
- const aPercentDiff = ((aOfferedRate - aMarketRate) / aMarketRate) * 100;
- const bPercentDiff = ((bOfferedRate - bMarketRate) / bMarketRate) * 100;
-
- comparison = aPercentDiff - bPercentDiff;
- break;
- case 7: // Trade
- comparison = a.offer_id.localeCompare(b.offer_id);
- break;
- }
-
- return currentSortDirection === 'desc' ? -comparison : comparison;
- });
+ return hasChangedFilters;
+}
+// UTILITY FUNCTIONS
+function formatTimeLeft(timestamp) {
+ const now = Math.floor(Date.now() / 1000);
+ if (timestamp <= now) return "Expired";
+ return formatTime(timestamp);
+}
+
+function getDisplayName(coinName) {
+ if (coinName.toLowerCase() === 'zcoin') {
+ return 'Firo';
}
-
- console.log(`[Debug] Filtered data length: ${filteredData.length}`);
- return filteredData;
+ return coinNameToDisplayName[coinName] || coinName;
}
-function calculateProfitLoss(fromCoin, toCoin, fromAmount, toAmount, isOwnOffer) {
- return new Promise((resolve) => {
- console.log(`Calculating profit/loss for ${fromAmount} ${fromCoin} to ${toAmount} ${toCoin}, isOwnOffer: ${isOwnOffer}`);
-
- if (!latestPrices) {
- console.error('Latest prices not available. Unable to calculate profit/loss.');
- resolve(null);
- return;
+function getCoinSymbolLowercase(coin) {
+ if (typeof coin === 'string') {
+ if (coin.toLowerCase() === 'bitcoin cash') {
+ return 'bitcoin-cash';
}
-
- const getPriceKey = (coin) => {
- const lowerCoin = coin.toLowerCase();
- if (lowerCoin === 'firo' || lowerCoin === 'zcoin') {
- return 'zcoin';
- }
- if (lowerCoin === 'bitcoin cash') {
- return 'bitcoin-cash';
- }
- if (lowerCoin === 'particl anon' || lowerCoin === 'particl blind') {
- return 'particl';
- }
- return coinNameToSymbol[coin] || lowerCoin;
- };
-
- const fromSymbol = getPriceKey(fromCoin);
- const toSymbol = getPriceKey(toCoin);
-
- const fromPriceUSD = latestPrices[fromSymbol]?.usd;
- const toPriceUSD = latestPrices[toSymbol]?.usd;
-
- if (!fromPriceUSD || !toPriceUSD) {
- console.warn(`Price data missing for ${fromSymbol} (${fromPriceUSD}) or ${toSymbol} (${toPriceUSD})`);
- resolve(null);
- return;
- }
-
- const fromValueUSD = fromAmount * fromPriceUSD;
- const toValueUSD = toAmount * toPriceUSD;
-
- let percentDiff;
- if (isOwnOffer) {
- percentDiff = ((toValueUSD / fromValueUSD) - 1) * 100;
- } else {
- percentDiff = ((fromValueUSD / toValueUSD) - 1) * 100;
- }
-
- console.log(`Percent difference: ${percentDiff.toFixed(2)}%`);
- resolve(percentDiff);
- });
-}
-
-async function getMarketRate(fromCoin, toCoin) {
- return new Promise((resolve) => {
- console.log(`Attempting to get market rate for ${fromCoin} to ${toCoin}`);
- if (!latestPrices) {
- console.warn('Latest prices object is not available');
- resolve(null);
- return;
- }
-
- const getPriceKey = (coin) => {
- const lowerCoin = coin.toLowerCase();
- if (lowerCoin === 'firo' || lowerCoin === 'zcoin') {
- return 'zcoin';
- }
- if (lowerCoin === 'bitcoin cash') {
- return 'bitcoin-cash';
- }
- return coinNameToSymbol[coin] || lowerCoin;
- };
-
- const fromSymbol = getPriceKey(fromCoin);
- const toSymbol = getPriceKey(toCoin);
-
- const fromPrice = latestPrices[fromSymbol]?.usd;
- const toPrice = latestPrices[toSymbol]?.usd;
- if (!fromPrice || !toPrice) {
- console.warn(`Missing price data for ${!fromPrice ? fromCoin : toCoin}`);
- resolve(null);
- return;
- }
- const rate = toPrice / fromPrice;
- console.log(`Market rate calculated: ${rate} ${toCoin}/${fromCoin}`);
- resolve(rate);
- });
-}
-
-function handleNoOffersScenario() {
- const formData = new FormData(filterForm);
- const filters = Object.fromEntries(formData);
- const hasActiveFilters = filters.coin_to !== 'any' ||
- filters.coin_from !== 'any' ||
- (filters.status && filters.status !== 'any');
-
- if (hasActiveFilters) {
- offersBody.innerHTML = `
-
- |
- No offers match the selected filters. Try different filter options or
-
- |
- `;
+ return (coinNameToSymbol[coin] || coin).toLowerCase();
+ } else if (coin && typeof coin === 'object' && coin.symbol) {
+ return coin.symbol.toLowerCase();
} else {
- offersBody.innerHTML = `
-
- |
- No active offers available. ${!isSentOffers ? 'Refreshing data...' : ''}
- |
- `;
- if (!isSentOffers) {
- setTimeout(() => fetchOffers(true), 2000);
- }
+ //console.warn('Invalid coin input:', coin);
+ return 'unknown';
}
}
-function createTableRow(offer, isSentOffers) {
- const row = document.createElement('tr');
- const uniqueId = `${offer.offer_id}_${offer.created_at}`;
- row.className = `opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600`;
- row.setAttribute('data-offer-id', uniqueId);
+function coinMatches(offerCoin, filterCoin) {
+ if (!offerCoin || !filterCoin) return false;
- const coinFrom = offer.coin_from;
- const coinTo = offer.coin_to;
- const coinFromSymbol = coinNameToSymbol[coinFrom] || coinFrom.toLowerCase();
- const coinToSymbol = coinNameToSymbol[coinTo] || coinTo.toLowerCase();
- const coinFromDisplay = getDisplayName(coinFrom);
- const coinToDisplay = getDisplayName(coinTo);
+ offerCoin = offerCoin.toLowerCase();
+ filterCoin = filterCoin.toLowerCase();
- const postedTime = formatTimeAgo(offer.created_at);
- const expiresIn = formatTimeLeft(offer.expire_at);
-
- const currentTime = Math.floor(Date.now() / 1000);
- const isActuallyExpired = currentTime > offer.expire_at;
+ if (offerCoin === filterCoin) return true;
- const isOwnOffer = offer.is_own_offer;
- const isRevoked = Boolean(offer.is_revoked);
-
- const { buttonClass, buttonText } = getButtonProperties(isActuallyExpired, isSentOffers, isOwnOffer, isRevoked);
-
- const fromAmount = parseFloat(offer.amount_from) || 0;
- const toAmount = parseFloat(offer.amount_to) || 0;
-
- row.innerHTML = `
- ${createTimeColumn(offer, postedTime, expiresIn)}
- ${createDetailsColumn(offer)}
- ${createTakerAmountColumn(offer, coinTo, coinFrom)}
- ${createSwapColumn(offer, coinFromDisplay, coinToDisplay, coinFromSymbol, coinToSymbol)}
- ${createOrderbookColumn(offer, coinFrom, coinTo)}
- ${createRateColumn(offer, coinFrom, coinTo)}
- ${createPercentageColumn(offer)}
- ${createActionColumn(offer, buttonClass, buttonText)}
- ${createTooltips(offer, isOwnOffer, coinFrom, coinTo, fromAmount, toAmount, postedTime, expiresIn, isActuallyExpired, isRevoked)}
- `;
-
- updateTooltipTargets(row, uniqueId);
- updateProfitLoss(row, coinFrom, coinTo, fromAmount, toAmount, isOwnOffer);
-
- return row;
-}
-
-async function updateOffersTable(isPaginationChange = false) {
- console.log('[Debug] Starting updateOffersTable function');
-
- try {
- if (!isPaginationChange) {
- const priceData = await fetchLatestPrices();
- if (!priceData) {
- console.error('Failed to fetch latest prices');
- } else {
- console.log('Latest prices fetched successfully');
- latestPrices = priceData;
- }
- }
-
- let validOffers = getValidOffers();
- console.log('[Debug] Valid offers:', validOffers.length);
-
- if (validOffers.length === 0) {
- handleNoOffersScenario();
- return;
- }
-
- const totalPages = Math.max(1, Math.ceil(validOffers.length / itemsPerPage));
- currentPage = Math.min(currentPage, totalPages);
-
- const startIndex = (currentPage - 1) * itemsPerPage;
- const endIndex = Math.min(startIndex + itemsPerPage, validOffers.length);
- const itemsToDisplay = validOffers.slice(startIndex, endIndex);
-
- offersBody.innerHTML = '';
-
- for (const offer of itemsToDisplay) {
- const row = createTableRow(offer, isSentOffers);
- if (row) {
- offersBody.appendChild(row);
- }
- }
-
- updateRowTimes();
- initializeFlowbiteTooltips();
- updatePaginationControls(totalPages);
-
- if (tableRateModule?.initializeTable) {
- tableRateModule.initializeTable();
- }
-
- if (!isPaginationChange) {
- lastRefreshTime = Date.now();
- if (newEntriesCountSpan) {
- const displayCount = isSentOffers ? jsonData.length : validOffers.length;
- newEntriesCountSpan.textContent = displayCount;
- }
- if (!isSentOffers) {
- nextRefreshCountdown = getTimeUntilNextExpiration();
- updateLastRefreshTime();
- updateNextRefreshTime();
- }
- }
-
- } catch (error) {
- console.error('[Debug] Error in updateOffersTable:', error);
- offersBody.innerHTML = ` | An error occurred while updating the offers table. Please try again later. | `;
- } finally {
- setRefreshButtonLoading(false);
- }
-}
-
-function startRefreshCountdown() {
- if (isSentOffers) return;
-
- let refreshTimeout;
- let countdownInterval;
-
- function refreshCycle() {
- checkExpiredAndFetchNew()
- .then(() => {
- startCountdown();
- })
- .catch(error => {
- console.error('Error in refresh cycle:', error);
- nextRefreshCountdown = 60;
- startCountdown();
- });
- }
-
- function startCountdown() {
- if (countdownInterval) clearInterval(countdownInterval);
- if (refreshTimeout) clearTimeout(refreshTimeout);
-
- updateNextRefreshTime();
-
- countdownInterval = setInterval(() => {
- if (nextRefreshCountdown > 0) {
- nextRefreshCountdown--;
- updateNextRefreshTime();
- } else {
- clearInterval(countdownInterval);
- refreshCycle();
- }
- }, 1000);
-
- refreshTimeout = setTimeout(refreshCycle, nextRefreshCountdown * 1000);
- }
-
- refreshCycle();
-
- window.addEventListener('beforeunload', () => {
- if (countdownInterval) clearInterval(countdownInterval);
- if (refreshTimeout) clearTimeout(refreshTimeout);
- });
-}
-
-function initializeTableRateModule() {
- if (typeof window.tableRateModule !== 'undefined') {
- tableRateModule = window.tableRateModule;
- console.log('tableRateModule loaded successfully');
+ if ((offerCoin === 'firo' || offerCoin === 'zcoin') &&
+ (filterCoin === 'firo' || filterCoin === 'zcoin')) {
return true;
- } else {
- console.warn('tableRateModule not found. Waiting for it to load...');
+ }
+
+ if ((offerCoin === 'bitcoincash' && filterCoin === 'bitcoin cash') ||
+ (offerCoin === 'bitcoin cash' && filterCoin === 'bitcoincash')) {
+ return true;
+ }
+
+ const particlVariants = ['particl', 'particl anon', 'particl blind'];
+ if (filterCoin === 'particl' && particlVariants.includes(offerCoin)) {
+ return true;
+ }
+
+ if (particlVariants.includes(filterCoin)) {
+ return offerCoin === filterCoin;
+ }
+
+ return false;
+}
+
+function getProfitColorClass(percentage) {
+ const numericPercentage = parseFloat(percentage);
+ if (numericPercentage > 0) return 'text-green-500';
+ if (numericPercentage < 0) return 'text-red-500';
+ if (numericPercentage === 0) return 'text-yellow-400';
+ return 'text-white';
+}
+
+function isOfferExpired(offer) {
+ if (isSentOffers) {
return false;
}
+ const currentTime = Math.floor(Date.now() / 1000);
+ const isExpired = offer.expire_at <= currentTime;
+ if (isExpired) {
+ console.log(`Offer ${offer.offer_id} is expired. Expire time: ${offer.expire_at}, Current time: ${currentTime}`);
+ }
+ return isExpired;
}
-function continueInitialization() {
- if (typeof volumeToggle !== 'undefined' && volumeToggle.init) {
- volumeToggle.init();
+function getTimeUntilNextExpiration() {
+ const currentTime = Math.floor(Date.now() / 1000);
+ const nextExpiration = jsonData.reduce((earliest, offer) => {
+ const timeUntilExpiration = offer.expire_at - currentTime;
+ return timeUntilExpiration > 0 && timeUntilExpiration < earliest ? timeUntilExpiration : earliest;
+ }, Infinity);
+
+ return Math.max(MIN_REFRESH_INTERVAL, Math.min(nextExpiration, 300));
+}
+
+function calculateInverseRate(rate) {
+ return (1 / parseFloat(rate)).toFixed(8);
+}
+
+function formatTime(timestamp, addAgoSuffix = false) {
+ const now = Math.floor(Date.now() / 1000);
+ const diff = Math.abs(now - timestamp);
+
+ let timeString;
+ if (diff < 60) {
+ timeString = `${diff} seconds`;
+ } else if (diff < 3600) {
+ timeString = `${Math.floor(diff / 60)} minutes`;
+ } else if (diff < 86400) {
+ timeString = `${Math.floor(diff / 3600)} hours`;
+ } else if (diff < 2592000) {
+ timeString = `${Math.floor(diff / 86400)} days`;
+ } else if (diff < 31536000) {
+ timeString = `${Math.floor(diff / 2592000)} months`;
+ } else {
+ timeString = `${Math.floor(diff / 31536000)} years`;
}
-
- updateCoinFilterImages();
- fetchOffers().then(() => {
- applyFilters();
- if (!isSentOffers) {
- startRefreshCountdown();
+
+ return addAgoSuffix ? `${timeString} ago` : timeString;
+}
+
+function escapeHtml(unsafe) {
+ if (typeof unsafe !== 'string') {
+ //console.warn('escapeHtml received a non-string value:', unsafe);
+ return '';
+ }
+ return unsafe
+ .replace(/&/g, "&")
+ .replace(//g, ">")
+ .replace(/"/g, """)
+ .replace(/'/g, "'");
+}
+
+function getCoinSymbol(fullName) {
+ const symbolMap = {
+ 'Bitcoin': 'BTC', 'Litecoin': 'LTC', 'Monero': 'XMR',
+ 'Particl': 'PART', 'Particl Blind': 'PART', 'Particl Anon': 'PART',
+ 'PIVX': 'PIVX', 'Firo': 'FIRO', 'Zcoin': 'FIRO',
+ 'Dash': 'DASH', 'Decred': 'DCR', 'Wownero': 'WOW',
+ 'Bitcoin Cash': 'BCH', 'Dogecoin': 'DOGE'
+ };
+ return symbolMap[fullName] || fullName;
+}
+
+// EVENT LISTENERS
+document.querySelectorAll('th[data-sortable="true"]').forEach(header => {
+ header.addEventListener('click', () => {
+ const columnIndex = parseInt(header.getAttribute('data-column-index'));
+
+ if (currentSortColumn === columnIndex) {
+ currentSortDirection = currentSortDirection === 'asc' ? 'desc' : 'asc';
+ } else {
+
+ currentSortColumn = columnIndex;
+ currentSortDirection = 'desc';
}
+
+ document.querySelectorAll('.sort-icon').forEach(icon => {
+ icon.classList.remove('text-blue-500');
+ icon.textContent = '↓';
+ });
+
+ const sortIcon = document.getElementById(`sort-icon-${columnIndex}`);
+ if (sortIcon) {
+ sortIcon.textContent = currentSortDirection === 'asc' ? '↑' : '↓';
+ sortIcon.classList.add('text-blue-500');
+ }
+
+ document.querySelectorAll('th[data-sortable="true"]').forEach(th => {
+ const thColumnIndex = parseInt(th.getAttribute('data-column-index'));
+ if (thColumnIndex === columnIndex) {
+ th.classList.add('text-blue-500');
+ } else {
+ th.classList.remove('text-blue-500');
+ }
+ });
+
+ localStorage.setItem('tableSortColumn', currentSortColumn);
+ localStorage.setItem('tableSortDirection', currentSortDirection);
+
+ applyFilters();
});
- const listingLabel = document.querySelector('span[data-listing-label]');
- if (listingLabel) {
- listingLabel.textContent = isSentOffers ? 'Total Listings: ' : 'Network Listings: ';
- }
-
- function updateTimesLoop() {
- updateRowTimes();
- requestAnimationFrame(updateTimesLoop);
- }
- requestAnimationFrame(updateTimesLoop);
-
- setInterval(updateRowTimes, 900000);
- console.log('Initialization completed');
-}
+ header.classList.add('cursor-pointer', 'hover:bg-gray-100', 'dark:hover:bg-gray-700');
+});
+const eventListeners = {
+ listeners: [],
+
+ add(element, eventType, handler, options = false) {
+ element.addEventListener(eventType, handler, options);
+ this.listeners.push({ element, eventType, handler, options });
+ // console.log(`Added ${eventType} listener to`, element);
+ },
+
+ addWindowListener(eventType, handler, options = false) {
+ window.addEventListener(eventType, handler, options);
+ this.listeners.push({ element: window, eventType, handler, options });
+ // console.log(`Added ${eventType} window listener`);
+ },
+
+ removeAll() {
+ console.log('Removing all event listeners...');
+ this.listeners.forEach(({ element, eventType, handler, options }) => {
+ element.removeEventListener(eventType, handler, options);
+ //console.log(`Removed ${eventType} listener from`, element);
+ });
+ this.listeners = [];
+ },
+
+ removeByElement(element) {
+ const remainingListeners = [];
+ this.listeners = this.listeners.filter(listener => {
+ if (listener.element === element) {
+ listener.element.removeEventListener(
+ listener.eventType,
+ listener.handler,
+ listener.options
+ );
+ console.log(`✂️ Removed ${listener.eventType} listener from`, element);
+ return false;
+ }
+ return true;
+ });
+ },
+};
+
+// TIMER MANAGEMENT
+const timerManager = {
+ intervals: [],
+ timeouts: [],
+
+ addInterval(callback, delay) {
+ const intervalId = setInterval(callback, delay);
+ this.intervals.push(intervalId);
+ return intervalId;
+ },
+
+ addTimeout(callback, delay) {
+ const timeoutId = setTimeout(callback, delay);
+ this.timeouts.push(timeoutId);
+ return timeoutId;
+ },
+
+ clearAllIntervals() {
+ this.intervals.forEach(clearInterval);
+ this.intervals = [];
+ },
+
+ clearAllTimeouts() {
+ this.timeouts.forEach(clearTimeout);
+ this.timeouts = [];
+ },
+
+ clearAll() {
+ this.clearAllIntervals();
+ this.clearAllTimeouts();
+ }
+};
+
+// INITIALIZATION AND EVENT BINDING
document.addEventListener('DOMContentLoaded', () => {
- console.log('DOM content loaded, initializing...');
-
- initializeFooter();
+ //console.log('DOM content loaded, initializing...');
+ console.log('View type:', isSentOffers ? 'sent offers' : 'received offers');
+
updateClearFiltersButton();
-
+
+ // Add event listeners for filter controls
+ const selectElements = filterForm.querySelectorAll('select');
+ selectElements.forEach(select => {
+ select.addEventListener('change', () => {
+ updateClearFiltersButton();
+ });
+ });
+
+ filterForm.addEventListener('change', () => {
+ applyFilters();
+ updateClearFiltersButton();
+ });
+
+ setTimeout(() => {
+ console.log('Starting WebSocket initialization...');
+ WebSocketManager.initialize();
+ }, 1000);
+
if (initializeTableRateModule()) {
continueInitialization();
} else {
@@ -1906,27 +2587,34 @@ document.addEventListener('DOMContentLoaded', () => {
clearInterval(retryInterval);
continueInitialization();
} else if (retryCount >= maxRetries) {
- console.error('Failed to load tableRateModule after multiple attempts');
+ //console.error('Failed to load tableRateModule after multiple attempts');
clearInterval(retryInterval);
continueInitialization();
}
}, 1000);
}
- filterForm.addEventListener('submit', (e) => {
+ eventListeners.add(filterForm, 'submit', (e) => {
e.preventDefault();
applyFilters();
});
- filterForm.addEventListener('change', applyFilters);
+ eventListeners.add(filterForm, 'change', applyFilters);
const coinToSelect = document.getElementById('coin_to');
const coinFromSelect = document.getElementById('coin_from');
-
- coinToSelect.addEventListener('change', applyFilters);
- coinFromSelect.addEventListener('change', applyFilters);
- document.getElementById('clearFilters').addEventListener('click', () => {
+ eventListeners.add(coinToSelect, 'change', () => {
+ applyFilters();
+ updateCoinFilterImages();
+ });
+
+ eventListeners.add(coinFromSelect, 'change', () => {
+ applyFilters();
+ updateCoinFilterImages();
+ });
+
+ eventListeners.add(document.getElementById('clearFilters'), 'click', () => {
filterForm.reset();
const statusSelect = document.getElementById('status');
if (statusSelect) {
@@ -1938,108 +2626,104 @@ document.addEventListener('DOMContentLoaded', () => {
updateCoinFilterImages();
});
- document.getElementById('refreshOffers').addEventListener('click', async () => {
- console.log('🔄 Smart refresh initiated');
- setRefreshButtonLoading(true);
+ eventListeners.add(document.getElementById('refreshOffers'), 'click', async () => {
+ console.log('Manual refresh initiated');
- try {
+ const refreshButton = document.getElementById('refreshOffers');
+ const refreshIcon = document.getElementById('refreshIcon');
+ const refreshText = document.getElementById('refreshText');
- const PRICES_CACHE_KEY = 'prices_coingecko';
- const cachedPrices = offerCache.get(PRICES_CACHE_KEY);
-
- if (!cachedPrices || !cachedPrices.remainingTime || cachedPrices.remainingTime < 60000) {
+ refreshButton.disabled = true;
+ refreshIcon.classList.add('animate-spin');
+ refreshText.textContent = 'Refreshing...';
+ refreshButton.classList.add('opacity-75', 'cursor-wait');
- console.log('Fetching fresh price data...');
- const newPrices = await fetchLatestPrices();
- if (newPrices) {
- latestPrices = newPrices;
+ try {
+ const endpoint = isSentOffers ? '/json/sentoffers' : '/json/offers';
+ const response = await fetch(endpoint);
+ if (!response.ok) {
+ throw new Error(`HTTP error! status: ${response.status}`);
}
- } else {
- console.log('Using cached price data (still valid)');
- }
+ const newData = await response.json();
- const endpoint = isSentOffers ? '/json/sentoffers' : '/json/offers';
- const response = await fetch(endpoint);
- const newData = await response.json();
+ const processedNewData = Array.isArray(newData) ? newData : Object.values(newData);
+ console.log('Fetched offers:', processedNewData.length);
- const processedNewData = Array.isArray(newData) ? newData : Object.values(newData);
- const formattedNewData = processedNewData.map(offer => ({
- ...offer,
- offer_id: String(offer.offer_id || ''),
- swap_type: String(offer.swap_type || 'N/A'),
- addr_from: String(offer.addr_from || ''),
- coin_from: String(offer.coin_from || ''),
- coin_to: String(offer.coin_to || ''),
- amount_from: String(offer.amount_from || '0'),
- amount_to: String(offer.amount_to || '0'),
- rate: String(offer.rate || '0'),
- created_at: Number(offer.created_at || 0),
- expire_at: Number(offer.expire_at || 0),
- is_own_offer: Boolean(offer.is_own_offer),
- amount_negotiable: Boolean(offer.amount_negotiable),
- is_revoked: Boolean(offer.is_revoked),
- unique_id: `${offer.offer_id}_${offer.created_at}_${offer.coin_from}_${offer.coin_to}`
- }));
-
- const existingIds = new Set(jsonData.map(offer => offer.offer_id));
- const newOffers = formattedNewData.filter(offer => !existingIds.has(offer.offer_id));
-
- if (newOffers.length > 0) {
- console.log(`Found ${newOffers.length} new offers`);
-
- jsonData = mergeSentOffers(jsonData, formattedNewData);
+ jsonData = formatInitialData(processedNewData);
originalJsonData = [...jsonData];
-
- const OFFERS_CACHE_KEY = `offers_${isSentOffers ? 'sent' : 'received'}`;
- offerCache.set(OFFERS_CACHE_KEY, jsonData, CACHE_DURATION);
- } else {
- console.log('No new offers found');
+
+ await updateOffersTable();
+ updateJsonView();
+ updatePaginationInfo();
+
+ console.log(' Manual refresh completed successfully');
+
+ } catch (error) {
+ console.error('Error during manual refresh:', error);
+ ui.displayErrorMessage('Failed to refresh offers. Please try again later.');
+ } finally {
+ refreshButton.disabled = false;
+ refreshIcon.classList.remove('animate-spin');
+ refreshText.textContent = 'Refresh';
+ refreshButton.classList.remove('opacity-75', 'cursor-wait');
}
-
- if (!isSentOffers) {
- jsonData = jsonData.filter(offer => !isOfferExpired(offer));
- originalJsonData = [...jsonData];
- }
-
- await updateOffersTable();
- updateJsonView();
- updatePaginationInfo();
-
- console.log('Smart refresh completed successfully');
-
- } catch (error) {
- console.error('Error during smart refresh:', error);
- ui.displayErrorMessage('Failed to refresh offers. Please try again later.');
- } finally {
- setRefreshButtonLoading(false);
- }
-});
-
- toggleButton.addEventListener('click', () => {
- tableView.classList.toggle('hidden');
- jsonView.classList.toggle('hidden');
- toggleButton.textContent = tableView.classList.contains('hidden') ? 'Show Table View' : 'Show JSON View';
});
- prevPageButton.addEventListener('click', () => {
+ eventListeners.add(prevPageButton, 'click', () => {
if (currentPage > 1) {
currentPage--;
const validOffers = getValidOffers();
const totalPages = Math.ceil(validOffers.length / itemsPerPage);
- updateOffersTable(true);
+ updateOffersTable();
updatePaginationControls(totalPages);
}
});
- nextPageButton.addEventListener('click', () => {
+ eventListeners.add(nextPageButton, 'click', () => {
const validOffers = getValidOffers();
const totalPages = Math.ceil(validOffers.length / itemsPerPage);
if (currentPage < totalPages) {
currentPage++;
- updateOffersTable(true);
+ updateOffersTable();
updatePaginationControls(totalPages);
}
});
+
+ timerManager.addInterval(() => {
+ if (WebSocketManager.isConnected()) {
+ console.log('WebSocket Status: Connected');
+ }
+ }, 30000);
+
+ timerManager.addInterval(() => {
+ CacheManager.cleanup();
+ }, 300000);
+
+ updateCoinFilterImages();
+ fetchOffers().then(() => {
+ //console.log('Initial offers fetched');
+ applyFilters();
+ }).catch(error => {
+ console.error('Error fetching initial offers:', error);
+ });
+
+ const listingLabel = document.querySelector('span[data-listing-label]');
+ if (listingLabel) {
+ listingLabel.textContent = isSentOffers ? 'Total Listings: ' : 'Network Listings: ';
+ }
+
+ timerManager.addInterval(updateRowTimes, 900000);
+
+ document.addEventListener('visibilitychange', () => {
+ if (!document.hidden) {
+ console.log('Page became visible, checking WebSocket connection');
+ if (!WebSocketManager.isConnected()) {
+ WebSocketManager.connect();
+ }
+ }
+ });
+
+ console.log('Initialization completed');
});
console.log('Offers Table Module fully initialized');
diff --git a/basicswap/static/js/pricechart.js b/basicswap/static/js/pricechart.js
index a379d71..d1712d6 100644
--- a/basicswap/static/js/pricechart.js
+++ b/basicswap/static/js/pricechart.js
@@ -1,4 +1,4 @@
-// Config
+// CONFIG
const config = {
apiKeys: getAPIKeys(),
coins: [
@@ -38,14 +38,7 @@ const config = {
currentResolution: 'year'
};
-function getAPIKeys() {
- return {
- cryptoCompare: '{{chart_api_key}}',
- coinGecko: '{{coingecko_api_key}}'
- };
-}
-
-// Utils
+// UTILS
const utils = {
formatNumber: (number, decimals = 2) =>
number.toFixed(decimals).replace(/\B(?=(\d{3})+(?!\d))/g, ','),
@@ -69,7 +62,7 @@ const utils = {
}
};
-// Error
+// ERROR
class AppError extends Error {
constructor(message, type = 'AppError') {
super(message);
@@ -77,7 +70,7 @@ class AppError extends Error {
}
}
-// Log
+// LOG
const logger = {
log: (message) => console.log(`[AppLog] ${new Date().toISOString()}: ${message}`),
warn: (message) => console.warn(`[AppWarn] ${new Date().toISOString()}: ${message}`),
@@ -86,8 +79,9 @@ const logger = {
// API
const api = {
- makePostRequest: (url, headers = {}) => {
- return new Promise((resolve, reject) => {
+ makePostRequest: (url, headers = {}) => {
+ const apiKeys = getAPIKeys();
+ return new Promise((resolve, reject) => {
const xhr = new XMLHttpRequest();
xhr.open('POST', '/json/readurl');
xhr.setRequestHeader('Content-Type', 'application/json');
@@ -147,12 +141,12 @@ const api = {
.map(coin => coin.name)
.join(',');
const url = `${config.apiEndpoints.coinGecko}/simple/price?ids=${coinIds}&vs_currencies=usd,btc&include_24hr_vol=true&include_24hr_change=true&api_key=${config.apiKeys.coinGecko}`;
-
- console.log(`Fetching data for multiple coins from CoinGecko: ${url}`);
+
+ //console.log(`Fetching data for multiple coins from CoinGecko: ${url}`);
try {
const data = await api.makePostRequest(url);
- console.log(`Raw CoinGecko data:`, data);
+ //console.log(`Raw CoinGecko data:`, data);
if (typeof data !== 'object' || data === null) {
throw new AppError(`Invalid data structure received from CoinGecko`);
@@ -171,11 +165,11 @@ const api = {
};
});
- console.log(`Transformed CoinGecko data:`, transformedData);
+ //console.log(`Transformed CoinGecko data:`, transformedData);
cache.set(cacheKey, transformedData);
return transformedData;
} catch (error) {
- console.error(`Error fetching CoinGecko data:`, error);
+ //console.error(`Error fetching CoinGecko data:`, error);
return { error: error.message };
}
},
@@ -185,30 +179,30 @@ const api = {
coinSymbols = [coinSymbols];
}
- console.log(`Fetching historical data for coins: ${coinSymbols.join(', ')}`);
+ //console.log(`Fetching historical data for coins: ${coinSymbols.join(', ')}`);
const results = {};
const fetchPromises = coinSymbols.map(async coin => {
const coinConfig = config.coins.find(c => c.symbol === coin);
if (!coinConfig) {
- console.error(`Coin configuration not found for ${coin}`);
+ //console.error(`Coin configuration not found for ${coin}`);
return;
}
if (coin === 'WOW') {
const url = `${config.apiEndpoints.coinGecko}/coins/wownero/market_chart?vs_currency=usd&days=1&api_key=${config.apiKeys.coinGecko}`;
- console.log(`CoinGecko URL for WOW: ${url}`);
+ //console.log(`CoinGecko URL for WOW: ${url}`);
try {
const response = await api.makePostRequest(url);
if (response && response.prices) {
results[coin] = response.prices;
} else {
- console.error(`Unexpected data structure for WOW:`, response);
+ //console.error(`Unexpected data structure for WOW:`, response);
}
} catch (error) {
- console.error(`Error fetching CoinGecko data for WOW:`, error);
+ //console.error(`Error fetching CoinGecko data for WOW:`, error);
}
} else {
const resolution = config.resolutions[config.currentResolution];
@@ -219,31 +213,31 @@ const api = {
url = `${config.apiEndpoints.cryptoCompareHistorical}?fsym=${coin}&tsym=USD&limit=${resolution.days}&api_key=${config.apiKeys.cryptoCompare}`;
}
- console.log(`CryptoCompare URL for ${coin}: ${url}`);
+ //console.log(`CryptoCompare URL for ${coin}: ${url}`);
try {
const response = await api.makePostRequest(url);
if (response.Response === "Error") {
- console.error(`API Error for ${coin}:`, response.Message);
+ //console.error(`API Error for ${coin}:`, response.Message);
} else if (response.Data && response.Data.Data) {
results[coin] = response.Data;
} else {
- console.error(`Unexpected data structure for ${coin}:`, response);
+ //console.error(`Unexpected data structure for ${coin}:`, response);
}
} catch (error) {
- console.error(`Error fetching CryptoCompare data for ${coin}:`, error);
+ //console.error(`Error fetching CryptoCompare data for ${coin}:`, error);
}
}
});
await Promise.all(fetchPromises);
- console.log('Final results object:', JSON.stringify(results, null, 2));
+ //console.log('Final results object:', JSON.stringify(results, null, 2));
return results;
}
};
-// Cache
+// CACHE
const cache = {
set: (key, value, customTtl = null) => {
const item = {
@@ -252,7 +246,7 @@ const cache = {
expiresAt: Date.now() + (customTtl || app.cacheTTL)
};
localStorage.setItem(key, JSON.stringify(item));
- console.log(`Cache set for ${key}, expires in ${(customTtl || app.cacheTTL) / 1000} seconds`);
+ //console.log(`Cache set for ${key}, expires in ${(customTtl || app.cacheTTL) / 1000} seconds`);
},
get: (key) => {
const itemStr = localStorage.getItem(key);
@@ -263,17 +257,17 @@ const cache = {
const item = JSON.parse(itemStr);
const now = Date.now();
if (now < item.expiresAt) {
- console.log(`Cache hit for ${key}, ${(item.expiresAt - now) / 1000} seconds remaining`);
+ //console.log(`Cache hit for ${key}, ${(item.expiresAt - now) / 1000} seconds remaining`);
return {
value: item.value,
remainingTime: item.expiresAt - now
};
} else {
- console.log(`Cache expired for ${key}`);
+ //console.log(`Cache expired for ${key}`);
localStorage.removeItem(key);
}
} catch (e) {
- console.error('Error parsing cache item:', e);
+ //console.error('Error parsing cache item:', e);
localStorage.removeItem(key);
}
return null;
@@ -287,7 +281,7 @@ const cache = {
localStorage.removeItem(key);
}
});
- console.log('Cache cleared');
+ //console.log('Cache cleared');
}
};
@@ -343,7 +337,7 @@ displayCoinData: (coin, data) => {
updateUI(false);
} catch (error) {
- console.error(`Error displaying data for ${coin}:`, error.message);
+ //console.error(`Error displaying data for ${coin}:`, error.message);
updateUI(true);
}
},
@@ -488,7 +482,7 @@ displayCoinData: (coin, data) => {
}
};
-// Chart
+// CHART
const chartModule = {
chart: null,
currentCoin: 'BTC',
@@ -675,12 +669,12 @@ const chartModule = {
plugins: [chartModule.verticalLinePlugin]
});
- console.log('Chart initialized:', chartModule.chart);
+ //console.log('Chart initialized:', chartModule.chart);
},
prepareChartData: (coinSymbol, data) => {
if (!data) {
- console.error(`No data received for ${coinSymbol}`);
+ //console.error(`No data received for ${coinSymbol}`);
return [];
}
@@ -739,7 +733,7 @@ const chartModule = {
y: price
}));
} else {
- console.error(`Unexpected data structure for ${coinSymbol}:`, data);
+ //console.error(`Unexpected data structure for ${coinSymbol}:`, data);
return [];
}
@@ -748,7 +742,7 @@ const chartModule = {
y: point.y
}));
} catch (error) {
- console.error(`Error preparing chart data for ${coinSymbol}:`, error);
+ //console.error(`Error preparing chart data for ${coinSymbol}:`, error);
return [];
}
},
@@ -786,21 +780,21 @@ const chartModule = {
if (cachedData && Object.keys(cachedData.value).length > 0) {
data = cachedData.value;
- console.log(`Using cached data for ${coinSymbol} (${config.currentResolution})`);
+ //console.log(`Using cached data for ${coinSymbol} (${config.currentResolution})`);
} else {
- console.log(`Fetching fresh data for ${coinSymbol} (${config.currentResolution})`);
+ //console.log(`Fetching fresh data for ${coinSymbol} (${config.currentResolution})`);
const allData = await api.fetchHistoricalDataXHR([coinSymbol]);
data = allData[coinSymbol];
if (!data || Object.keys(data).length === 0) {
throw new Error(`No data returned for ${coinSymbol}`);
}
- console.log(`Caching new data for ${cacheKey}`);
+ //console.log(`Caching new data for ${cacheKey}`);
cache.set(cacheKey, data, config.cacheTTL);
cachedData = null;
}
const chartData = chartModule.prepareChartData(coinSymbol, data);
- console.log(`Prepared chart data for ${coinSymbol}:`, chartData.slice(0, 5));
+ //console.log(`Prepared chart data for ${coinSymbol}:`, chartData.slice(0, 5));
if (chartData.length === 0) {
throw new Error(`No valid chart data for ${coinSymbol}`);
@@ -832,7 +826,7 @@ const chartModule = {
chartModule.chart.update('active');
} else {
- console.error('Chart object not initialized');
+ //console.error('Chart object not initialized');
throw new Error('Chart object not initialized');
}
@@ -841,7 +835,7 @@ const chartModule = {
ui.updateLoadTimeAndCache(loadTime, cachedData);
} catch (error) {
- console.error(`Error updating chart for ${coinSymbol}:`, error);
+ //console.error(`Error updating chart for ${coinSymbol}:`, error);
ui.displayErrorMessage(`Failed to update chart for ${coinSymbol}: ${error.message}`);
} finally {
chartModule.hideChartLoader();
@@ -849,14 +843,30 @@ const chartModule = {
},
showChartLoader: () => {
- document.getElementById('chart-loader').classList.remove('hidden');
- document.getElementById('coin-chart').classList.add('hidden');
+ const loader = document.getElementById('chart-loader');
+ const chart = document.getElementById('coin-chart');
+
+ if (!loader || !chart) {
+ //console.warn('Chart loader or chart container elements not found');
+ return;
+ }
+
+ loader.classList.remove('hidden');
+ chart.classList.add('hidden');
},
hideChartLoader: () => {
- document.getElementById('chart-loader').classList.add('hidden');
- document.getElementById('coin-chart').classList.remove('hidden');
- }
+ const loader = document.getElementById('chart-loader');
+ const chart = document.getElementById('coin-chart');
+
+ if (!loader || !chart) {
+ //console.warn('Chart loader or chart container elements not found');
+ return;
+ }
+
+ loader.classList.add('hidden');
+ chart.classList.remove('hidden');
+ },
};
Chart.register(chartModule.verticalLinePlugin);
@@ -928,7 +938,7 @@ const app = {
chartModule.initChart();
chartModule.showChartLoader();
} else {
- console.warn('Chart container not found, skipping chart initialization');
+ //console.warn('Chart container not found, skipping chart initialization');
}
console.log('Loading all coin data...');
@@ -941,13 +951,13 @@ const app = {
}
ui.setActiveContainer('btc-container');
- console.log('Setting up event listeners and initializations...');
+ //console.log('Setting up event listeners and initializations...');
app.setupEventListeners();
app.initializeSelectImages();
app.initAutoRefresh();
} catch (error) {
- console.error('Error during initialization:', error);
+ //console.error('Error during initialization:', error);
ui.displayErrorMessage('Failed to initialize the dashboard. Please try refreshing the page.');
} finally {
ui.hideLoader();
@@ -959,7 +969,7 @@ const app = {
},
loadAllCoinData: async () => {
- console.log('Loading data for all coins...');
+ //console.log('Loading data for all coins...');
try {
const allCoinData = await api.fetchCoinGeckoDataXHR();
if (allCoinData.error) {
@@ -974,24 +984,24 @@ const app = {
const cacheKey = `coinData_${coin.symbol}`;
cache.set(cacheKey, coinData);
} else {
- console.warn(`No data found for ${coin.symbol}`);
+ //console.warn(`No data found for ${coin.symbol}`);
}
}
} catch (error) {
- console.error('Error loading all coin data:', error);
+ //console.error('Error loading all coin data:', error);
ui.displayErrorMessage('Failed to load coin data. Please try refreshing the page.');
} finally {
- console.log('All coin data loaded');
+ //console.log('All coin data loaded');
}
},
loadCoinData: async (coin) => {
- console.log(`Loading data for ${coin.symbol}...`);
+ //console.log(`Loading data for ${coin.symbol}...`);
const cacheKey = `coinData_${coin.symbol}`;
let cachedData = cache.get(cacheKey);
let data;
if (cachedData) {
- console.log(`Using cached data for ${coin.symbol}`);
+ //console.log(`Using cached data for ${coin.symbol}`);
data = cachedData.value;
} else {
try {
@@ -1004,11 +1014,11 @@ const app = {
if (data.error) {
throw new Error(data.error);
}
- console.log(`Caching new data for ${coin.symbol}`);
+ //console.log(`Caching new data for ${coin.symbol}`);
cache.set(cacheKey, data);
cachedData = null;
} catch (error) {
- console.error(`Error fetching ${coin.symbol} data:`, error.message);
+ //console.error(`Error fetching ${coin.symbol} data:`, error.message);
data = {
error: error.message
};
@@ -1018,16 +1028,16 @@ const app = {
}
ui.displayCoinData(coin.symbol, data);
ui.updateLoadTimeAndCache(0, cachedData);
- console.log(`Data loaded for ${coin.symbol}`);
+ //console.log(`Data loaded for ${coin.symbol}`);
},
setupEventListeners: () => {
- console.log('Setting up event listeners...');
+ //console.log('Setting up event listeners...');
config.coins.forEach(coin => {
const container = document.getElementById(`${coin.symbol.toLowerCase()}-container`);
if (container) {
container.addEventListener('click', () => {
- console.log(`${coin.symbol} container clicked`);
+ //console.log(`${coin.symbol} container clicked`);
ui.setActiveContainer(`${coin.symbol.toLowerCase()}-container`);
if (chartModule.chart) {
if (coin.symbol === 'WOW') {
@@ -1054,7 +1064,7 @@ const app = {
if (closeErrorButton) {
closeErrorButton.addEventListener('click', ui.hideErrorMessage);
}
- console.log('Event listeners set up');
+ //console.log('Event listeners set up');
},
initAutoRefresh: () => {
@@ -1090,7 +1100,7 @@ const app = {
earliestExpiration = Math.min(earliestExpiration, cachedItem.expiresAt);
}
} catch (error) {
- console.error(`Error parsing cached item ${key}:`, error);
+ //console.error(`Error parsing cached item ${key}:`, error);
localStorage.removeItem(key);
}
}
@@ -1149,7 +1159,7 @@ const app = {
const cacheKey = `coinData_${coin.symbol}`;
cache.set(cacheKey, coinData);
} else {
- console.error(`No data found for ${coin.symbol}`);
+ //console.error(`No data found for ${coin.symbol}`);
}
}
@@ -1164,7 +1174,7 @@ const app = {
console.log('All data refreshed successfully');
} catch (error) {
- console.error('Error refreshing all data:', error);
+ //console.error('Error refreshing all data:', error);
ui.displayErrorMessage('Failed to refresh all data. Please try again.');
} finally {
ui.hideLoader();
@@ -1231,7 +1241,7 @@ const app = {
},
startSpinAnimation: () => {
- console.log('Starting spin animation on auto-refresh button');
+ //console.log('Starting spin animation on auto-refresh button');
const svg = document.querySelector('#toggle-auto-refresh svg');
if (svg) {
svg.classList.add('animate-spin');
@@ -1242,7 +1252,7 @@ const app = {
},
stopSpinAnimation: () => {
- console.log('Stopping spin animation on auto-refresh button');
+ //console.log('Stopping spin animation on auto-refresh button');
const svg = document.querySelector('#toggle-auto-refresh svg');
if (svg) {
svg.classList.remove('animate-spin');
@@ -1250,7 +1260,7 @@ const app = {
},
updateLastRefreshedTime: () => {
- console.log('Updating last refreshed time');
+ //console.log('Updating last refreshed time');
const lastRefreshedElement = document.getElementById('last-refreshed-time');
if (lastRefreshedElement && app.lastRefreshedTime) {
const formattedTime = app.lastRefreshedTime.toLocaleTimeString();
@@ -1268,43 +1278,43 @@ const app = {
},
updateBTCPrice: async () => {
- console.log('Updating BTC price...');
+ //console.log('Updating BTC price...');
try {
const priceData = await api.fetchCoinGeckoDataXHR();
if (priceData.error) {
- console.error('Error fetching BTC price:', priceData.error);
+ //console.error('Error fetching BTC price:', priceData.error);
app.btcPriceUSD = 0;
} else if (priceData.btc && priceData.btc.current_price) {
app.btcPriceUSD = priceData.btc.current_price;
} else {
- console.error('Unexpected BTC data structure:', priceData);
+ //console.error('Unexpected BTC data structure:', priceData);
app.btcPriceUSD = 0;
}
} catch (error) {
- console.error('Error fetching BTC price:', error);
+ //console.error('Error fetching BTC price:', error);
app.btcPriceUSD = 0;
}
- console.log('Current BTC price:', app.btcPriceUSD);
+ //console.log('Current BTC price:', app.btcPriceUSD);
},
sortTable: (columnIndex) => {
- console.log(`Sorting column: ${columnIndex}`);
+ //console.log(`Sorting column: ${columnIndex}`);
const sortableColumns = [0, 5, 6, 7]; // 0: Time, 5: Rate, 6: Market +/-, 7: Trade
if (!sortableColumns.includes(columnIndex)) {
- console.log(`Column ${columnIndex} is not sortable`);
+ //console.log(`Column ${columnIndex} is not sortable`);
return;
}
const table = document.querySelector('table');
if (!table) {
- console.error("Table not found for sorting.");
+ //console.error("Table not found for sorting.");
return;
}
const rows = Array.from(table.querySelectorAll('tbody tr'));
console.log(`Found ${rows.length} rows to sort`);
const sortIcon = document.getElementById(`sort-icon-${columnIndex}`);
if (!sortIcon) {
- console.error("Sort icon not found.");
+ //console.error("Sort icon not found.");
return;
}
const sortOrder = sortIcon.textContent === '↓' ? 1 : -1;
@@ -1318,7 +1328,7 @@ sortTable: (columnIndex) => {
case 1: // Time column
aValue = getSafeTextContent(a.querySelector('td:first-child .text-xs:first-child'));
bValue = getSafeTextContent(b.querySelector('td:first-child .text-xs:first-child'));
- console.log(`Comparing times: "${aValue}" vs "${bValue}"`);
+ //console.log(`Comparing times: "${aValue}" vs "${bValue}"`);
const parseTime = (timeStr) => {
const [value, unit] = timeStr.split(' ');
@@ -1337,7 +1347,7 @@ sortTable: (columnIndex) => {
case 6: // Market +/-
aValue = getSafeTextContent(a.cells[columnIndex]);
bValue = getSafeTextContent(b.cells[columnIndex]);
- console.log(`Comparing values: "${aValue}" vs "${bValue}"`);
+ //console.log(`Comparing values: "${aValue}" vs "${bValue}"`);
aValue = parseFloat(aValue.replace(/[^\d.-]/g, '') || '0');
bValue = parseFloat(bValue.replace(/[^\d.-]/g, '') || '0');
@@ -1346,8 +1356,8 @@ sortTable: (columnIndex) => {
case 7: // Trade
const aCell = a.cells[columnIndex];
const bCell = b.cells[columnIndex];
- console.log('aCell:', aCell ? aCell.outerHTML : 'null');
- console.log('bCell:', bCell ? bCell.outerHTML : 'null');
+ //console.log('aCell:', aCell ? aCell.outerHTML : 'null');
+ //console.log('bCell:', bCell ? bCell.outerHTML : 'null');
aValue = getSafeTextContent(aCell.querySelector('a')) ||
getSafeTextContent(aCell.querySelector('button')) ||
@@ -1359,7 +1369,7 @@ sortTable: (columnIndex) => {
aValue = aValue.toLowerCase();
bValue = bValue.toLowerCase();
- console.log(`Comparing trade actions: "${aValue}" vs "${bValue}"`);
+ //console.log(`Comparing trade actions: "${aValue}" vs "${bValue}"`);
if (aValue === bValue) return 0;
if (aValue === "swap") return -1 * sortOrder;
@@ -1369,7 +1379,7 @@ sortTable: (columnIndex) => {
default:
aValue = getSafeTextContent(a.cells[columnIndex]);
bValue = getSafeTextContent(b.cells[columnIndex]);
- console.log(`Comparing default values: "${aValue}" vs "${bValue}"`);
+ //console.log(`Comparing default values: "${aValue}" vs "${bValue}"`);
return aValue.localeCompare(bValue, undefined, {
numeric: true,
sensitivity: 'base'
@@ -1381,9 +1391,9 @@ sortTable: (columnIndex) => {
if (tbody) {
rows.forEach(row => tbody.appendChild(row));
} else {
- console.error("Table body not found.");
+ //console.error("Table body not found.");
}
- console.log('Sorting completed');
+ //console.log('Sorting completed');
},
initializeSelectImages: () => {
@@ -1391,7 +1401,7 @@ sortTable: (columnIndex) => {
const select = document.getElementById(selectId);
const button = document.getElementById(`${selectId}_button`);
if (!select || !button) {
- console.error(`Elements not found for ${selectId}`);
+ //console.error(`Elements not found for ${selectId}`);
return;
}
const selectedOption = select.options[select.selectedIndex];
@@ -1418,7 +1428,7 @@ sortTable: (columnIndex) => {
select.addEventListener('change', handleSelectChange);
updateSelectedImage(selectId);
} else {
- console.error(`Select element not found for ${selectId}`);
+ //console.error(`Select element not found for ${selectId}`);
}
});
},
@@ -1445,7 +1455,7 @@ updateResolutionButtons: (coinSymbol) => {
});
},
- toggleAutoRefresh: () => {
+ toggleAutoRefresh: () => {
console.log('Toggling auto-refresh');
app.isAutoRefreshEnabled = !app.isAutoRefreshEnabled;
localStorage.setItem('autoRefreshEnabled', app.isAutoRefreshEnabled.toString());
@@ -1480,4 +1490,12 @@ resolutionButtons.forEach(button => {
});
});
+// LOAD
app.init();
+
+document.addEventListener('visibilitychange', () => {
+ if (!document.hidden && chartModule.chart) {
+ console.log('Page became visible, reinitializing chart');
+ chartModule.updateChart(chartModule.currentCoin, true);
+ }
+});
diff --git a/basicswap/templates/footer.html b/basicswap/templates/footer.html
index 54dbd89..e61fd82 100644
--- a/basicswap/templates/footer.html
+++ b/basicswap/templates/footer.html
@@ -25,7 +25,7 @@
© 2024~ (BSX) BasicSwap
BSX: v{{ version }}
- GUI: v3.1.1
+ GUI: v3.1.2
Made with
{{ love_svg | safe }}
diff --git a/basicswap/templates/index.html b/basicswap/templates/index.html
index a7d7119..0d1985e 100644
--- a/basicswap/templates/index.html
+++ b/basicswap/templates/index.html
@@ -4,7 +4,7 @@
- (BSX) BasicSwap v{{ version }} - (GUI) v.3.1.1
+ (BSX) BasicSwap v{{ version }} - (GUI) v.3.1.2
Welcome to BasicSwap DEX
The World's Most Secure and Decentralized DEX, Safely swap cryptocurrencies without central points of failure.
It’s free, completely trustless, and highly secure.
diff --git a/basicswap/templates/offer.html b/basicswap/templates/offer.html
index a5e29b6..fca5910 100644
--- a/basicswap/templates/offer.html
+++ b/basicswap/templates/offer.html
@@ -392,21 +392,11 @@
- Settings
+ Value
|
-
- | Amount you will get {{ data.amt_from }} {{ data.tla_from }}
- {% if data.xmr_type == true %}
- (excluding estimated {{ data.amt_from_lock_spend_tx_fee }} {{ data.tla_from }} in tx fees).
- {% else %}
- (excluding a tx fee).
- {% endif %} |
- Amount you will send {{ data.amt_to }} {{ data.tla_to }}
- |
-
| Send From Address |
@@ -475,21 +465,135 @@ if (document.readyState === 'loading') {
handleBidsPageAddress();
}
- {% if data.amount_negotiable == true %}
- |
- | Amount |
-
-
- |
-
- {% endif %}
- {% if data.rate_negotiable == true %}
-
- | Rate |
-
- |
-
- {% endif %}
+{% if data.amount_negotiable == true %}
+
+
+
+ 
+
+ Sending ({{ data.tla_to }})
+ |
+
+
+
+
+ max {{ data.amt_to }} ({{ data.tla_to }})
+
+ |
+
+
+
+
+ 
+
+ Receiving ({{ data.tla_from }})
+ |
+
+
+
+
+ max {{ data.amt_from }} ({{ data.tla_from }})
+
+ (excluding estimated {{ data.amt_from_lock_spend_tx_fee }} {{ data.tla_from }} in tx fees)
+ {% else %}
+ (excluding a tx fee)
+ {% endif %}
+ |
+
+{% else %}
+
+ |
+
+
+
+ Sending ({{ data.tla_to }})
+ |
+
+
+
+
+ max {{ data.amt_to }} ({{ data.tla_to }})
+
+ (Amount not variable)
+ |
+
+
+ |
+
+
+
+ Receiving ({{ data.tla_from }})
+ |
+
+
+
+
+ max {{ data.amt_from }} ({{ data.tla_from }})
+
+ (excluding estimated {{ data.amt_from_lock_spend_tx_fee }} {{ data.tla_from }} in tx fees)
+ {% else %}
+ (excluding a tx fee)
+ {% endif %}
+ |
+
+{% endif %}
+
+ | Rate |
+
+ {% if data.rate_negotiable == true %}
+
+ {% else %}
+
+ (Rate is not negotiable)
+ {% endif %}
+ |
+
| Minutes valid |
@@ -519,15 +623,24 @@ if (document.readyState === 'loading') {
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+ | |