diff --git a/BTCPayServer.Tests/BTCPayServer.Tests.csproj b/BTCPayServer.Tests/BTCPayServer.Tests.csproj index 3d896a1cb..96ecd4425 100644 --- a/BTCPayServer.Tests/BTCPayServer.Tests.csproj +++ b/BTCPayServer.Tests/BTCPayServer.Tests.csproj @@ -12,6 +12,10 @@ $(DefineConstants);NETCOREAPP21 + + + $(DefineConstants);SHORT_TIME + diff --git a/BTCPayServer.Tests/Dockerfile b/BTCPayServer.Tests/Dockerfile index c3ff88e26..fc503a9ee 100644 --- a/BTCPayServer.Tests/Dockerfile +++ b/BTCPayServer.Tests/Dockerfile @@ -25,6 +25,6 @@ ENV SCREEN_HEIGHT 600 \ SCREEN_WIDTH 1200 COPY . . -RUN cd BTCPayServer.Tests && dotnet build +RUN cd BTCPayServer.Tests && dotnet build /p:CI_TESTS=true WORKDIR /source/BTCPayServer.Tests ENTRYPOINT ["./docker-entrypoint.sh"] diff --git a/BTCPayServer.Tests/TestUtils.cs b/BTCPayServer.Tests/TestUtils.cs index 2f2819fd1..561585cca 100644 --- a/BTCPayServer.Tests/TestUtils.cs +++ b/BTCPayServer.Tests/TestUtils.cs @@ -15,7 +15,7 @@ namespace BTCPayServer.Tests { public static class TestUtils { -#if DEBUG +#if DEBUG && !SHORT_TIMEOUT public const int TestTimeout = 600_000; #else public const int TestTimeout = 60_000; diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs index 4ec8334b0..1319528b3 100644 --- a/BTCPayServer/Controllers/StoresController.cs +++ b/BTCPayServer/Controllers/StoresController.cs @@ -574,7 +574,7 @@ namespace BTCPayServer.Controllers { return View("Confirm", new ConfirmModel() { - Action = "Delete this store", + Action = "Delete", Title = "Delete this store", Description = "This action is irreversible and will remove all information related to this store. (Invoices, Apps etc...)", ButtonClass = "btn-danger" @@ -637,7 +637,7 @@ namespace BTCPayServer.Controllers return NotFound(); return View("Confirm", new ConfirmModel() { - Action = "Revoke the token", + Action = "Revoke", Title = "Revoke the token", Description = $"The access token with the label \"{token.Label}\" will be revoked, do you wish to continue?", ButtonClass = "btn-danger" diff --git a/BTCPayServer/Views/Shared/Confirm.cshtml b/BTCPayServer/Views/Shared/Confirm.cshtml index 48323cb6c..9ed0f0707 100644 --- a/BTCPayServer/Views/Shared/Confirm.cshtml +++ b/BTCPayServer/Views/Shared/Confirm.cshtml @@ -1,26 +1,56 @@ @model ConfirmModel + +@inject BTCPayServer.HostedServices.NBXplorerDashboard dashboard +@inject BTCPayServer.HostedServices.CssThemeManager themeManager +@addTagHelper *, BundlerMinifier.TagHelpers @{ - Layout = "_Layout.cshtml"; + Layout = null; } -
-
-
-
-

@Model.Title

-
-

@Model.Description

+ + + + + + + + @if (themeManager.DiscourageSearchEngines) + { + + } + BTCPay Server + @* CSS *@ + + + + @* JS *@ + + + +
+
+
+

@Model.Title

+
+
+
+
+

@Model.Description

+
+
+ @if (!String.IsNullOrEmpty(Model.Action)) + { +
+
+
+ + +
+
+
+ }
- @if (!String.IsNullOrEmpty(Model.Action)) - { -
-
-
- -
-
-
- }
-
+ +