From de2e222ae5bfe56a9229f1868854bd01705f57ac Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Tue, 10 Dec 2019 18:58:12 +0900
Subject: [PATCH] Improve signing vault UI

---
 .../Views/Wallets/WalletSendVault.cshtml        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/BTCPayServer/Views/Wallets/WalletSendVault.cshtml b/BTCPayServer/Views/Wallets/WalletSendVault.cshtml
index 27536df33..31f868e98 100644
--- a/BTCPayServer/Views/Wallets/WalletSendVault.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletSendVault.cshtml
@@ -29,7 +29,7 @@
     <script src="~/js/vaultbridge.js" type="text/javascript" defer="defer"></script>
     <script src="~/js/vaultbridge.ui.js" type="text/javascript" defer="defer"></script>
     <script type="text/javascript">
-        $(function () {
+        async function askSign() {
             var websocketPath = $("#WebsocketPath").val();
             var loc = window.location, ws_uri;
             if (loc.protocol === "https:") {
@@ -43,15 +43,16 @@
             $("#vaultPlaceholder").html(html);
 
             var vaultUI = new vaultui.VaultBridgeUI(ws_uri);
-            vaultUI.askSignPSBT({
+            if (await vaultUI.askForDevice() && await vaultUI.askSignPSBT({
                 walletId: $("#WalletId").val(),
                 psbt: $("#PSBT").val()
-            }).then(function (ok) {
-                if (ok) {
-                    $("#PSBT").val(vaultUI.psbt);
-                    $("#broadcastForm").submit();
-                }
-            });
+            })) {
+                $("#PSBT").val(vaultUI.psbt);
+                $("#broadcastForm").submit();
+            }
+        }
+        $(function () {
+            askSign();
         });
     </script>
 }