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] 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 3e1df373c..c7d9eee2c 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 0c19367d7..90ea9c2cd 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,
         },
     )