From d95a3032e6ee3c12e573ad0d268dac2eeda8a2a6 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Wed, 31 Aug 2022 20:27:42 +0100
Subject: [PATCH 1/3] Fix for boltcard app change

---
 lnbits/extensions/boltcards/lnurl.py           | 8 +++++++-
 lnbits/extensions/boltcards/static/js/index.js | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/boltcards/lnurl.py b/lnbits/extensions/boltcards/lnurl.py
index 693792c3..60b3b232 100644
--- a/lnbits/extensions/boltcards/lnurl.py
+++ b/lnbits/extensions/boltcards/lnurl.py
@@ -151,12 +151,18 @@ async def api_auth(a, request: Request):
     )
 
     response = {
+        "card_name": card.name,
+        "id": 1,
         "k0": card.k0,
         "k1": card.k1,
         "k2": card.k2,
+        "k3": card.k1,
+        "k4": card.k2,
         "lnurlw_base": lnurlw_base,
+        "protocol_name": "new_bolt_card_response",
+        "protocol_version": 1
     }
-
+    
     return response
 
 
diff --git a/lnbits/extensions/boltcards/static/js/index.js b/lnbits/extensions/boltcards/static/js/index.js
index 2e975a1f..11df222a 100644
--- a/lnbits/extensions/boltcards/static/js/index.js
+++ b/lnbits/extensions/boltcards/static/js/index.js
@@ -268,7 +268,9 @@ new Vue({
         external_id: card.external_id,
         k0: card.k0,
         k1: card.k1,
-        k2: card.k2
+        k2: card.k2,
+        k3: card.k1,
+        k4: card.k2
       }
       this.qrCodeDialog.show = true
     },

From 7e90c47008eb78c27d7569e92ded0563fcee6094 Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Wed, 31 Aug 2022 21:32:53 +0100
Subject: [PATCH 2/3] Works with new app

---
 lnbits/extensions/boltcards/lnurl.py                     | 6 ++----
 .../extensions/boltcards/templates/boltcards/index.html  | 9 ---------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/lnbits/extensions/boltcards/lnurl.py b/lnbits/extensions/boltcards/lnurl.py
index 60b3b232..6cf69c28 100644
--- a/lnbits/extensions/boltcards/lnurl.py
+++ b/lnbits/extensions/boltcards/lnurl.py
@@ -137,7 +137,6 @@ async def api_auth(a, request: Request):
         return response
 
     card = await get_card_by_otp(a)
-
     if not card:
         raise HTTPException(
             detail="Card does not exist.", status_code=HTTPStatus.NOT_FOUND
@@ -151,21 +150,20 @@ async def api_auth(a, request: Request):
     )
 
     response = {
-        "card_name": card.name,
+        "card_name": card.card_name,
         "id": 1,
         "k0": card.k0,
         "k1": card.k1,
         "k2": card.k2,
         "k3": card.k1,
         "k4": card.k2,
-        "lnurlw_base": lnurlw_base,
+        "lnurlw_base": "lnurlw://" + lnurlw_base,
         "protocol_name": "new_bolt_card_response",
         "protocol_version": 1
     }
     
     return response
 
-
 ###############LNURLPAY REFUNDS#################
 
 
diff --git a/lnbits/extensions/boltcards/templates/boltcards/index.html b/lnbits/extensions/boltcards/templates/boltcards/index.html
index 96d9c9d0..55cc1e5e 100644
--- a/lnbits/extensions/boltcards/templates/boltcards/index.html
+++ b/lnbits/extensions/boltcards/templates/boltcards/index.html
@@ -382,15 +382,6 @@
         <strong>File key:</strong> {{ qrCodeDialog.data.k2 }}<br />
       </p>
       <br />
-
-      <q-btn
-        unelevated
-        outline
-        color="grey"
-        @click="copyText(lnurlLink + qrCodeDialog.data.external_id)"
-        label="Base url (LNURL://)"
-      >
-      </q-btn>
       <q-btn
         unelevated
         outline

From 39800fd5fde60b69f3852c801385ae4c7058693e Mon Sep 17 00:00:00 2001
From: ben <ben@arc.wales>
Date: Wed, 31 Aug 2022 21:42:27 +0100
Subject: [PATCH 3/3] Fixed daily limit

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

diff --git a/lnbits/extensions/boltcards/lnurl.py b/lnbits/extensions/boltcards/lnurl.py
index 6cf69c28..feaab2d0 100644
--- a/lnbits/extensions/boltcards/lnurl.py
+++ b/lnbits/extensions/boltcards/lnurl.py
@@ -85,7 +85,7 @@ async def api_scan(p, c, request: Request, external_id: str = None):
     hits_amount = 0
     for hit in todays_hits:
         hits_amount = hits_amount + hit.amount
-    if (hits_amount + card.tx_limit) > card.daily_limit:
+    if hits_amount > card.daily_limit:
         return {"status": "ERROR", "reason": "Max daily limit spent."}
     hit = await create_hit(card.id, ip, agent, card.counter, ctr_int)
     lnurlpay = lnurl_encode(request.url_for("boltcards.lnurlp_response", hit_id=hit.id))