feat:small UI improvements
This commit is contained in:
parent
0e87e6608f
commit
6098b8308e
2 changed files with 32 additions and 21 deletions
|
|
@ -637,7 +637,11 @@ new Vue({
|
||||||
const data = await this.etractTxFromPsbt(
|
const data = await this.etractTxFromPsbt(
|
||||||
this.payment.psbtBase64Signed
|
this.payment.psbtBase64Signed
|
||||||
)
|
)
|
||||||
|
if (data) {
|
||||||
this.payment.signedTx = JSON.parse(data.tx_json)
|
this.payment.signedTx = JSON.parse(data.tx_json)
|
||||||
|
} else {
|
||||||
|
this.payment.signedTx = null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
psbtChunks = []
|
psbtChunks = []
|
||||||
|
|
|
||||||
|
|
@ -173,24 +173,29 @@
|
||||||
|
|
||||||
<q-card>
|
<q-card>
|
||||||
<div class="row q-pt-sm q-pb-sm items-center no-wrap q-mb-md">
|
<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
|
<q-btn
|
||||||
unelevated
|
unelevated
|
||||||
|
class="btn-full"
|
||||||
color="secondary"
|
color="secondary"
|
||||||
@click="scanAllAddresses"
|
@click="scanAllAddresses"
|
||||||
:disabled="scan.scanning == true"
|
:disabled="scan.scanning == true"
|
||||||
>Scan Blockchain</q-btn
|
>Scan Blockchain</q-btn
|
||||||
>
|
>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="col-6">
|
||||||
<q-spinner
|
<q-spinner
|
||||||
v-if="scan.scanning == true"
|
v-if="scan.scanning == true"
|
||||||
color="primary"
|
color="primary"
|
||||||
size="2.55em"
|
size="2.55em"
|
||||||
></q-spinner>
|
></q-spinner>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto q-mr-md">
|
<div class="col-3 q-pr-md">
|
||||||
<q-btn
|
<q-btn
|
||||||
unelevated
|
unelevated
|
||||||
color="secondary"
|
color="secondary"
|
||||||
|
class="btn-full"
|
||||||
@click="goToPaymentView"
|
@click="goToPaymentView"
|
||||||
:disabled="scan.scanning == true"
|
:disabled="scan.scanning == true"
|
||||||
>Make Payment</q-btn
|
>Make Payment</q-btn
|
||||||
|
|
@ -992,7 +997,7 @@
|
||||||
class="text-subtitle2"
|
class="text-subtitle2"
|
||||||
color="green"
|
color="green"
|
||||||
>
|
>
|
||||||
{{payment.changeAmount ? payment.changeAmount:
|
{{payment.changeAmount ? satBtc(payment.changeAmount):
|
||||||
'no change'}}
|
'no change'}}
|
||||||
</q-badge>
|
</q-badge>
|
||||||
<q-badge
|
<q-badge
|
||||||
|
|
@ -1050,7 +1055,6 @@
|
||||||
@click="openSerialPort()"
|
@click="openSerialPort()"
|
||||||
unelevated
|
unelevated
|
||||||
color="secondary"
|
color="secondary"
|
||||||
class="q-pr-lg"
|
|
||||||
>Connect</q-btn
|
>Connect</q-btn
|
||||||
>
|
>
|
||||||
<q-btn
|
<q-btn
|
||||||
|
|
@ -1058,7 +1062,6 @@
|
||||||
@click="closeSerialPort()"
|
@click="closeSerialPort()"
|
||||||
outline
|
outline
|
||||||
color="gray"
|
color="gray"
|
||||||
class="q-pr-lg"
|
|
||||||
>Disconnect</q-btn
|
>Disconnect</q-btn
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1066,10 +1069,11 @@
|
||||||
<q-toggle
|
<q-toggle
|
||||||
label="Advanced Config"
|
label="Advanced Config"
|
||||||
color="secodary float-left"
|
color="secodary float-left"
|
||||||
|
class="q-ml-lg"
|
||||||
v-model="serial.showAdvancedConfig"
|
v-model="serial.showAdvancedConfig"
|
||||||
></q-toggle>
|
></q-toggle>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-4">
|
<div class="col-3 ">
|
||||||
<q-btn
|
<q-btn
|
||||||
v-if="serial.selectedPort"
|
v-if="serial.selectedPort"
|
||||||
@click="sendPsbtToSerialPort()"
|
@click="sendPsbtToSerialPort()"
|
||||||
|
|
@ -1111,16 +1115,14 @@
|
||||||
<div class="col-9">
|
<div class="col-9">
|
||||||
<q-badge color="orange">{{satBtc(payment.signedTx.fee)}} </q-badge></div>
|
<q-badge color="orange">{{satBtc(payment.signedTx.fee)}} </q-badge></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row items-center no-wrap q-mb-sm">
|
<q-separator class="q-mb-lg"></q-separator>
|
||||||
<div class="col-3 q-pr-lg">Send </div>
|
|
||||||
<div class="col-9">
|
|
||||||
<div v-for="out in payment.signedTx.outputs" class="row items-center no-wrap q-mb-sm">
|
<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-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 class="col-9">
|
||||||
</div>
|
<q-badge outline color="blue">{{out.address}}</q-badge></div>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
|
|
@ -1298,7 +1300,12 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endblock %} {% block scripts %} {{ window_vars(user) }}
|
{% 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 type="text/javascript" src="https://mempool.space/mempool.js"></script>
|
||||||
|
|
||||||
<script src="{{ url_for('watchonly_static', path='js/tables.js') }}"></script>
|
<script src="{{ url_for('watchonly_static', path='js/tables.js') }}"></script>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue