From f11a51a4cc6d836b4dacd739ca11127b5804076e Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 3 Aug 2022 10:17:17 +0300
Subject: [PATCH] fix: shortcut buttons

---
 .../static/components/address-list/address-list.js          | 3 +++
 .../watchonly/static/components/history/history.html        | 4 ++--
 .../watchonly/static/components/history/history.js          | 5 ++---
 .../watchonly/static/components/utxo-list/utxo-list.html    | 4 ++--
 .../watchonly/static/components/utxo-list/utxo-list.js      | 6 +++---
 lnbits/extensions/watchonly/static/js/index.js              | 6 ++++--
 lnbits/extensions/watchonly/templates/watchonly/index.html  | 3 +++
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/lnbits/extensions/watchonly/static/components/address-list/address-list.js b/lnbits/extensions/watchonly/static/components/address-list/address-list.js
index 2e113406..4f4f0023 100644
--- a/lnbits/extensions/watchonly/static/components/address-list/address-list.js
+++ b/lnbits/extensions/watchonly/static/components/address-list/address-list.js
@@ -107,6 +107,9 @@ async function addressList(path) {
       },
       showAddressDetails: function (addressData) {
         this.$emit('show-address-details', addressData)
+      },
+      searchInTab: function (tab, value) {
+        this.$emit('search:tab', {tab, value})
       }
     },
 
diff --git a/lnbits/extensions/watchonly/static/components/history/history.html b/lnbits/extensions/watchonly/static/components/history/history.html
index 52133084..ac805dfa 100644
--- a/lnbits/extensions/watchonly/static/components/history/history.html
+++ b/lnbits/extensions/watchonly/static/components/history/history.html
@@ -6,7 +6,7 @@
         borderless
         dense
         debounce="300"
-        v-model="historyTable.filter"
+        v-model="filter"
         placeholder="Search"
         class="float-right"
       >
@@ -38,7 +38,7 @@
     virtual-scroll
     :columns="historyTable.columns"
     :pagination.sync="historyTable.pagination"
-    :filter="historyTable.filter"
+    :filter="filter"
   >
     <template v-slot:body="props">
       <q-tr :props="props">
diff --git a/lnbits/extensions/watchonly/static/components/history/history.js b/lnbits/extensions/watchonly/static/components/history/history.js
index db98c668..574a1ef6 100644
--- a/lnbits/extensions/watchonly/static/components/history/history.js
+++ b/lnbits/extensions/watchonly/static/components/history/history.js
@@ -4,7 +4,7 @@ async function history(path) {
     name: 'history',
     template,
 
-    props: ['history', 'mempool-endpoint', 'sats-denominated'],
+    props: ['history', 'mempool-endpoint', 'sats-denominated', 'filter'],
     data: function () {
       return {
         historyTable: {
@@ -65,8 +65,7 @@ async function history(path) {
           ],
           pagination: {
             rowsPerPage: 0
-          },
-          filter: ''
+          }
         }
       }
     },
diff --git a/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.html b/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.html
index 5b7e9858..a55b99e9 100644
--- a/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.html
+++ b/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.html
@@ -28,7 +28,7 @@
           borderless
           dense
           debounce="300"
-          v-model="utxosTable.filter"
+          v-model="filter"
           placeholder="Search"
         >
           <template v-slot:append>
@@ -45,7 +45,7 @@
       row-key="id"
       :columns="columns"
       :pagination.sync="utxosTable.pagination"
-      :filter="utxosTable.filter"
+      :filter="filter"
     >
       <template v-slot:body="props">
         <q-tr :props="props">
diff --git a/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.js b/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.js
index 3dfcb9d9..6741ed94 100644
--- a/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.js
+++ b/lnbits/extensions/watchonly/static/components/utxo-list/utxo-list.js
@@ -10,7 +10,8 @@ async function utxoList(path) {
       'selectable',
       'payed-amount',
       'sats-denominated',
-      'mempool-endpoint'
+      'mempool-endpoint',
+      'filter'
     ],
 
     data: function () {
@@ -65,8 +66,7 @@ async function utxoList(path) {
           ],
           pagination: {
             rowsPerPage: 10
-          },
-          filter: ''
+          }
         },
         utxoSelectionModes: [
           'Manual',
diff --git a/lnbits/extensions/watchonly/static/js/index.js b/lnbits/extensions/watchonly/static/js/index.js
index 536fab8f..6135ed17 100644
--- a/lnbits/extensions/watchonly/static/js/index.js
+++ b/lnbits/extensions/watchonly/static/js/index.js
@@ -43,11 +43,13 @@ const watchOnly = async () => {
         walletAccounts: [],
         addresses: [],
         history: [],
+        historyFilter: '',
 
         showAddress: false,
         addressNote: '',
         showPayment: false,
         fetchedUtxos: false,
+        utxosFilter: '',
         network: null
       }
     },
@@ -362,9 +364,9 @@ const watchOnly = async () => {
         this.addressNote = addressData.note || ''
         this.showAddress = true
       },
-      searchInTab: function (tab, value) {
+      searchInTab: function ({tab, value}) {
         this.tab = tab
-        this[`${tab}Table`].filter = value
+        this[`${tab}Filter`] = value
       },
 
       updateAccounts: async function (accounts) {
diff --git a/lnbits/extensions/watchonly/templates/watchonly/index.html b/lnbits/extensions/watchonly/templates/watchonly/index.html
index 41ba26e1..b106dd39 100644
--- a/lnbits/extensions/watchonly/templates/watchonly/index.html
+++ b/lnbits/extensions/watchonly/templates/watchonly/index.html
@@ -98,6 +98,7 @@
               @scan:address="scanAddress"
               @show-address-details="showAddressDetails"
               @update:addresses="initUtxos"
+              @search:tab="searchInTab"
               :inkey="g.user.wallets[0].inkey"
             >
             </address-list>
@@ -107,6 +108,7 @@
               :history="history"
               :mempool-endpoint="mempoolHostname"
               :sats-denominated="config.sats_denominated"
+              :filter="historyFilter"
             ></history>
           </q-tab-panel>
           <q-tab-panel name="utxos">
@@ -115,6 +117,7 @@
               :mempool-endpoint="mempoolHostname"
               :accounts="walletAccounts"
               :sats-denominated="config.sats_denominated"
+              :filter="utxosFilter"
             ></utxo-list>
           </q-tab-panel>
         </q-tab-panels>