From cbec44bb73b36fd308006ad48b51c6742c855c06 Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Sun, 30 May 2021 10:38:21 +0200
Subject: [PATCH] Fix QR Code shower

---
 BTCPayServer/Views/Manage/APIKeys.cshtml         |  6 ++----
 BTCPayServer/Views/Shared/ShowQR.cshtml          |  2 --
 BTCPayServer/Views/Wallets/WalletSettings.cshtml | 13 ++++---------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/BTCPayServer/Views/Manage/APIKeys.cshtml b/BTCPayServer/Views/Manage/APIKeys.cshtml
index 2cf0a70c7..a5256e868 100644
--- a/BTCPayServer/Views/Manage/APIKeys.cshtml
+++ b/BTCPayServer/Views/Manage/APIKeys.cshtml
@@ -84,10 +84,8 @@
 }
 
 @section PageFootContent {
-<script src="~/vendor/vuejs/vue.min.js" asp-append-version="true"></script>
-<script src="~/vendor/vue-qrcode/vue-qrcode.min.js" asp-append-version="true"></script>
-<script src="~/vendor/bc-ur/web-bundle.js" asp-append-version="true"></script>
-<script src="~/vendor/vue-qrcode-reader/vue-qrcode-reader.browser.js" asp-append-version="true"></script>
+
+<bundle name="wwwroot/bundles/camera-bundle.min.js"></bundle>
 <script src="~/js/copy-to-clipboard.js" asp-append-version="true"></script>
 <script>
     document.addEventListener("DOMContentLoaded", function () {
diff --git a/BTCPayServer/Views/Shared/ShowQR.cshtml b/BTCPayServer/Views/Shared/ShowQR.cshtml
index fed6d2051..37df2c823 100644
--- a/BTCPayServer/Views/Shared/ShowQR.cshtml
+++ b/BTCPayServer/Views/Shared/ShowQR.cshtml
@@ -21,7 +21,6 @@
         </div>
     </div>
 </div>
-@section PageFootContent {
 <script>
  function initQRShow(title, data, modalId)
  {
@@ -109,4 +108,3 @@
  	});
  }
  </script>
-}
diff --git a/BTCPayServer/Views/Wallets/WalletSettings.cshtml b/BTCPayServer/Views/Wallets/WalletSettings.cshtml
index 725b465d8..c2d54aab2 100644
--- a/BTCPayServer/Views/Wallets/WalletSettings.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletSettings.cshtml
@@ -51,7 +51,7 @@
                     </div>
                     <div class="form-group col-auto">
                         <label asp-for="@Model.AccountKeys[i].AccountKeyPath" class="form-label"></label>
-                        <input asp-for="@Model.AccountKeys[i].AccountKeyPath" class="form-control" style="max-width:16ch;" />
+                        <input asp-for="@Model.AccountKeys[i].AccountKeyPath" class="form-control" style="max-width:16ch;"/>
                         <span asp-validation-for="@Model.AccountKeys[i].AccountKeyPath" class="text-danger"></span>
                     </div>
                 </div>
@@ -86,7 +86,9 @@
     </div>
 </div>
 
+<partial name="ShowQR"/>
 @section PageHeadContent {
+    <bundle name="wwwroot/bundles/camera-bundle.min.js"></bundle>
     <link href="~/vendor/vue-qrcode-reader/vue-qrcode-reader.css" rel="stylesheet" asp-append-version="true"/>
     <style>
         .register-wallet{ display: none; }
@@ -94,12 +96,8 @@
 }
 
 @section PageFootContent {
-    <script src="~/vendor/vuejs/vue.min.js" asp-append-version="true"></script>
-    <script src="~/vendor/vue-qrcode/vue-qrcode.min.js" asp-append-version="true"></script>
-    <script src="~/vendor/bc-ur/web-bundle.js" asp-append-version="true"></script>
-    <script src="~/vendor/vue-qrcode-reader/vue-qrcode-reader.browser.js" asp-append-version="true"></script>
     <script>
-        var wallets = @Safe.Json(Model.AccountKeys.Select(model =>  Encoders.Hex.EncodeData(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(model, Formatting.None)))));
+        var wallets = @Safe.Json(Model.AccountKeys.Select(model => Encoders.Hex.EncodeData(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(model, Formatting.None)))));
         document.addEventListener("DOMContentLoaded", function () {     
             var qrApp = initQRShow("Wallet QR", "", "scan-qr-modal");
             $("button[data-wallet]").on("click", function (){
@@ -124,6 +122,3 @@
     </script>
 }
 
-<partial name="ShowQR"/>
-
-