From 5afa847e6e69ebe7b4bacbb8b6542007fc0b96e4 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Thu, 21 Nov 2019 16:38:43 +0900
Subject: [PATCH] Fix sign transaction

---
 BTCPayServer/Views/Stores/AddDerivationScheme.cshtml  |  8 --------
 .../AddDerivationSchemes_HardwareWalletDialogs.cshtml |  4 +---
 BTCPayServer/Views/Wallets/WalletSendVault.cshtml     |  1 +
 BTCPayServer/wwwroot/js/vaultbridge.ui.js             |  4 +++-
 BTCPayServer/wwwroot/main/site.css                    | 11 +++++++++++
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
index e0782411a..ecb64bd98 100644
--- a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
+++ b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
@@ -9,14 +9,6 @@
         .hw-fields {
             display: none;
         }
-
-        .pin-button {
-            height: 135px;
-            margin-top: 20px;
-            background: white;
-            border: solid lightgray 4px;
-            cursor: pointer;
-        }
     </style>
 }
 
diff --git a/BTCPayServer/Views/Stores/AddDerivationSchemes_HardwareWalletDialogs.cshtml b/BTCPayServer/Views/Stores/AddDerivationSchemes_HardwareWalletDialogs.cshtml
index ea099b353..47e928799 100644
--- a/BTCPayServer/Views/Stores/AddDerivationSchemes_HardwareWalletDialogs.cshtml
+++ b/BTCPayServer/Views/Stores/AddDerivationSchemes_HardwareWalletDialogs.cshtml
@@ -108,9 +108,7 @@
                     </div>
                 </div>
 
-                <button id="vault-confirm" class="btn btn-primary" style="display:none;" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    Confirm pin code
-                </button>
+                <button id="vault-confirm" class="btn btn-primary" style="display:none;" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
             </div>
         </form>
     </div>
diff --git a/BTCPayServer/Views/Wallets/WalletSendVault.cshtml b/BTCPayServer/Views/Wallets/WalletSendVault.cshtml
index b392ce2f4..21b94c46d 100644
--- a/BTCPayServer/Views/Wallets/WalletSendVault.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletSendVault.cshtml
@@ -18,6 +18,7 @@
             <input type="hidden" asp-for="WebsocketPath" />
         </form>
         <div id="vaultPlaceholder"></div>
+        <button id="vault-confirm" class="btn btn-primary" style="display:none;" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
     </div>
 </div>
 
diff --git a/BTCPayServer/wwwroot/js/vaultbridge.ui.js b/BTCPayServer/wwwroot/js/vaultbridge.ui.js
index b273ba453..9f58cebe8 100644
--- a/BTCPayServer/wwwroot/js/vaultbridge.ui.js
+++ b/BTCPayServer/wwwroot/js/vaultbridge.ui.js
@@ -184,6 +184,7 @@ var vaultui = (function () {
             show(VaultFeedbacks.needPin);
             $("#pin-input").css("display", "block");
             $("#vault-confirm").css("display", "block");
+            $("#vault-confirm").text("Confirm the pin code");
             return new Promise(function (resolve, reject) {
                 var pinCode = "";
                 $("#vault-confirm").click(async function () {
@@ -213,11 +214,12 @@ var vaultui = (function () {
             show(VaultFeedbacks.needPassphrase);
             $("#passphrase-input").css("display", "block");
             $("#vault-confirm").css("display", "block");
+            $("#vault-confirm").text("Confirm the passphrase");
             return new Promise(function (resolve, reject) {
                 $("#vault-confirm").click(async function () {
                     var passphrase = $("#Password").val();
                     if (passphrase !== $("#PasswordConfirmation").val()) {
-                        show("invalid-password-confirm");
+                        show(VaultFeedbacks.invalidPasswordConfirmation);
                         return;
                     }
                     $("#passphrase-input").css("display", "none");
diff --git a/BTCPayServer/wwwroot/main/site.css b/BTCPayServer/wwwroot/main/site.css
index bce831524..cf6709325 100644
--- a/BTCPayServer/wwwroot/main/site.css
+++ b/BTCPayServer/wwwroot/main/site.css
@@ -136,3 +136,14 @@ pre {
 .feedback-icon-failed {
     color: red;
 }
+.pin-button {
+    height: 135px;
+    margin-top: 20px;
+    background-color: white;
+    border: solid lightgray 4px;
+    cursor: pointer;
+}
+
+    .pin-button:hover {
+        background-color: lightgray;
+    }