From c476d795807b9fa857fa95f8b6064321f761e00e Mon Sep 17 00:00:00 2001
From: bitkarrot <73979971+bitkarrot@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:03:57 -0800
Subject: [PATCH] remove circular, fix html

---
 crud.py                     | 16 ++++++++--------
 templates/lnurlp/index.html | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/crud.py b/crud.py
index 2362601..31495ac 100644
--- a/crud.py
+++ b/crud.py
@@ -3,7 +3,7 @@ from typing import List, Optional, Union
 
 from lnbits.helpers import urlsafe_short_hash
 
-from . import db, maindb
+from . import db #, maindb
 from .models import CreatePayLinkData, PayLink
 
 from loguru import logger
@@ -94,13 +94,13 @@ async def check_lnaddress_format(username: str) -> bool:
         return
     return True
 
-async def get_wallet_key(wallet_id: str) -> str:
-    row = await maindb.fetchone("SELECT inkey FROM wallets WHERE id = ?", (wallet_id,))
-    if row is not None:
-        return row[0]
-    else:
-        assert False, "Cannot locate wallet invoice key"
-        return
+# async def get_wallet_key(wallet_id: str) -> str:
+#     row = await maindb.fetchone("SELECT inkey FROM wallets WHERE id = ?", (wallet_id,))
+#     if row is not None:
+#         return row[0]
+#     else:
+#         assert False, "Cannot locate wallet invoice key"
+#         return
     
 async def get_address_data(username: str) -> Optional[PayLink]:
     row = await db.fetchone(
diff --git a/templates/lnurlp/index.html b/templates/lnurlp/index.html
index f1ffacc..c902b23 100644
--- a/templates/lnurlp/index.html
+++ b/templates/lnurlp/index.html
@@ -29,9 +29,9 @@
             <q-tr :props="props">
               <q-th auto-width></q-th>
               <q-th auto-width>Description</q-th>
-              <q-th auto-width>Lightning Address</q-th>
               <q-th auto-width>Amount</q-th>
               <q-th auto-width>Currency</q-th>
+              <q-th auto-width>Lightning Address</q-th>
               <q-th auto-width></q-th>
               <q-th auto-width></q-th>
             </q-tr>
@@ -149,6 +149,14 @@
           label="Wallet *"
         >
         </q-select>
+        <q-input
+        filled
+        dense
+        v-model.trim="formDialog.data.description"
+        type="text"
+        label="Item description *"
+      >
+      </q-input>
         <div class="row">
           <div class="col">
            <q-input
@@ -164,14 +172,6 @@
           </div>
           </q-input>
         </div>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialog.data.description"
-          type="text"
-          label="Item description *"
-        >
-        </q-input>
         <div class="row q-col-gutter-sm">
           <q-input
             filled