From 9154660479c284d6ceec4b095e51aba1339de86d Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Tue, 2 Aug 2022 15:16:32 +0100
Subject: [PATCH] Fix/tipjar desc and satspay (#824)

* fix tipjar description from screwing charges

* small fix for charges when onchain isn't set

* make dni happy

* make black happy
---
 lnbits/extensions/satspay/views.py    | 5 ++++-
 lnbits/extensions/tipjar/views_api.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/satspay/views.py b/lnbits/extensions/satspay/views.py
index 5b641510..69d81dad 100644
--- a/lnbits/extensions/satspay/views.py
+++ b/lnbits/extensions/satspay/views.py
@@ -34,12 +34,15 @@ async def display(request: Request, charge_id: str):
     wallet = await get_wallet(charge.lnbitswallet)
     onchainwallet_config = await get_config(charge.user)
     inkey = wallet.inkey if wallet else None
+    mempool_endpoint = (
+        onchainwallet_config.mempool_endpoint if onchainwallet_config else None
+    )
     return satspay_renderer().TemplateResponse(
         "satspay/display.html",
         {
             "request": request,
             "charge_data": charge.dict(),
             "wallet_inkey": inkey,
-            "mempool_endpoint": onchainwallet_config.mempool_endpoint,
+            "mempool_endpoint": mempool_endpoint,
         },
     )
diff --git a/lnbits/extensions/tipjar/views_api.py b/lnbits/extensions/tipjar/views_api.py
index 5a55a3ca..50c5138b 100644
--- a/lnbits/extensions/tipjar/views_api.py
+++ b/lnbits/extensions/tipjar/views_api.py
@@ -57,7 +57,7 @@ async def api_create_tip(data: createTips):
     name = name.replace('"', "''")
     if not name:
         name = "Anonymous"
-    description = f'"{name}": {message}'
+    description = f"{name}: {message}"
     charge = await create_charge(
         user=charge_details["user"],
         data=CreateCharge(