From e144ccf9632dda146a514174eeb6759884c1d5cf Mon Sep 17 00:00:00 2001
From: QuickMythril <quickmythril@gmail.com>
Date: Mon, 9 May 2022 14:56:37 -0400
Subject: [PATCH] Update DGB/RVN to match master

Added some changes that were not applied to new-coins during the previous merge from the master branch.
---
 .../plugins/core/wallet/wallet-app.src.js        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js
index 7ce21df2..a7ec21e8 100644
--- a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js
+++ b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js
@@ -1357,7 +1357,7 @@ class MultiWallet extends LitElement {
                         </p>
                         <div 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>
                             <paper-slider
                                 class="blue"
@@ -1371,8 +1371,8 @@ class MultiWallet extends LitElement {
                             >
                             </paper-slider>
                         </div>
-                        <p style="color: red;">${this.errorMessage}</p>
-                        <p style="color: green;">${this.successMessage}</p>
+                        ${this.renderClearSuccess()}
+                        ${this.renderClearError()}
                         ${this.sendMoneyLoading ? html` <paper-progress indeterminate style="width: 100%; margin: 4px;"></paper-progress> ` : ''}
                         <div class="buttons">
                             <div>
@@ -1385,7 +1385,7 @@ class MultiWallet extends LitElement {
                     </div>
                     <mwc-button
                         slot="primaryAction"
-                        dialogAction="cancel"
+                        @click="${() => this.closeDgbDialog()}"
                         class="red"
                     >
                     ${translate("general.close")}
@@ -1433,7 +1433,7 @@ class MultiWallet extends LitElement {
                         </p>
                         <div 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>
                             <paper-slider
                                 class="blue"
@@ -1447,8 +1447,8 @@ class MultiWallet extends LitElement {
                             >
                             </paper-slider>
                         </div>
-                        <p style="color: red;">${this.errorMessage}</p>
-                        <p style="color: green;">${this.successMessage}</p>
+                        ${this.renderClearSuccess()}
+                        ${this.renderClearError()}
                         ${this.sendMoneyLoading ? html` <paper-progress indeterminate style="width: 100%; margin: 4px;"></paper-progress> ` : ''}
                         <div class="buttons">
                             <div>
@@ -1461,7 +1461,7 @@ class MultiWallet extends LitElement {
                     </div>
                     <mwc-button
                         slot="primaryAction"
-                        dialogAction="cancel"
+                        @click="${() => this.closeRvnDialog()}"
                         class="red"
                     >
                     ${translate("general.close")}