Merge branch 'master' of ssh://taler.net/var/git/wallet

3 files changed, 14 insertions, 60 deletions

diff --git a/extension/popup/balance-overview.html b/extension/popup/balance-overview.html
index 2f82becf8..a3aeae697 100644
--- a/extension/popup/balance-overview.html
+++ b/extension/popup/balance-overview.html
@@ -10,9 +10,14 @@
     <script src="balance-overview.js" type="text/javascript"></script>
     
     <script id="balance-template" type="text/x-handlebars-template">
-	{{#each this}}
-          <p>{{prettyAmountNoCurrency this}} <a>{{@key}}</a></p>
-	{{/each}}
+        {{#if this.length}}
+          {{#each this}}
+            <p>{{prettyAmountNoCurrency this}} <a>{{@key}}</a></p>
+          {{/each}}
+        {{else}}
+          <p>Looks like your wallet is empty. Want to get some
+          <a id="link-kudos" href="http://bank.demo.taler.net">KUDOS?</a>
+        {{/if}}
     </script>
 
   </head>
@@ -26,11 +31,6 @@
     </div>
 
     <div id="content">
-      <div id="balance">
-        <p>Looks like your wallet is empty. Want to get some
-        <a id="link-kudos" href="http://bank.demo.taler.net">KUDOS?</a>
-        </p>
-      </div>
     </div>
 
   </body>
diff --git a/extension/popup/balance-overview.js b/extension/popup/balance-overview.js
index f33be0637..4fd991b23 100644
--- a/extension/popup/balance-overview.js
+++ b/extension/popup/balance-overview.js
@@ -17,31 +17,9 @@ let React = {
 document.addEventListener('DOMContentLoaded', (e) => {
     console.log("content loaded");
     chrome.runtime.sendMessage({ type: "balances" }, function (wallet) {
-        console.log("got balance");
-        let n = 0;
-        let table = React.createElement("div", null);
-        let source = document.getElementById("balance-template").innerHTML;
-        console.log("size", Object.keys(wallet).length);
-        if (Object.keys(wallet).length > 0) {
-            let template = Handlebars.compile(source);
-            console.log("wallet ", JSON.stringify(wallet));
-            let html = template(wallet);
-            console.log("Hb generated html", html);
-            table.innerHTML = html;
-            let p = document.getElementById("content");
-            p.replaceChild(table, p.firstElementChild);
-        }
-        /*
-        for (let curr in wallet) {
-          n++;
-          let x = wallet[curr];
-          let num = x.value + x.fraction / 10e6;
-          table.appendChild(<p>{num} <a>{x.currency}</a></p>);
-        }
-        if (n != 0) {
-          let p = document.getElementById("content");
-          p.replaceChild(table, p.firstElementChild);
-        } */
+        let context = document.getElementById("balance-template").innerHTML;
+        let template = Handlebars.compile(context);
+        document.getElementById("content").innerHTML = template(wallet);
     });
     document.getElementById("debug").addEventListener("click", (e) => {
         chrome.tabs.create({
diff --git a/extension/popup/balance-overview.tsx b/extension/popup/balance-overview.tsx
index b1ee0fa27..88ff1bccb 100644
--- a/extension/popup/balance-overview.tsx
+++ b/extension/popup/balance-overview.tsx
@@ -19,33 +19,9 @@ let React = {
 document.addEventListener('DOMContentLoaded', (e) => {
   console.log("content loaded");
   chrome.runtime.sendMessage({type: "balances"}, function(wallet) {
-    console.log("got balance");
-    let n = 0;
-    let table = <div />;
-    
-    let source = document.getElementById("balance-template").innerHTML;
-    console.log("size", Object.keys(wallet).length);
-    if (Object.keys(wallet).length > 0){
-      let template = Handlebars.compile(source);
-      console.log("wallet ", JSON.stringify(wallet));
-      let html = template(wallet);
-      console.log("Hb generated html", html);
-      table.innerHTML = html;
-      let p = document.getElementById("content");
-      p.replaceChild(table, p.firstElementChild);
-    }
-
-    /*
-    for (let curr in wallet) {
-      n++;
-      let x = wallet[curr];
-      let num = x.value + x.fraction / 10e6;
-      table.appendChild(<p>{num} <a>{x.currency}</a></p>);
-    }
-    if (n != 0) {
-      let p = document.getElementById("content");
-      p.replaceChild(table, p.firstElementChild);
-    } */
+    let context = document.getElementById("balance-template").innerHTML;
+    let template = Handlebars.compile(context);
+    document.getElementById("content").innerHTML = template(wallet);
   });
 
   document.getElementById("debug").addEventListener("click", (e) => {