From b68eae6f7d8977695757dc5c0b0cc3ac4ecaaec3 Mon Sep 17 00:00:00 2001
From: Dennis Reimann <mail@dennisreimann.de>
Date: Thu, 16 Dec 2021 14:43:29 +0100
Subject: [PATCH] Re-add status messages to pull payments and payout views

---
 .../StorePullPayments/NewPullPayment.cshtml    | 18 +++++++++---------
 .../Views/StorePullPayments/Payouts.cshtml     |  2 ++
 .../StorePullPayments/PullPayments.cshtml      |  2 ++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/BTCPayServer/Views/StorePullPayments/NewPullPayment.cshtml b/BTCPayServer/Views/StorePullPayments/NewPullPayment.cshtml
index 58a0599db..588c8a4d8 100644
--- a/BTCPayServer/Views/StorePullPayments/NewPullPayment.cshtml
+++ b/BTCPayServer/Views/StorePullPayments/NewPullPayment.cshtml
@@ -2,11 +2,11 @@
 @using BTCPayServer.Views.Stores
 @model BTCPayServer.Models.WalletViewModels.NewPullPaymentModel
 @{
-    Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["NavPartialName"] = "../Stores/_Nav";
     ViewData.SetActivePage(StoreNavPages.PullPayments, "New pull payment", Context.GetStoreData().StoreName);
 }
 
+<partial name="_StatusMessage" />
+
 <div class="row">
     <div class="col-md-6">
         <h4 class="mb-3">@ViewData["Title"]</h4>
@@ -16,18 +16,18 @@
               asp-action="NewPullPayment">
             <div class="form-group">
                 <label asp-for="Name" class="form-label"></label>
-                <input asp-for="Name" class="form-control" />
+                <input asp-for="Name" class="form-control"/>
                 <span asp-validation-for="Name" class="text-danger"></span>
             </div>
             <div class="row">
                 <div class="form-group col-8">
                     <label asp-for="Amount" class="form-label"></label>
-                    <input asp-for="Amount" class="form-control" />
+                    <input asp-for="Amount" class="form-control"/>
                     <span asp-validation-for="Amount" class="text-danger"></span>
                 </div>
                 <div class="form-group col-4">
                     <label asp-for="Currency" class="form-label"></label>
-                    <input asp-for="Currency" class="form-control" />
+                    <input asp-for="Currency" class="form-control"/>
                     <span asp-validation-for="Currency" class="text-danger"></span>
                 </div>
             </div>
@@ -52,7 +52,7 @@
                         <h2 class="accordion-header" id="additional-custom-css-header">
                             <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#additional-custom-css" aria-expanded="false" aria-controls="additional-custom-css">
                                 Custom CSS
-                                <vc:icon symbol="caret-down" />
+                                <vc:icon symbol="caret-down"/>
                             </button>
                         </h2>
                         <div id="additional-custom-css" class="accordion-collapse collapse" aria-labelledby="additional-custom-css-header">
@@ -62,7 +62,7 @@
                                     <a href="https://docs.btcpayserver.org/Development/Theme/#2-bootstrap-themes" target="_blank" rel="noreferrer noopener">
                                         <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
                                     </a>
-                                    <input asp-for="CustomCSSLink" class="form-control" />
+                                    <input asp-for="CustomCSSLink" class="form-control"/>
                                     <span asp-validation-for="CustomCSSLink" class="text-danger"></span>
                                 </div>
                                 <div class="form-group">
@@ -75,9 +75,9 @@
                     </div>
                 </div>
             </div>
-            
+
             <div class="form-group">
-                <input type="submit" value="Create" class="btn btn-primary" id="Create" />
+                <input type="submit" value="Create" class="btn btn-primary" id="Create"/>
             </div>
         </form>
     </div>
diff --git a/BTCPayServer/Views/StorePullPayments/Payouts.cshtml b/BTCPayServer/Views/StorePullPayments/Payouts.cshtml
index 237e23127..8724064cd 100644
--- a/BTCPayServer/Views/StorePullPayments/Payouts.cshtml
+++ b/BTCPayServer/Views/StorePullPayments/Payouts.cshtml
@@ -48,6 +48,8 @@
     </script>
 }
 
+<partial name="_StatusMessage" />
+
 <h2 class="mt-1 mb-4">@ViewData["Title"]</h2>
 
 <form method="post">
diff --git a/BTCPayServer/Views/StorePullPayments/PullPayments.cshtml b/BTCPayServer/Views/StorePullPayments/PullPayments.cshtml
index bec34e3d8..5612b3022 100644
--- a/BTCPayServer/Views/StorePullPayments/PullPayments.cshtml
+++ b/BTCPayServer/Views/StorePullPayments/PullPayments.cshtml
@@ -34,6 +34,8 @@
     </style>
 }
 
+<partial name="_StatusMessage" />
+
 <div class="d-flex align-items-center justify-content-between mb-2">
     <h2 class="mb-0">
         @ViewData["Title"]