From 3cbbe2a93d546e4e64c36a6a79e3c2355ced648b Mon Sep 17 00:00:00 2001
From: ChuckNorrison <2964146+ChuckNorrison@users.noreply.github.com>
Date: Thu, 17 Nov 2022 15:44:59 +0100
Subject: [PATCH 01/54] fix integer to bigint for extensions

Some more INTEGER to BIGINT conversion for postgresql database
---
 lnbits/extensions/lnurlp/migrations.py      | 2 +-
 lnbits/extensions/offlineshop/migrations.py | 2 +-
 lnbits/extensions/paywall/migrations.py     | 4 ++--
 lnbits/extensions/satsdice/migrations.py    | 6 +++---
 lnbits/extensions/satspay/migrations.py     | 4 ++--
 lnbits/extensions/watchonly/migrations.py   | 4 ++--
 lnbits/extensions/withdraw/migrations.py    | 8 ++++----
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lnbits/extensions/lnurlp/migrations.py b/lnbits/extensions/lnurlp/migrations.py
index 81dd62f8..83a99c2c 100644
--- a/lnbits/extensions/lnurlp/migrations.py
+++ b/lnbits/extensions/lnurlp/migrations.py
@@ -8,7 +8,7 @@ async def m001_initial(db):
             id {db.serial_primary_key},
             wallet TEXT NOT NULL,
             description TEXT NOT NULL,
-            amount INTEGER NOT NULL,
+            amount {db.big_int} NOT NULL,
             served_meta INTEGER NOT NULL,
             served_pr INTEGER NOT NULL
         );
diff --git a/lnbits/extensions/offlineshop/migrations.py b/lnbits/extensions/offlineshop/migrations.py
index 84aea27e..4e668668 100644
--- a/lnbits/extensions/offlineshop/migrations.py
+++ b/lnbits/extensions/offlineshop/migrations.py
@@ -22,7 +22,7 @@ async def m001_initial(db):
             description TEXT NOT NULL,
             image TEXT, -- image/png;base64,...
             enabled BOOLEAN NOT NULL DEFAULT true,
-            price INTEGER NOT NULL,
+            price {db.big_int} NOT NULL,
             unit TEXT NOT NULL DEFAULT 'sat'
         );
         """
diff --git a/lnbits/extensions/paywall/migrations.py b/lnbits/extensions/paywall/migrations.py
index fa91e409..bef954f6 100644
--- a/lnbits/extensions/paywall/migrations.py
+++ b/lnbits/extensions/paywall/migrations.py
@@ -10,7 +10,7 @@ async def m001_initial(db):
             secret TEXT NOT NULL,
             url TEXT NOT NULL,
             memo TEXT NOT NULL,
-            amount INTEGER NOT NULL,
+            amount {db.big_int} NOT NULL,
             time TIMESTAMP NOT NULL DEFAULT """
         + db.timestamp_now
         + """
@@ -32,7 +32,7 @@ async def m002_redux(db):
             url TEXT NOT NULL,
             memo TEXT NOT NULL,
             description TEXT NULL,
-            amount INTEGER DEFAULT 0,
+            amount {db.big_int} DEFAULT 0,
             time TIMESTAMP NOT NULL DEFAULT """
         + db.timestamp_now
         + """,
diff --git a/lnbits/extensions/satsdice/migrations.py b/lnbits/extensions/satsdice/migrations.py
index 61298241..990123f2 100644
--- a/lnbits/extensions/satsdice/migrations.py
+++ b/lnbits/extensions/satsdice/migrations.py
@@ -10,7 +10,7 @@ async def m001_initial(db):
             title TEXT,
             min_bet INTEGER,
             max_bet INTEGER,
-            amount INTEGER DEFAULT 0,
+            amount {db.big_int} DEFAULT 0,
             served_meta INTEGER NOT NULL,
             served_pr INTEGER NOT NULL,
             multiplier FLOAT,
@@ -32,7 +32,7 @@ async def m002_initial(db):
         CREATE TABLE satsdice.satsdice_withdraw (
             id TEXT PRIMARY KEY,
             satsdice_pay TEXT,
-            value INTEGER DEFAULT 1,
+            value {db.big_int} DEFAULT 1,
             unique_hash TEXT UNIQUE,
             k1 TEXT,
             open_time INTEGER,
@@ -51,7 +51,7 @@ async def m003_initial(db):
         CREATE TABLE satsdice.satsdice_payment (
             payment_hash TEXT PRIMARY KEY,
             satsdice_pay TEXT,
-            value INTEGER,
+            value {db.big_int},
             paid BOOL DEFAULT FALSE,
             lost BOOL DEFAULT FALSE
         );
diff --git a/lnbits/extensions/satspay/migrations.py b/lnbits/extensions/satspay/migrations.py
index 87446c80..a9d61418 100644
--- a/lnbits/extensions/satspay/migrations.py
+++ b/lnbits/extensions/satspay/migrations.py
@@ -18,8 +18,8 @@ async def m001_initial(db):
             completelink TEXT,
             completelinktext TEXT,
             time INTEGER,
-            amount INTEGER,
-            balance INTEGER DEFAULT 0,
+            amount {db.big_int},
+            balance {db.big_int} DEFAULT 0,
             timestamp TIMESTAMP NOT NULL DEFAULT """
         + db.timestamp_now
         + """
diff --git a/lnbits/extensions/watchonly/migrations.py b/lnbits/extensions/watchonly/migrations.py
index 76f7f951..dbe0c1a2 100644
--- a/lnbits/extensions/watchonly/migrations.py
+++ b/lnbits/extensions/watchonly/migrations.py
@@ -10,7 +10,7 @@ async def m001_initial(db):
             masterpub TEXT NOT NULL,
             title TEXT NOT NULL,
             address_no INTEGER NOT NULL DEFAULT 0,
-            balance INTEGER NOT NULL
+            balance {db.big_int} NOT NULL
         );
     """
     )
@@ -21,7 +21,7 @@ async def m001_initial(db):
             id TEXT NOT NULL PRIMARY KEY,
             address TEXT NOT NULL,
             wallet TEXT NOT NULL,
-            amount INTEGER NOT NULL
+            amount {db.big_int} NOT NULL
         );
     """
     )
diff --git a/lnbits/extensions/withdraw/migrations.py b/lnbits/extensions/withdraw/migrations.py
index 5484277a..e30f88d0 100644
--- a/lnbits/extensions/withdraw/migrations.py
+++ b/lnbits/extensions/withdraw/migrations.py
@@ -8,8 +8,8 @@ async def m001_initial(db):
             id TEXT PRIMARY KEY,
             wallet TEXT,
             title TEXT,
-            min_withdrawable INTEGER DEFAULT 1,
-            max_withdrawable INTEGER DEFAULT 1,
+            min_withdrawable {db.big_int} DEFAULT 1,
+            max_withdrawable {db.big_int} DEFAULT 1,
             uses INTEGER DEFAULT 1,
             wait_time INTEGER,
             is_unique INTEGER DEFAULT 0,
@@ -33,8 +33,8 @@ async def m002_change_withdraw_table(db):
             id TEXT PRIMARY KEY,
             wallet TEXT,
             title TEXT,
-            min_withdrawable INTEGER DEFAULT 1,
-            max_withdrawable INTEGER DEFAULT 1,
+            min_withdrawable {db.big_int} DEFAULT 1,
+            max_withdrawable {db.big_int} DEFAULT 1,
             uses INTEGER DEFAULT 1,
             wait_time INTEGER,
             is_unique INTEGER DEFAULT 0,

From 4b408c1f0a02b461ef84d869efacfe95f56e9aa0 Mon Sep 17 00:00:00 2001
From: calle <93376500+callebtc@users.noreply.github.com>
Date: Sat, 19 Nov 2022 14:32:17 -0600
Subject: [PATCH 02/54] Update migrations.py

f string
---
 lnbits/extensions/paywall/migrations.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/paywall/migrations.py b/lnbits/extensions/paywall/migrations.py
index bef954f6..9b3341fd 100644
--- a/lnbits/extensions/paywall/migrations.py
+++ b/lnbits/extensions/paywall/migrations.py
@@ -3,7 +3,7 @@ async def m001_initial(db):
     Initial paywalls table.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE paywall.paywalls (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
@@ -25,7 +25,7 @@ async def m002_redux(db):
     """
     await db.execute("ALTER TABLE paywall.paywalls RENAME TO paywalls_old")
     await db.execute(
-        """
+        f"""
         CREATE TABLE paywall.paywalls (
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,

From 066015c05cc616824de0101cbe9aabd71cf82097 Mon Sep 17 00:00:00 2001
From: calle <93376500+callebtc@users.noreply.github.com>
Date: Sat, 19 Nov 2022 14:33:18 -0600
Subject: [PATCH 03/54] Update migrations.py

f string
---
 lnbits/extensions/satsdice/migrations.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/satsdice/migrations.py b/lnbits/extensions/satsdice/migrations.py
index 990123f2..82ab35ba 100644
--- a/lnbits/extensions/satsdice/migrations.py
+++ b/lnbits/extensions/satsdice/migrations.py
@@ -3,7 +3,7 @@ async def m001_initial(db):
     Creates an improved satsdice table and migrates the existing data.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE satsdice.satsdice_pay (
             id TEXT PRIMARY KEY,
             wallet TEXT,
@@ -28,7 +28,7 @@ async def m002_initial(db):
     Creates an improved satsdice table and migrates the existing data.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE satsdice.satsdice_withdraw (
             id TEXT PRIMARY KEY,
             satsdice_pay TEXT,
@@ -47,7 +47,7 @@ async def m003_initial(db):
     Creates an improved satsdice table and migrates the existing data.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE satsdice.satsdice_payment (
             payment_hash TEXT PRIMARY KEY,
             satsdice_pay TEXT,

From f70d30bfa62f7b27f7a4e8f20736047810b3a4d9 Mon Sep 17 00:00:00 2001
From: calle <93376500+callebtc@users.noreply.github.com>
Date: Sat, 19 Nov 2022 14:34:13 -0600
Subject: [PATCH 04/54] Update migrations.py

---
 lnbits/extensions/withdraw/migrations.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/withdraw/migrations.py b/lnbits/extensions/withdraw/migrations.py
index e30f88d0..0c6ed4fc 100644
--- a/lnbits/extensions/withdraw/migrations.py
+++ b/lnbits/extensions/withdraw/migrations.py
@@ -3,7 +3,7 @@ async def m001_initial(db):
     Creates an improved withdraw table and migrates the existing data.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE withdraw.withdraw_links (
             id TEXT PRIMARY KEY,
             wallet TEXT,
@@ -28,7 +28,7 @@ async def m002_change_withdraw_table(db):
     Creates an improved withdraw table and migrates the existing data.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE withdraw.withdraw_link (
             id TEXT PRIMARY KEY,
             wallet TEXT,

From 60cc0ca11ab8c1e53913dac9ee1676e32793d72f Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Fri, 25 Nov 2022 14:53:03 +0100
Subject: [PATCH 05/54] strip html

---
 lnbits/db.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lnbits/db.py b/lnbits/db.py
index f52b0391..7d15a304 100644
--- a/lnbits/db.py
+++ b/lnbits/db.py
@@ -1,6 +1,7 @@
 import asyncio
 import datetime
 import os
+import re
 import time
 from contextlib import asynccontextmanager
 from typing import Optional
@@ -71,6 +72,16 @@ class Connection(Compat):
         if self.type in {POSTGRES, COCKROACH}:
             query = query.replace("%", "%%")
             query = query.replace("?", "%s")
+
+            # strip html
+            CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
+
+            def cleanhtml(raw_html):
+                cleantext = re.sub(CLEANR, "", raw_html)
+                return cleantext
+
+            query = cleanhtml(query)
+
         return query
 
     async def fetchall(self, query: str, values: tuple = ()) -> list:

From b970f0cb0c6799b75f94df19814d6b1fe79f1d73 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Fri, 25 Nov 2022 15:11:58 +0100
Subject: [PATCH 06/54] rewrite values in db

---
 lnbits/db.py | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/lnbits/db.py b/lnbits/db.py
index 7d15a304..e67cc22e 100644
--- a/lnbits/db.py
+++ b/lnbits/db.py
@@ -72,30 +72,41 @@ class Connection(Compat):
         if self.type in {POSTGRES, COCKROACH}:
             query = query.replace("%", "%%")
             query = query.replace("?", "%s")
-
-            # strip html
-            CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
-
-            def cleanhtml(raw_html):
-                cleantext = re.sub(CLEANR, "", raw_html)
-                return cleantext
-
-            query = cleanhtml(query)
-
         return query
 
+    def rewrite_values(self, values):
+        # strip html
+        CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
+
+        def cleanhtml(raw_html):
+            if type(raw_html) == str:
+                cleantext = re.sub(CLEANR, "", raw_html)
+                return cleantext
+            else:
+                return raw_html
+
+        # tuple to list and back to tuple
+        values = tuple([cleanhtml(l) for l in list(values)])
+        return values
+
     async def fetchall(self, query: str, values: tuple = ()) -> list:
-        result = await self.conn.execute(self.rewrite_query(query), values)
+        result = await self.conn.execute(
+            self.rewrite_query(query), self.rewrite_values(values)
+        )
         return await result.fetchall()
 
     async def fetchone(self, query: str, values: tuple = ()):
-        result = await self.conn.execute(self.rewrite_query(query), values)
+        result = await self.conn.execute(
+            self.rewrite_query(query), self.rewrite_values(values)
+        )
         row = await result.fetchone()
         await result.close()
         return row
 
     async def execute(self, query: str, values: tuple = ()):
-        return await self.conn.execute(self.rewrite_query(query), values)
+        return await self.conn.execute(
+            self.rewrite_query(query), self.rewrite_values(values)
+        )
 
 
 class Database(Compat):

From aa0fbde54185f87a399478d90c321677245a3d5c Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Fri, 25 Nov 2022 15:20:39 +0100
Subject: [PATCH 07/54] use isinstance, not type

---
 lnbits/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/db.py b/lnbits/db.py
index e67cc22e..321b23d0 100644
--- a/lnbits/db.py
+++ b/lnbits/db.py
@@ -79,7 +79,7 @@ class Connection(Compat):
         CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
 
         def cleanhtml(raw_html):
-            if type(raw_html) == str:
+            if isinstance(raw_html, str):
                 cleantext = re.sub(CLEANR, "", raw_html)
                 return cleantext
             else:

From 00cb7a8d21f8b11e572a711331ae0bb07d6ba8bf Mon Sep 17 00:00:00 2001
From: Black Coffee <randommw@protonmail.com>
Date: Mon, 24 Oct 2022 14:05:30 +0100
Subject: [PATCH 08/54] Added satspay settings migration

---
 lnbits/extensions/satspay/migrations.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lnbits/extensions/satspay/migrations.py b/lnbits/extensions/satspay/migrations.py
index 2579961f..47129dd9 100644
--- a/lnbits/extensions/satspay/migrations.py
+++ b/lnbits/extensions/satspay/migrations.py
@@ -37,3 +37,18 @@ async def m002_add_charge_extra_data(db):
             ADD COLUMN extra TEXT DEFAULT '{"mempool_endpoint": "https://mempool.space", "network": "Mainnet"}';
         """
     )
+
+async def m002_add_settings_table(db):
+    """
+    Settings table
+    """
+
+    await db.execute(
+        """
+        CREATE TABLE satspay.settings (
+            id TEXT NOT NULL PRIMARY KEY,
+            "user" TEXT,
+            custom_css TEXT
+        );
+    """
+    )

From 4e9132ec04974575037c1a28828dcbb999dfebec Mon Sep 17 00:00:00 2001
From: Black Coffee <randommw@protonmail.com>
Date: Mon, 24 Oct 2022 15:33:49 +0100
Subject: [PATCH 09/54] SatsPay server save custom css settings now working

---
 lnbits/extensions/satspay/crud.py             | 38 ++++++++++-
 lnbits/extensions/satspay/migrations.py       |  1 -
 lnbits/extensions/satspay/models.py           |  2 +
 .../satspay/templates/satspay/index.html      | 65 +++++++++++++++++++
 lnbits/extensions/satspay/views_api.py        | 29 ++++++++-
 5 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 968c9ab0..3e45f773 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -3,6 +3,8 @@ from typing import List, Optional
 
 from loguru import logger
 
+from loguru import logger
+
 from lnbits.core.services import create_invoice
 from lnbits.core.views.api import api_payment
 from lnbits.helpers import urlsafe_short_hash
@@ -10,7 +12,8 @@ from lnbits.helpers import urlsafe_short_hash
 from ..watchonly.crud import get_config, get_fresh_address
 from . import db
 from .helpers import fetch_onchain_balance
-from .models import Charges, CreateCharge
+from .models import Charges, CreateCharge, SatsPaySettings
+
 
 ###############CHARGES##########################
 
@@ -121,3 +124,36 @@ async def check_address_balance(charge_id: str) -> Optional[Charges]:
             if invoice_status["paid"]:
                 return await update_charge(charge_id=charge_id, balance=charge.amount)
     return await get_charge(charge_id)
+
+
+################## SETTINGS ###################
+async def save_settings(user: str, data: SatsPaySettings):
+    # insert or update
+    row = await db.fetchone(
+        """SELECT user FROM satspay.settings WHERE user = ?""", (user,)
+    )
+    if row:
+        await db.execute(
+            """
+            UPDATE satspay.settings SET custom_css = ? WHERE user = ?
+            """,
+            (
+                data.custom_css,
+                user
+            ),
+        )
+    else:
+        await db.execute(
+            """
+            INSERT INTO satspay.settings (
+                user,
+                custom_css
+                )
+            VALUES (?, ?)
+            """,
+            (
+                user,
+                data.custom_css,
+            ),
+        )
+    return True
diff --git a/lnbits/extensions/satspay/migrations.py b/lnbits/extensions/satspay/migrations.py
index 47129dd9..4a4b5460 100644
--- a/lnbits/extensions/satspay/migrations.py
+++ b/lnbits/extensions/satspay/migrations.py
@@ -46,7 +46,6 @@ async def m002_add_settings_table(db):
     await db.execute(
         """
         CREATE TABLE satspay.settings (
-            id TEXT NOT NULL PRIMARY KEY,
             "user" TEXT,
             custom_css TEXT
         );
diff --git a/lnbits/extensions/satspay/models.py b/lnbits/extensions/satspay/models.py
index 1e7c95c9..2c391f1f 100644
--- a/lnbits/extensions/satspay/models.py
+++ b/lnbits/extensions/satspay/models.py
@@ -72,3 +72,5 @@ class Charges(BaseModel):
 
     def must_call_webhook(self):
         return self.webhook and self.paid and self.config.webhook_success == False
+class SatsPaySettings(BaseModel):
+    custom_css: str = Query(None)
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index 60c4d519..648da73f 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -8,6 +8,11 @@
         <q-btn unelevated color="primary" @click="formDialogCharge.show = true"
           >New charge
         </q-btn>
+
+          <q-btn unelevated color="primary" @click="formDialogSettings.show = true"
+          >SatsPay settings
+        </q-btn>
+
       </q-card-section>
     </q-card>
 
@@ -394,6 +399,33 @@
       </q-form>
     </q-card>
   </q-dialog>
+
+<q-dialog v-model="formDialogSettings.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <q-form @submit="sendFormDataSettings" class="q-gutter-md">
+        <q-input
+          filled
+          dense
+          v-model.trim="formDialogSettings.data.custom_css"
+          type="textarea"
+          label="Custom CSS"
+        >
+            <q-tooltip>Custom CSS to apply styles to your SatsPay invoice</q-tooltip>
+        </q-input>
+        <div class="row q-mt-lg">
+          <q-btn
+            unelevated
+            color="primary"
+            type="submit"
+            >Save Settings</q-btn
+          >
+          <q-btn @click="cancelSettings" flat color="grey" class="q-ml-auto"
+            >Cancel</q-btn
+          >
+        </div>
+      </q-form>
+    </q-card>
+  </q-dialog>
 </div>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <!-- lnbits/static/vendor
@@ -505,10 +537,20 @@
             time: null,
             amount: null
           }
+        },
+      formDialogSettings: {
+          show: false,
+          data: {
+            custom_css: '',
+            }
         }
       }
     },
     methods: {
+      cancelSettings: function(data) {
+        this.formDialogCharge.data.custom_css = ''
+        this.formDialogSettings.show = false
+      },
       cancelCharge: function (data) {
         this.formDialogCharge.data.description = ''
         this.formDialogCharge.data.onchain = false
@@ -580,6 +622,12 @@
           LNbits.utils.notifyApiError(error)
         }
       },
+      sendFormDataSettings: function () {
+        const wallet = this.g.user.wallets[0].inkey
+        const data = this.formDialogSettings.data
+        data.custom_css = data.custom_css
+        this.saveSettings(wallet, data)
+      },
       sendFormDataCharge: function () {
         const wallet = this.g.user.wallets[0].inkey
         const data = this.formDialogCharge.data
@@ -651,6 +699,23 @@
           this.rescanning = false
         }
       },
+      saveSettings: async function (wallet, data) {
+        try {
+          const resp = await LNbits.api.request(
+            'POST',
+            '/satspay/api/v1/settings',
+            wallet,
+            data
+          )
+
+          this.formDialogSettings.show = false
+          this.formDialogSettings.data = {
+            custom_css: ''
+          }
+        } catch (error) {
+          LNbits.utils.notifyApiError(error)
+        }
+      },
       createCharge: async function (wallet, data) {
         try {
           const resp = await LNbits.api.request(
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index bfff55a2..ee9bb997 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -1,6 +1,8 @@
 import json
 from http import HTTPStatus
 
+from loguru import logger
+import httpx
 from fastapi.params import Depends
 from starlette.exceptions import HTTPException
 
@@ -19,9 +21,11 @@ from .crud import (
     get_charge,
     get_charges,
     update_charge,
+    save_settings,
 )
 from .helpers import call_webhook, public_charge
-from .models import CreateCharge
+from .helpers import compact_charge
+from .models import CreateCharge, SatsPaySettings
 
 #############################CHARGES##########################
 
@@ -125,4 +129,27 @@ async def api_charge_balance(charge_id):
         extra = {**charge.config.dict(), **resp}
         await update_charge(charge_id=charge.id, extra=json.dumps(extra))
 
+    if charge.paid and charge.webhook:
+        async with httpx.AsyncClient() as client:
+            try:
+                r = await client.post(
+                    charge.webhook,
+                    json=compact_charge(charge),
+                    timeout=40,
+                )
+            except AssertionError:
+                charge.webhook = None
+    
     return {**public_charge(charge)}
+
+#############################CHARGES##########################
+
+
+@satspay_ext.post("/api/v1/settings")
+async def api_settings_save(
+    data: SatsPaySettings, wallet: WalletTypeInfo = Depends(require_invoice_key)
+):
+    logger.debug("wallet.wallet.user")
+    logger.debug(wallet.wallet.user)
+    await save_settings(user=wallet.wallet.user, data=data)
+    return True

From 220dc699cf50e1b296b87a34e1c6ac61d882a966 Mon Sep 17 00:00:00 2001
From: Black Coffee <randommw@protonmail.com>
Date: Mon, 24 Oct 2022 15:53:43 +0100
Subject: [PATCH 10/54] Settings now save and load and have an insert or delete
 for new / existing settings

---
 lnbits/extensions/satspay/crud.py             | 13 ++++++++++++
 lnbits/extensions/satspay/models.py           |  4 ++++
 .../satspay/templates/satspay/index.html      | 20 ++++++++++++++++++-
 lnbits/extensions/satspay/views_api.py        | 12 +++++++++++
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 3e45f773..c6f0d5b8 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -102,6 +102,19 @@ async def get_charges(user: str) -> List[Charges]:
     )
     return [Charges.from_row(row) for row in rows]
 
+async def get_settings(user: str) -> SatsPaySettings:
+    row = await db.fetchone(
+        """SELECT * FROM satspay.settings WHERE "user" = ?""",
+        (user,),
+    )
+    logger.debug('Settings data')
+    logger.debug(row)
+
+    if row:
+        return SatsPaySettings.from_row(row)
+    else:
+        return None
+
 
 async def delete_charge(charge_id: str) -> None:
     await db.execute("DELETE FROM satspay.charges WHERE id = ?", (charge_id,))
diff --git a/lnbits/extensions/satspay/models.py b/lnbits/extensions/satspay/models.py
index 2c391f1f..d5f01b21 100644
--- a/lnbits/extensions/satspay/models.py
+++ b/lnbits/extensions/satspay/models.py
@@ -74,3 +74,7 @@ class Charges(BaseModel):
         return self.webhook and self.paid and self.config.webhook_success == False
 class SatsPaySettings(BaseModel):
     custom_css: str = Query(None)
+
+    @classmethod
+    def from_row(cls, row: Row) -> "SatsPaySettings":
+        return cls(**dict(row))
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index 648da73f..2c2d2eca 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -9,7 +9,7 @@
           >New charge
         </q-btn>
 
-          <q-btn unelevated color="primary" @click="formDialogSettings.show = true"
+          <q-btn unelevated color="primary" @click="getSettings();formDialogSettings.show = true"
           >SatsPay settings
         </q-btn>
 
@@ -442,6 +442,7 @@
     mixins: [windowMixin],
     data: function () {
       return {
+        settings: {},
         filter: '',
         balance: null,
         walletLinks: [],
@@ -622,6 +623,21 @@
           LNbits.utils.notifyApiError(error)
         }
       },
+
+    getSettings: async function () {
+        try {
+          const {data} = await LNbits.api.request(
+            'GET',
+            '/satspay/api/v1/settings',
+            this.g.user.wallets[0].inkey
+          )
+            console.log('Settings data', data)
+          this.formDialogSettings.data = data
+        } catch (error) {
+          LNbits.utils.notifyApiError(error)
+        }
+      },
+
       sendFormDataSettings: function () {
         const wallet = this.g.user.wallets[0].inkey
         const data = this.formDialogSettings.data
@@ -700,6 +716,7 @@
         }
       },
       saveSettings: async function (wallet, data) {
+          console.log('wallet', wallet)
         try {
           const resp = await LNbits.api.request(
             'POST',
@@ -768,6 +785,7 @@
       }
     },
     created: async function () {
+      await this.getSettings()
       await this.getCharges()
       await this.getWalletConfig()
       await this.getWalletLinks()
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index ee9bb997..5731a7e4 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -22,6 +22,7 @@ from .crud import (
     get_charges,
     update_charge,
     save_settings,
+    get_settings,
 )
 from .helpers import call_webhook, public_charge
 from .helpers import compact_charge
@@ -153,3 +154,14 @@ async def api_settings_save(
     logger.debug(wallet.wallet.user)
     await save_settings(user=wallet.wallet.user, data=data)
     return True
+
+
+@satspay_ext.get("/api/v1/settings")
+async def api_settings_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
+    logger.debug('HERHEHRHEHRHEHR')
+    try:
+        return await get_settings(wallet.wallet.user)
+    except HTTPException:
+        logger.error('Error loading satspay settings')
+        logger.error(HTTPException)
+        return ""

From 7106dee2ce76b5395d22ff56553519c60416b202 Mon Sep 17 00:00:00 2001
From: Black Coffee <randommw@protonmail.com>
Date: Mon, 24 Oct 2022 16:38:56 +0100
Subject: [PATCH 11/54] Custom CSS on SatsPay server working!:)

---
 lnbits/extensions/satspay/crud.py             | 12 ++-----
 lnbits/extensions/satspay/models.py           |  1 +
 .../satspay/templates/satspay/display.html    | 30 ++++++++++++++++-
 .../satspay/templates/satspay/index.html      | 33 +++++++++----------
 lnbits/extensions/satspay/views.py            | 18 +++++++++-
 lnbits/extensions/satspay/views_api.py        | 13 ++++----
 6 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index c6f0d5b8..2591da9e 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -3,8 +3,6 @@ from typing import List, Optional
 
 from loguru import logger
 
-from loguru import logger
-
 from lnbits.core.services import create_invoice
 from lnbits.core.views.api import api_payment
 from lnbits.helpers import urlsafe_short_hash
@@ -14,7 +12,6 @@ from . import db
 from .helpers import fetch_onchain_balance
 from .models import Charges, CreateCharge, SatsPaySettings
 
-
 ###############CHARGES##########################
 
 
@@ -102,14 +99,12 @@ async def get_charges(user: str) -> List[Charges]:
     )
     return [Charges.from_row(row) for row in rows]
 
+
 async def get_settings(user: str) -> SatsPaySettings:
     row = await db.fetchone(
         """SELECT * FROM satspay.settings WHERE "user" = ?""",
         (user,),
     )
-    logger.debug('Settings data')
-    logger.debug(row)
-
     if row:
         return SatsPaySettings.from_row(row)
     else:
@@ -150,10 +145,7 @@ async def save_settings(user: str, data: SatsPaySettings):
             """
             UPDATE satspay.settings SET custom_css = ? WHERE user = ?
             """,
-            (
-                data.custom_css,
-                user
-            ),
+            (data.custom_css, user),
         )
     else:
         await db.execute(
diff --git a/lnbits/extensions/satspay/models.py b/lnbits/extensions/satspay/models.py
index d5f01b21..94c0938c 100644
--- a/lnbits/extensions/satspay/models.py
+++ b/lnbits/extensions/satspay/models.py
@@ -72,6 +72,7 @@ class Charges(BaseModel):
 
     def must_call_webhook(self):
         return self.webhook and self.paid and self.config.webhook_success == False
+
 class SatsPaySettings(BaseModel):
     custom_css: str = Query(None)
 
diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index a24ed84c..da617a10 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -297,7 +297,12 @@
   </div>
   <div class="col-lg- 4 col-md-3 col-sm-1"></div>
 </div>
-
+{% endblock %} {% block styles %}
+<link
+  href="/satspay/css/{{ charge_data.id }}"
+  rel="stylesheet"
+  type="text/css"
+/>
 {% endblock %} {% block scripts %}
 
 <script src="https://mempool.space/mempool.js"></script>
@@ -310,6 +315,7 @@
     mixins: [windowMixin],
     data() {
       return {
+        customCss: '',
         charge: JSON.parse('{{charge_data | tojson}}'),
         mempoolEndpoint: '{{mempool_endpoint}}',
         network: '{{network}}',
@@ -335,6 +341,27 @@
       }
     },
     methods: {
+      startPaymentNotifier() {
+        this.cancelListener()
+        if (!this.lnbitswallet) return
+        this.cancelListener = LNbits.events.onInvoicePaid(
+          this.wallet,
+          payment => {
+            this.checkInvoiceBalance()
+          }
+        )
+      },
+      getCustomCss: async function () {
+        try {
+          const {data} = await LNbits.api.request(
+            'GET',
+            `/satspay/api/v1/settings/css/${this.charge.id}`
+          )
+          this.customCss = data
+        } catch (error) {
+          LNbits.utils.notifyApiError(error)
+        }
+      },
       checkBalances: async function () {
         if (!this.charge.payment_request && this.charge.hasOnchainStaleBalance)
           return
@@ -438,6 +465,7 @@
       }
     },
     created: async function () {
+      await this.getCustomCss()
       if (this.charge.payment_request) this.payInvoice()
       else this.payOnchain()
 
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index 2c2d2eca..ea29171b 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -9,10 +9,12 @@
           >New charge
         </q-btn>
 
-          <q-btn unelevated color="primary" @click="getSettings();formDialogSettings.show = true"
+        <q-btn
+          unelevated
+          color="primary"
+          @click="getSettings();formDialogSettings.show = true"
           >SatsPay settings
         </q-btn>
-
       </q-card-section>
     </q-card>
 
@@ -400,7 +402,7 @@
     </q-card>
   </q-dialog>
 
-<q-dialog v-model="formDialogSettings.show" position="top">
+  <q-dialog v-model="formDialogSettings.show" position="top">
     <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
       <q-form @submit="sendFormDataSettings" class="q-gutter-md">
         <q-input
@@ -410,15 +412,12 @@
           type="textarea"
           label="Custom CSS"
         >
-            <q-tooltip>Custom CSS to apply styles to your SatsPay invoice</q-tooltip>
+          <q-tooltip
+            >Custom CSS to apply styles to your SatsPay invoice</q-tooltip
+          >
         </q-input>
         <div class="row q-mt-lg">
-          <q-btn
-            unelevated
-            color="primary"
-            type="submit"
-            >Save Settings</q-btn
-          >
+          <q-btn unelevated color="primary" type="submit">Save Settings</q-btn>
           <q-btn @click="cancelSettings" flat color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
@@ -539,16 +538,16 @@
             amount: null
           }
         },
-      formDialogSettings: {
+        formDialogSettings: {
           show: false,
           data: {
-            custom_css: '',
-            }
+            custom_css: ''
+          }
         }
       }
     },
     methods: {
-      cancelSettings: function(data) {
+      cancelSettings: function (data) {
         this.formDialogCharge.data.custom_css = ''
         this.formDialogSettings.show = false
       },
@@ -624,14 +623,14 @@
         }
       },
 
-    getSettings: async function () {
+      getSettings: async function () {
         try {
           const {data} = await LNbits.api.request(
             'GET',
             '/satspay/api/v1/settings',
             this.g.user.wallets[0].inkey
           )
-            console.log('Settings data', data)
+          console.log('Settings data', data)
           this.formDialogSettings.data = data
         } catch (error) {
           LNbits.utils.notifyApiError(error)
@@ -716,7 +715,7 @@
         }
       },
       saveSettings: async function (wallet, data) {
-          console.log('wallet', wallet)
+        console.log('wallet', wallet)
         try {
           const resp = await LNbits.api.request(
             'POST',
diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index 7b769a20..0618ce1b 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -1,5 +1,6 @@
 from http import HTTPStatus
 
+from fastapi import Response
 from fastapi.param_functions import Depends
 from fastapi.templating import Jinja2Templates
 from starlette.exceptions import HTTPException
@@ -11,7 +12,7 @@ from lnbits.decorators import check_user_exists
 from lnbits.extensions.satspay.helpers import public_charge
 
 from . import satspay_ext, satspay_renderer
-from .crud import get_charge
+from .crud import get_charge, get_charge_config, get_settings
 
 templates = Jinja2Templates(directory="templates")
 
@@ -40,3 +41,18 @@ async def display(request: Request, charge_id: str):
             "network": charge.config.network,
         },
     )
+
+
+@satspay_ext.get("/css/{charge_id}")
+async def display(charge_id: str, response: Response):
+    charge = await get_charge(charge_id)
+    if not charge:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Charge link does not exist."
+        )
+    wallet = await get_wallet(charge.lnbitswallet)
+    settings = await get_settings(wallet.user)
+    if settings:
+        return Response(content=settings.custom_css, media_type="text/css")
+
+    return None
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index 5731a7e4..b8c424b2 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -1,11 +1,12 @@
 import json
 from http import HTTPStatus
 
-from loguru import logger
 import httpx
 from fastapi.params import Depends
+from loguru import logger
 from starlette.exceptions import HTTPException
 
+from lnbits.core.crud import get_wallet
 from lnbits.decorators import (
     WalletTypeInfo,
     get_key_type,
@@ -20,9 +21,9 @@ from .crud import (
     delete_charge,
     get_charge,
     get_charges,
-    update_charge,
-    save_settings,
     get_settings,
+    save_settings,
+    update_charge,
 )
 from .helpers import call_webhook, public_charge
 from .helpers import compact_charge
@@ -143,6 +144,7 @@ async def api_charge_balance(charge_id):
     
     return {**public_charge(charge)}
 
+
 #############################CHARGES##########################
 
 
@@ -150,18 +152,15 @@ async def api_charge_balance(charge_id):
 async def api_settings_save(
     data: SatsPaySettings, wallet: WalletTypeInfo = Depends(require_invoice_key)
 ):
-    logger.debug("wallet.wallet.user")
-    logger.debug(wallet.wallet.user)
     await save_settings(user=wallet.wallet.user, data=data)
     return True
 
 
 @satspay_ext.get("/api/v1/settings")
 async def api_settings_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
-    logger.debug('HERHEHRHEHRHEHR')
     try:
         return await get_settings(wallet.wallet.user)
     except HTTPException:
-        logger.error('Error loading satspay settings')
+        logger.error("Error loading satspay settings")
         logger.error(HTTPException)
         return ""

From 1296dd85746aa6a0a0f629bb6e26f42783fbf439 Mon Sep 17 00:00:00 2001
From: Black Coffee <randommw@protonmail.com>
Date: Tue, 25 Oct 2022 11:04:07 +0100
Subject: [PATCH 12/54] Removed unused custom css api call from display.html

---
 .../extensions/satspay/templates/satspay/display.html | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index da617a10..42178075 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -351,17 +351,6 @@
           }
         )
       },
-      getCustomCss: async function () {
-        try {
-          const {data} = await LNbits.api.request(
-            'GET',
-            `/satspay/api/v1/settings/css/${this.charge.id}`
-          )
-          this.customCss = data
-        } catch (error) {
-          LNbits.utils.notifyApiError(error)
-        }
-      },
       checkBalances: async function () {
         if (!this.charge.payment_request && this.charge.hasOnchainStaleBalance)
           return

From f074d81827052b9f03c10b2f6c02d7f5bf92d8db Mon Sep 17 00:00:00 2001
From: Black Coffee <randommw@protonmail.com>
Date: Tue, 25 Oct 2022 11:28:49 +0100
Subject: [PATCH 13/54] Remove theme settings on satspay invoice page and
 default to blue theme to allow users to skin satspay invoice page more easily

---
 .../satspay/templates/satspay/display.html    |  9 +++++++++
 lnbits/static/scss/base.scss                  | 20 +++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index 42178075..6d34a386 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -303,6 +303,11 @@
   rel="stylesheet"
   type="text/css"
 />
+<style>
+  header button.q-btn-dropdown {
+    display: none;
+  }
+</style>
 {% endblock %} {% block scripts %}
 
 <script src="https://mempool.space/mempool.js"></script>
@@ -456,6 +461,10 @@
     created: async function () {
       await this.getCustomCss()
       if (this.charge.payment_request) this.payInvoice()
+      // Remove a user defined theme
+      document.body.setAttribute('data-theme', '')
+
+      if (this.charge.lnbitswallet) this.payInvoice()
       else this.payOnchain()
 
       await this.checkBalances()
diff --git a/lnbits/static/scss/base.scss b/lnbits/static/scss/base.scss
index 672a85b6..c8951fcd 100644
--- a/lnbits/static/scss/base.scss
+++ b/lnbits/static/scss/base.scss
@@ -7,7 +7,7 @@ $colors in $themes {
             [data-theme='#{$theme}'] .q-drawer--dark,
             body[data-theme='#{$theme}'].body--dark,
             [data-theme='#{$theme}'] .q-menu--dark {
-                background: $color !important;
+                background: $color;
             }
             /* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
       // set a darker body bg for all themes, when in "dark mode"
@@ -19,7 +19,7 @@ $colors in $themes {
         @if $name=='info' {
             [data-theme='#{$theme}'] .q-card--dark,
             [data-theme='#{$theme}'] .q-stepper--dark {
-                background: $color !important;
+                background: $color;
             }
         }
     }
@@ -27,37 +27,37 @@ $colors in $themes {
         @each $name,
         $color in $colors {
             .bg-#{$name} {
-                background: $color !important;
+                background: $color;
             }
             .text-#{$name} {
-                color: $color !important;
+                color: $color;
             }
         }
     }
 }
 
 [data-theme='freedom'] .q-drawer--dark {
-    background: #0a0a0a !important;
+    background: #0a0a0a;
 }
 
 [data-theme='freedom'] .q-header {
-    background: #0a0a0a !important;
+    background: #0a0a0a;
 }
 
 [data-theme='salvador'] .q-drawer--dark {
-    background: #242424 !important;
+    background: #242424;
 }
 
 [data-theme='salvador'] .q-header {
-    background: #0f47af !important;
+    background: #0f47af;
 }
 
 [data-theme='flamingo'] .q-drawer--dark {
-    background: #e75480 !important;
+    background: #e75480;
 }
 
 [data-theme='flamingo'] .q-header {
-    background: #e75480 !important;
+    background: #e75480;
 }
 
 [v-cloak] {

From 6dd52acc5b2a2f9ccd1fcfba3bc2c42640d8fec2 Mon Sep 17 00:00:00 2001
From: Black Coffee <randommw@protonmail.com>
Date: Tue, 25 Oct 2022 14:21:29 +0100
Subject: [PATCH 14/54] Remove console.log from satspay index.html

---
 lnbits/extensions/satspay/templates/satspay/index.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index ea29171b..78c45a8b 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -630,7 +630,6 @@
             '/satspay/api/v1/settings',
             this.g.user.wallets[0].inkey
           )
-          console.log('Settings data', data)
           this.formDialogSettings.data = data
         } catch (error) {
           LNbits.utils.notifyApiError(error)
@@ -715,7 +714,6 @@
         }
       },
       saveSettings: async function (wallet, data) {
-        console.log('wallet', wallet)
         try {
           const resp = await LNbits.api.request(
             'POST',

From 1d8f4cb01b2c1cb5747fb179b5b896cdaae0a07c Mon Sep 17 00:00:00 2001
From: Black Coffee <randommw@protonmail.com>
Date: Tue, 25 Oct 2022 14:30:37 +0100
Subject: [PATCH 15/54] Change user to user_id in satspay settings table and
 fixed first use bug

---
 lnbits/extensions/satspay/crud.py             | 34 +++++++++----------
 lnbits/extensions/satspay/migrations.py       |  2 +-
 .../satspay/templates/satspay/index.html      |  4 ++-
 lnbits/extensions/satspay/views_api.py        |  2 +-
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 2591da9e..7f4161a5 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -100,17 +100,6 @@ async def get_charges(user: str) -> List[Charges]:
     return [Charges.from_row(row) for row in rows]
 
 
-async def get_settings(user: str) -> SatsPaySettings:
-    row = await db.fetchone(
-        """SELECT * FROM satspay.settings WHERE "user" = ?""",
-        (user,),
-    )
-    if row:
-        return SatsPaySettings.from_row(row)
-    else:
-        return None
-
-
 async def delete_charge(charge_id: str) -> None:
     await db.execute("DELETE FROM satspay.charges WHERE id = ?", (charge_id,))
 
@@ -135,30 +124,41 @@ async def check_address_balance(charge_id: str) -> Optional[Charges]:
 
 
 ################## SETTINGS ###################
-async def save_settings(user: str, data: SatsPaySettings):
+async def save_settings(user_id: str, data: SatsPaySettings):
     # insert or update
     row = await db.fetchone(
-        """SELECT user FROM satspay.settings WHERE user = ?""", (user,)
+        """SELECT user_id FROM satspay.settings WHERE user_id = ?""", (user_id,)
     )
     if row:
         await db.execute(
             """
-            UPDATE satspay.settings SET custom_css = ? WHERE user = ?
+            UPDATE satspay.settings SET custom_css = ? WHERE user_id = ?
             """,
-            (data.custom_css, user),
+            (data.custom_css, user_id),
         )
     else:
         await db.execute(
             """
             INSERT INTO satspay.settings (
-                user,
+                user_id,
                 custom_css
                 )
             VALUES (?, ?)
             """,
             (
-                user,
+                user_id,
                 data.custom_css,
             ),
         )
     return True
+
+
+async def get_settings(user_id: str) -> SatsPaySettings:
+    row = await db.fetchone(
+        """SELECT * FROM satspay.settings WHERE user_id = ?""",
+        (user_id,),
+    )
+    if row:
+        return SatsPaySettings.from_row(row)
+    else:
+        return None
\ No newline at end of file
diff --git a/lnbits/extensions/satspay/migrations.py b/lnbits/extensions/satspay/migrations.py
index 4a4b5460..fe0a9d9c 100644
--- a/lnbits/extensions/satspay/migrations.py
+++ b/lnbits/extensions/satspay/migrations.py
@@ -46,7 +46,7 @@ async def m002_add_settings_table(db):
     await db.execute(
         """
         CREATE TABLE satspay.settings (
-            "user" TEXT,
+            user_id TEXT,
             custom_css TEXT
         );
     """
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index 78c45a8b..02d74653 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -630,7 +630,9 @@
             '/satspay/api/v1/settings',
             this.g.user.wallets[0].inkey
           )
-          this.formDialogSettings.data = data
+            if(data) {
+                this.formDialogSettings.data.custom_css = data.custom_css
+            }
         } catch (error) {
           LNbits.utils.notifyApiError(error)
         }
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index b8c424b2..429453df 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -152,7 +152,7 @@ async def api_charge_balance(charge_id):
 async def api_settings_save(
     data: SatsPaySettings, wallet: WalletTypeInfo = Depends(require_invoice_key)
 ):
-    await save_settings(user=wallet.wallet.user, data=data)
+    await save_settings(user_id=wallet.wallet.user, data=data)
     return True
 
 

From 6f9d32478b122fd5c7e77ab4c2639af86e792cb6 Mon Sep 17 00:00:00 2001
From: Black Coffee <randommw@protonmail.com>
Date: Tue, 25 Oct 2022 14:31:34 +0100
Subject: [PATCH 16/54] run isort and black

---
 lnbits/extensions/satspay/crud.py                      | 2 +-
 lnbits/extensions/satspay/templates/satspay/index.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 7f4161a5..6ed324a4 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -161,4 +161,4 @@ async def get_settings(user_id: str) -> SatsPaySettings:
     if row:
         return SatsPaySettings.from_row(row)
     else:
-        return None
\ No newline at end of file
+        return None
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index 02d74653..fb7c4285 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -630,9 +630,9 @@
             '/satspay/api/v1/settings',
             this.g.user.wallets[0].inkey
           )
-            if(data) {
-                this.formDialogSettings.data.custom_css = data.custom_css
-            }
+          if (data) {
+            this.formDialogSettings.data.custom_css = data.custom_css
+          }
         } catch (error) {
           LNbits.utils.notifyApiError(error)
         }

From a26a13a88db30796693495218bb1d16c00357b41 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Thu, 24 Nov 2022 14:54:19 +0000
Subject: [PATCH 17/54] Now you can have multiple themes

---
 lnbits/extensions/satspay/config.json         |   4 +-
 lnbits/extensions/satspay/crud.py             |  55 +++--
 lnbits/extensions/satspay/migrations.py       |  18 +-
 lnbits/extensions/satspay/models.py           |   9 +-
 lnbits/extensions/satspay/static/js/utils.js  |   5 +
 .../satspay/templates/satspay/_api_docs.html  |   8 +-
 .../satspay/templates/satspay/display.html    |   9 +-
 .../satspay/templates/satspay/index.html      | 226 +++++++++++++++---
 lnbits/extensions/satspay/views.py            |  18 +-
 lnbits/extensions/satspay/views_api.py        |  48 +++-
 10 files changed, 305 insertions(+), 95 deletions(-)

diff --git a/lnbits/extensions/satspay/config.json b/lnbits/extensions/satspay/config.json
index beb0071c..fe9e3df4 100644
--- a/lnbits/extensions/satspay/config.json
+++ b/lnbits/extensions/satspay/config.json
@@ -2,7 +2,5 @@
   "name": "SatsPay Server",
   "short_description": "Create onchain and LN charges",
   "icon": "payment",
-  "contributors": [
-    "arcbtc"
-  ]
+  "contributors": ["arcbtc"]
 }
diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 6ed324a4..113b0cb4 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -10,7 +10,8 @@ from lnbits.helpers import urlsafe_short_hash
 from ..watchonly.crud import get_config, get_fresh_address
 from . import db
 from .helpers import fetch_onchain_balance
-from .models import Charges, CreateCharge, SatsPaySettings
+from .models import Charges, CreateCharge, SatsPayThemes
+
 
 ###############CHARGES##########################
 
@@ -53,7 +54,8 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             time,
             amount,
             balance,
-            extra
+            extra,
+            custom_css,
         )
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
@@ -71,6 +73,7 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             data.completelinktext,
             data.time,
             data.amount,
+            data.custom_css,
             0,
             data.extra,
         ),
@@ -124,41 +127,51 @@ async def check_address_balance(charge_id: str) -> Optional[Charges]:
 
 
 ################## SETTINGS ###################
-async def save_settings(user_id: str, data: SatsPaySettings):
+
+
+async def save_theme(data: SatsPayThemes, css_id: str = None):
     # insert or update
-    row = await db.fetchone(
-        """SELECT user_id FROM satspay.settings WHERE user_id = ?""", (user_id,)
-    )
-    if row:
+    if css_id:
         await db.execute(
             """
-            UPDATE satspay.settings SET custom_css = ? WHERE user_id = ?
+            UPDATE satspay.themes SET custom_css = ?, title = ? WHERE css_id = ?
             """,
-            (data.custom_css, user_id),
+            (data.custom_css, data.title, css_id),
         )
     else:
+        css_id = urlsafe_short_hash()
         await db.execute(
             """
-            INSERT INTO satspay.settings (
-                user_id,
+            INSERT INTO satspay.themes (
+                css_id,
+                title,
+                user,
                 custom_css
                 )
-            VALUES (?, ?)
+            VALUES (?, ?, ?, ?)
             """,
             (
-                user_id,
+                css_id,
+                data.title,
+                data.user,
                 data.custom_css,
             ),
         )
-    return True
+    return await get_theme(css_id)
 
 
-async def get_settings(user_id: str) -> SatsPaySettings:
-    row = await db.fetchone(
-        """SELECT * FROM satspay.settings WHERE user_id = ?""",
+async def get_theme(css_id: str) -> SatsPayThemes:
+    row = await db.fetchone("SELECT * FROM satspay.themes WHERE css_id = ?", (css_id,))
+    return SatsPayThemes.from_row(row) if row else None
+
+
+async def get_themes(user_id: str) -> List[SatsPayThemes]:
+    rows = await db.fetchall(
+        """SELECT * FROM satspay.themes WHERE "user" = ? ORDER BY "timestamp" DESC """,
         (user_id,),
     )
-    if row:
-        return SatsPaySettings.from_row(row)
-    else:
-        return None
+    return [SatsPayThemes.from_row(row) for row in rows]
+
+
+async def delete_theme(theme_id: str) -> None:
+    await db.execute("DELETE FROM satspay.themes WHERE css_id = ?", (theme_id,))
diff --git a/lnbits/extensions/satspay/migrations.py b/lnbits/extensions/satspay/migrations.py
index fe0a9d9c..8787cc8b 100644
--- a/lnbits/extensions/satspay/migrations.py
+++ b/lnbits/extensions/satspay/migrations.py
@@ -38,16 +38,26 @@ async def m002_add_charge_extra_data(db):
         """
     )
 
-async def m002_add_settings_table(db):
+async def m002_add_themes_table(db):
     """
-    Settings table
+    Themes table
     """
 
     await db.execute(
         """
-        CREATE TABLE satspay.settings (
-            user_id TEXT,
+        CREATE TABLE satspay.themes (
+            css_id TEXT,
+            user TEXT,
+            title TEXT,
             custom_css TEXT
         );
     """
     )
+
+
+async def m003_add_custom_css_to_charges(db):
+    """
+    Add custom css option column to the 'charges' table
+    """
+
+    await db.execute("ALTER TABLE satspay.charges ADD COLUMN custom_css TEXT;")
diff --git a/lnbits/extensions/satspay/models.py b/lnbits/extensions/satspay/models.py
index 94c0938c..4227cabc 100644
--- a/lnbits/extensions/satspay/models.py
+++ b/lnbits/extensions/satspay/models.py
@@ -14,6 +14,7 @@ class CreateCharge(BaseModel):
     webhook: str = Query(None)
     completelink: str = Query(None)
     completelinktext: str = Query(None)
+    custom_css: Optional[str]
     time: int = Query(..., ge=1)
     amount: int = Query(..., ge=1)
     extra: str = "{}"
@@ -38,6 +39,7 @@ class Charges(BaseModel):
     completelink: Optional[str]
     completelinktext: Optional[str] = "Back to Merchant"
     extra: str = "{}"
+    custom_css: Optional[str]
     time: int
     amount: int
     balance: int
@@ -73,9 +75,12 @@ class Charges(BaseModel):
     def must_call_webhook(self):
         return self.webhook and self.paid and self.config.webhook_success == False
 
-class SatsPaySettings(BaseModel):
+class SatsPayThemes(BaseModel):
+    css_id: str = Query(None)
+    title: str = Query(None)
     custom_css: str = Query(None)
+    user: Optional[str]
 
     @classmethod
-    def from_row(cls, row: Row) -> "SatsPaySettings":
+    def from_row(cls, row: Row) -> "SatsPayThemes":
         return cls(**dict(row))
diff --git a/lnbits/extensions/satspay/static/js/utils.js b/lnbits/extensions/satspay/static/js/utils.js
index 92927955..2b1be8bd 100644
--- a/lnbits/extensions/satspay/static/js/utils.js
+++ b/lnbits/extensions/satspay/static/js/utils.js
@@ -26,5 +26,10 @@ const mapCharge = (obj, oldObj = {}) => {
   return charge
 }
 
+const mapCSS = (obj, oldObj = {}) => {
+  const theme = _.clone(obj)
+  return theme
+}
+
 const minutesToTime = min =>
   min > 0 ? new Date(min * 1000).toISOString().substring(14, 19) : ''
diff --git a/lnbits/extensions/satspay/templates/satspay/_api_docs.html b/lnbits/extensions/satspay/templates/satspay/_api_docs.html
index ed658735..6d5ae661 100644
--- a/lnbits/extensions/satspay/templates/satspay/_api_docs.html
+++ b/lnbits/extensions/satspay/templates/satspay/_api_docs.html
@@ -5,7 +5,13 @@
       WatchOnly extension, we highly reccomend using a fresh extended public Key
       specifically for SatsPayServer!<br />
       <small>
-        Created by, <a href="https://github.com/benarc">Ben Arc</a></small
+        Created by, <a href="https://github.com/benarc">Ben Arc</a>,
+        <a
+          target="_blank"
+          style="color: unset"
+          href="https://github.com/motorina0"
+          >motorina0</a
+        ></small
       >
     </p>
     <br />
diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index 6d34a386..437f81c7 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -299,7 +299,7 @@
 </div>
 {% endblock %} {% block styles %}
 <link
-  href="/satspay/css/{{ charge_data.id }}"
+  href="/satspay/css/{{ charge_data.custom_css }}"
   rel="stylesheet"
   type="text/css"
 />
@@ -324,6 +324,7 @@
         charge: JSON.parse('{{charge_data | tojson}}'),
         mempoolEndpoint: '{{mempool_endpoint}}',
         network: '{{network}}',
+        css_id: '{{ charge_data.css_id }}',
         pendingFunds: 0,
         ws: null,
         newProgress: 0.4,
@@ -462,8 +463,10 @@
       await this.getCustomCss()
       if (this.charge.payment_request) this.payInvoice()
       // Remove a user defined theme
-      document.body.setAttribute('data-theme', '')
-
+      console.log(this.charge.custom_css)
+      if (this.charge.custom_css) {
+        document.body.setAttribute('data-theme', '')
+      }
       if (this.charge.lnbitswallet) this.payInvoice()
       else this.payOnchain()
 
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index fb7c4285..08bf785d 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -12,8 +12,8 @@
         <q-btn
           unelevated
           color="primary"
-          @click="getSettings();formDialogSettings.show = true"
-          >SatsPay settings
+          @click="getThemes();formDialogThemes.show = true"
+          >New CSS Theme
         </q-btn>
       </q-card-section>
     </q-card>
@@ -266,6 +266,63 @@
         </q-table>
       </q-card-section>
     </q-card>
+
+    <q-card>
+      <q-card-section>
+        <div class="row items-center no-wrap q-mb-md">
+          <div class="col">
+            <h5 class="text-subtitle1 q-my-none">Themes</h5>
+          </div>
+        </div>
+        <q-table
+          dense
+          flat
+          :data="themeLinks"
+          row-key="id"
+          :columns="customCSSTable.columns"
+          :pagination.sync="customCSSTable.pagination"
+        >
+          {% raw %}
+          <template v-slot:header="props">
+            <q-tr :props="props">
+              <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.label }}
+              </q-th>
+              <q-th auto-width></q-th>
+            </q-tr>
+          </template>
+
+          <template v-slot:body="props">
+            <q-tr :props="props">
+              <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                {{ col.value }}
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="updateformDialog(props.row.css_id)"
+                  icon="edit"
+                  color="light-blue"
+                ></q-btn>
+              </q-td>
+              <q-td auto-width>
+                <q-btn
+                  flat
+                  dense
+                  size="xs"
+                  @click="deleteTheme(props.row.css_id)"
+                  icon="cancel"
+                  color="pink"
+                ></q-btn>
+              </q-td>
+            </q-tr>
+          </template>
+          {% endraw %}
+        </q-table>
+      </q-card-section>
+    </q-card>
   </div>
 
   <div class="col-12 col-md-5 q-gutter-y-md">
@@ -384,6 +441,15 @@
           label="Wallet *"
         >
         </q-select>
+        <q-select
+          filled
+          dense
+          emit-value
+          v-model="formDialogCharge.data.custom_css"
+          :options="themeOptions"
+          label="Custom CSS theme (optional)"
+        >
+        </q-select>
         <div class="row q-mt-lg">
           <q-btn
             unelevated
@@ -402,23 +468,36 @@
     </q-card>
   </q-dialog>
 
-  <q-dialog v-model="formDialogSettings.show" position="top">
+  <q-dialog v-model="formDialogThemes.show" position="top">
     <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form @submit="sendFormDataSettings" class="q-gutter-md">
+      <q-form @submit="sendFormDataThemes" class="q-gutter-md">
         <q-input
           filled
           dense
-          v-model.trim="formDialogSettings.data.custom_css"
+          v-model.trim="formDialogThemes.data.title"
+          type="text"
+          label="*Title"
+        ></q-input>
+        <q-input
+          filled
+          dense
+          v-model.trim="formDialogThemes.data.custom_css"
           type="textarea"
           label="Custom CSS"
         >
-          <q-tooltip
-            >Custom CSS to apply styles to your SatsPay invoice</q-tooltip
-          >
         </q-input>
         <div class="row q-mt-lg">
-          <q-btn unelevated color="primary" type="submit">Save Settings</q-btn>
-          <q-btn @click="cancelSettings" flat color="grey" class="q-ml-auto"
+          <q-btn
+            v-if="formDialogThemes.data.css_id"
+            unelevated
+            color="primary"
+            type="submit"
+            >Update CSS theme</q-btn
+          >
+          <q-btn v-else unelevated color="primary" type="submit"
+            >Save CSS theme</q-btn
+          >
+          <q-btn @click="cancelThemes" flat color="grey" class="q-ml-auto"
             >Cancel</q-btn
           >
         </div>
@@ -446,7 +525,9 @@
         balance: null,
         walletLinks: [],
         chargeLinks: [],
-        onchainwallet: null,
+        themeLinks: [],
+        themeOptions: [],
+        onchainwallet: '',
         rescanning: false,
         mempool: {
           endpoint: '',
@@ -526,7 +607,25 @@
             rowsPerPage: 10
           }
         },
-
+        customCSSTable: {
+          columns: [
+            {
+              name: 'css_id',
+              align: 'left',
+              label: 'ID',
+              field: 'css_id'
+            },
+            {
+              name: 'title',
+              align: 'left',
+              label: 'Title',
+              field: 'title'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10
+          }
+        },
         formDialogCharge: {
           show: false,
           data: {
@@ -534,11 +633,12 @@
             onchainwallet: '',
             lnbits: false,
             description: '',
+            custom_css: '',
             time: null,
             amount: null
           }
         },
-        formDialogSettings: {
+        formDialogThemes: {
           show: false,
           data: {
             custom_css: ''
@@ -547,9 +647,9 @@
       }
     },
     methods: {
-      cancelSettings: function (data) {
+      cancelThemes: function (data) {
         this.formDialogCharge.data.custom_css = ''
-        this.formDialogSettings.show = false
+        this.formDialogThemes.show = false
       },
       cancelCharge: function (data) {
         this.formDialogCharge.data.description = ''
@@ -559,6 +659,7 @@
         this.formDialogCharge.data.time = null
         this.formDialogCharge.data.amount = null
         this.formDialogCharge.data.webhook = ''
+        this.formDialogCharge.data.custom_css = ''
         this.formDialogCharge.data.completelink = ''
         this.formDialogCharge.show = false
       },
@@ -623,30 +724,38 @@
         }
       },
 
-      getSettings: async function () {
+      getThemes: async function () {
         try {
           const {data} = await LNbits.api.request(
             'GET',
-            '/satspay/api/v1/settings',
+            '/satspay/api/v1/themes',
             this.g.user.wallets[0].inkey
           )
-          if (data) {
-            this.formDialogSettings.data.custom_css = data.custom_css
-          }
+          console.log(data)
+          this.themeLinks = data.map(c =>
+            mapCSS(
+              c,
+              this.themeLinks.find(old => old.css_id === c.css_id)
+            )
+          )
+          this.themeOptions = data.map(w => ({
+            id: w.css_id,
+            label: w.title + ' - ' + w.css_id
+          }))
         } catch (error) {
           LNbits.utils.notifyApiError(error)
         }
       },
 
-      sendFormDataSettings: function () {
+      sendFormDataThemes: function () {
         const wallet = this.g.user.wallets[0].inkey
-        const data = this.formDialogSettings.data
-        data.custom_css = data.custom_css
-        this.saveSettings(wallet, data)
+        const data = this.formDialogThemes.data
+        this.createTheme(wallet, data)
       },
       sendFormDataCharge: function () {
-        const wallet = this.g.user.wallets[0].inkey
+        this.formDialogCharge.data.custom_css = this.formDialogCharge.data.custom_css.id
         const data = this.formDialogCharge.data
+        const wallet = this.g.user.wallets[0].inkey
         data.amount = parseInt(data.amount)
         data.time = parseInt(data.time)
         data.lnbitswallet = data.lnbits ? data.lnbitswallet : null
@@ -715,23 +824,68 @@
           this.rescanning = false
         }
       },
-      saveSettings: async function (wallet, data) {
+      updateformDialog: function (themeId) {
+        const theme = _.findWhere(this.themeLinks, {css_id: themeId})
+        console.log(theme.css_id)
+        this.formDialogThemes.data.css_id = theme.css_id
+        this.formDialogThemes.data.title = theme.title
+        this.formDialogThemes.data.custom_css = theme.custom_css
+        this.formDialogThemes.show = true
+      },
+      createTheme: async function (wallet, data) {
+        console.log(data.css_id)
         try {
-          const resp = await LNbits.api.request(
-            'POST',
-            '/satspay/api/v1/settings',
-            wallet,
-            data
-          )
-
-          this.formDialogSettings.show = false
-          this.formDialogSettings.data = {
+          if (data.css_id) {
+            const resp = await LNbits.api.request(
+              'POST',
+              '/satspay/api/v1/themes/' + data.css_id,
+              wallet,
+              data
+            )
+            this.themeLinks = _.reject(this.themeLinks, function (obj) {
+              return obj.css_id === data.css_id
+            })
+            this.themeLinks.unshift(mapCSS(resp.data))
+          } else {
+            const resp = await LNbits.api.request(
+              'POST',
+              '/satspay/api/v1/themes',
+              wallet,
+              data
+            )
+            this.themeLinks.unshift(mapCSS(resp.data))
+          }
+          this.formDialogThemes.show = false
+          this.formDialogThemes.data = {
+            title: '',
             custom_css: ''
           }
         } catch (error) {
+          console.log('cun')
           LNbits.utils.notifyApiError(error)
         }
       },
+
+      deleteTheme: function (themeId) {
+        const theme = _.findWhere(this.themeLinks, {id: themeId})
+        LNbits.utils
+          .confirmDialog('Are you sure you want to delete this theme?')
+          .onOk(async () => {
+            try {
+              const response = await LNbits.api.request(
+                'DELETE',
+                '/satspay/api/v1/themes/' + themeId,
+                this.g.user.wallets[0].adminkey
+              )
+
+              this.themeLinks = _.reject(this.themeLinks, function (obj) {
+                return obj.css_id === themeId
+              })
+            } catch (error) {
+              LNbits.utils.notifyApiError(error)
+            }
+          })
+      },
       createCharge: async function (wallet, data) {
         try {
           const resp = await LNbits.api.request(
@@ -784,7 +938,7 @@
       }
     },
     created: async function () {
-      await this.getSettings()
+      await this.getThemes()
       await this.getCharges()
       await this.getWalletConfig()
       await this.getWalletLinks()
diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index 0618ce1b..72362f86 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -12,7 +12,7 @@ from lnbits.decorators import check_user_exists
 from lnbits.extensions.satspay.helpers import public_charge
 
 from . import satspay_ext, satspay_renderer
-from .crud import get_charge, get_charge_config, get_settings
+from .crud import get_charge, get_charge_config, get_themes, get_theme
 
 templates = Jinja2Templates(directory="templates")
 
@@ -43,16 +43,10 @@ async def display(request: Request, charge_id: str):
     )
 
 
-@satspay_ext.get("/css/{charge_id}")
-async def display(charge_id: str, response: Response):
-    charge = await get_charge(charge_id)
-    if not charge:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Charge link does not exist."
-        )
-    wallet = await get_wallet(charge.lnbitswallet)
-    settings = await get_settings(wallet.user)
-    if settings:
-        return Response(content=settings.custom_css, media_type="text/css")
+@satspay_ext.get("/css/{css_id}")
+async def display(css_id: str, response: Response):
+    theme = await get_theme(css_id)
+    if theme:
+        return Response(content=theme.custom_css, media_type="text/css")
 
     return None
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index 429453df..d5b510ab 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -21,13 +21,15 @@ from .crud import (
     delete_charge,
     get_charge,
     get_charges,
-    get_settings,
-    save_settings,
+    get_theme,
+    get_themes,
+    delete_theme,
+    save_theme,
     update_charge,
 )
 from .helpers import call_webhook, public_charge
 from .helpers import compact_charge
-from .models import CreateCharge, SatsPaySettings
+from .models import CreateCharge, SatsPayThemes
 
 #############################CHARGES##########################
 
@@ -145,22 +147,42 @@ async def api_charge_balance(charge_id):
     return {**public_charge(charge)}
 
 
-#############################CHARGES##########################
+#############################THEMES##########################
 
 
-@satspay_ext.post("/api/v1/settings")
-async def api_settings_save(
-    data: SatsPaySettings, wallet: WalletTypeInfo = Depends(require_invoice_key)
+@satspay_ext.post("/api/v1/themes")
+@satspay_ext.post("/api/v1/themes/{css_id}")
+async def api_themes_save(
+    data: SatsPayThemes,
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
+    css_id: str = None,
 ):
-    await save_settings(user_id=wallet.wallet.user, data=data)
-    return True
+    if css_id:
+        theme = await save_theme(css_id=css_id, data=data)
+    else:
+        data.user = wallet.wallet.user
+        theme = await save_theme(data=data)
+    return theme
 
 
-@satspay_ext.get("/api/v1/settings")
-async def api_settings_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
+@satspay_ext.get("/api/v1/themes")
+async def api_themes_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
     try:
-        return await get_settings(wallet.wallet.user)
+        return await get_themes(wallet.wallet.user)
     except HTTPException:
-        logger.error("Error loading satspay settings")
+        logger.error("Error loading satspay themes")
         logger.error(HTTPException)
         return ""
+
+
+@satspay_ext.delete("/api/v1/themes/{theme_id}")
+async def api_charge_delete(theme_id, wallet: WalletTypeInfo = Depends(get_key_type)):
+    theme = await get_theme(theme_id)
+
+    if not theme:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Theme does not exist."
+        )
+
+    await delete_theme(theme_id)
+    return "", HTTPStatus.NO_CONTENT

From 193fc349f003a7dd9f31e609aef48bc121aa6c76 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Fri, 25 Nov 2022 14:53:03 +0100
Subject: [PATCH 18/54] strip html

---
 lnbits/db.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lnbits/db.py b/lnbits/db.py
index f52b0391..7d15a304 100644
--- a/lnbits/db.py
+++ b/lnbits/db.py
@@ -1,6 +1,7 @@
 import asyncio
 import datetime
 import os
+import re
 import time
 from contextlib import asynccontextmanager
 from typing import Optional
@@ -71,6 +72,16 @@ class Connection(Compat):
         if self.type in {POSTGRES, COCKROACH}:
             query = query.replace("%", "%%")
             query = query.replace("?", "%s")
+
+            # strip html
+            CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
+
+            def cleanhtml(raw_html):
+                cleantext = re.sub(CLEANR, "", raw_html)
+                return cleantext
+
+            query = cleanhtml(query)
+
         return query
 
     async def fetchall(self, query: str, values: tuple = ()) -> list:

From c448287f4a162e2707a9edbfd1fd1c3229106948 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Fri, 25 Nov 2022 15:11:58 +0100
Subject: [PATCH 19/54] rewrite values in db

---
 lnbits/db.py | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/lnbits/db.py b/lnbits/db.py
index 7d15a304..e67cc22e 100644
--- a/lnbits/db.py
+++ b/lnbits/db.py
@@ -72,30 +72,41 @@ class Connection(Compat):
         if self.type in {POSTGRES, COCKROACH}:
             query = query.replace("%", "%%")
             query = query.replace("?", "%s")
-
-            # strip html
-            CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
-
-            def cleanhtml(raw_html):
-                cleantext = re.sub(CLEANR, "", raw_html)
-                return cleantext
-
-            query = cleanhtml(query)
-
         return query
 
+    def rewrite_values(self, values):
+        # strip html
+        CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
+
+        def cleanhtml(raw_html):
+            if type(raw_html) == str:
+                cleantext = re.sub(CLEANR, "", raw_html)
+                return cleantext
+            else:
+                return raw_html
+
+        # tuple to list and back to tuple
+        values = tuple([cleanhtml(l) for l in list(values)])
+        return values
+
     async def fetchall(self, query: str, values: tuple = ()) -> list:
-        result = await self.conn.execute(self.rewrite_query(query), values)
+        result = await self.conn.execute(
+            self.rewrite_query(query), self.rewrite_values(values)
+        )
         return await result.fetchall()
 
     async def fetchone(self, query: str, values: tuple = ()):
-        result = await self.conn.execute(self.rewrite_query(query), values)
+        result = await self.conn.execute(
+            self.rewrite_query(query), self.rewrite_values(values)
+        )
         row = await result.fetchone()
         await result.close()
         return row
 
     async def execute(self, query: str, values: tuple = ()):
-        return await self.conn.execute(self.rewrite_query(query), values)
+        return await self.conn.execute(
+            self.rewrite_query(query), self.rewrite_values(values)
+        )
 
 
 class Database(Compat):

From 9d27a6f272b06f3c6004ef0f464a7642b850120c Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Fri, 25 Nov 2022 15:20:39 +0100
Subject: [PATCH 20/54] use isinstance, not type

---
 lnbits/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/db.py b/lnbits/db.py
index e67cc22e..321b23d0 100644
--- a/lnbits/db.py
+++ b/lnbits/db.py
@@ -79,7 +79,7 @@ class Connection(Compat):
         CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
 
         def cleanhtml(raw_html):
-            if type(raw_html) == str:
+            if isinstance(raw_html, str):
                 cleantext = re.sub(CLEANR, "", raw_html)
                 return cleantext
             else:

From c54077f65b4e6684d372d33c6f6dc2c1d0fb797a Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Fri, 25 Nov 2022 14:23:15 +0000
Subject: [PATCH 21/54] Revert "Merge remote-tracking branch
 'origin/fix/strip_html_db' into feature/satspay-server-custom-css"

This reverts commit f98278fabaffef1ffacf0b8c84e8c1ca166e8ae8.
---
 lnbits/db.py | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/lnbits/db.py b/lnbits/db.py
index 321b23d0..f52b0391 100644
--- a/lnbits/db.py
+++ b/lnbits/db.py
@@ -1,7 +1,6 @@
 import asyncio
 import datetime
 import os
-import re
 import time
 from contextlib import asynccontextmanager
 from typing import Optional
@@ -74,39 +73,18 @@ class Connection(Compat):
             query = query.replace("?", "%s")
         return query
 
-    def rewrite_values(self, values):
-        # strip html
-        CLEANR = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
-
-        def cleanhtml(raw_html):
-            if isinstance(raw_html, str):
-                cleantext = re.sub(CLEANR, "", raw_html)
-                return cleantext
-            else:
-                return raw_html
-
-        # tuple to list and back to tuple
-        values = tuple([cleanhtml(l) for l in list(values)])
-        return values
-
     async def fetchall(self, query: str, values: tuple = ()) -> list:
-        result = await self.conn.execute(
-            self.rewrite_query(query), self.rewrite_values(values)
-        )
+        result = await self.conn.execute(self.rewrite_query(query), values)
         return await result.fetchall()
 
     async def fetchone(self, query: str, values: tuple = ()):
-        result = await self.conn.execute(
-            self.rewrite_query(query), self.rewrite_values(values)
-        )
+        result = await self.conn.execute(self.rewrite_query(query), values)
         row = await result.fetchone()
         await result.close()
         return row
 
     async def execute(self, query: str, values: tuple = ()):
-        return await self.conn.execute(
-            self.rewrite_query(query), self.rewrite_values(values)
-        )
+        return await self.conn.execute(self.rewrite_query(query), values)
 
 
 class Database(Compat):

From 5c029a7af9062a79b91d43d2f71017c4e562632e Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Fri, 25 Nov 2022 19:10:18 +0000
Subject: [PATCH 22/54] only allows admins to use custom themes

---
 lnbits/extensions/satspay/migrations.py             |  4 ++--
 .../extensions/satspay/templates/satspay/index.html | 13 ++++++++++++-
 lnbits/extensions/satspay/views.py                  |  9 ++++++---
 lnbits/extensions/satspay/views_api.py              | 10 ++++++++++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/lnbits/extensions/satspay/migrations.py b/lnbits/extensions/satspay/migrations.py
index 8787cc8b..c6beb658 100644
--- a/lnbits/extensions/satspay/migrations.py
+++ b/lnbits/extensions/satspay/migrations.py
@@ -38,7 +38,7 @@ async def m002_add_charge_extra_data(db):
         """
     )
 
-async def m002_add_themes_table(db):
+async def m003_add_themes_table(db):
     """
     Themes table
     """
@@ -55,7 +55,7 @@ async def m002_add_themes_table(db):
     )
 
 
-async def m003_add_custom_css_to_charges(db):
+async def m004_add_custom_css_to_charges(db):
     """
     Add custom css option column to the 'charges' table
     """
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index 08bf785d..decf2b91 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -10,11 +10,20 @@
         </q-btn>
 
         <q-btn
+          v-if="admin == 'True'"
           unelevated
           color="primary"
           @click="getThemes();formDialogThemes.show = true"
           >New CSS Theme
         </q-btn>
+        <q-btn
+          v-else
+          disable
+          unelevated
+          color="primary"
+          @click="getThemes();formDialogThemes.show = true"
+          >New CSS Theme
+        <q-tooltip>For security reason, custom css is only available to server admins.</q-tooltip></q-btn>
       </q-card-section>
     </q-card>
 
@@ -267,7 +276,7 @@
       </q-card-section>
     </q-card>
 
-    <q-card>
+    <q-card  v-if="admin == 'True'">
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -522,6 +531,7 @@
       return {
         settings: {},
         filter: '',
+        admin: '{{ admin }}',
         balance: null,
         walletLinks: [],
         chargeLinks: [],
@@ -938,6 +948,7 @@
       }
     },
     created: async function () {
+      console.log(this.admin)
       await this.getThemes()
       await this.getCharges()
       await this.getWalletConfig()
diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index 72362f86..7ba73acf 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -10,17 +10,20 @@ from starlette.responses import HTMLResponse
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists
 from lnbits.extensions.satspay.helpers import public_charge
+from lnbits.settings import LNBITS_ADMIN_USERS
 
 from . import satspay_ext, satspay_renderer
-from .crud import get_charge, get_charge_config, get_themes, get_theme
+from .crud import get_charge, get_theme
 
 templates = Jinja2Templates(directory="templates")
 
-
 @satspay_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
+    admin = False
+    if LNBITS_ADMIN_USERS and user.id not in LNBITS_ADMIN_USERS:
+        admin = True
     return satspay_renderer().TemplateResponse(
-        "satspay/index.html", {"request": request, "user": user.dict()}
+        "satspay/index.html", {"request": request, "user": user.dict(), "admin": admin}
     )
 
 
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index d5b510ab..2bce1a72 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -15,6 +15,11 @@ from lnbits.decorators import (
 )
 from lnbits.extensions.satspay import satspay_ext
 
+from lnbits.settings import (
+    LNBITS_ADMIN_EXTENSIONS,
+    LNBITS_ADMIN_USERS,
+)
+
 from .crud import (
     check_address_balance,
     create_charge,
@@ -157,6 +162,11 @@ async def api_themes_save(
     wallet: WalletTypeInfo = Depends(require_invoice_key),
     css_id: str = None,
 ):
+    if LNBITS_ADMIN_USERS and wallet.wallet.user not in LNBITS_ADMIN_USERS:
+        raise HTTPException(
+            status_code=HTTPStatus.FORBIDDEN,
+            detail="Only server admins can create themes.",
+        )
     if css_id:
         theme = await save_theme(css_id=css_id, data=data)
     else:

From 5b75d4f262e44d08e66b6e741b1f85030ffb93c6 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Fri, 25 Nov 2022 19:18:14 +0000
Subject: [PATCH 23/54] added back crud

---
 lnbits/extensions/satspay/crud.py | 48 +++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 113b0cb4..3d2b7e98 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -129,6 +129,54 @@ async def check_address_balance(charge_id: str) -> Optional[Charges]:
 ################## SETTINGS ###################
 
 
+async def save_theme(data: SatsPayThemes, css_id: str = None):
+    # insert or update
+    if css_id:
+        await db.execute(
+            """
+            UPDATE satspay.themes SET custom_css = ?, title = ? WHERE css_id = ?
+            """,
+            (data.custom_css, data.title, css_id),
+        )
+    else:
+        css_id = urlsafe_short_hash()
+        await db.execute(
+            """
+            INSERT INTO satspay.themes (
+                css_id,
+                title,
+                user,
+                custom_css
+                )
+            VALUES (?, ?, ?, ?)
+            """,
+            (
+                css_id,
+                data.title,
+                data.user,
+                data.custom_css,
+            ),
+        )
+    return await get_theme(css_id)
+
+
+async def get_theme(css_id: str) -> SatsPayThemes:
+    row = await db.fetchone("SELECT * FROM satspay.themes WHERE css_id = ?", (css_id,))
+    return SatsPayThemes.from_row(row) if row else None
+
+
+async def get_themes(user_id: str) -> List[SatsPayThemes]:
+    rows = await db.fetchall(
+        """SELECT * FROM satspay.themes WHERE "user" = ? ORDER BY "timestamp" DESC """,
+        (user_id,),
+    )
+    return await get_config(row.user)
+
+
+
+################## SETTINGS ###################
+
+
 async def save_theme(data: SatsPayThemes, css_id: str = None):
     # insert or update
     if css_id:

From a19bb520c3e2beb884d53ecba512faac1c1c5211 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Fri, 25 Nov 2022 19:21:42 +0000
Subject: [PATCH 24/54] removed compact_charge

---
 lnbits/extensions/satspay/views_api.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index 2bce1a72..5f0e72ce 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -32,9 +32,9 @@ from .crud import (
     save_theme,
     update_charge,
 )
-from .helpers import call_webhook, public_charge
-from .helpers import compact_charge
+
 from .models import CreateCharge, SatsPayThemes
+from .helpers import call_webhook, public_charge
 
 #############################CHARGES##########################
 

From 7dc90177ecabd7fa4c0a9e97e965d5310ad05d02 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Fri, 25 Nov 2022 19:25:32 +0000
Subject: [PATCH 25/54] Auto stash before checking out "HEAD"

---
 lnbits/extensions/satspay/templates/satspay/index.html | 4 +++-
 lnbits/extensions/satspay/views_api.py                 | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index decf2b91..c3ae7686 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -949,7 +949,9 @@
     },
     created: async function () {
       console.log(this.admin)
-      await this.getThemes()
+      if(this.admin == "True"){
+          await this.getThemes()
+      }
       await this.getCharges()
       await this.getWalletConfig()
       await this.getWalletLinks()
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index 5f0e72ce..d9defa2f 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -143,7 +143,7 @@ async def api_charge_balance(charge_id):
             try:
                 r = await client.post(
                     charge.webhook,
-                    json=compact_charge(charge),
+                    json=public_charge(charge),
                     timeout=40,
                 )
             except AssertionError:

From 3a9dbb97c514f4f460e5d083f958c390e5a33ba5 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Fri, 25 Nov 2022 19:28:45 +0000
Subject: [PATCH 26/54] fixed admin check

---
 lnbits/extensions/satspay/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index 7ba73acf..0c19367d 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -20,7 +20,7 @@ templates = Jinja2Templates(directory="templates")
 @satspay_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
     admin = False
-    if LNBITS_ADMIN_USERS and user.id not in LNBITS_ADMIN_USERS:
+    if LNBITS_ADMIN_USERS and user.id in LNBITS_ADMIN_USERS:
         admin = True
     return satspay_renderer().TemplateResponse(
         "satspay/index.html", {"request": request, "user": user.dict(), "admin": admin}

From 254cb8cce1d2ec5df40f741243f1df1756320089 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Fri, 25 Nov 2022 19:34:13 +0000
Subject: [PATCH 27/54] added back custom css to public page

---
 .../extensions/satspay/templates/satspay/display.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index 437f81c7..8a7f92f8 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -308,6 +308,17 @@
     display: none;
   }
 </style>
+{% endblock %} % block styles %}
+<link
+  href="/satspay/css/{{ charge_data.custom_css }}"
+  rel="stylesheet"
+  type="text/css"
+/>
+<style>
+  header button.q-btn-dropdown {
+    display: none;
+  }
+</style>
 {% endblock %} {% block scripts %}
 
 <script src="https://mempool.space/mempool.js"></script>

From 769bce0f94e529951ce3e4a6f6000cdd8af04067 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Fri, 25 Nov 2022 19:43:45 +0000
Subject: [PATCH 28/54] Added back custom_css

---
 lnbits/extensions/satspay/crud.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 3d2b7e98..3e1df373 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -52,12 +52,13 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             completelink,
             completelinktext,
             time,
+            custom_css,
             amount,
             balance,
             extra,
             custom_css,
         )
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
             charge_id,

From 16183a03170dc8dc86c4d18d5d63f73223552710 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Sat, 26 Nov 2022 00:40:13 +0000
Subject: [PATCH 29/54] Trying to fix conflict errors

---
 lnbits/extensions/satspay/crud.py  | 6 ++++--
 lnbits/extensions/satspay/views.py | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 3e1df373..c7d9eee2 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -12,7 +12,7 @@ from . import db
 from .helpers import fetch_onchain_balance
 from .models import Charges, CreateCharge, SatsPayThemes
 
-
+from loguru import logger
 ###############CHARGES##########################
 
 
@@ -52,8 +52,8 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             completelink,
             completelinktext,
             time,
-            custom_css,
             amount,
+            custom_css,
             balance,
             extra,
             custom_css,
@@ -79,6 +79,7 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             data.extra,
         ),
     )
+    logger.debug(await get_charge(charge_id))
     return await get_charge(charge_id)
 
 
@@ -93,6 +94,7 @@ async def update_charge(charge_id: str, **kwargs) -> Optional[Charges]:
 
 async def get_charge(charge_id: str) -> Charges:
     row = await db.fetchone("SELECT * FROM satspay.charges WHERE id = ?", (charge_id,))
+    
     return Charges.from_row(row) if row else None
 
 
diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index 0c19367d..90ea9c2c 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -15,6 +15,8 @@ from lnbits.settings import LNBITS_ADMIN_USERS
 from . import satspay_ext, satspay_renderer
 from .crud import get_charge, get_theme
 
+from loguru import logger
+
 templates = Jinja2Templates(directory="templates")
 
 @satspay_ext.get("/", response_class=HTMLResponse)
@@ -34,14 +36,15 @@ async def display(request: Request, charge_id: str):
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Charge link does not exist."
         )
+    logger.debug(charge)
 
     return satspay_renderer().TemplateResponse(
         "satspay/display.html",
         {
             "request": request,
             "charge_data": public_charge(charge),
-            "mempool_endpoint": charge.config.mempool_endpoint,
-            "network": charge.config.network,
+            "mempool_endpoint": charge.extra.mempool_endpoint,
+            "network": charge.extra.network,
         },
     )
 

From 1d01ed861bb624784b3e3f52010ff5a5ae305ebe Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Sat, 26 Nov 2022 01:11:54 +0000
Subject: [PATCH 30/54] resolving conflict errors

---
 lnbits/extensions/satspay/crud.py                   |  3 +++
 .../satspay/templates/satspay/display.html          | 13 +------------
 lnbits/extensions/satspay/views.py                  |  8 ++++----
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index c7d9eee2..092720a3 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -27,6 +27,9 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
         onchainaddress = onchain.address
     else:
         onchainaddress = None
+        data.extra = json.dumps(
+            {"mempool_endpoint": "https://mempool.space", "network": "Mainnet"}
+        )
     if data.lnbitswallet:
         payment_hash, payment_request = await create_invoice(
             wallet_id=data.lnbitswallet,
diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index 8a7f92f8..b91e6fe4 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -308,17 +308,6 @@
     display: none;
   }
 </style>
-{% endblock %} % block styles %}
-<link
-  href="/satspay/css/{{ charge_data.custom_css }}"
-  rel="stylesheet"
-  type="text/css"
-/>
-<style>
-  header button.q-btn-dropdown {
-    display: none;
-  }
-</style>
 {% endblock %} {% block scripts %}
 
 <script src="https://mempool.space/mempool.js"></script>
@@ -478,7 +467,7 @@
       if (this.charge.custom_css) {
         document.body.setAttribute('data-theme', '')
       }
-      if (this.charge.lnbitswallet) this.payInvoice()
+      if (this.charge.payment_request) this.payInvoice()
       else this.payOnchain()
 
       await this.checkBalances()
diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index 90ea9c2c..deb17165 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -1,5 +1,5 @@
 from http import HTTPStatus
-
+import json
 from fastapi import Response
 from fastapi.param_functions import Depends
 from fastapi.templating import Jinja2Templates
@@ -36,15 +36,15 @@ async def display(request: Request, charge_id: str):
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Charge link does not exist."
         )
-    logger.debug(charge)
+    extra = json.loads(charge.extra)
 
     return satspay_renderer().TemplateResponse(
         "satspay/display.html",
         {
             "request": request,
             "charge_data": public_charge(charge),
-            "mempool_endpoint": charge.extra.mempool_endpoint,
-            "network": charge.extra.network,
+            "mempool_endpoint": extra["mempool_endpoint"],
+            "network": extra["network"],
         },
     )
 

From e192b6c3f5278f25bc1d1cd4d163f6db82e7a1e7 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Sat, 26 Nov 2022 01:52:30 +0000
Subject: [PATCH 31/54] Added lost return

---
 lnbits/extensions/satspay/views.py     | 1 -
 lnbits/extensions/satspay/views_api.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index deb17165..dff51fbd 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -54,5 +54,4 @@ async def display(css_id: str, response: Response):
     theme = await get_theme(css_id)
     if theme:
         return Response(content=theme.custom_css, media_type="text/css")
-
     return None
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index d9defa2f..22ae8d12 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -151,7 +151,7 @@ async def api_charge_balance(charge_id):
     
     return {**public_charge(charge)}
 
-
+    
 #############################THEMES##########################
 
 

From 577d5fccd7a83f4784d9c8e21a1ee75f0bfbc84c Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Sat, 26 Nov 2022 02:10:47 +0000
Subject: [PATCH 32/54] adding missing css to public_charge

---
 lnbits/extensions/satspay/helpers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lnbits/extensions/satspay/helpers.py b/lnbits/extensions/satspay/helpers.py
index 2aa83e1f..71cfb0f2 100644
--- a/lnbits/extensions/satspay/helpers.py
+++ b/lnbits/extensions/satspay/helpers.py
@@ -19,6 +19,7 @@ def public_charge(charge: Charges):
         "time_elapsed": charge.time_elapsed,
         "time_left": charge.time_left,
         "paid": charge.paid,
+        "custom_css": charge.custom_css,
     }
 
     if charge.paid:

From 879996039f2908a7a67759822782183288791e0a Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Sat, 26 Nov 2022 02:11:59 +0000
Subject: [PATCH 33/54] formatting

---
 lnbits/extensions/satspay/crud.py                    |  4 ++--
 lnbits/extensions/satspay/models.py                  |  1 +
 .../extensions/satspay/templates/satspay/index.html  | 12 ++++++++----
 lnbits/extensions/satspay/views.py                   |  1 +
 lnbits/extensions/satspay/views_api.py               |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 092720a3..bbb269b1 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -13,6 +13,7 @@ from .helpers import fetch_onchain_balance
 from .models import Charges, CreateCharge, SatsPayThemes
 
 from loguru import logger
+
 ###############CHARGES##########################
 
 
@@ -97,7 +98,7 @@ async def update_charge(charge_id: str, **kwargs) -> Optional[Charges]:
 
 async def get_charge(charge_id: str) -> Charges:
     row = await db.fetchone("SELECT * FROM satspay.charges WHERE id = ?", (charge_id,))
-    
+
     return Charges.from_row(row) if row else None
 
 
@@ -179,7 +180,6 @@ async def get_themes(user_id: str) -> List[SatsPayThemes]:
     return await get_config(row.user)
 
 
-
 ################## SETTINGS ###################
 
 
diff --git a/lnbits/extensions/satspay/models.py b/lnbits/extensions/satspay/models.py
index 4227cabc..cfb3c7ac 100644
--- a/lnbits/extensions/satspay/models.py
+++ b/lnbits/extensions/satspay/models.py
@@ -75,6 +75,7 @@ class Charges(BaseModel):
     def must_call_webhook(self):
         return self.webhook and self.paid and self.config.webhook_success == False
 
+
 class SatsPayThemes(BaseModel):
     css_id: str = Query(None)
     title: str = Query(None)
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index c3ae7686..a77b444d 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -23,7 +23,11 @@
           color="primary"
           @click="getThemes();formDialogThemes.show = true"
           >New CSS Theme
-        <q-tooltip>For security reason, custom css is only available to server admins.</q-tooltip></q-btn>
+          <q-tooltip
+            >For security reason, custom css is only available to server
+            admins.</q-tooltip
+          ></q-btn
+        >
       </q-card-section>
     </q-card>
 
@@ -276,7 +280,7 @@
       </q-card-section>
     </q-card>
 
-    <q-card  v-if="admin == 'True'">
+    <q-card v-if="admin == 'True'">
       <q-card-section>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col">
@@ -949,8 +953,8 @@
     },
     created: async function () {
       console.log(this.admin)
-      if(this.admin == "True"){
-          await this.getThemes()
+      if (this.admin == 'True') {
+        await this.getThemes()
       }
       await this.getCharges()
       await this.getWalletConfig()
diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index dff51fbd..843e6260 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -19,6 +19,7 @@ from loguru import logger
 
 templates = Jinja2Templates(directory="templates")
 
+
 @satspay_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
     admin = False
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index 22ae8d12..d9defa2f 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -151,7 +151,7 @@ async def api_charge_balance(charge_id):
     
     return {**public_charge(charge)}
 
-    
+
 #############################THEMES##########################
 
 

From 63d52581f25530d8f045c098108051a956c935d8 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Sat, 26 Nov 2022 15:24:44 +0000
Subject: [PATCH 34/54] Primary key

---
 lnbits/extensions/satspay/migrations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/satspay/migrations.py b/lnbits/extensions/satspay/migrations.py
index c6beb658..7308f6c8 100644
--- a/lnbits/extensions/satspay/migrations.py
+++ b/lnbits/extensions/satspay/migrations.py
@@ -46,7 +46,7 @@ async def m003_add_themes_table(db):
     await db.execute(
         """
         CREATE TABLE satspay.themes (
-            css_id TEXT,
+            css_id TEXT NOT NULL PRIMARY KEY,
             user TEXT,
             title TEXT,
             custom_css TEXT

From 58eefd4d3023d55ac4dbb558eb267fbe65f54113 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Sat, 26 Nov 2022 15:27:52 +0000
Subject: [PATCH 35/54] isort

---
 lnbits/extensions/satspay/crud.py      |  4 +---
 lnbits/extensions/satspay/views.py     |  4 +++-
 lnbits/extensions/satspay/views_api.py | 10 ++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index bbb269b1..ca9c856c 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -7,13 +7,11 @@ from lnbits.core.services import create_invoice
 from lnbits.core.views.api import api_payment
 from lnbits.helpers import urlsafe_short_hash
 
-from ..watchonly.crud import get_config, get_fresh_address
 from . import db
+from ..watchonly.crud import get_config, get_fresh_address
 from .helpers import fetch_onchain_balance
 from .models import Charges, CreateCharge, SatsPayThemes
 
-from loguru import logger
-
 ###############CHARGES##########################
 
 
diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index 843e6260..8bffc2b9 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -1,8 +1,10 @@
-from http import HTTPStatus
 import json
+from http import HTTPStatus
+
 from fastapi import Response
 from fastapi.param_functions import Depends
 from fastapi.templating import Jinja2Templates
+from loguru import logger
 from starlette.exceptions import HTTPException
 from starlette.requests import Request
 from starlette.responses import HTMLResponse
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index d9defa2f..b0c298fa 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -7,13 +7,10 @@ from loguru import logger
 from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_wallet
-from lnbits.decorators import (
-    WalletTypeInfo,
-    get_key_type,
-    require_admin_key,
-    require_invoice_key,
-)
+from lnbits.decorators import (WalletTypeInfo, get_key_type, require_admin_key,
+                               require_invoice_key)
 from lnbits.extensions.satspay import satspay_ext
+from lnbits.settings import LNBITS_ADMIN_EXTENSIONS, LNBITS_ADMIN_USERS
 
 from lnbits.settings import (
     LNBITS_ADMIN_EXTENSIONS,
@@ -35,6 +32,7 @@ from .crud import (
 
 from .models import CreateCharge, SatsPayThemes
 from .helpers import call_webhook, public_charge
+from .models import CreateCharge, SatsPayThemes
 
 #############################CHARGES##########################
 

From 7380c37c736c4e6a6fe276d58b7377c1f483b7b2 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 10:53:16 +0200
Subject: [PATCH 36/54] fix: timestamp does not exist on `themes`

---
 lnbits/extensions/satspay/crud.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index ca9c856c..c1b0948c 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -197,7 +197,7 @@ async def save_theme(data: SatsPayThemes, css_id: str = None):
             INSERT INTO satspay.themes (
                 css_id,
                 title,
-                user,
+                "user",
                 custom_css
                 )
             VALUES (?, ?, ?, ?)
@@ -219,7 +219,7 @@ async def get_theme(css_id: str) -> SatsPayThemes:
 
 async def get_themes(user_id: str) -> List[SatsPayThemes]:
     rows = await db.fetchall(
-        """SELECT * FROM satspay.themes WHERE "user" = ? ORDER BY "timestamp" DESC """,
+        """SELECT * FROM satspay.themes WHERE "user" = ? ORDER BY "title" DESC """,
         (user_id,),
     )
     return [SatsPayThemes.from_row(row) for row in rows]

From 2f5e5cf4d47954bbaad81f5dd759617301cf9dd7 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 10:53:55 +0200
Subject: [PATCH 37/54] fix: quote `user` column

---
 lnbits/extensions/satspay/migrations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/satspay/migrations.py b/lnbits/extensions/satspay/migrations.py
index 7308f6c8..a1c6d30b 100644
--- a/lnbits/extensions/satspay/migrations.py
+++ b/lnbits/extensions/satspay/migrations.py
@@ -47,7 +47,7 @@ async def m003_add_themes_table(db):
         """
         CREATE TABLE satspay.themes (
             css_id TEXT NOT NULL PRIMARY KEY,
-            user TEXT,
+            "user" TEXT,
             title TEXT,
             custom_css TEXT
         );

From e818f34888386859264f54f3836c111f832660a6 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 15:52:39 +0200
Subject: [PATCH 38/54] fix: rebase clean-up

---
 lnbits/extensions/satspay/crud.py             |  7 +----
 lnbits/extensions/satspay/migrations.py       |  1 +
 .../satspay/templates/satspay/display.html    | 13 ---------
 .../satspay/templates/satspay/index.html      |  1 -
 lnbits/extensions/satspay/views.py            |  7 ++---
 lnbits/extensions/satspay/views_api.py        | 28 +++++--------------
 6 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index c1b0948c..13e114e3 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -7,8 +7,8 @@ from lnbits.core.services import create_invoice
 from lnbits.core.views.api import api_payment
 from lnbits.helpers import urlsafe_short_hash
 
-from . import db
 from ..watchonly.crud import get_config, get_fresh_address
+from . import db
 from .helpers import fetch_onchain_balance
 from .models import Charges, CreateCharge, SatsPayThemes
 
@@ -26,9 +26,6 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
         onchainaddress = onchain.address
     else:
         onchainaddress = None
-        data.extra = json.dumps(
-            {"mempool_endpoint": "https://mempool.space", "network": "Mainnet"}
-        )
     if data.lnbitswallet:
         payment_hash, payment_request = await create_invoice(
             wallet_id=data.lnbitswallet,
@@ -81,7 +78,6 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             data.extra,
         ),
     )
-    logger.debug(await get_charge(charge_id))
     return await get_charge(charge_id)
 
 
@@ -96,7 +92,6 @@ async def update_charge(charge_id: str, **kwargs) -> Optional[Charges]:
 
 async def get_charge(charge_id: str) -> Charges:
     row = await db.fetchone("SELECT * FROM satspay.charges WHERE id = ?", (charge_id,))
-
     return Charges.from_row(row) if row else None
 
 
diff --git a/lnbits/extensions/satspay/migrations.py b/lnbits/extensions/satspay/migrations.py
index a1c6d30b..ff6b44be 100644
--- a/lnbits/extensions/satspay/migrations.py
+++ b/lnbits/extensions/satspay/migrations.py
@@ -38,6 +38,7 @@ async def m002_add_charge_extra_data(db):
         """
     )
 
+
 async def m003_add_themes_table(db):
     """
     Themes table
diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index b91e6fe4..8fc240c7 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -320,11 +320,9 @@
     mixins: [windowMixin],
     data() {
       return {
-        customCss: '',
         charge: JSON.parse('{{charge_data | tojson}}'),
         mempoolEndpoint: '{{mempool_endpoint}}',
         network: '{{network}}',
-        css_id: '{{ charge_data.css_id }}',
         pendingFunds: 0,
         ws: null,
         newProgress: 0.4,
@@ -347,16 +345,6 @@
       }
     },
     methods: {
-      startPaymentNotifier() {
-        this.cancelListener()
-        if (!this.lnbitswallet) return
-        this.cancelListener = LNbits.events.onInvoicePaid(
-          this.wallet,
-          payment => {
-            this.checkInvoiceBalance()
-          }
-        )
-      },
       checkBalances: async function () {
         if (!this.charge.payment_request && this.charge.hasOnchainStaleBalance)
           return
@@ -463,7 +451,6 @@
       await this.getCustomCss()
       if (this.charge.payment_request) this.payInvoice()
       // Remove a user defined theme
-      console.log(this.charge.custom_css)
       if (this.charge.custom_css) {
         document.body.setAttribute('data-theme', '')
       }
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index a77b444d..fd8cf1ec 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -952,7 +952,6 @@
       }
     },
     created: async function () {
-      console.log(this.admin)
       if (this.admin == 'True') {
         await this.getThemes()
       }
diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index 8bffc2b9..a8ccbd39 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -17,8 +17,6 @@ from lnbits.settings import LNBITS_ADMIN_USERS
 from . import satspay_ext, satspay_renderer
 from .crud import get_charge, get_theme
 
-from loguru import logger
-
 templates = Jinja2Templates(directory="templates")
 
 
@@ -39,15 +37,14 @@ async def display(request: Request, charge_id: str):
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="Charge link does not exist."
         )
-    extra = json.loads(charge.extra)
 
     return satspay_renderer().TemplateResponse(
         "satspay/display.html",
         {
             "request": request,
             "charge_data": public_charge(charge),
-            "mempool_endpoint": extra["mempool_endpoint"],
-            "network": extra["network"],
+            "mempool_endpoint": charge.config.mempool_endpoint,
+            "network": charge.config.network,
         },
     )
 
diff --git a/lnbits/extensions/satspay/views_api.py b/lnbits/extensions/satspay/views_api.py
index b0c298fa..09884040 100644
--- a/lnbits/extensions/satspay/views_api.py
+++ b/lnbits/extensions/satspay/views_api.py
@@ -7,30 +7,27 @@ from loguru import logger
 from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_wallet
-from lnbits.decorators import (WalletTypeInfo, get_key_type, require_admin_key,
-                               require_invoice_key)
+from lnbits.decorators import (
+    WalletTypeInfo,
+    get_key_type,
+    require_admin_key,
+    require_invoice_key,
+)
 from lnbits.extensions.satspay import satspay_ext
 from lnbits.settings import LNBITS_ADMIN_EXTENSIONS, LNBITS_ADMIN_USERS
 
-from lnbits.settings import (
-    LNBITS_ADMIN_EXTENSIONS,
-    LNBITS_ADMIN_USERS,
-)
-
 from .crud import (
     check_address_balance,
     create_charge,
     delete_charge,
+    delete_theme,
     get_charge,
     get_charges,
     get_theme,
     get_themes,
-    delete_theme,
     save_theme,
     update_charge,
 )
-
-from .models import CreateCharge, SatsPayThemes
 from .helpers import call_webhook, public_charge
 from .models import CreateCharge, SatsPayThemes
 
@@ -136,17 +133,6 @@ async def api_charge_balance(charge_id):
         extra = {**charge.config.dict(), **resp}
         await update_charge(charge_id=charge.id, extra=json.dumps(extra))
 
-    if charge.paid and charge.webhook:
-        async with httpx.AsyncClient() as client:
-            try:
-                r = await client.post(
-                    charge.webhook,
-                    json=public_charge(charge),
-                    timeout=40,
-                )
-            except AssertionError:
-                charge.webhook = None
-    
     return {**public_charge(charge)}
 
 

From 3d314eae3891dd5ce626af9f2198ea3f4cec9945 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 16:02:07 +0200
Subject: [PATCH 39/54] fix: sql insert

---
 lnbits/extensions/satspay/crud.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 13e114e3..22293f8c 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -52,7 +52,6 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             completelinktext,
             time,
             amount,
-            custom_css,
             balance,
             extra,
             custom_css,
@@ -73,9 +72,9 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             data.completelinktext,
             data.time,
             data.amount,
-            data.custom_css,
             0,
             data.extra,
+            data.custom_css,
         ),
     )
     return await get_charge(charge_id)

From 810cb46e34d1ffaf761f3f26b519010e27f899b3 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 16:11:05 +0200
Subject: [PATCH 40/54] fix: SQL syntax

---
 lnbits/extensions/satspay/crud.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 22293f8c..17df69d7 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -54,7 +54,7 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             amount,
             balance,
             extra,
-            custom_css,
+            custom_css
         )
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
@@ -74,7 +74,7 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             data.amount,
             0,
             data.extra,
-            data.custom_css,
+            data.custom_css
         ),
     )
     return await get_charge(charge_id)

From 0592c02c100cdba9f72ba46d23fc057e5a8b7a78 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 16:17:18 +0200
Subject: [PATCH 41/54] fix: merge bug

---
 lnbits/extensions/satspay/templates/satspay/display.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index 8fc240c7..58ca0a50 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -449,7 +449,6 @@
     },
     created: async function () {
       await this.getCustomCss()
-      if (this.charge.payment_request) this.payInvoice()
       // Remove a user defined theme
       if (this.charge.custom_css) {
         document.body.setAttribute('data-theme', '')

From ce3eab9522aa6cd319a46a33186d59e2f8d3e7e7 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 16:28:09 +0200
Subject: [PATCH 42/54] fix: merge leftover

---
 lnbits/extensions/satspay/templates/satspay/display.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index 58ca0a50..433b2b5b 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -448,7 +448,6 @@
       }
     },
     created: async function () {
-      await this.getCustomCss()
       // Remove a user defined theme
       if (this.charge.custom_css) {
         document.body.setAttribute('data-theme', '')

From 3fbb6bb9e45959c748ce57a0180c766fc8d954a4 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 16:37:42 +0200
Subject: [PATCH 43/54] fix: custom css is optional

---
 lnbits/extensions/satspay/templates/satspay/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index fd8cf1ec..9691572a 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -767,7 +767,7 @@
         this.createTheme(wallet, data)
       },
       sendFormDataCharge: function () {
-        this.formDialogCharge.data.custom_css = this.formDialogCharge.data.custom_css.id
+        this.formDialogCharge.data.custom_css = this.formDialogCharge.data.custom_css?.id
         const data = this.formDialogCharge.data
         const wallet = this.g.user.wallets[0].inkey
         data.amount = parseInt(data.amount)

From 015f19fd0e2fd42e60e4467e7accfbcd1648f038 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 16:40:39 +0200
Subject: [PATCH 44/54] feat: move custom css next to the other optional fileds

---
 lnbits/extensions/satspay/crud.py              |  2 +-
 .../satspay/templates/satspay/index.html       | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index 17df69d7..7e34f6f8 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -74,7 +74,7 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
             data.amount,
             0,
             data.extra,
-            data.custom_css
+            data.custom_css,
         ),
     )
     return await get_charge(charge_id)
diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index 9691572a..afb7837e 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -405,6 +405,15 @@
           label="Completed button text (ie 'Back to merchant')"
         >
         </q-input>
+        <q-select
+          filled
+          dense
+          emit-value
+          v-model="formDialogCharge.data.custom_css"
+          :options="themeOptions"
+          label="Custom CSS theme (optional)"
+        >
+        </q-select>
 
         <div class="row">
           <div class="col">
@@ -454,15 +463,6 @@
           label="Wallet *"
         >
         </q-select>
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="formDialogCharge.data.custom_css"
-          :options="themeOptions"
-          label="Custom CSS theme (optional)"
-        >
-        </q-select>
         <div class="row q-mt-lg">
           <q-btn
             unelevated

From 5fc0910f6ae77f02beaf49589271c2b36f4e5535 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 16:59:47 +0200
Subject: [PATCH 45/54] feat: add `Advanced` toggle

---
 .../satspay/templates/satspay/index.html      | 82 +++++++++++--------
 1 file changed, 47 insertions(+), 35 deletions(-)

diff --git a/lnbits/extensions/satspay/templates/satspay/index.html b/lnbits/extensions/satspay/templates/satspay/index.html
index afb7837e..602b1a28 100644
--- a/lnbits/extensions/satspay/templates/satspay/index.html
+++ b/lnbits/extensions/satspay/templates/satspay/index.html
@@ -380,41 +380,6 @@
         >
         </q-input>
 
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialogCharge.data.webhook"
-          type="url"
-          label="Webhook (URL to send transaction data to once paid)"
-        >
-        </q-input>
-
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialogCharge.data.completelink"
-          type="url"
-          label="Completed button URL"
-        >
-        </q-input>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialogCharge.data.completelinktext"
-          type="text"
-          label="Completed button text (ie 'Back to merchant')"
-        >
-        </q-input>
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="formDialogCharge.data.custom_css"
-          :options="themeOptions"
-          label="Custom CSS theme (optional)"
-        >
-        </q-select>
-
         <div class="row">
           <div class="col">
             <div v-if="walletLinks.length > 0">
@@ -463,6 +428,52 @@
           label="Wallet *"
         >
         </q-select>
+        <q-toggle
+          v-model="showAdvanced"
+          label="Show advanced options"
+        ></q-toggle>
+        <div v-if="showAdvanced" class="row">
+          <div class="col">
+            <q-input
+              filled
+              dense
+              v-model.trim="formDialogCharge.data.webhook"
+              type="url"
+              label="Webhook (URL to send transaction data to once paid)"
+              class="q-mt-lg"
+            >
+            </q-input>
+
+            <q-input
+              filled
+              dense
+              v-model.trim="formDialogCharge.data.completelink"
+              type="url"
+              label="Completed button URL"
+              class="q-mt-lg"
+            >
+            </q-input>
+            <q-input
+              filled
+              dense
+              v-model.trim="formDialogCharge.data.completelinktext"
+              type="text"
+              label="Completed button text (ie 'Back to merchant')"
+              class="q-mt-lg"
+            >
+            </q-input>
+            <q-select
+              filled
+              dense
+              emit-value
+              v-model="formDialogCharge.data.custom_css"
+              :options="themeOptions"
+              label="Custom CSS theme (optional)"
+              class="q-mt-lg"
+            >
+            </q-select>
+          </div>
+        </div>
         <div class="row q-mt-lg">
           <q-btn
             unelevated
@@ -547,6 +558,7 @@
           endpoint: '',
           network: 'Mainnet'
         },
+        showAdvanced: false,
 
         chargesTable: {
           columns: [

From 10ceac696b0b483aa5f402b8f8aea3c60feb97c0 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 17:00:07 +0200
Subject: [PATCH 46/54] fix: show `completelink` in the absence of webhook

---
 lnbits/extensions/satspay/helpers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lnbits/extensions/satspay/helpers.py b/lnbits/extensions/satspay/helpers.py
index 71cfb0f2..60c5ba4a 100644
--- a/lnbits/extensions/satspay/helpers.py
+++ b/lnbits/extensions/satspay/helpers.py
@@ -24,6 +24,7 @@ def public_charge(charge: Charges):
 
     if charge.paid:
         c["completelink"] = charge.completelink
+        c["completelinktext"] = charge.completelinktext
 
     return c
 

From 92f6c8c5289222bc68b71e477c20c539cbcb4020 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 28 Nov 2022 17:00:29 +0200
Subject: [PATCH 47/54] fix: show `completelink` in the absence of webhook

---
 lnbits/extensions/satspay/templates/satspay/display.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index 433b2b5b..8ea218bd 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -174,7 +174,7 @@
                 <div class="col text-center">
                   <q-btn
                     outline
-                    v-if="charge.webhook"
+                    v-if="charge.completelink"
                     type="a"
                     :href="charge.completelink"
                     :label="charge.completelinktext"

From f34e5496c069263fa3e40bb935fa30daa04e91f5 Mon Sep 17 00:00:00 2001
From: ChuckNorrison <2964146+ChuckNorrison@users.noreply.github.com>
Date: Mon, 28 Nov 2022 19:00:43 +0100
Subject: [PATCH 48/54] add missing f-string for SQL

---
 lnbits/extensions/satspay/migrations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/satspay/migrations.py b/lnbits/extensions/satspay/migrations.py
index a9d61418..3dacb031 100644
--- a/lnbits/extensions/satspay/migrations.py
+++ b/lnbits/extensions/satspay/migrations.py
@@ -4,7 +4,7 @@ async def m001_initial(db):
     """
 
     await db.execute(
-        """
+        f"""
         CREATE TABLE satspay.charges (
             id TEXT NOT NULL PRIMARY KEY,
             "user" TEXT,

From 4f05c6c12e284d4a322a9041d19f66d01afa205b Mon Sep 17 00:00:00 2001
From: ChuckNorrison <2964146+ChuckNorrison@users.noreply.github.com>
Date: Mon, 28 Nov 2022 19:02:31 +0100
Subject: [PATCH 49/54] add missing f-string for SQL

---
 lnbits/extensions/watchonly/migrations.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/watchonly/migrations.py b/lnbits/extensions/watchonly/migrations.py
index dbe0c1a2..e33062c9 100644
--- a/lnbits/extensions/watchonly/migrations.py
+++ b/lnbits/extensions/watchonly/migrations.py
@@ -3,7 +3,7 @@ async def m001_initial(db):
     Initial wallet table.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE watchonly.wallets (
             id TEXT NOT NULL PRIMARY KEY,
             "user" TEXT,
@@ -16,7 +16,7 @@ async def m001_initial(db):
     )
 
     await db.execute(
-        """
+        f"""
         CREATE TABLE watchonly.addresses (
             id TEXT NOT NULL PRIMARY KEY,
             address TEXT NOT NULL,

From b68172696debd1840a1aca659c163253092c0e40 Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 29 Nov 2022 10:28:19 +0000
Subject: [PATCH 50/54] change status code to 400 on exception

---
 lnbits/core/views/api.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py
index 11075370..ae3e6a5e 100644
--- a/lnbits/core/views/api.py
+++ b/lnbits/core/views/api.py
@@ -12,7 +12,7 @@ from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
 import async_timeout
 import httpx
 import pyqrcode
-from fastapi import Depends, Header, Query, Request
+from fastapi import Depends, Header, Query, Request, Response
 from fastapi.exceptions import HTTPException
 from fastapi.params import Body
 from loguru import logger
@@ -584,8 +584,8 @@ class DecodePayment(BaseModel):
     data: str
 
 
-@core_app.post("/api/v1/payments/decode")
-async def api_payments_decode(data: DecodePayment):
+@core_app.post("/api/v1/payments/decode", status_code=HTTPStatus.OK)
+async def api_payments_decode(data: DecodePayment, response: Response):
     payment_str = data.data
     try:
         if payment_str[:5] == "LNURL":
@@ -606,6 +606,7 @@ async def api_payments_decode(data: DecodePayment):
                 "min_final_cltv_expiry": invoice.min_final_cltv_expiry,
             }
     except:
+        response.status_code = HTTPStatus.BAD_REQUEST
         return {"message": "Failed to decode"}
 
 

From 45c121c5903c1c1eb923d95d467f3271661a52cd Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Tue, 29 Nov 2022 11:52:04 +0100
Subject: [PATCH 51/54] update requirements

---
 requirements.txt | 127 +++++++++++++++++++++++++++--------------------
 1 file changed, 72 insertions(+), 55 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index eb9a6e5e..1431478c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,55 +1,72 @@
-aiofiles==0.8.0
-anyio==3.6.1
-asyncio==3.4.3
-attrs==21.4.0
-bech32==1.2.0
-bitstring==3.1.9
-cerberus==1.3.4
-certifi==2022.6.15
-cffi==1.15.0
-click==8.1.3
-ecdsa==0.18.0
-embit==0.5.0
-environs==9.5.0
-fastapi==0.79.0
-h11==0.12.0
-httpcore==0.15.0
-httptools==0.4.0
-httpx==0.23.0
-idna==3.3
-jinja2==3.0.1
-lnurl==0.3.6
-loguru==0.6.0
-markupsafe==2.1.1
-marshmallow==3.17.0
-outcome==1.2.0
-packaging==21.3
-psycopg2-binary==2.9.3
-pycparser==2.21
-pycryptodomex==3.15.0
-pydantic==1.9.1
-pyngrok==5.1.0
-pyparsing==3.0.9
-pypng==0.20220715.0
-pyqrcode==1.2.1
-pyscss==1.4.0
-python-dotenv==0.20.0
-pyyaml==6.0
-represent==1.6.0.post0
-rfc3986==1.5.0
-secp256k1==0.14.0
-shortuuid==1.0.9
-six==1.16.0
-sniffio==1.2.0
-sqlalchemy-aio==0.17.0
-sqlalchemy==1.3.23
-sse-starlette==0.10.3
-starlette==0.19.1
-typing-extensions==4.3.0
-uvicorn==0.18.2
-uvloop==0.16.0
-watchfiles==0.16.0
-websockets==10.3
-websocket-client==1.3.3
-async-timeout==4.0.2
-setuptools==65.4.0
\ No newline at end of file
+aiofiles==0.8.0 ; python_version >= "3.7" and python_version < "4.0"
+anyio==3.6.1 ; python_version >= "3.7" and python_version < "4.0"
+asgiref==3.4.1 ; python_version >= "3.7" and python_version < "4.0"
+asn1crypto==1.5.1 ; python_version >= "3.7" and python_version < "4.0"
+async-timeout==4.0.2 ; python_version >= "3.7" and python_version < "4.0"
+attrs==21.2.0 ; python_version >= "3.7" and python_version < "4.0"
+base58==2.1.1 ; python_version >= "3.7" and python_version < "4.0"
+bech32==1.2.0 ; python_version >= "3.7" and python_version < "4.0"
+bitstring==3.1.9 ; python_version >= "3.7" and python_version < "4.0"
+cerberus==1.3.4 ; python_version >= "3.7" and python_version < "4.0"
+certifi==2021.5.30 ; python_version >= "3.7" and python_version < "4.0"
+cffi==1.15.0 ; python_version >= "3.7" and python_version < "4.0"
+charset-normalizer==2.0.6 ; python_version >= "3.7" and python_version < "4.0"
+click==8.0.1 ; python_version >= "3.7" and python_version < "4.0"
+coincurve==17.0.0 ; python_version >= "3.7" and python_version < "4.0"
+colorama==0.4.5 ; python_version >= "3.7" and python_version < "4.0" and platform_system == "Windows" or python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32"
+cryptography==36.0.2 ; python_version >= "3.7" and python_version < "4.0"
+ecdsa==0.17.0 ; python_version >= "3.7" and python_version < "4.0"
+embit==0.4.9 ; python_version >= "3.7" and python_version < "4.0"
+enum34==1.1.10 ; python_version >= "3.7" and python_version < "4.0"
+environs==9.3.3 ; python_version >= "3.7" and python_version < "4.0"
+fastapi==0.78.0 ; python_version >= "3.7" and python_version < "4.0"
+grpcio==1.49.1 ; python_version >= "3.7" and python_version < "4.0"
+h11==0.12.0 ; python_version >= "3.7" and python_version < "4.0"
+httpcore==0.15.0 ; python_version >= "3.7" and python_version < "4.0"
+httptools==0.4.0 ; python_version >= "3.7" and python_version < "4.0"
+httpx==0.23.0 ; python_version >= "3.7" and python_version < "4.0"
+idna==3.2 ; python_version >= "3.7" and python_version < "4.0"
+importlib-metadata==4.8.1 ; python_version >= "3.7" and python_version < "4.0"
+jinja2==3.0.1 ; python_version >= "3.7" and python_version < "4.0"
+lnurl==0.3.6 ; python_version >= "3.7" and python_version < "4.0"
+loguru==0.5.3 ; python_version >= "3.7" and python_version < "4.0"
+markupsafe==2.0.1 ; python_version >= "3.7" and python_version < "4.0"
+marshmallow==3.17.0 ; python_version >= "3.7" and python_version < "4.0"
+outcome==1.1.0 ; python_version >= "3.7" and python_version < "4.0"
+packaging==21.3 ; python_version >= "3.7" and python_version < "4.0"
+pathlib2==2.3.7.post1 ; python_version >= "3.7" and python_version < "4.0"
+protobuf==4.21.7 ; python_version >= "3.7" and python_version < "4.0"
+psycopg2-binary==2.9.1 ; python_version >= "3.7" and python_version < "4.0"
+pycparser==2.21 ; python_version >= "3.7" and python_version < "4.0"
+pycryptodomex==3.14.1 ; python_version >= "3.7" and python_version < "4.0"
+pydantic==1.8.2 ; python_version >= "3.7" and python_version < "4.0"
+pyln-bolt7==1.0.246 ; python_version >= "3.7" and python_version < "4.0"
+pyln-client==0.11.1 ; python_version >= "3.7" and python_version < "4.0"
+pyln-proto==0.11.1 ; python_version >= "3.7" and python_version < "4.0"
+pyparsing==3.0.9 ; python_version >= "3.7" and python_version < "4.0"
+pypng==0.0.21 ; python_version >= "3.7" and python_version < "4.0"
+pyqrcode==1.2.1 ; python_version >= "3.7" and python_version < "4.0"
+pyscss==1.4.0 ; python_version >= "3.7" and python_version < "4.0"
+pysocks==1.7.1 ; python_version >= "3.7" and python_version < "4.0"
+python-dotenv==0.19.0 ; python_version >= "3.7" and python_version < "4.0"
+pyyaml==5.4.1 ; python_version >= "3.7" and python_version < "4.0"
+represent==1.6.0.post0 ; python_version >= "3.7" and python_version < "4.0"
+rfc3986==1.5.0 ; python_version >= "3.7" and python_version < "4.0"
+rfc3986[idna2008]==1.5.0 ; python_version >= "3.7" and python_version < "4.0"
+secp256k1==0.14.0 ; python_version >= "3.7" and python_version < "4.0"
+setuptools==65.4.1 ; python_version >= "3.7" and python_version < "4.0"
+shortuuid==1.0.1 ; python_version >= "3.7" and python_version < "4.0"
+six==1.16.0 ; python_version >= "3.7" and python_version < "4.0"
+sniffio==1.2.0 ; python_version >= "3.7" and python_version < "4.0"
+sqlalchemy-aio==0.17.0 ; python_version >= "3.7" and python_version < "4.0"
+sqlalchemy==1.3.23 ; python_version >= "3.7" and python_version < "4.0"
+sse-starlette==0.6.2 ; python_version >= "3.7" and python_version < "4.0"
+starlette==0.19.1 ; python_version >= "3.7" and python_version < "4.0"
+typing-extensions==3.10.0.2 ; python_version >= "3.7" and python_version < "4.0"
+uvicorn==0.18.1 ; python_version >= "3.7" and python_version < "4.0"
+uvloop==0.16.0 ; python_version >= "3.7" and python_version < "4.0"
+watchgod==0.7 ; python_version >= "3.7" and python_version < "4.0"
+websocket-client==1.3.3 ; python_version >= "3.7" and python_version < "4.0"
+websockets==10.0 ; python_version >= "3.7" and python_version < "4.0"
+win32-setctime==1.1.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32"
+zipp==3.5.0 ; python_version >= "3.7" and python_version < "4.0"

From 9c3f7e8e3451d1a77cbf5f4c7b58466831d2908a Mon Sep 17 00:00:00 2001
From: Arc <33088785+arcbtc@users.noreply.github.com>
Date: Tue, 29 Nov 2022 11:40:40 +0000
Subject: [PATCH 52/54] Revert "update requirements"

---
 requirements.txt | 127 ++++++++++++++++++++---------------------------
 1 file changed, 55 insertions(+), 72 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 1431478c..eb9a6e5e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,72 +1,55 @@
-aiofiles==0.8.0 ; python_version >= "3.7" and python_version < "4.0"
-anyio==3.6.1 ; python_version >= "3.7" and python_version < "4.0"
-asgiref==3.4.1 ; python_version >= "3.7" and python_version < "4.0"
-asn1crypto==1.5.1 ; python_version >= "3.7" and python_version < "4.0"
-async-timeout==4.0.2 ; python_version >= "3.7" and python_version < "4.0"
-attrs==21.2.0 ; python_version >= "3.7" and python_version < "4.0"
-base58==2.1.1 ; python_version >= "3.7" and python_version < "4.0"
-bech32==1.2.0 ; python_version >= "3.7" and python_version < "4.0"
-bitstring==3.1.9 ; python_version >= "3.7" and python_version < "4.0"
-cerberus==1.3.4 ; python_version >= "3.7" and python_version < "4.0"
-certifi==2021.5.30 ; python_version >= "3.7" and python_version < "4.0"
-cffi==1.15.0 ; python_version >= "3.7" and python_version < "4.0"
-charset-normalizer==2.0.6 ; python_version >= "3.7" and python_version < "4.0"
-click==8.0.1 ; python_version >= "3.7" and python_version < "4.0"
-coincurve==17.0.0 ; python_version >= "3.7" and python_version < "4.0"
-colorama==0.4.5 ; python_version >= "3.7" and python_version < "4.0" and platform_system == "Windows" or python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32"
-cryptography==36.0.2 ; python_version >= "3.7" and python_version < "4.0"
-ecdsa==0.17.0 ; python_version >= "3.7" and python_version < "4.0"
-embit==0.4.9 ; python_version >= "3.7" and python_version < "4.0"
-enum34==1.1.10 ; python_version >= "3.7" and python_version < "4.0"
-environs==9.3.3 ; python_version >= "3.7" and python_version < "4.0"
-fastapi==0.78.0 ; python_version >= "3.7" and python_version < "4.0"
-grpcio==1.49.1 ; python_version >= "3.7" and python_version < "4.0"
-h11==0.12.0 ; python_version >= "3.7" and python_version < "4.0"
-httpcore==0.15.0 ; python_version >= "3.7" and python_version < "4.0"
-httptools==0.4.0 ; python_version >= "3.7" and python_version < "4.0"
-httpx==0.23.0 ; python_version >= "3.7" and python_version < "4.0"
-idna==3.2 ; python_version >= "3.7" and python_version < "4.0"
-importlib-metadata==4.8.1 ; python_version >= "3.7" and python_version < "4.0"
-jinja2==3.0.1 ; python_version >= "3.7" and python_version < "4.0"
-lnurl==0.3.6 ; python_version >= "3.7" and python_version < "4.0"
-loguru==0.5.3 ; python_version >= "3.7" and python_version < "4.0"
-markupsafe==2.0.1 ; python_version >= "3.7" and python_version < "4.0"
-marshmallow==3.17.0 ; python_version >= "3.7" and python_version < "4.0"
-outcome==1.1.0 ; python_version >= "3.7" and python_version < "4.0"
-packaging==21.3 ; python_version >= "3.7" and python_version < "4.0"
-pathlib2==2.3.7.post1 ; python_version >= "3.7" and python_version < "4.0"
-protobuf==4.21.7 ; python_version >= "3.7" and python_version < "4.0"
-psycopg2-binary==2.9.1 ; python_version >= "3.7" and python_version < "4.0"
-pycparser==2.21 ; python_version >= "3.7" and python_version < "4.0"
-pycryptodomex==3.14.1 ; python_version >= "3.7" and python_version < "4.0"
-pydantic==1.8.2 ; python_version >= "3.7" and python_version < "4.0"
-pyln-bolt7==1.0.246 ; python_version >= "3.7" and python_version < "4.0"
-pyln-client==0.11.1 ; python_version >= "3.7" and python_version < "4.0"
-pyln-proto==0.11.1 ; python_version >= "3.7" and python_version < "4.0"
-pyparsing==3.0.9 ; python_version >= "3.7" and python_version < "4.0"
-pypng==0.0.21 ; python_version >= "3.7" and python_version < "4.0"
-pyqrcode==1.2.1 ; python_version >= "3.7" and python_version < "4.0"
-pyscss==1.4.0 ; python_version >= "3.7" and python_version < "4.0"
-pysocks==1.7.1 ; python_version >= "3.7" and python_version < "4.0"
-python-dotenv==0.19.0 ; python_version >= "3.7" and python_version < "4.0"
-pyyaml==5.4.1 ; python_version >= "3.7" and python_version < "4.0"
-represent==1.6.0.post0 ; python_version >= "3.7" and python_version < "4.0"
-rfc3986==1.5.0 ; python_version >= "3.7" and python_version < "4.0"
-rfc3986[idna2008]==1.5.0 ; python_version >= "3.7" and python_version < "4.0"
-secp256k1==0.14.0 ; python_version >= "3.7" and python_version < "4.0"
-setuptools==65.4.1 ; python_version >= "3.7" and python_version < "4.0"
-shortuuid==1.0.1 ; python_version >= "3.7" and python_version < "4.0"
-six==1.16.0 ; python_version >= "3.7" and python_version < "4.0"
-sniffio==1.2.0 ; python_version >= "3.7" and python_version < "4.0"
-sqlalchemy-aio==0.17.0 ; python_version >= "3.7" and python_version < "4.0"
-sqlalchemy==1.3.23 ; python_version >= "3.7" and python_version < "4.0"
-sse-starlette==0.6.2 ; python_version >= "3.7" and python_version < "4.0"
-starlette==0.19.1 ; python_version >= "3.7" and python_version < "4.0"
-typing-extensions==3.10.0.2 ; python_version >= "3.7" and python_version < "4.0"
-uvicorn==0.18.1 ; python_version >= "3.7" and python_version < "4.0"
-uvloop==0.16.0 ; python_version >= "3.7" and python_version < "4.0"
-watchgod==0.7 ; python_version >= "3.7" and python_version < "4.0"
-websocket-client==1.3.3 ; python_version >= "3.7" and python_version < "4.0"
-websockets==10.0 ; python_version >= "3.7" and python_version < "4.0"
-win32-setctime==1.1.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32"
-zipp==3.5.0 ; python_version >= "3.7" and python_version < "4.0"
+aiofiles==0.8.0
+anyio==3.6.1
+asyncio==3.4.3
+attrs==21.4.0
+bech32==1.2.0
+bitstring==3.1.9
+cerberus==1.3.4
+certifi==2022.6.15
+cffi==1.15.0
+click==8.1.3
+ecdsa==0.18.0
+embit==0.5.0
+environs==9.5.0
+fastapi==0.79.0
+h11==0.12.0
+httpcore==0.15.0
+httptools==0.4.0
+httpx==0.23.0
+idna==3.3
+jinja2==3.0.1
+lnurl==0.3.6
+loguru==0.6.0
+markupsafe==2.1.1
+marshmallow==3.17.0
+outcome==1.2.0
+packaging==21.3
+psycopg2-binary==2.9.3
+pycparser==2.21
+pycryptodomex==3.15.0
+pydantic==1.9.1
+pyngrok==5.1.0
+pyparsing==3.0.9
+pypng==0.20220715.0
+pyqrcode==1.2.1
+pyscss==1.4.0
+python-dotenv==0.20.0
+pyyaml==6.0
+represent==1.6.0.post0
+rfc3986==1.5.0
+secp256k1==0.14.0
+shortuuid==1.0.9
+six==1.16.0
+sniffio==1.2.0
+sqlalchemy-aio==0.17.0
+sqlalchemy==1.3.23
+sse-starlette==0.10.3
+starlette==0.19.1
+typing-extensions==4.3.0
+uvicorn==0.18.2
+uvloop==0.16.0
+watchfiles==0.16.0
+websockets==10.3
+websocket-client==1.3.3
+async-timeout==4.0.2
+setuptools==65.4.0
\ No newline at end of file

From 9549ecdf900b7f421a654c500b7b449a4208ba4e Mon Sep 17 00:00:00 2001
From: Arc <33088785+arcbtc@users.noreply.github.com>
Date: Tue, 29 Nov 2022 11:48:54 +0000
Subject: [PATCH 53/54] Revert "Revert "update requirements""

---
 requirements.txt | 127 +++++++++++++++++++++++++++--------------------
 1 file changed, 72 insertions(+), 55 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index eb9a6e5e..1431478c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,55 +1,72 @@
-aiofiles==0.8.0
-anyio==3.6.1
-asyncio==3.4.3
-attrs==21.4.0
-bech32==1.2.0
-bitstring==3.1.9
-cerberus==1.3.4
-certifi==2022.6.15
-cffi==1.15.0
-click==8.1.3
-ecdsa==0.18.0
-embit==0.5.0
-environs==9.5.0
-fastapi==0.79.0
-h11==0.12.0
-httpcore==0.15.0
-httptools==0.4.0
-httpx==0.23.0
-idna==3.3
-jinja2==3.0.1
-lnurl==0.3.6
-loguru==0.6.0
-markupsafe==2.1.1
-marshmallow==3.17.0
-outcome==1.2.0
-packaging==21.3
-psycopg2-binary==2.9.3
-pycparser==2.21
-pycryptodomex==3.15.0
-pydantic==1.9.1
-pyngrok==5.1.0
-pyparsing==3.0.9
-pypng==0.20220715.0
-pyqrcode==1.2.1
-pyscss==1.4.0
-python-dotenv==0.20.0
-pyyaml==6.0
-represent==1.6.0.post0
-rfc3986==1.5.0
-secp256k1==0.14.0
-shortuuid==1.0.9
-six==1.16.0
-sniffio==1.2.0
-sqlalchemy-aio==0.17.0
-sqlalchemy==1.3.23
-sse-starlette==0.10.3
-starlette==0.19.1
-typing-extensions==4.3.0
-uvicorn==0.18.2
-uvloop==0.16.0
-watchfiles==0.16.0
-websockets==10.3
-websocket-client==1.3.3
-async-timeout==4.0.2
-setuptools==65.4.0
\ No newline at end of file
+aiofiles==0.8.0 ; python_version >= "3.7" and python_version < "4.0"
+anyio==3.6.1 ; python_version >= "3.7" and python_version < "4.0"
+asgiref==3.4.1 ; python_version >= "3.7" and python_version < "4.0"
+asn1crypto==1.5.1 ; python_version >= "3.7" and python_version < "4.0"
+async-timeout==4.0.2 ; python_version >= "3.7" and python_version < "4.0"
+attrs==21.2.0 ; python_version >= "3.7" and python_version < "4.0"
+base58==2.1.1 ; python_version >= "3.7" and python_version < "4.0"
+bech32==1.2.0 ; python_version >= "3.7" and python_version < "4.0"
+bitstring==3.1.9 ; python_version >= "3.7" and python_version < "4.0"
+cerberus==1.3.4 ; python_version >= "3.7" and python_version < "4.0"
+certifi==2021.5.30 ; python_version >= "3.7" and python_version < "4.0"
+cffi==1.15.0 ; python_version >= "3.7" and python_version < "4.0"
+charset-normalizer==2.0.6 ; python_version >= "3.7" and python_version < "4.0"
+click==8.0.1 ; python_version >= "3.7" and python_version < "4.0"
+coincurve==17.0.0 ; python_version >= "3.7" and python_version < "4.0"
+colorama==0.4.5 ; python_version >= "3.7" and python_version < "4.0" and platform_system == "Windows" or python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32"
+cryptography==36.0.2 ; python_version >= "3.7" and python_version < "4.0"
+ecdsa==0.17.0 ; python_version >= "3.7" and python_version < "4.0"
+embit==0.4.9 ; python_version >= "3.7" and python_version < "4.0"
+enum34==1.1.10 ; python_version >= "3.7" and python_version < "4.0"
+environs==9.3.3 ; python_version >= "3.7" and python_version < "4.0"
+fastapi==0.78.0 ; python_version >= "3.7" and python_version < "4.0"
+grpcio==1.49.1 ; python_version >= "3.7" and python_version < "4.0"
+h11==0.12.0 ; python_version >= "3.7" and python_version < "4.0"
+httpcore==0.15.0 ; python_version >= "3.7" and python_version < "4.0"
+httptools==0.4.0 ; python_version >= "3.7" and python_version < "4.0"
+httpx==0.23.0 ; python_version >= "3.7" and python_version < "4.0"
+idna==3.2 ; python_version >= "3.7" and python_version < "4.0"
+importlib-metadata==4.8.1 ; python_version >= "3.7" and python_version < "4.0"
+jinja2==3.0.1 ; python_version >= "3.7" and python_version < "4.0"
+lnurl==0.3.6 ; python_version >= "3.7" and python_version < "4.0"
+loguru==0.5.3 ; python_version >= "3.7" and python_version < "4.0"
+markupsafe==2.0.1 ; python_version >= "3.7" and python_version < "4.0"
+marshmallow==3.17.0 ; python_version >= "3.7" and python_version < "4.0"
+outcome==1.1.0 ; python_version >= "3.7" and python_version < "4.0"
+packaging==21.3 ; python_version >= "3.7" and python_version < "4.0"
+pathlib2==2.3.7.post1 ; python_version >= "3.7" and python_version < "4.0"
+protobuf==4.21.7 ; python_version >= "3.7" and python_version < "4.0"
+psycopg2-binary==2.9.1 ; python_version >= "3.7" and python_version < "4.0"
+pycparser==2.21 ; python_version >= "3.7" and python_version < "4.0"
+pycryptodomex==3.14.1 ; python_version >= "3.7" and python_version < "4.0"
+pydantic==1.8.2 ; python_version >= "3.7" and python_version < "4.0"
+pyln-bolt7==1.0.246 ; python_version >= "3.7" and python_version < "4.0"
+pyln-client==0.11.1 ; python_version >= "3.7" and python_version < "4.0"
+pyln-proto==0.11.1 ; python_version >= "3.7" and python_version < "4.0"
+pyparsing==3.0.9 ; python_version >= "3.7" and python_version < "4.0"
+pypng==0.0.21 ; python_version >= "3.7" and python_version < "4.0"
+pyqrcode==1.2.1 ; python_version >= "3.7" and python_version < "4.0"
+pyscss==1.4.0 ; python_version >= "3.7" and python_version < "4.0"
+pysocks==1.7.1 ; python_version >= "3.7" and python_version < "4.0"
+python-dotenv==0.19.0 ; python_version >= "3.7" and python_version < "4.0"
+pyyaml==5.4.1 ; python_version >= "3.7" and python_version < "4.0"
+represent==1.6.0.post0 ; python_version >= "3.7" and python_version < "4.0"
+rfc3986==1.5.0 ; python_version >= "3.7" and python_version < "4.0"
+rfc3986[idna2008]==1.5.0 ; python_version >= "3.7" and python_version < "4.0"
+secp256k1==0.14.0 ; python_version >= "3.7" and python_version < "4.0"
+setuptools==65.4.1 ; python_version >= "3.7" and python_version < "4.0"
+shortuuid==1.0.1 ; python_version >= "3.7" and python_version < "4.0"
+six==1.16.0 ; python_version >= "3.7" and python_version < "4.0"
+sniffio==1.2.0 ; python_version >= "3.7" and python_version < "4.0"
+sqlalchemy-aio==0.17.0 ; python_version >= "3.7" and python_version < "4.0"
+sqlalchemy==1.3.23 ; python_version >= "3.7" and python_version < "4.0"
+sse-starlette==0.6.2 ; python_version >= "3.7" and python_version < "4.0"
+starlette==0.19.1 ; python_version >= "3.7" and python_version < "4.0"
+typing-extensions==3.10.0.2 ; python_version >= "3.7" and python_version < "4.0"
+uvicorn==0.18.1 ; python_version >= "3.7" and python_version < "4.0"
+uvloop==0.16.0 ; python_version >= "3.7" and python_version < "4.0"
+watchgod==0.7 ; python_version >= "3.7" and python_version < "4.0"
+websocket-client==1.3.3 ; python_version >= "3.7" and python_version < "4.0"
+websockets==10.0 ; python_version >= "3.7" and python_version < "4.0"
+win32-setctime==1.1.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32"
+zipp==3.5.0 ; python_version >= "3.7" and python_version < "4.0"

From 4fe408f067639b6cb9237e9e1a89d9beb3a7ee04 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Tue, 29 Nov 2022 22:13:40 +0000
Subject: [PATCH 54/54] Fixed css

---
 lnbits/static/scss/base.scss | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lnbits/static/scss/base.scss b/lnbits/static/scss/base.scss
index c8951fcd..672a85b6 100644
--- a/lnbits/static/scss/base.scss
+++ b/lnbits/static/scss/base.scss
@@ -7,7 +7,7 @@ $colors in $themes {
             [data-theme='#{$theme}'] .q-drawer--dark,
             body[data-theme='#{$theme}'].body--dark,
             [data-theme='#{$theme}'] .q-menu--dark {
-                background: $color;
+                background: $color !important;
             }
             /* IF WANTING TO SET A DARKER BG COLOR IN THE FUTURE
       // set a darker body bg for all themes, when in "dark mode"
@@ -19,7 +19,7 @@ $colors in $themes {
         @if $name=='info' {
             [data-theme='#{$theme}'] .q-card--dark,
             [data-theme='#{$theme}'] .q-stepper--dark {
-                background: $color;
+                background: $color !important;
             }
         }
     }
@@ -27,37 +27,37 @@ $colors in $themes {
         @each $name,
         $color in $colors {
             .bg-#{$name} {
-                background: $color;
+                background: $color !important;
             }
             .text-#{$name} {
-                color: $color;
+                color: $color !important;
             }
         }
     }
 }
 
 [data-theme='freedom'] .q-drawer--dark {
-    background: #0a0a0a;
+    background: #0a0a0a !important;
 }
 
 [data-theme='freedom'] .q-header {
-    background: #0a0a0a;
+    background: #0a0a0a !important;
 }
 
 [data-theme='salvador'] .q-drawer--dark {
-    background: #242424;
+    background: #242424 !important;
 }
 
 [data-theme='salvador'] .q-header {
-    background: #0f47af;
+    background: #0f47af !important;
 }
 
 [data-theme='flamingo'] .q-drawer--dark {
-    background: #e75480;
+    background: #e75480 !important;
 }
 
 [data-theme='flamingo'] .q-header {
-    background: #e75480;
+    background: #e75480 !important;
 }
 
 [v-cloak] {