From f747091257971ab38637e74ef931435f5fc50645 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Mon, 26 Sep 2022 21:13:40 +0100
Subject: [PATCH] Fixed json

---
 .../gerty/templates/gerty/gerty.html          | 16 +++++++---
 lnbits/extensions/gerty/views.py              |  2 ++
 lnbits/extensions/gerty/views_api.py          | 30 ++++++++-----------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/lnbits/extensions/gerty/templates/gerty/gerty.html b/lnbits/extensions/gerty/templates/gerty/gerty.html
index 1411f7e9..d46ed856 100644
--- a/lnbits/extensions/gerty/templates/gerty/gerty.html
+++ b/lnbits/extensions/gerty/templates/gerty/gerty.html
@@ -54,7 +54,7 @@
     mixins: [windowMixin],
     data: function () {
       return {
-        gertyName: '{{gerty.name}}',
+        gerty: "",
         walletColors: [
           {first: "#3f51b5",
           second: "#1a237e"},
@@ -85,10 +85,18 @@
 
     },
     created: function () {
+      this.gerty = {{ gerty | tojson }}
       console.log(this.gerty)
-   //   if(){
-      
-   //   }
+
+      if(this.gerty.wallets){
+        for (let i = 0; i < this.gerty.wallets.length; i++) {
+          this.gertywallets[i].name = this.gerty.wallets.name
+          this.gertywallets[i].amount = this.gerty.wallets.amount
+          this.gertywallets[i].color1 = this.walletColors[i].first
+          this.gertywallets[i].color2 = this.walletColors[i].second
+        }
+      }
+      console.log(this.gertywallets)
     }
   })
 </script>
diff --git a/lnbits/extensions/gerty/views.py b/lnbits/extensions/gerty/views.py
index f749d354..630cb48b 100644
--- a/lnbits/extensions/gerty/views.py
+++ b/lnbits/extensions/gerty/views.py
@@ -16,6 +16,8 @@ from .views_api import api_gerty_json
 
 import json
 
+from loguru import logger
+
 templates = Jinja2Templates(directory="templates")
 
 @gerty_ext.get("/", response_class=HTMLResponse)
diff --git a/lnbits/extensions/gerty/views_api.py b/lnbits/extensions/gerty/views_api.py
index a5847d8a..ef81f8e1 100644
--- a/lnbits/extensions/gerty/views_api.py
+++ b/lnbits/extensions/gerty/views_api.py
@@ -103,7 +103,7 @@ async def api_gerty_json(
     gertyReturn = []
 
     # Get Wallet info
-    wallets = ['wallets']
+    wallets = []
     if gerty.lnbits_wallets != "":
         for lnbits_wallet in json.loads(gerty.lnbits_wallets):
             wallet = await get_wallet_for_key(key=lnbits_wallet)
@@ -113,18 +113,16 @@ async def api_gerty_json(
                     "balance": wallet.balance_msat,
                     "inkey": wallet.inkey,
                 })
-        gertyReturn.append(wallets)
 
     #Get Satoshi quotes
-    satoshi = ['sats_quote']
+    satoshi = []
     if gerty.sats_quote:
         quote = await api_gerty_satoshi()
         if quote:
             satoshi.append(await api_gerty_satoshi())
-        gertyReturn.append(satoshi)
 
     #Get Exchange Value
-    exchange = ['exchange']
+    exchange = []
     if gerty.exchange != "":
         try:
             amount = await satoshis_amount_as_fiat(100000000, gerty.exchange)
@@ -135,35 +133,33 @@ async def api_gerty_json(
                 })
         except:
             pass
-        gertyReturn.append(exchange)
 
-    onchain = ['onchain']
+    onchain = []
     if gerty.onchain_stats and isinstance(gerty.mempool_endpoint, str):
         async with httpx.AsyncClient() as client:
-            difficulty = ['difficulty']
+            difficulty = []
             r = await client.get(gerty.mempool_endpoint + "/api/v1/difficulty-adjustment")
             if r:
                 difficulty.append(r.json())
-                onchain.append(difficulty)
-            mempool = ['mempool']
+                onchain.append({"difficulty":difficulty})
+            mempool = []
             r = await client.get(gerty.mempool_endpoint + "/api/v1/fees/mempool-blocks")
             if r:
                 mempool.append(r.json())
-                onchain.append(mempool)
-            threed = ['threed']
+                onchain.append({"mempool":mempool})
+            threed = []
             r = await client.get(gerty.mempool_endpoint + "/api/v1/mining/hashrate/3d")
             if r:
                 threed.append(r.json())
-                onchain.append(threed)
-        gertyReturn.append(onchain)
+                onchain.append({"threed":threed})
 
-    ln = ['ln']
+    ln = []
     if gerty.ln_stats and isinstance(gerty.mempool_endpoint, str):
         async with httpx.AsyncClient() as client:
             r = await client.get(gerty.mempool_endpoint + "/api/v1/lightning/statistics/latest")
             if r:
                 ln.append(r.json())
-                gertyReturn.append(ln)
-    return gertyReturn
+
+    return {"wallets":wallets, "sats_quote":satoshi, "exchange":exchange, "onchain":onchain, "ln":ln}