From 1728fe053d00de08038c791d43f3de44b905f1b1 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Sun, 13 Nov 2022 19:15:40 -0600
Subject: [PATCH] change pages

---
 .../cashu/templates/cashu/index.html          |  6 +--
 .../cashu/templates/cashu/mint.html           | 24 +++++++----
 .../cashu/templates/cashu/wallet.html         | 42 +++++++++----------
 3 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/lnbits/extensions/cashu/templates/cashu/index.html b/lnbits/extensions/cashu/templates/cashu/index.html
index f54b39b1..6c69da93 100644
--- a/lnbits/extensions/cashu/templates/cashu/index.html
+++ b/lnbits/extensions/cashu/templates/cashu/index.html
@@ -218,18 +218,18 @@
         toggleAdvanced: false,
         cashusTable: {
           columns: [
-            {name: 'id', align: 'left', label: 'ID', field: 'id'},
+            {name: 'id', align: 'left', label: 'Mint ID', field: 'id'},
             {name: 'name', align: 'left', label: 'Name', field: 'name'},
             {
               name: 'tickershort',
               align: 'left',
-              label: 'tickershort',
+              label: 'Ticker',
               field: 'tickershort'
             },
             {
               name: 'wallet',
               align: 'left',
-              label: 'Cashu wallet',
+              label: 'Mint wallet',
               field: 'wallet'
             },
             {
diff --git a/lnbits/extensions/cashu/templates/cashu/mint.html b/lnbits/extensions/cashu/templates/cashu/mint.html
index 894d7087..b9300c3d 100644
--- a/lnbits/extensions/cashu/templates/cashu/mint.html
+++ b/lnbits/extensions/cashu/templates/cashu/mint.html
@@ -1,7 +1,7 @@
 {% extends "public.html" %} {% block page %}
 <div class="row q-col-gutter-md justify-center">
   <div class="col-12 col-md-7 col-lg-6 q-gutter-y-md">
-    <q-card class="q-pa-lg">
+    <q-card class="q-pa-lg q-mb-xl">
       <q-card-section class="q-pa-none">
         <center>
           <q-icon
@@ -9,10 +9,10 @@
             class="text-grey"
             style="font-size: 10rem"
           ></q-icon>
-          <h3 class="q-my-none">{{ mint_name }}</h3>
-          <p style="font-size: 1rem" class="q-my-sm">Cashu mint</p>
+          <h4 class="q-mt-none q-mb-md">{{ mint_name }}</h4>
           <a
-            style="font-size: 1.5rem; color: white"
+            class="q-my-xl text-white"
+            style="font-size: 1.5rem"
             href="../wallet?mint_id={{ mint_id }}"
             target="”_blank”"
             >Open wallet</a
@@ -21,7 +21,7 @@
         <br />
         <br />
         <h6 class="q-my-none">
-          <p><strong>Read the following text carefully!</strong></p>
+          <p><strong>Read the following carefully!</strong></p>
           <p>
             This is a
             <a
@@ -30,14 +30,20 @@
               target="”_blank”"
               >Cashu</a
             >
-            mint. Cashu is a Ecash system on Bitcoin.
+            mint which is an Ecash system on Bitcoin.
+          </p>
+          <p>
+            <strong>Open this page in your browser</strong><br />
+            Before you continue, make sure to open this page in your device's
+            native browser application (Safari for iOS, Chrome for Android) if
+            you want to add Cashu wallet to your home screen.
           </p>
           <p>
             <strong>Add to home screen</strong><br />
             You can add Cashu to your home screen as a progressive web app
-            (PWA). When you open the wallet in your browser, on Android Chrome,
-            click the menu at the upper right. On iOS Safari, click the share
-            button. Now press the Add to Home screen button.
+            (PWA). When you open the wallet in your browser, on Android
+            (Chrome), click the menu at the upper right. On iOS (Safari), click
+            the share button. Now press the Add to Home screen button.
           </p>
           <p>
             <strong>Backup your wallet</strong><br />
diff --git a/lnbits/extensions/cashu/templates/cashu/wallet.html b/lnbits/extensions/cashu/templates/cashu/wallet.html
index 27ef5e5c..a8016ba7 100644
--- a/lnbits/extensions/cashu/templates/cashu/wallet.html
+++ b/lnbits/extensions/cashu/templates/cashu/wallet.html
@@ -125,9 +125,6 @@ page_container %}
                       <q-td key="sum" :props="props">
                         <div>{{props.row.sum}}</div>
                       </q-td>
-                      <q-td key="memo" :props="props">
-                        <div>{{props.row.memo}}</div>
-                      </q-td>
                     </q-tr>
                   </template>
                   {% endraw %}
@@ -186,17 +183,17 @@ page_container %}
                       <q-td
                         key="amount"
                         :props="props"
-                        :class="props.row.amount > 0 ? 'text-green-13 text-weight-bold' : ''"
+                        :class="props.row.amount > 0 && props.row.status === 'paid' ? 'text-green-13 text-weight-bold' : ''"
                       >
                         <div>{{props.row.amount}}</div>
                       </q-td>
 
-                      <!-- <q-td key="memo" :props="props">
-                        <div>{{props.row.memo}}</div>
-                      </q-td> -->
                       <q-td key="date" :props="props">
                         <div>{{props.row.date}}</div>
                       </q-td>
+                      <!-- <q-td key="memo" :props="props">
+                        <div>{{props.row.memo}}</div>
+                      </q-td> -->
                       <q-td key="bolt11" :props="props">
                         <div>{{props.row.bolt11}}</div>
                       </q-td>
@@ -269,6 +266,9 @@ page_container %}
                       <q-td key="date" :props="props">
                         <div>{{props.row.date}}</div>
                       </q-td>
+                      <!-- <q-td key="memo" :props="props">
+                        <div>{{props.row.memo}}</div>
+                      </q-td> -->
                       <q-td key="token" :props="props">
                         <div>{{props.row.token}}</div>
                       </q-td>
@@ -931,13 +931,6 @@ page_container %}
               field: 'sum',
               sortable: true
             }
-            // {
-            //   name: 'memo',
-            //   align: 'left',
-            //   label: 'Memo',
-            //   field: 'memo',
-            //   sortable: true
-            // }
           ],
           pagination: {
             rowsPerPage: 5
@@ -960,13 +953,6 @@ page_container %}
               field: 'amount',
               sortable: true
             },
-            // {
-            //   name: 'memo',
-            //   align: 'left',
-            //   label: 'Memo',
-            //   field: 'memo',
-            //   sortable: true
-            // },
             {
               name: 'date',
               align: 'left',
@@ -974,6 +960,13 @@ page_container %}
               field: 'date',
               sortable: true
             },
+            // {
+            //   name: 'memo',
+            //   align: 'left',
+            //   label: 'Memo',
+            //   field: 'memo',
+            //   sortable: true
+            // },
             {
               name: 'bolt11',
               align: 'left',
@@ -1020,6 +1013,13 @@ page_container %}
               field: 'date',
               sortable: true
             },
+            // {
+            //   name: 'memo',
+            //   align: 'left',
+            //   label: 'Memo',
+            //   field: 'memo',
+            //   sortable: true
+            // },
             {
               name: 'token',
               align: 'left',