From d10e07b67b29f6cec10b45d57e1d27f2544aac86 Mon Sep 17 00:00:00 2001
From: d11n <mail@dennisreimann.de>
Date: Wed, 24 Apr 2024 14:05:35 +0200
Subject: [PATCH] Pull payment QR scan fixes (#5950)

Updates the icon and fixes a JS error, in case the LNURL/Boltcard option isn't available.
---
 BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
index fbe2f0728..9a94be43c 100644
--- a/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
+++ b/BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml
@@ -58,7 +58,7 @@
                                         <select class="form-select w-auto" asp-for="SelectedPaymentMethod" asp-items="Model.PaymentMethods.Select(id => new SelectListItem(id.ToString(), id.ToString()))"></select>
                                     }
                                     <button type="button" class="btn btn-secondary only-for-js" data-bs-toggle="modal" data-bs-target="#scanModal" title="Scan destination with camera" id="scandestination-button">
-                                        <i class="fa fa-camera"></i>
+                                        <vc:icon symbol="scan-qr"/>
                                     </button>
                                 </div>
                             </div>
@@ -202,7 +202,7 @@
             </p>
 			@if (Model.LnurlEndpoint is not null)
 			{
-				<p id="BoltcardActions" style="visibility:hidden">
+				<p id="BoltcardActions">
 					<a id="SetupBoltcard" asp-action="SetupBoltcard" asp-controller="UIPullPayment" asp-route-pullPaymentId="@Model.Id" asp-route-command="configure-boltcard">
 						Setup Boltcard
 					</a>
@@ -229,11 +229,10 @@
 			const isAndroid = /(android)/i.test(navigator.userAgent);
 			if (isAndroid) {
 				document.getElementById("SetupBoltcard").setAttribute('target', '_blank');
-				document.getElementById("SetupBoltcard").setAttribute('href', @Safe.Json(@Model.SetupDeepLink));
+				document.getElementById("SetupBoltcard").setAttribute('href', @Safe.Json(Model.SetupDeepLink));
 				document.getElementById("ResetBoltcard").setAttribute('target', '_blank');
-				document.getElementById("ResetBoltcard").setAttribute('href', @Safe.Json(@Model.ResetDeepLink));
+				document.getElementById("ResetBoltcard").setAttribute('href', @Safe.Json(Model.ResetDeepLink));
 			}
-			document.getElementById("BoltcardActions").style.visibility = "visible";
 
             window.qrApp = initQRShow({});
             delegate('click', 'button[page-qr]', event => {