aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions 1

feat:small UI improvements

Browse source
This commit is contained in:
Vlad Stan 2022-07-14 18:47:52 +03:00
parent 0e87e6608f
commit 6098b8308e
2 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lnbits/extensions/watchonly/static/js/index.js
View file

@ -637,7 +637,11 @@ new Vue({
const data = await this.etractTxFromPsbt(
this.payment.psbtBase64Signed
)
this.payment.signedTx = JSON.parse(data.tx_json)
if (data) {
this.payment.signedTx = JSON.parse(data.tx_json)
} else {
this.payment.signedTx = null
}
}
} else {
psbtChunks = []

47
lnbits/extensions/watchonly/templates/watchonly/index.html
View file

@ -173,24 +173,29 @@
<q-card>
<div class="row q-pt-sm q-pb-sm items-center no-wrap q-mb-md">
<div class="col q-ml-lg">
<div class="col-3 q-pl-md">
<q-btn
unelevated
class="btn-full"
color="secondary"
@click="scanAllAddresses"
:disabled="scan.scanning == true"
>Scan Blockchain</q-btn
>
<q-spinner
v-if="scan.scanning == true"
color="primary"
size="2.55em"
></q-spinner>
</div>
<div class="col-auto q-mr-md">
<div class="col-6">
<q-spinner
v-if="scan.scanning == true"
color="primary"
size="2.55em"
></q-spinner>
</div>
<div class="col-3 q-pr-md">
<q-btn
unelevated
color="secondary"
class="btn-full"
@click="goToPaymentView"
:disabled="scan.scanning == true"
>Make Payment</q-btn
@ -992,7 +997,7 @@
class="text-subtitle2"
color="green"
>
{{payment.changeAmount ? payment.changeAmount:
{{payment.changeAmount ? satBtc(payment.changeAmount):
'no change'}}
</q-badge>
<q-badge
@ -1050,7 +1055,6 @@
@click="openSerialPort()"
unelevated
color="secondary"
class="q-pr-lg"
>Connect</q-btn
>
<q-btn
@ -1058,7 +1062,6 @@
@click="closeSerialPort()"
outline
color="gray"
class="q-pr-lg"
>Disconnect</q-btn
>
</div>
@ -1066,10 +1069,11 @@
<q-toggle
label="Advanced Config"
color="secodary float-left"
class="q-ml-lg"
v-model="serial.showAdvancedConfig"
></q-toggle>
</div>
<div class="col-4">
<div class="col-3 ">
<q-btn
v-if="serial.selectedPort"
@click="sendPsbtToSerialPort()"
@ -1111,16 +1115,14 @@
<div class="col-9">
<q-badge color="orange">{{satBtc(payment.signedTx.fee)}} </q-badge></div>
</div>
<div class="row items-center no-wrap q-mb-sm">
<div class="col-3 q-pr-lg">Send </div>
<q-separator class="q-mb-lg"></q-separator>
<div v-for="out in payment.signedTx.outputs" class="row items-center no-wrap q-mb-sm">
<div class="col-3 q-pr-lg"> <q-badge color="orange">{{satBtc(out.amount)}}</div>
<div class="col-9">
<div v-for="out in payment.signedTx.outputs" class="row items-center no-wrap q-mb-sm">
<div class="col-3 q-pr-lg"> <q-badge color="orange">{{satBtc(out.amount)}}</div>
<div class="col-1">to</div>
<div class="col-8">{{out.address}}</div>
</div>
</div>
<q-badge outline color="blue">{{out.address}}</q-badge></div>
</div>
</div>
</div>
</q-card-section>
@ -1298,7 +1300,12 @@
</div>
{% endblock %} {% block scripts %} {{ window_vars(user) }}
<!-- todo: use endpoint here -->
<style>
.btn-full {
width: 100%;
}
</style>
<script type="text/javascript" src="https://mempool.space/mempool.js"></script>
<script src="{{ url_for('watchonly_static', path='js/tables.js') }}"></script>