4
1
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-02-11 17:55:51 +00:00

Update DGB/RVN to match master

Added some changes that were not applied to new-coins during the previous merge from the master branch.
This commit is contained in:
QuickMythril 2022-05-09 14:56:37 -04:00 committed by GitHub
parent 1d1f8fe707
commit e144ccf963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1357,7 +1357,7 @@ class MultiWallet extends LitElement {
</p> </p>
<div style="margin-bottom: 0;"> <div style="margin-bottom: 0;">
<p style="margin-bottom: 0;"> <p style="margin-bottom: 0;">
${translate("walletpage.wchange24")}: <span style="font-weight: bold;">${(this.dgbFeePerByte / 1e8).toFixed(8)} DGB</span><br>L${translate("walletpage.wchange25")} ${translate("walletpage.wchange24")}: <span style="font-weight: bold;">${(this.dgbFeePerByte / 1e8).toFixed(8)} DGB</span><br>${translate("walletpage.wchange25")}
</p> </p>
<paper-slider <paper-slider
class="blue" class="blue"
@ -1371,8 +1371,8 @@ class MultiWallet extends LitElement {
> >
</paper-slider> </paper-slider>
</div> </div>
<p style="color: red;">${this.errorMessage}</p> ${this.renderClearSuccess()}
<p style="color: green;">${this.successMessage}</p> ${this.renderClearError()}
${this.sendMoneyLoading ? html` <paper-progress indeterminate style="width: 100%; margin: 4px;"></paper-progress> ` : ''} ${this.sendMoneyLoading ? html` <paper-progress indeterminate style="width: 100%; margin: 4px;"></paper-progress> ` : ''}
<div class="buttons"> <div class="buttons">
<div> <div>
@ -1385,7 +1385,7 @@ class MultiWallet extends LitElement {
</div> </div>
<mwc-button <mwc-button
slot="primaryAction" slot="primaryAction"
dialogAction="cancel" @click="${() => this.closeDgbDialog()}"
class="red" class="red"
> >
${translate("general.close")} ${translate("general.close")}
@ -1433,7 +1433,7 @@ class MultiWallet extends LitElement {
</p> </p>
<div style="margin-bottom: 0;"> <div style="margin-bottom: 0;">
<p style="margin-bottom: 0;"> <p style="margin-bottom: 0;">
${translate("walletpage.wchange24")}: <span style="font-weight: bold;">${(this.rvnFeePerByte / 1e8).toFixed(8)} RVN</span><br>L${translate("walletpage.wchange25")} ${translate("walletpage.wchange24")}: <span style="font-weight: bold;">${(this.rvnFeePerByte / 1e8).toFixed(8)} RVN</span><br>${translate("walletpage.wchange25")}
</p> </p>
<paper-slider <paper-slider
class="blue" class="blue"
@ -1447,8 +1447,8 @@ class MultiWallet extends LitElement {
> >
</paper-slider> </paper-slider>
</div> </div>
<p style="color: red;">${this.errorMessage}</p> ${this.renderClearSuccess()}
<p style="color: green;">${this.successMessage}</p> ${this.renderClearError()}
${this.sendMoneyLoading ? html` <paper-progress indeterminate style="width: 100%; margin: 4px;"></paper-progress> ` : ''} ${this.sendMoneyLoading ? html` <paper-progress indeterminate style="width: 100%; margin: 4px;"></paper-progress> ` : ''}
<div class="buttons"> <div class="buttons">
<div> <div>
@ -1461,7 +1461,7 @@ class MultiWallet extends LitElement {
</div> </div>
<mwc-button <mwc-button
slot="primaryAction" slot="primaryAction"
dialogAction="cancel" @click="${() => this.closeRvnDialog()}"
class="red" class="red"
> >
${translate("general.close")} ${translate("general.close")}