From 48ab496cb47259d66427a739bded3afb92b4d2b8 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 4 Aug 2022 11:05:27 +0300
Subject: [PATCH] fix: address type selection

---
 .../components/wallet-list/wallet-list.html   |  1 -
 .../components/wallet-list/wallet-list.js     | 24 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.html b/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.html
index ccd6f678..3472a52f 100644
--- a/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.html
+++ b/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.html
@@ -191,7 +191,6 @@
           label="Account Extended Public Key; xpub, ypub, zpub; Bitcoin Descriptor"
         ></q-input>
         <q-select
-          v-if="formDialog.useSerialPort"
           filled
           dense
           emit-value
diff --git a/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js b/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js
index dcc862a9..adc82b3e 100644
--- a/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js
+++ b/lnbits/extensions/watchonly/static/components/wallet-list/wallet-list.js
@@ -19,7 +19,12 @@ async function walletList(path) {
         formDialog: {
           show: false,
 
-          addressType: [],
+          addressType: {
+            label: 'Segwit (P2WPKH)',
+            id: 'wpkh',
+            pathMainnet: "m/84'/0'/0'",
+            pathTestnet: "m/84'/1'/0'"
+          },
           useSerialPort: false,
           data: {
             title: '',
@@ -32,25 +37,25 @@ async function walletList(path) {
         addressTypeOptions: [
           {
             label: 'Legacy (P2PKH)',
-            value: 'pkh',
+            id: 'pkh',
             pathMainnet: "m/44'/0'/0'",
             pathTestnet: "m/44'/1'/0'"
           },
           {
             label: 'Segwit (P2WPKH)',
-            value: 'wpkh',
+            id: 'wpkh',
             pathMainnet: "m/84'/0'/0'",
             pathTestnet: "m/84'/1'/0'"
           },
           {
             label: 'Wrapped Segwit (P2SH-P2WPKH)',
-            value: 'sh',
+            id: 'sh',
             pathMainnet: "m/49'/0'/0'",
             pathTestnet: "m/49'/1'/0'"
           },
           {
             label: 'Taproot (P2TR)',
-            value: 'tr',
+            id: 'tr',
             pathMainnet: "m/86'/0'/0'",
             pathTestnet: "m/86'/1'/0'"
           }
@@ -116,13 +121,12 @@ async function walletList(path) {
             const {xpub, fingerprint} = await this.fetchXpubFromHww()
             if (!xpub) return
             const path = this.accountPath.substring(2)
-            const outputType = this.formDialog.addressType
+            const outputType = this.formDialog.addressType.id
             if (outputType === 'sh') {
               data.masterpub = `${outputType}(wpkh([${fingerprint}/${path}]${xpub}/{0,1}/*))`
             } else {
               data.masterpub = `${outputType}([${fingerprint}/${path}]${xpub}/{0,1}/*)`
             }
-            console.log('###  data.masterpub', data.masterpub)
           }
           const response = await LNbits.api.request(
             'POST',
@@ -270,16 +274,16 @@ async function walletList(path) {
           })
         }
       },
-      handleAddressTypeChanged: function (value) {
+      handleAddressTypeChanged: function (value = {}) {
         const addressType =
-          this.addressTypeOptions.find(t => t.value === value) || {}
+          this.addressTypeOptions.find(t => t.id === value.id) || {}
         this.accountPath = addressType[`path${this.network}`]
       }
     },
     created: async function () {
       if (this.inkey) {
         await this.refreshWalletAccounts()
-        this.handleAddressTypeChanged('wpkh')
+        this.handleAddressTypeChanged(this.addressTypeOptions[1])
       }
     }
   })