diff --git a/lnbits/extensions/watchonly/static/js/index.js b/lnbits/extensions/watchonly/static/js/index.js index 512a4d5e..9db60c83 100644 --- a/lnbits/extensions/watchonly/static/js/index.js +++ b/lnbits/extensions/watchonly/static/js/index.js @@ -563,8 +563,6 @@ new Vue({ } }, broadcastTransaction: async function () { - console.log('### broadcastTransaction', this.payment.signedTxHex) - try { const wallet = this.g.user.wallets[0] const {data} = await LNbits.api.request( @@ -574,12 +572,21 @@ new Vue({ {tx_hex: this.payment.signedTxHex} ) this.payment.sentTxId = data + this.$q.notify({ type: 'positive', message: 'Transaction broadcasted!', caption: `${data}`, 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() } catch (error) { this.payment.sentTxId = null this.$q.notify({ diff --git a/lnbits/extensions/watchonly/templates/watchonly/index.html b/lnbits/extensions/watchonly/templates/watchonly/index.html index d64706e8..8e978043 100644 --- a/lnbits/extensions/watchonly/templates/watchonly/index.html +++ b/lnbits/extensions/watchonly/templates/watchonly/index.html @@ -1116,12 +1116,11 @@ class="q-mb-md" >
Confirm - + v-if="hww.signingPsbt == true" + color="primary" + > +
- -
+
+ + +
+
Transaction Id
+
diff --git a/lnbits/extensions/watchonly/views_api.py b/lnbits/extensions/watchonly/views_api.py index 8adbd22e..db7248c4 100644 --- a/lnbits/extensions/watchonly/views_api.py +++ b/lnbits/extensions/watchonly/views_api.py @@ -320,13 +320,12 @@ async def api_tx_broadcast( raise ValueError( "Cannot broadcast transaction. Mempool endpoint not defined!" ) - x = bytes.fromhex(data.tx_hex) - # async with httpx.AsyncClient() as client: - # r = await client.post(config.mempool_endpoint + "/api/tx", data=data.tx_hex) - # tx_id = r.text - # return tx_id - return "0f0f0f0f0f0f0f0f0f0f0f00f0f0f0f0f0f0f0f0f0f00f0f0f0f0f0f0.mock.transaction.id" + async with httpx.AsyncClient() as client: + r = await client.post(config.mempool_endpoint + "/api/tx", data=data.tx_hex) + tx_id = r.text + return tx_id + # return "0f0f0f0f0f0f0f0f0f0f0f00f0f0f0f0f0f0f0f0f0f00f0f0f0f0f0f0.mock.transaction.id" except Exception as e: raise HTTPException(status_code=HTTPStatus.BAD_REQUEST, detail=str(e))