From b6645000615f0955533eed2ebe31d000e0932a10 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 27 Jul 2022 11:35:42 +0300
Subject: [PATCH] refactor: code clean-up

---
 .../static/components/payment/payment.js      | 21 ++++++++-----------
 .../extensions/watchonly/static/js/index.js   |  4 +---
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/lnbits/extensions/watchonly/static/components/payment/payment.js b/lnbits/extensions/watchonly/static/components/payment/payment.js
index 5ca15913..e2a59207 100644
--- a/lnbits/extensions/watchonly/static/components/payment/payment.js
+++ b/lnbits/extensions/watchonly/static/components/payment/payment.js
@@ -28,6 +28,9 @@ async function payment(path) {
         DUST_LIMIT: 546,
         tx: null,
         psbtBase64: null,
+        signedTx: null,
+        sentTxId: null,
+        signedTxId: null,
         paymentTab: 'destination',
         sendToList: [{address: '', amount: undefined}],
         changeWallet: null,
@@ -228,14 +231,13 @@ async function payment(path) {
       },
       broadcastTransaction: async function () {
         try {
-          const wallet = this.g.user.wallets[0]
           const {data} = await LNbits.api.request(
             'POST',
             '/watchonly/api/v1/tx',
-            wallet.adminkey,
-            {tx_hex: this.payment.signedTxHex}
+            this.adminkey,
+            {tx_hex: this.signedTxHex}
           )
-          this.payment.sentTxId = data
+          this.sentTxId = data
 
           this.$q.notify({
             type: 'positive',
@@ -244,15 +246,10 @@ async function payment(path) {
             timeout: 10000
           })
 
-          this.hww.psbtSent = false
-          this.payment.psbtBase64Signed = null
-          this.payment.signedTxHex = null
-          this.payment.signedTx = null
-          this.payment.psbtBase64 = null
-
-          await this.scanAddressWithAmount()
+          // await this.scanAddressWithAmount()
+          // todo: event
         } catch (error) {
-          this.payment.sentTxId = null
+          this.sentTxId = null
           this.$q.notify({
             type: 'warning',
             message: 'Failed to broadcast!',
diff --git a/lnbits/extensions/watchonly/static/js/index.js b/lnbits/extensions/watchonly/static/js/index.js
index c8ca588c..706e265f 100644
--- a/lnbits/extensions/watchonly/static/js/index.js
+++ b/lnbits/extensions/watchonly/static/js/index.js
@@ -84,9 +84,7 @@ const watchOnly = async () => {
         showAddress: false,
         addressNote: '',
         showPayment: false,
-        fetchedUtxos: false,
-        signedTx: null,
-        signedTxHex: null
+        fetchedUtxos: false
       }
     },