Fix wownero rate + bug fixes.

- Fix wownero rates on offers page.
- Fix wownero USD price on wallet/wallets page.
- Set dark mode as default.
- Fix tooltips.
- Fix JS errors.

basicswap/templates/footer.html

@@ -43,7 +43,6 @@
   </div>
 </section>
 <script>
-  (function() {
   var toggleImages = function() {
     var html = document.querySelector('html');
     var darkImages = document.querySelectorAll('.dark-image');
@@ -56,13 +55,13 @@
       toggleImageDisplay(darkImages, 'none');
       toggleImageDisplay(lightImages, 'block');
     }
-    }
+  };
 
   var toggleImageDisplay = function(images, display) {
     images.forEach(function(img) {
       img.style.display = display;
     });
-    }
+  };
 
   document.addEventListener('DOMContentLoaded', function() {
     var themeToggle = document.getElementById('theme-toggle');
@@ -75,7 +74,6 @@
 
     toggleImages();
   });
-  })();
 </script>
 <script>
   var themeToggleDarkIcon = document.getElementById('theme-toggle-dark-icon');

basicswap/templates/header.html

@@ -12,6 +12,7 @@
   <link type="text/css" media="all" href="/static/css/style.css" rel="stylesheet">
   <script src="/static/js/main.js"></script>
   <script src="/static/js/libs/flowbite.js"></script>
+
 <script>
   const isDarkMode =
     localStorage.getItem('color-theme') === 'dark' ||
@@ -19,7 +20,7 @@
       window.matchMedia('(prefers-color-scheme: dark)').matches);
 
   if (!localStorage.getItem('color-theme')) {
-    localStorage.setItem('color-theme', isDarkMode ? 'dark' : 'light');
+    localStorage.setItem('color-theme', 'dark');
   }
 
   document.documentElement.classList.toggle('dark', isDarkMode);
@@ -260,10 +261,10 @@
               <!-- dev mode icons on/off -->
               <ul class="xl:flex">
               <li>
-                <div data-tooltip-target="tooltip-debug" class="ml-5 flex items-center text-gray-50 hover:text-gray-100 text-sm">
+                <div data-tooltip-target="tooltip-DEV" class="ml-5 flex items-center text-gray-50 hover:text-gray-100 text-sm">
                   {{ debug_nerd_svg | safe }}
-                  <span data-tooltip-target="tooltip-DEV" ></span> </div>
-                <div id="tooltip-debug" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
+                 </div>
+                <div id="tooltip-DEV" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
                   <p><b>Debug mode:</b> Active</p>
                   {% if debug_ui_mode == true %}
                   <p><b>Debug UI mode:</b> Active</p>
@@ -278,8 +279,7 @@
                 <ul class="xl:flex"><li>
                 {% if locked == true %}
                 <div data-tooltip-target="tooltip-locked-wallets" class="ml-5 flex items-center text-gray-50 hover:text-gray-100 text-sm">
-                  {{ wallet_locked_svg | safe }}
-                  <span data-tooltip-target="tooltip-locked-wallets" ></span> </div>
+                  {{ wallet_locked_svg | safe }}</div>
                 <div id="tooltip-locked-wallets" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
                   <p><b>Wallets:</b> Locked </p>
                 </div>
@@ -287,8 +287,7 @@
                 <a href='/lock'>
                 <div data-tooltip-target="tooltip-unlocked-wallets" class="ml-5 flex items-center text-gray-50 hover:text-gray-100 text-sm">
                 {{ wallet_unlocked_svg | safe }}
-                  <span data-tooltip-target="tooltip-unlocked-wallets" ></span> </div>
-                <div class="tooltip-arrow" data-popper-arrow></div>
+                 </div>
                 <div id="tooltip-unlocked-wallets" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">
                   <p><b>Wallets:</b> Unlocked </p>
                 </div>
@@ -303,7 +302,7 @@
                     <a href="/tor">
                       <div data-tooltip-target="tooltip-tor" class="flex items-center text-gray-50 hover:text-gray-100 text-sm">
                         {{ tor_purple_svg | safe }}
-                    </a> <span data-tooltip-target="tooltip-tor"></span></div>
+                    </a></div>
                     <div id="tooltip-tor" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip"><b>Tor mode:</b> Active
                       {% if tor_established == true %}
                       <br><b>Tor:</b> Connected
@@ -316,7 +315,6 @@
               <button data-tooltip-target="tooltip-darkmode" id="theme-toggle" type="button" class="text-gray-500 dark:text-gray-400 focus:outline-none rounded-lg text-sm ml-5">
                 {{ sun_svg | safe }}
                 {{ moon_svg | safe }}
-               <span data-tooltip-target="tooltip-darkmode"></span>
                   <div id="tooltip-darkmode" role="tooltip" class="inline-block absolute invisible z-10 py-2 px-3 text-sm font-medium text-white bg-blue-500 rounded-lg shadow-sm opacity-0 transition-opacity duration-300 tooltip">Dark mode</div>
               </button>
             </div>

basicswap/templates/offers.html

@@ -486,22 +486,22 @@ window.addEventListener('load', function() {
     if (container != null) {
       container.addEventListener('click', () => {
         setActiveContainer(container_id);
-        updateChart(coin);
+        updateChart(coin, coinGeckoApiKey);
       });
     }
     if (coin === 'WOW') {
-      fetchWowneroData();
+      fetchWowneroData(coinGeckoApiKey);
     } else if (coin === 'ZANO') {
       fetchZanoData(coinGeckoApiKey);
     } else {
       fetchCryptoCompareData(coin, api_key);
     }
   });
-  updateChart('BTC');
+  updateChart('BTC', coinGeckoApiKey);
 });
 
-function fetchZanoData(coinGeckoApiKey) {
-    fetch(`https://api.coingecko.com/api/v3/coins/zano/market_chart?vs_currency=usd&days=30&interval=daily&api_key=${coinGeckoApiKey}`)
+function fetchWowneroData(coinGeckoApiKey) {
+    fetch(`https://api.coingecko.com/api/v3/coins/wownero/market_chart?vs_currency=usd&days=1&api_key={{coingecko_api_key}}`)
         .then(response => {
             if (!response.ok) {
                 throw new Error(`Error fetching data. Status: ${response.status}`);
@@ -509,16 +509,17 @@ function fetchZanoData(coinGeckoApiKey) {
             return response.json();
         })
         .then(data => {
-            displayZanoData(data);
+            displayWowneroData(data);
         })
         .catch(error => {
-            console.error('Fetching Zano data:', error);
-            displayErrorMessage('Unable to fetch data for Zano. Please try again later.');
+            console.error('Fetching Wownero data:', error);
+            displayErrorMessage('Unable to fetch data for Wownero. Please try again later.');
         });
 }
 
-    function fetchCryptoCompareData(coin, api_key) {
-      fetch(`https://min-api.cryptocompare.com/data/pricemultifull?fsyms=${coin}&tsyms=USD,BTC&api_key=${api_key}`)
+
+function fetchZanoData(coinGeckoApiKey) {
+    fetch(`https://api.coingecko.com/api/v3/coins/zano/market_chart?vs_currency=usd&days=30&interval=daily&api_key={{coingecko_api_key}}`)
         .then(response => {
             if (!response.ok) {
                 throw new Error(`Error fetching data. Status: ${response.status}`);
@@ -526,16 +527,16 @@ function fetchZanoData(coinGeckoApiKey) {
             return response.json();
         })
         .then(data => {
-          displayCoinData(coin, data);
+            displayZanoData(data);
         })
         .catch(error => {
-          console.error(`Fetching ${coin} data:`, error);
-          displayErrorMessage(`Unable to fetch data. Please verify your API key or try again later.`);
+            console.error('Fetching Zano data:', error);
+            displayErrorMessage('Unable to fetch data for Zano. Please try again later.');
         });
 }
 
-    function fetchWowneroData(coinGeckoApiKey) {
-        fetch(`https://api.coingecko.com/api/v3/coins/wownero/market_chart?vs_currency=usd&days=1&api_key=${coinGeckoApiKey}`)
+function fetchCryptoCompareData(coin, api_key) {
+    fetch(`https://min-api.cryptocompare.com/data/pricemultifull?fsyms=${coin}&tsyms=USD,BTC&api_key={{chart_api_key}}`)
         .then(response => {
             if (!response.ok) {
                 throw new Error(`Error fetching data. Status: ${response.status}`);
@@ -543,15 +544,14 @@ function fetchZanoData(coinGeckoApiKey) {
             return response.json();
         })
         .then(data => {
-                displayWowneroData(data);
+            displayCoinData(coin, data);
         })
         .catch(error => {
-                console.error('Fetching Wownero data:', error);
-                displayErrorMessage('Unable to fetch data for Wownero. Please try again later.');
+            console.error(`Fetching ${coin} data:`, error);
+            displayErrorMessage(`Unable to fetch data. Please verify your API key or try again later.`);
         });
 }
 
-
     function displayWowneroData(data) {
       const prices = data.prices;
 
@@ -667,6 +667,8 @@ function negativePriceChangeHTML(value) {
 }
 
 function setActiveContainer(containerId) {
+  const api_key = '{{chart_api_key}}';
+  const coinGeckoApiKey = '{{coingecko_api_key}}';
   const containerIds = ['btc-container', 'xmr-container', 'part-container', 'pivx-container', 'firo-container', 'dash-container', 'ltc-container', 'doge-container', 'eth-container', 'dcr-container', 'zano-container', 'wow-container'];
   const activeClass = 'active-container';
   containerIds.forEach(id => {
@@ -691,13 +693,10 @@ const coinOptions = {
   }
 };
 
-function updateChart(coinSymbol) {
+function updateChart(coinSymbol, coinGeckoApiKey) {
   coin = coinSymbol;
-  const api_key = '{{chart_api_key}}';
-  const coinGeckoApiKey = '{{coingecko_api_key}}';
-
   if (coinSymbol === 'WOW') {
-    fetch(`https://api.coingecko.com/api/v3/coins/wownero/market_chart?vs_currency=usd&days=30&interval=daily&api_key=${coinGeckoApiKey}`)
+    fetch(`https://api.coingecko.com/api/v3/coins/wownero/market_chart?vs_currency=usd&days=30&interval=daily&api_key={{coingecko_api_key}}`)
       .then(response => response.json())
       .then(data => {
         const chartData = {
@@ -717,7 +716,7 @@ function updateChart(coinSymbol) {
       })
       .catch(error => console.error('Error updating chart for Wownero:', error));
   } else if (coinSymbol === 'ZANO') {
-    fetch(`https://api.coingecko.com/api/v3/coins/zano/market_chart?vs_currency=usd&days=30&interval=daily&api_key=${coinGeckoApiKey}`)
+    fetch(`https://api.coingecko.com/api/v3/coins/zano/market_chart?vs_currency=usd&days=30&interval=daily&api_key={{coingecko_api_key}}`)
       .then(response => response.json())
       .then(data => {
         const chartData = {
@@ -737,7 +736,7 @@ function updateChart(coinSymbol) {
       })
       .catch(error => console.error('Error updating chart for Zano:', error));
   } else {
-    fetch(`https://min-api.cryptocompare.com/data/v2/histoday?fsym=${coinSymbol}&tsym=USD&limit=30&api_key=${api_key}`)
+    fetch(`https://min-api.cryptocompare.com/data/v2/histoday?fsym=${coinSymbol}&tsym=USD&limit=30&api_key={{chart_api_key}}`)
       .then(response => response.json())
       .then(data => {
         // Check if data is undefined
@@ -1322,6 +1321,7 @@ const coinNameToSymbol = {
 };
 
 const exchangeRateCache = {};
+const coinGeckoApiKey = '{{coingecko_api_key}}';
 
 function updateUsdValue(cryptoCell, coinFullName, isRate = false) {
     const coinSymbol = coinNameToSymbol[coinFullName];
@@ -1332,48 +1332,32 @@ function updateUsdValue(cryptoCell, coinFullName, isRate = false) {
 
     const cryptoValue = parseFloat(cryptoCell.textContent);
     const usdCell = cryptoCell.nextElementSibling;
-    if (usdCell) {
-        // Check if the exchange rate is in the cache and is not expired
+    if (!usdCell) {
+        console.error("USD cell does not exist.");
+        return;
+    }
+
     if (exchangeRateCache[coinSymbol] && !isCacheExpired(coinSymbol)) {
         console.log(`Using cached exchange rate for ${coinSymbol}`);
         const exchangeRate = exchangeRateCache[coinSymbol].rate;
-            const cryptoValue = parseFloat(cryptoCell.textContent);
         const usdValue = cryptoValue * exchangeRate;
         usdCell.textContent = `${usdValue.toFixed(2)} USD`;
 
         updateProfitLoss(cryptoCell.closest('tr'));
         updateProfitValue(cryptoCell.closest('tr'));
-        }
-    } else {
+        return;
     }
 
-    if (isRate) {
-        const rateCell = usdCell.nextElementSibling;
-        if (rateCell) {
-            const usdValue = rateCell.previousElementSibling.textContent * cryptoValue;
-            usdCell.textContent = `${usdValue.toFixed(2)} USD`;
-        } else {
-            console.error("Rate cell does not exist.");
-        }
-    } else {
-        const apiUrl = `https://min-api.cryptocompare.com/data/price?fsym=${coinSymbol}&tsyms=USD`;
+    const apiUrl = coinSymbol === 'WOW'
+        ? `https://api.coingecko.com/api/v3/simple/price?ids=wownero&vs_currencies=usd&api_key=${{coingecko_api_key}}`
+        : `https://min-api.cryptocompare.com/data/price?fsym=${coinSymbol}&tsyms=USD`;
 
-        if (exchangeRateCache[coinSymbol] && !isCacheExpired(coinSymbol)) {
-            // console.log(`Using cached exchange rate for ${coinSymbol}`);
-            const exchangeRate = exchangeRateCache[coinSymbol].rate;
-            const usdValue = cryptoValue * exchangeRate;
-            usdCell.textContent = `${usdValue.toFixed(2)} USD`;
-
-            updateProfitLoss(cryptoCell.closest('tr'));
-            updateProfitValue(cryptoCell.closest('tr'));
-        } else {
-            // console.log(`Fetching exchange rate from API for ${coinSymbol}`);
     fetch(apiUrl)
         .then(response => response.json())
         .then(data => {
-                    const exchangeRate = data.USD;
+            const exchangeRate = coinSymbol === 'WOW' ? data.wownero.usd : data.USD;
             if (!isNaN(exchangeRate)) {
-                        // console.log(`Received exchange rate from API for ${coinSymbol}`);
+                console.log(`Received exchange rate from API for ${coinSymbol}`);
                 const usdValue = cryptoValue * exchangeRate;
                 usdCell.textContent = `${usdValue.toFixed(2)} USD`;
 
@@ -1391,10 +1375,10 @@ function updateUsdValue(cryptoCell, coinFullName, isRate = false) {
             }
         })
         .catch(error => {
+            console.error(`Fetching ${coinSymbol} data:`, error);
+            usdCell.textContent = 'Error fetching data';
         });
 }
-    }
-}
 
 function isCacheExpired(coinSymbol) {
     const cacheEntry = exchangeRateCache[coinSymbol];
@@ -1408,15 +1392,17 @@ function updateProfitLoss(row) {
 
     if (!isNaN(sellingUSD) && !isNaN(buyingUSD)) {
         const profitLossPercentage = ((sellingUSD - buyingUSD) / buyingUSD) * 100;
-        profitLossCell.textContent = `${profitLossPercentage.toFixed(2)}%`;
 
         if (profitLossPercentage > 0) {
-            profitLossCell.classList.add('text-green-500'); // Profit (positive)
+            profitLossCell.textContent = `-${profitLossPercentage.toFixed(2)}%`; // Change from "+" to "-"
+            profitLossCell.classList.add('text-green-500'); // Profit (negative)
             profitLossCell.classList.remove('text-red-500');
         } else if (profitLossPercentage < 0) {
-            profitLossCell.classList.add('text-red-500'); // Loss (negative)
+            profitLossCell.textContent = `+${Math.abs(profitLossPercentage).toFixed(2)}%`; // Change from "-" to "+"
+            profitLossCell.classList.add('text-red-500'); // Loss (positive)
             profitLossCell.classList.remove('text-green-500');
         } else {
+            profitLossCell.textContent = `${profitLossPercentage.toFixed(2)}%`;
             profitLossCell.classList.add('text-yellow-500'); // No profit or loss (zero)
             profitLossCell.classList.remove('text-green-500', 'text-red-500');
         }
@@ -1426,6 +1412,7 @@ function updateProfitLoss(row) {
     }
 }
 
+
 function updateProfitValue(row) {
     const sellingUSD = parseFloat(row.querySelector('.usd-value').textContent);
     const profitValueCell = row.querySelector('.profit-value');
@@ -1460,23 +1447,18 @@ function sortTable(columnIndex) {
     const sortIcon = document.getElementById(`sort-icon-${columnIndex}`);
     let sortOrder = sortIcon.textContent === '↓' ? 1 : -1;
 
-    if (sortOrder === 1) {
-        sortIcon.textContent = '↑';
-    } else {
-        sortIcon.textContent = '↓';
-    }
+    sortIcon.textContent = sortOrder === 1 ? '↑' : '↓';
 
     rows.sort((a, b) => {
         const aValue = a.cells[columnIndex].textContent.trim();
         const bValue = b.cells[columnIndex].textContent.trim();
 
-        if (aValue < bValue) return -1 * sortOrder;
-        if (aValue > bValue) return 1 * sortOrder;
-        return 0;
+        return aValue < bValue ? -1 * sortOrder : aValue > bValue ? 1 * sortOrder : 0;
     });
 
     rows.forEach(row => table.querySelector('tbody').appendChild(row));
 }
+
 document.addEventListener('DOMContentLoaded', function() {
     const coinToSelect = document.getElementById('coin_to');
     const coinFromSelect = document.getElementById('coin_from');
@@ -1486,11 +1468,7 @@ document.addEventListener('DOMContentLoaded', function() {
     function updateSelectedImage(selectElement, buttonElement) {
         const selectedOption = selectElement.options[selectElement.selectedIndex];
         const imageURL = selectedOption.getAttribute('data-image');
-    if (imageURL) {
-      buttonElement.style.backgroundImage = `url('${imageURL}')`;
-    } else {
-      buttonElement.style.backgroundImage = 'none';
-    }
+        buttonElement.style.backgroundImage = imageURL ? `url('${imageURL}')` : 'none';
     }
 
     coinToSelect.addEventListener('change', function() {
@@ -1505,6 +1483,7 @@ document.addEventListener('DOMContentLoaded', function() {
     updateSelectedImage(coinToSelect, coinToButton);
     updateSelectedImage(coinFromSelect, coinFromButton);
 });
+
 </script>
 {% include 'footer.html' %}
 </body>

basicswap/templates/wallet.html

@@ -848,15 +848,29 @@
   'Particl Blind': 'PART',
   'Particl Anon': 'PART',
   'Monero': 'XMR',
+  'Wownero': 'WOW',
   'Litecoin': 'LTC',
   'Firo': 'FIRO',
   'Dash': 'DASH',
   'PIVX': 'PIVX',
-    'DECRED': 'DCR',
-    'WOWNERO': 'WOW'
+  'Decred': 'DCR',
+  'Zano': 'ZANO',
 };
 
-  const getUsdValue = (cryptoValue, coinSymbol) => fetch(`https://min-api.cryptocompare.com/data/price?fsym=${coinSymbol}&tsyms=USD`)
+const getUsdValue = (cryptoValue, coinSymbol) => {
+  if (coinSymbol === 'WOW') {
+    return fetch(`https://api.coingecko.com/api/v3/simple/price?ids=wownero&vs_currencies=usd`)
+      .then(response => response.json())
+      .then(data => {
+        const exchangeRate = data.wownero.usd;
+        if (!isNaN(exchangeRate)) {
+          return cryptoValue * exchangeRate;
+        } else {
+          throw new Error(`Invalid exchange rate for ${coinSymbol}`);
+        }
+      });
+  } else {
+    return fetch(`https://min-api.cryptocompare.com/data/price?fsym=${coinSymbol}&tsyms=USD`)
       .then(response => response.json())
       .then(data => {
         const exchangeRate = data.USD;
@@ -866,6 +880,8 @@
           throw new Error(`Invalid exchange rate for ${coinSymbol}`);
         }
       });
+  }
+};
 
   const updateUsdValue = async (cryptoCell, coinFullName, usdValueSpan) => {
     const coinSymbol = coinNameToSymbol[coinFullName] || '';

basicswap/templates/wallets.html

@@ -223,9 +223,28 @@ const coinNameToSymbol = {
 };
 
 const getUsdValue = (cryptoValue, coinSymbol) => {
-  return fetch(`https://min-api.cryptocompare.com/data/price?fsym=${coinSymbol}&tsyms=USD`)
+  let apiUrl;
+
+  if (coinSymbol === 'WOW') {
+    apiUrl = `https://api.coingecko.com/api/v3/simple/price?ids=wownero&vs_currencies=usd`;
+  } else {
+    apiUrl = `https://min-api.cryptocompare.com/data/price?fsym=${coinSymbol}&tsyms=USD`;
+  }
+
+  return fetch(apiUrl)
     .then(response => response.json())
     .then(data => {
+      if (coinSymbol === 'WOW') {
+        const exchangeRate = data.wownero.usd;
+        if (!isNaN(exchangeRate)) {
+          return {
+            usdValue: cryptoValue * exchangeRate,
+            btcValue: cryptoValue / exchangeRate
+          };
+        } else {
+          throw new Error(`Invalid exchange rate for ${coinSymbol}`);
+        }
+      } else {
         const exchangeRate = data.USD;
         if (!isNaN(exchangeRate)) {
           return {
@@ -235,6 +254,7 @@ const getUsdValue = (cryptoValue, coinSymbol) => {
         } else {
           throw new Error(`Invalid exchange rate for ${coinSymbol}`);
         }
+      }
     });
 };