fix: scanAddressesWithAmount
This commit is contained in:
parent
dc2ecfe9a2
commit
b576ef4f21
3 changed files with 16 additions and 6 deletions
|
|
@ -102,22 +102,22 @@ async function utxoList(path) {
|
|||
return total
|
||||
},
|
||||
applyUtxoSelectionMode: function () {
|
||||
const mode = this.utxoSelectionMode
|
||||
const isSelectAll = mode === 'Select All'
|
||||
if (isSelectAll) {
|
||||
this.utxos.data.forEach(u => (u.selected = true))
|
||||
this.utxos.forEach(u => (u.selected = true))
|
||||
return
|
||||
}
|
||||
|
||||
const payedAmount = this['payed-amount']
|
||||
const mode = this.payment.utxoSelectionMode
|
||||
this.utxos.data.forEach(u => (u.selected = false))
|
||||
this.utxos.forEach(u => (u.selected = false))
|
||||
const isManual = mode === 'Manual'
|
||||
if (isManual || !payedAmount) return
|
||||
|
||||
const isSmallerFirst = mode === 'Smaller Inputs First'
|
||||
const isLargerFirst = mode === 'Larger Inputs First'
|
||||
|
||||
let selectedUtxos = this.utxos.data.slice()
|
||||
let selectedUtxos = this.utxos.slice()
|
||||
if (isSmallerFirst || isLargerFirst) {
|
||||
const sortFn = isSmallerFirst
|
||||
? (a, b) => a.amount - b.amount
|
||||
|
|
|
|||
|
|
@ -85,7 +85,8 @@ const watchOnly = async () => {
|
|||
|
||||
showAddress: false,
|
||||
addressNote: '',
|
||||
showPayment: false
|
||||
showPayment: false,
|
||||
fetchedUtxos: false
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -684,6 +685,7 @@ const watchOnly = async () => {
|
|||
this.utxos.total = 0
|
||||
this.history = []
|
||||
const addresses = this.addresses.filter(a => a.hasActivity)
|
||||
console.log('### scanAddressWithAmount', this.addresses, addresses)
|
||||
await this.updateUtxosForAddresses(addresses)
|
||||
},
|
||||
scanAddress: async function (addressData) {
|
||||
|
|
@ -831,6 +833,13 @@ const watchOnly = async () => {
|
|||
},
|
||||
showAddressDetails: function (addressData) {
|
||||
this.openQrCodeDialog(addressData)
|
||||
},
|
||||
initUtxos: function (addresses) {
|
||||
if (!this.fetchedUtxos && addresses.length) {
|
||||
this.fetchedUtxos = true
|
||||
this.addresses = addresses
|
||||
this.scanAddressWithAmount()
|
||||
}
|
||||
}
|
||||
},
|
||||
created: async function () {
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
color="gray"
|
||||
class="btn-full"
|
||||
@click="showPayment = false"
|
||||
>Discard Payment</q-btn
|
||||
>Back</q-btn
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -85,6 +85,7 @@
|
|||
:sats-denominated="config.data.sats_denominated"
|
||||
@scan:address="scanAddress"
|
||||
@show-address-details="showAddressDetails"
|
||||
@update:addresses="initUtxos"
|
||||
:inkey="g.user.wallets[0].inkey"
|
||||
>
|
||||
</address-list>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue