From 558b9d2f9b562eed5ab9bd8d7fa3b900a58892f0 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Sat, 5 Nov 2022 07:02:59 +0100
Subject: [PATCH] check token id

---
 lnbits/extensions/cashu/templates/cashu/wallet.html | 8 ++++----
 lnbits/extensions/cashu/views_api.py                | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lnbits/extensions/cashu/templates/cashu/wallet.html b/lnbits/extensions/cashu/templates/cashu/wallet.html
index 0832473b2..d8763cbc8 100644
--- a/lnbits/extensions/cashu/templates/cashu/wallet.html
+++ b/lnbits/extensions/cashu/templates/cashu/wallet.html
@@ -119,7 +119,7 @@ page_container %}
                   :data="invoicesCashu"
                   :columns="invoicesTable.columns"
                   :pagination.sync="invoicesTable.pagination"
-                  no-data-label="No invoices made yet"
+                  no-data-label="There are no invoices here yet"
                   :filter="invoicesTable.filter"
                 >
                   {% raw %}
@@ -140,12 +140,12 @@ page_container %}
                             class="q-mr-md cursor-pointer"
                             @click="recheckInvoice(props.row.hash)"
                           >
-                            Recheck
+                            Check
                           </q-badge>
                         </div>
                         <div v-if="props.row.status === 'paid'">
-                          <q-icon v-if="props.row.amount>0" name= "call_received" color="green"></q-icon>
-                          <q-icon v-if="props.row.amount<0" name= "call_made" color="red"></q-icon>
+                          <q-icon v-if="props.row.amount>0" name= "call_received" color="green"><q-tooltip>Received</q-tooltip></q-icon>
+                          <q-icon v-if="props.row.amount<0" name= "call_made" color="red"><q-tooltip>Paid</q-tooltip></q-icon>
                           <!-- <q-icon name="props.row.amount < 0 ? 'call_made' : 'call_received'" color="green"></q-icon> -->
 
                         </div>
diff --git a/lnbits/extensions/cashu/views_api.py b/lnbits/extensions/cashu/views_api.py
index 806347cbf..5f7e93103 100644
--- a/lnbits/extensions/cashu/views_api.py
+++ b/lnbits/extensions/cashu/views_api.py
@@ -345,6 +345,15 @@ async def split(
             status_code=HTTPStatus.NOT_FOUND, detail="Mint does not exist."
         )
     proofs = payload.proofs
+
+    # !!!!!!! MAKE SURE THAT PROOFS ARE ONLY FROM THIS CASHU KEYSET ID
+    # THIS IS NECESSARY BECAUSE THE CASHU BACKEND WILL ACCEPT ANY VALID
+    # TOKENS
+    assert all([p.id == cashu.keyset_id for p in proofs]), HTTPException(
+        status_code=HTTPStatus.BAD_REQUEST,
+        detail="Proofs include tokens from another mint.",
+    )
+
     amount = payload.amount
     outputs = payload.outputs.blinded_messages
     assert outputs, Exception("no outputs provided.")