From 6a7c28eb0e80e36bf038c1ccc883c378f99a961d Mon Sep 17 00:00:00 2001
From: Ben Arc <ben@arc.wales>
Date: Thu, 8 Apr 2021 01:34:44 +0100
Subject: [PATCH] Deleted some prints

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

diff --git a/lnbits/extensions/satspay/crud.py b/lnbits/extensions/satspay/crud.py
index caa6fcd1..c90af764 100644
--- a/lnbits/extensions/satspay/crud.py
+++ b/lnbits/extensions/satspay/crud.py
@@ -9,7 +9,7 @@ from lnbits.helpers import urlsafe_short_hash
 from quart import jsonify
 import httpx
 from lnbits.core.services import create_invoice, check_invoice_status
-from ..watchonly.crud import get_watch_wallet, get_derive_address, get_mempool, update_watch_wallet
+from ..watchonly.crud import get_watch_wallet, get_fresh_address, get_mempool
 
 
 ###############CHARGES##########################
@@ -19,10 +19,9 @@ async def create_charge(user: str, description: str = None, onchainwallet: Optio
     charge_id = urlsafe_short_hash()
     if onchainwallet:
         wallet = await get_watch_wallet(onchainwallet)
-        onchainaddress = await get_derive_address(onchainwallet, int(wallet[4]) + 1)
-        await update_watch_wallet(wallet_id=onchainwallet, address_no=int(wallet[4]) + 1)
+        onchainaddress = await get_fresh_address(onchainwallet)
     else:
-        onchainaddress = None
+        onchainaddress.address = None
     if lnbitswallet:
         payment_hash, payment_request = await create_invoice(
             wallet_id=lnbitswallet,
@@ -51,7 +50,7 @@ async def create_charge(user: str, description: str = None, onchainwallet: Optio
         )
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
-        (charge_id, user, description, onchainwallet, onchainaddress, lnbitswallet,
+        (charge_id, user, description, onchainwallet, onchainaddress.address, lnbitswallet,
          payment_request, payment_hash, webhook, completelink, completelinktext, time, amount, 0),
     )
     return await get_charge(charge_id)
diff --git a/lnbits/extensions/satspay/templates/satspay/display.html b/lnbits/extensions/satspay/templates/satspay/display.html
index 16538a7c..a37c57b8 100644
--- a/lnbits/extensions/satspay/templates/satspay/display.html
+++ b/lnbits/extensions/satspay/templates/satspay/display.html
@@ -190,7 +190,6 @@
             if (self.charge_balance >= self.charge_amount ){
               self.charge_paid = "True"
             }
-            console.log(self.charge_paid)
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)
@@ -241,7 +240,6 @@
       this.getTheTime()
       this.getThePercentage()
       var timerCount = this.timerCount
-      console.log('{{ charge.paid }}')
       if('{{ charge.paid }}' == 'False'){
         timerCount()
       }