From 452915478bc61dac5167ad07afbdd75bcd0ba84e Mon Sep 17 00:00:00 2001
From: d11n <mail@dennisreimann.de>
Date: Tue, 20 Apr 2021 09:16:21 +0200
Subject: [PATCH] UI: Fix duplicate status messages (#2481)

The status message is included in the NavLayout, hence the pages that use this layout should not include the status message.

Fixes #2478.
---
 BTCPayServer/Views/Manage/APIKeys.cshtml                    | 2 --
 BTCPayServer/Views/Manage/AddApiKey.cshtml                  | 2 --
 BTCPayServer/Views/Manage/ChangePassword.cshtml             | 2 --
 BTCPayServer/Views/Manage/Index.cshtml                      | 2 --
 BTCPayServer/Views/Manage/NotificationSettings.cshtml       | 2 --
 BTCPayServer/Views/Manage/SetPassword.cshtml                | 2 --
 BTCPayServer/Views/Manage/U2FAuthentication.cshtml          | 2 --
 BTCPayServer/Views/Shared/Ethereum/UpdateChainConfig.cshtml | 3 +--
 BTCPayServer/Views/Wallets/NewPullPayment.cshtml            | 2 --
 9 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/BTCPayServer/Views/Manage/APIKeys.cshtml b/BTCPayServer/Views/Manage/APIKeys.cshtml
index dfc06931c..aa443b3ed 100644
--- a/BTCPayServer/Views/Manage/APIKeys.cshtml
+++ b/BTCPayServer/Views/Manage/APIKeys.cshtml
@@ -4,8 +4,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.APIKeys, "Manage your API Keys");
 }
 
-<partial name="_StatusMessage" />
-
 <p>
     The <a asp-controller="Home" asp-action="SwaggerDocs" target="_blank">BTCPay Server Greenfield API</a> offers programmatic access to your instance. You can manage your BTCPay
     Server (e.g. stores, invoices, users) as well as automate workflows and integrations (see <a href="https://docs.btcpayserver.org/GreenFieldExample/">use case examples</a>).
diff --git a/BTCPayServer/Views/Manage/AddApiKey.cshtml b/BTCPayServer/Views/Manage/AddApiKey.cshtml
index 84959950b..30eb9c9c0 100644
--- a/BTCPayServer/Views/Manage/AddApiKey.cshtml
+++ b/BTCPayServer/Views/Manage/AddApiKey.cshtml
@@ -7,8 +7,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.APIKeys, "Add API Key");
 }
 
-<partial name="_StatusMessage" />
-
 <h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
 <p>Generate a new api key to use BTCPay through its API.</p>
diff --git a/BTCPayServer/Views/Manage/ChangePassword.cshtml b/BTCPayServer/Views/Manage/ChangePassword.cshtml
index 588e20e1d..03a330e41 100644
--- a/BTCPayServer/Views/Manage/ChangePassword.cshtml
+++ b/BTCPayServer/Views/Manage/ChangePassword.cshtml
@@ -3,8 +3,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.ChangePassword, "Change password");
 }
 
-<partial name="_StatusMessage" />
-
 <div class="row">
     <div class="col-md-6">
         @if (!ViewContext.ModelState.IsValid)
diff --git a/BTCPayServer/Views/Manage/Index.cshtml b/BTCPayServer/Views/Manage/Index.cshtml
index 640baac10..a4a20c48c 100644
--- a/BTCPayServer/Views/Manage/Index.cshtml
+++ b/BTCPayServer/Views/Manage/Index.cshtml
@@ -3,8 +3,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.Index, "Profile");
 }
 
-<partial name="_StatusMessage" />
-
 <form method="post">
     @if (!ViewContext.ModelState.IsValid)
     {
diff --git a/BTCPayServer/Views/Manage/NotificationSettings.cshtml b/BTCPayServer/Views/Manage/NotificationSettings.cshtml
index 9831f4211..e7b39bcc3 100644
--- a/BTCPayServer/Views/Manage/NotificationSettings.cshtml
+++ b/BTCPayServer/Views/Manage/NotificationSettings.cshtml
@@ -5,8 +5,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.Notifications, "Notification preferences");
 }
 
-<partial name="_StatusMessage" />
-
 <form method="post" asp-action="NotificationSettings">
     @if (Model.All)
     {
diff --git a/BTCPayServer/Views/Manage/SetPassword.cshtml b/BTCPayServer/Views/Manage/SetPassword.cshtml
index 14edc279c..de37e8c52 100644
--- a/BTCPayServer/Views/Manage/SetPassword.cshtml
+++ b/BTCPayServer/Views/Manage/SetPassword.cshtml
@@ -3,8 +3,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.ChangePassword, "Set password");
 }
 
-<partial name="_StatusMessage" />
-
 <h4>Set your password</h4>
 
 <p class="text-info">
diff --git a/BTCPayServer/Views/Manage/U2FAuthentication.cshtml b/BTCPayServer/Views/Manage/U2FAuthentication.cshtml
index 26c6d6d07..34b0d1e69 100644
--- a/BTCPayServer/Views/Manage/U2FAuthentication.cshtml
+++ b/BTCPayServer/Views/Manage/U2FAuthentication.cshtml
@@ -3,8 +3,6 @@
     ViewData.SetActivePageAndTitle(ManageNavPages.U2F, "Registered U2F devices");
 }
 
-<partial name="_StatusMessage" />
-
 <form asp-action="AddU2FDevice" method="get">
     <table class="table table-lg mb-4">
         <thead>
diff --git a/BTCPayServer/Views/Shared/Ethereum/UpdateChainConfig.cshtml b/BTCPayServer/Views/Shared/Ethereum/UpdateChainConfig.cshtml
index f569c8d0f..23f445077 100644
--- a/BTCPayServer/Views/Shared/Ethereum/UpdateChainConfig.cshtml
+++ b/BTCPayServer/Views/Shared/Ethereum/UpdateChainConfig.cshtml
@@ -11,8 +11,7 @@
     ViewData.SetActivePageAndTitle(ServerNavPages.Policies, $"ETH Chain {Model.ChainId} Configuration");
 }
 
-<partial name="_StatusMessage"/>
-@if (!this.ViewContext.ModelState.IsValid)
+@if (!ViewContext.ModelState.IsValid)
 {
     <div asp-validation-summary="All" class="text-danger"></div>
 }
diff --git a/BTCPayServer/Views/Wallets/NewPullPayment.cshtml b/BTCPayServer/Views/Wallets/NewPullPayment.cshtml
index bd390f4e2..76b34ab97 100644
--- a/BTCPayServer/Views/Wallets/NewPullPayment.cshtml
+++ b/BTCPayServer/Views/Wallets/NewPullPayment.cshtml
@@ -48,8 +48,6 @@
         }
 </style>
 
-<partial name="_StatusMessage" />
-
 <div class="row">
     <div class="col-md-6">
         <h4 class="mb-3">@ViewData["Title"]</h4>