From eaa1f446c78346a74dc08fcf69004dd1a806cd03 Mon Sep 17 00:00:00 2001
From: RenanMsV <r.delaneza@gmail.com>
Date: Mon, 19 Apr 2021 09:39:42 -0300
Subject: [PATCH 1/3] Added always show USD option

---
 index.html       |  8 ++++++++
 js/app_common.js | 28 ++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 3e4a477..07cf6fd 100644
--- a/index.html
+++ b/index.html
@@ -69,6 +69,14 @@ <h3>Choose Your Base Currency</h3>
       </label>
       </div>
 
+      <div class="checkbox-wrapper">
+        <input id="always-show-usd" class="checkbox-styled" type="checkbox" name="always-show-usd">
+        <label class="checkbox-styled-label">
+          Always show USD?
+          <div></div>
+        </label>
+        </div>
+
       <h3>Tip Jar</h3>
       <ul id="tips">
         <li>BTC: 17iENfaJkEpxGXW7mgdFh9hGMZV65R2zVL</li>
diff --git a/js/app_common.js b/js/app_common.js
index 3efbc7c..11ede68 100644
--- a/js/app_common.js
+++ b/js/app_common.js
@@ -52,6 +52,7 @@ var url =
   base +
   "&extraParams=crypto-price-widget";
 var pinCheck = document.getElementById("pin-to-top");
+var alwaysShowUsd = document.getElementById("always-show-usd");
 
 function clearData() {
   ul.innerHTML = "";
@@ -134,6 +135,13 @@ function initData() {
             remote.getCurrentWindow().setAlwaysOnTop(false);
           }
 
+          //Always show USD - settings check - immediately set checkbox and window to saved state
+          if (settings.get("user.alwaysShowUsd") == "yes") {
+            alwaysShowUsd.checked = true;
+          } else {
+            alwaysShowUsd.checked = false;
+          }
+
           sortChildren(document.getElementById("prices"), function (li) {
             return +li.getAttribute("sortorder");
           });
@@ -167,7 +175,8 @@ function updateData() {
     settings.get("user.coins") +
     "&tsyms=" +
     base +
-    "&extraParams=crypto-price-widget";
+    ",USD&extraParams=crypto-price-widget";
+  console.log(url)
   /*
    ** What data needs to be grabbed/changed?
    ** Base currency
@@ -194,7 +203,10 @@ function updateData() {
 
           let coinSymbol = coinRAW[base].FROMSYMBOL;
           let coinRate = coinDISPLAY[base].PRICE.replace(/ /g, ""); //.replace(/ /g,'') removes space after $
-
+          if (base != "USD" && settings.get("user.alwaysShowUsd") == "yes") { // display also prices in USD
+            coinRate = coinRate + (" <small>($") + coinRAW["USD"].PRICE.toFixed(4) + ")</small>"
+          }
+          
           //replace currencies that have no symbols with easier to read formats
           if (coinRate.includes("AUD")) {
             coinRate = coinRate.replace("AUD", "A$");
@@ -474,6 +486,18 @@ pinCheck.onclick = function (event) {
   }
 };
 
+/***********
+ * ALWAYS SHOW USD
+ *************/
+alwaysShowUsd.onclick = function (event) {
+  var checkbox = event.target;
+  if (checkbox.checked) {
+    settings.set("user.alwaysShowUsd", "yes")
+  } else {
+    settings.set("user.alwaysShowUsd", "no")
+  }
+}
+
 /*******
  * APP UI
  ********/

From 5f93ed668da2c678bc66c46b43e5baa61934c156 Mon Sep 17 00:00:00 2001
From: RenanMsV <r.delaneza@gmail.com>
Date: Mon, 19 Apr 2021 10:06:39 -0300
Subject: [PATCH 2/3] Removed forgotten console.log

---
 js/app_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/app_common.js b/js/app_common.js
index 11ede68..122a004 100644
--- a/js/app_common.js
+++ b/js/app_common.js
@@ -176,7 +176,7 @@ function updateData() {
     "&tsyms=" +
     base +
     ",USD&extraParams=crypto-price-widget";
-  console.log(url)
+
   /*
    ** What data needs to be grabbed/changed?
    ** Base currency

From 5a5270a13484d81c508fd712c12a37306414461d Mon Sep 17 00:00:00 2001
From: RenanMsV <r.delaneza@gmail.com>
Date: Tue, 20 Apr 2021 10:28:20 -0300
Subject: [PATCH 3/3] Update app_common.js to delete unnecessary bracket

---
 js/app_common.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/app_common.js b/js/app_common.js
index 122a004..190a192 100644
--- a/js/app_common.js
+++ b/js/app_common.js
@@ -203,8 +203,9 @@ function updateData() {
 
           let coinSymbol = coinRAW[base].FROMSYMBOL;
           let coinRate = coinDISPLAY[base].PRICE.replace(/ /g, ""); //.replace(/ /g,'') removes space after $
+          
           if (base != "USD" && settings.get("user.alwaysShowUsd") == "yes") { // display also prices in USD
-            coinRate = coinRate + (" <small>($") + coinRAW["USD"].PRICE.toFixed(4) + ")</small>"
+            coinRate = coinRate + " <small>($" + coinRAW["USD"].PRICE.toFixed(4) + ")</small>"
           }
           
           //replace currencies that have no symbols with easier to read formats