bump

Add policy to discourage search engines + build robots.txt dynamcally

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Report a problem
+about: File a technical problem or report a bug
+---
+
+**Describe the problem/bug**
+A clear and concise description of what the bug is.
+
+**Your environment**
+* Version of BTCPay Server:
+* Deployment method: 
+* Other relevant environment details:
+
+**Logs (if applicable)**
+Basic logs can be found in Server Settings > Logs.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Actual behavior**
+Tell us what happens instead
+
+**Screenshots/Links**
+If applicable, add screenshots or links to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Ideas and feature requests
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Provide examples**
+If applicable provide examples, wireframes, sketches or images to better explain your idea.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

BTCPayServer.Tests/BTCPayServerTester.cs

@@ -129,6 +129,7 @@ namespace BTCPayServer.Tests
                     {
                         s.AddLogging(l =>
                         {
+                            l.AddFilter("System.Net.Http.HttpClient", LogLevel.Critical);
                             l.SetMinimumLevel(LogLevel.Information)
                             .AddFilter("Microsoft", LogLevel.Error)
                             .AddFilter("Hangfire", LogLevel.Error)

BTCPayServer.Tests/ChangellyTests.cs

@@ -218,7 +218,7 @@ namespace BTCPayServer.Tests
                     tester.NetworkProvider, fetcher);
                 changellyController.IsTest = true;
                 Assert.IsType<decimal>(Assert
-                    .IsType<OkObjectResult>(await changellyController.CalculateAmount(user.StoreId, "ltc", "btc", 1.0m))
+                    .IsType<OkObjectResult>(await changellyController.CalculateAmount(user.StoreId, "ltc", "btc", 1.0m, default))
                     .Value);
             }
         }

BTCPayServer.Tests/CrowdfundTests.cs

@@ -109,7 +109,7 @@ namespace BTCPayServer.Tests
                 Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(appId, new ContributeToCrowdfund()
                 {
                     Amount = new decimal(0.01)
-                }));
+                }, default));
                 
                 Assert.IsType<NotFoundResult>(await anonAppPubsController.ViewCrowdfund(appId, string.Empty));
                 
@@ -118,7 +118,7 @@ namespace BTCPayServer.Tests
                 {
                     RedirectToCheckout = false,
                     Amount = new decimal(0.01)
-                }));
+                }, default));
                 Assert.IsType<ViewResult>(await publicApps.ViewCrowdfund(appId, string.Empty));
                 Assert.IsType<NotFoundResult>(await anonAppPubsController.ViewCrowdfund(appId, string.Empty));
                 
@@ -130,7 +130,7 @@ namespace BTCPayServer.Tests
                 Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(appId, new ContributeToCrowdfund()
                 {
                     Amount = new decimal(0.01)
-                }));
+                }, default));
                 
                 //Scenario 4: Enabled But End Date < Now - Not Allowed
                 
@@ -142,7 +142,7 @@ namespace BTCPayServer.Tests
                 Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(appId, new ContributeToCrowdfund()
                 {
                     Amount = new decimal(0.01)
-                }));
+                }, default));
                 
                 
                 //Scenario 5: Enabled and within correct timeframe, however target is enforced and Amount is Over - Not Allowed
@@ -156,13 +156,13 @@ namespace BTCPayServer.Tests
                 Assert.IsType<NotFoundObjectResult>(await anonAppPubsController.ContributeToCrowdfund(appId, new ContributeToCrowdfund()
                 {
                     Amount = new decimal(1.01)
-                }));
+                }, default));
                 
                 //Scenario 6: Allowed
                 Assert.IsType<OkObjectResult>(await anonAppPubsController.ContributeToCrowdfund(appId, new ContributeToCrowdfund()
                 {
                     Amount = new decimal(0.05)
-                }));
+                }, default));
                 
             }
         }

BTCPayServer.Tests/Mocks/MockRateProvider.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using BTCPayServer.Services.Rates;
@@ -10,7 +11,7 @@ namespace BTCPayServer.Tests.Mocks
     public class MockRateProvider : IRateProvider
     {
         public ExchangeRates ExchangeRates { get; set; } = new ExchangeRates();
-        public Task<ExchangeRates> GetRatesAsync()
+        public Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
             return Task.FromResult(ExchangeRates);
         }

BTCPayServer.Tests/UnitTest1.cs

@@ -589,7 +589,7 @@ namespace BTCPayServer.Tests
             Assert.True(RateRules.TryParse("X_X=kraken(X_BTC) * kraken(BTC_X)", out var rule));
             foreach (var pair in new[] { "DOGE_USD", "DOGE_CAD", "DASH_CAD", "DASH_USD", "DASH_EUR" })
             {
-                var result = fetcher.FetchRate(CurrencyPair.Parse(pair), rule).GetAwaiter().GetResult();
+                var result = fetcher.FetchRate(CurrencyPair.Parse(pair), rule, default).GetAwaiter().GetResult();
                 Assert.NotNull(result.BidAsk);
                 Assert.Empty(result.Errors);
             }
@@ -718,20 +718,32 @@ namespace BTCPayServer.Tests
                 acc.RegisterDerivationScheme("LTC");
 
                 var rateController = acc.GetController<RateController>();
-                var GetBaseCurrencyRatesResult = JObject.Parse(((JsonResult)rateController.GetBaseCurrencyRates("BTC", acc.StoreId)
+                var GetBaseCurrencyRatesResult = JObject.Parse(((JsonResult)rateController.GetBaseCurrencyRates("BTC", acc.StoreId, default)
                     .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
                 Assert.NotNull(GetBaseCurrencyRatesResult);
                 Assert.NotNull(GetBaseCurrencyRatesResult.Data);
                 Assert.Equal(2, GetBaseCurrencyRatesResult.Data.Length);
                 Assert.Single(GetBaseCurrencyRatesResult.Data.Where(o => o.Code == "LTC"));
 
-                var GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, acc.StoreId)
+                var GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, acc.StoreId, default)
                     .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
+                // We don't have any default currencies, so this should be failing
+                Assert.Null(GetRatesResult?.Data);
+
+                var store = acc.GetController<StoresController>();
+                var ratesVM = (RatesViewModel)(Assert.IsType<ViewResult>(store.Rates(acc.StoreId)).Model);
+                ratesVM.DefaultCurrencyPairs = "BTC_USD,LTC_USD";
+                store.Rates(ratesVM).Wait();
+                store = acc.GetController<StoresController>();
+                rateController = acc.GetController<RateController>();
+                GetRatesResult = JObject.Parse(((JsonResult)rateController.GetRates(null, acc.StoreId, default)
+                    .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate[]>>();
+                // Now we should have a result
                 Assert.NotNull(GetRatesResult);
                 Assert.NotNull(GetRatesResult.Data);
                 Assert.Equal(2, GetRatesResult.Data.Length);
 
-                var GetCurrencyPairRateResult = JObject.Parse(((JsonResult)rateController.GetCurrencyPairRate("BTC", "LTC", acc.StoreId)
+                var GetCurrencyPairRateResult = JObject.Parse(((JsonResult)rateController.GetCurrencyPairRate("BTC", "LTC", acc.StoreId, default)
                     .GetAwaiter().GetResult()).Value.ToJson()).ToObject<DataWrapper<Rate>>();
 
                 Assert.NotNull(GetCurrencyPairRateResult);
@@ -1006,7 +1018,7 @@ namespace BTCPayServer.Tests
         private static decimal CreateInvoice(ServerTester tester, TestAccount user, string exchange, string currency = "USD")
         {
             var storeController = user.GetController<StoresController>();
-            var vm = (RatesViewModel)((ViewResult)storeController.Rates()).Model;
+            var vm = (RatesViewModel)((ViewResult)storeController.Rates(user.StoreId)).Model;
             vm.PreferredExchange = exchange;
             storeController.Rates(vm).Wait();
             var invoice2 = user.BitPay.CreateInvoice(new Invoice()
@@ -1044,7 +1056,7 @@ namespace BTCPayServer.Tests
                 Assert.Equal(Money.Coins(1.0m), invoice1.BtcPrice);
 
                 var storeController = user.GetController<StoresController>();
-                var vm = (RatesViewModel)((ViewResult)storeController.Rates()).Model;
+                var vm = (RatesViewModel)((ViewResult)storeController.Rates(user.StoreId)).Model;
                 Assert.Equal(0.0, vm.Spread);
                 vm.Spread = 40;
                 storeController.Rates(vm).Wait();
@@ -1143,7 +1155,7 @@ namespace BTCPayServer.Tests
                 user.RegisterDerivationScheme("BTC");
 
                 var store = user.GetController<StoresController>();
-                var rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
+                var rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(user.StoreId)).Model);
                 Assert.False(rateVm.ShowScripting);
                 Assert.Equal("coinaverage", rateVm.PreferredExchange);
                 Assert.Equal(0.0, rateVm.Spread);
@@ -1151,7 +1163,7 @@ namespace BTCPayServer.Tests
 
                 rateVm.PreferredExchange = "bitflyer";
                 Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
-                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
+                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(user.StoreId)).Model);
                 Assert.Equal("bitflyer", rateVm.PreferredExchange);
 
                 rateVm.ScriptTest = "BTC_JPY,BTC_CAD";
@@ -1168,7 +1180,8 @@ namespace BTCPayServer.Tests
                 Assert.IsType<RedirectToActionResult>(store.ShowRateRulesPost(true).Result);
                 Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
                 store = user.GetController<StoresController>();
-                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
+                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(user.StoreId)).Model);
+                Assert.Equal(rateVm.StoreId, user.StoreId);
                 Assert.Equal(rateVm.DefaultScript, rateVm.Script);
                 Assert.True(rateVm.ShowScripting);
                 rateVm.ScriptTest = "BTC_JPY";
@@ -1185,7 +1198,7 @@ namespace BTCPayServer.Tests
                 Assert.True(rateVm.TestRateRules.All(t => !t.Error));
                 Assert.IsType<RedirectToActionResult>(store.Rates(rateVm, "Save").Result);
                 store = user.GetController<StoresController>();
-                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates()).Model);
+                rateVm = Assert.IsType<RatesViewModel>(Assert.IsType<ViewResult>(store.Rates(user.StoreId)).Model);
                 Assert.Equal(50, rateVm.Spread);
                 Assert.True(rateVm.ShowScripting);
                 Assert.Contains("DOGE_X", rateVm.Script, StringComparison.OrdinalIgnoreCase);
@@ -2239,7 +2252,7 @@ donation:
             foreach (var result in factory
                 .Providers
                 .Where(p => p.Value is BackgroundFetcherRateProvider)
-                .Select(p => (ExpectedName: p.Key, ResultAsync: p.Value.GetRatesAsync(), Fetcher: (BackgroundFetcherRateProvider)p.Value))
+                .Select(p => (ExpectedName: p.Key, ResultAsync: p.Value.GetRatesAsync(default), Fetcher: (BackgroundFetcherRateProvider)p.Value))
                 .ToList())
             {
                 Logs.Tester.LogInformation($"Testing {result.ExpectedName}");
@@ -2256,12 +2269,13 @@ donation:
                 Assert.Contains(exchangeRates.ByExchange[result.ExpectedName],
                         e => (e.CurrencyPair == new CurrencyPair("BTC", "USD") ||
                                e.CurrencyPair == new CurrencyPair("BTC", "EUR") ||
-                               e.CurrencyPair == new CurrencyPair("BTC", "USDT"))
+                               e.CurrencyPair == new CurrencyPair("BTC", "USDT") ||
+                               e.CurrencyPair == new CurrencyPair("BTC", "CAD"))
                                && e.BidAsk.Bid > 1.0m // 1BTC will always be more than 1USD
                                );
             }
             // Kraken emit one request only after first GetRates
-            factory.Providers["kraken"].GetRatesAsync().GetAwaiter().GetResult();
+            factory.Providers["kraken"].GetRatesAsync(default).GetAwaiter().GetResult();
         }
 
         [Fact]
@@ -2277,7 +2291,7 @@ donation:
                     .ToHashSet();
 
             var rules = new StoreBlob().GetDefaultRateRules(provider);
-            var result = fetcher.FetchRates(pairs, rules);
+            var result = fetcher.FetchRates(pairs, rules, default);
             foreach (var value in result)
             {
                 var rateResult = value.Value.GetAwaiter().GetResult();
@@ -2299,7 +2313,7 @@ donation:
         class SpyRateProvider : IRateProvider
         {
             public bool Hit { get; set; }
-            public Task<ExchangeRates> GetRatesAsync()
+            public Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
             {
                 Hit = true;
                 var rates = new ExchangeRates();
@@ -2406,47 +2420,47 @@ donation:
 
             var fetcher = new RateFetcher(factory);
 
-            var fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            var fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertHit();
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertNotHit();
 
             Thread.Sleep(3000);
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertHit();
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertNotHit();
             // Should cache at exchange level so this should hit the cache
-            var fetchedRate2 = fetcher.FetchRate(CurrencyPair.Parse("LTC_USD"), rateRules).GetAwaiter().GetResult();
+            var fetchedRate2 = fetcher.FetchRate(CurrencyPair.Parse("LTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertNotHit();
             Assert.Null(fetchedRate2.BidAsk);
             Assert.Equal(RateRulesErrors.RateUnavailable, fetchedRate2.Errors.First());
 
             // Should cache at exchange level this should not hit the cache as it is different exchange
             RateRules.TryParse("X_X = bittrex(X_X);", out rateRules);
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertHit();
 
             factory.Providers.Clear();
             var fetch = new BackgroundFetcherRateProvider(spy);
             fetch.DoNotAutoFetchIfExpired = true;
             factory.Providers.Add("bittrex", fetch);
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertHit();
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertNotHit();
-            fetch.UpdateIfNecessary().GetAwaiter().GetResult();
+            fetch.UpdateIfNecessary(default).GetAwaiter().GetResult();
             spy.AssertNotHit();
             fetch.RefreshRate = TimeSpan.FromSeconds(1.0);
             Thread.Sleep(1020);
-            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules).GetAwaiter().GetResult();
+            fetchedRate = fetcher.FetchRate(CurrencyPair.Parse("BTC_USD"), rateRules, default).GetAwaiter().GetResult();
             spy.AssertNotHit();
             fetch.ValidatyTime = TimeSpan.FromSeconds(1.0);
-            fetch.UpdateIfNecessary().GetAwaiter().GetResult();
+            fetch.UpdateIfNecessary(default).GetAwaiter().GetResult();
             spy.AssertHit();
-            fetch.GetRatesAsync().GetAwaiter().GetResult();
+            fetch.GetRatesAsync(default).GetAwaiter().GetResult();
             Thread.Sleep(1000);
-            Assert.Throws<InvalidOperationException>(() => fetch.GetRatesAsync().GetAwaiter().GetResult());
+            Assert.Throws<InvalidOperationException>(() => fetch.GetRatesAsync(default).GetAwaiter().GetResult());
         }
 
         [Fact]

BTCPayServer.Tests/docker-compose.yml

@@ -69,7 +69,7 @@ services:
 
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.0.0.8
+    image: nicolasdorier/nbxplorer:2.0.0.15
     restart: unless-stopped
     ports:
       - "32838:32838"
@@ -119,7 +119,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v0.6.2-dev
+    image: btcpayserver/lightning:v0.7.0-1-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment: 
@@ -165,7 +165,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v0.6.2-dev
+    image: btcpayserver/lightning:v0.7.0-1-dev
     stop_signal: SIGKILL
     environment: 
       EXPOSE_TCP: "true"

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.3.77</Version>
+		<Version>1.0.3.84</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -33,7 +33,7 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.9" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.13" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
     <PackageReference Include="HtmlSanitizer" Version="4.0.199" />
@@ -45,10 +45,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NBitcoin" Version="4.1.1.84" />
+    <PackageReference Include="NBitcoin" Version="4.1.1.86" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.32" />	  
     <PackageReference Include="DBreeze" Version="1.92.0" />
-    <PackageReference Include="NBXplorer.Client" Version="2.0.0.4" />
+    <PackageReference Include="NBXplorer.Client" Version="2.0.0.5" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
     <PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.3" />

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -32,7 +32,6 @@ namespace BTCPayServer.Configuration
             app.Option("--chains | -c", $"Chains to support as a comma separated (default: btc; available: {chains})", CommandOptionType.SingleValue);
             app.Option("--postgres", $"Connection string to a PostgreSQL database (default: SQLite)", CommandOptionType.SingleValue);
             app.Option("--mysql", $"Connection string to a MySQL database (default: SQLite)", CommandOptionType.SingleValue);
-            app.Option("--externalurl", $"The expected external URL of this service, to use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
             app.Option("--externalservices", $"Links added to external services inside Server Settings / Services under the format service1:path2;service2:path2.(default: empty)", CommandOptionType.SingleValue);
             app.Option("--bundlejscss", $"Bundle JavaScript and CSS files for better performance (default: true)", CommandOptionType.SingleValue);
             app.Option("--rootpath", "The root path in the URL to access BTCPay (default: /)", CommandOptionType.SingleValue);

BTCPayServer/Controllers/AccessTokenController.cs

@@ -35,6 +35,8 @@ namespace BTCPayServer.Controllers
         [AllowAnonymous]
         public async Task<DataWrapper<List<PairingCodeResponse>>> Tokens([FromBody] TokenRequest request)
         {
+            if (request == null)
+                throw new BitpayHttpException(400, "The request body is missing");
             PairingCodeEntity pairingEntity = null;
             if (string.IsNullOrEmpty(request.PairingCode))
             {

BTCPayServer/Controllers/AppsController.Crowdfund.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
@@ -56,7 +57,9 @@ namespace BTCPayServer.Controllers
                 AppId = appId,
                 SearchTerm = app.TagAllInvoices ? $"storeid:{app.StoreDataId}" : $"orderid:{AppService.GetCrowdfundOrderId(appId)}",
                 DisplayPerksRanking = settings.DisplayPerksRanking,
-                SortPerksByPopularity = settings.SortPerksByPopularity
+                SortPerksByPopularity = settings.SortPerksByPopularity,
+                Sounds                = string.Join(Environment.NewLine, settings.Sounds),
+                AnimationColors                = string.Join(Environment.NewLine, settings.AnimationColors)
             };
             return View(vm);
         }
@@ -90,6 +93,24 @@ namespace BTCPayServer.Controllers
             {
                 ModelState.AddModelError(nameof(vm.DisplayPerksRanking), "You must sort by popularity in order to display ranking.");
             }
+
+            var parsedSounds = vm.Sounds.Split(
+                new[] {"\r\n", "\r", "\n"},
+                StringSplitOptions.None
+            ).Select(s => s.Trim()).ToArray();
+            if (vm.SoundsEnabled && !parsedSounds.Any())
+            {
+                ModelState.AddModelError(nameof(vm.Sounds), "You must have at least one sound if you enable sounds");
+            }
+            
+            var parsedAnimationColors = vm.AnimationColors.Split(
+                new[] { "\r\n", "\r", "\n" },
+                StringSplitOptions.None
+            ).Select(s => s.Trim()).ToArray();
+            if (vm.AnimationsEnabled && !parsedAnimationColors.Any())
+            {
+                ModelState.AddModelError(nameof(vm.AnimationColors), "You must have at least one animation color if you enable animations");
+            }
             
             if (!ModelState.IsValid)
             {
@@ -124,7 +145,9 @@ namespace BTCPayServer.Controllers
                 ResetEveryAmount = vm.ResetEveryAmount,
                 ResetEvery = Enum.Parse<CrowdfundResetEvery>(vm.ResetEvery),
                 DisplayPerksRanking = vm.DisplayPerksRanking,
-                SortPerksByPopularity = vm.SortPerksByPopularity
+                SortPerksByPopularity = vm.SortPerksByPopularity,
+                Sounds = parsedSounds,
+                AnimationColors = parsedAnimationColors
             };
 
             app.TagAllInvoices = vm.UseAllStoreInvoices;

BTCPayServer/Controllers/AppsController.cs

@@ -84,7 +84,7 @@ namespace BTCPayServer.Controllers
                 StatusMessage = new StatusMessageModel()
                 {
                     Html =
-                        $"Error: You must have created at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
+                        $"Error: You need to create at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
                     Severity = StatusMessageModel.StatusSeverity.Error
                 }.ToString();
                 return RedirectToAction(nameof(ListApps));
@@ -104,7 +104,7 @@ namespace BTCPayServer.Controllers
                 StatusMessage = new StatusMessageModel()
                 {
                     Html =
-                        $"Error: You must have created at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
+                        $"Error: You need to create at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
                     Severity = StatusMessageModel.StatusSeverity.Error
                 }.ToString();
                 return RedirectToAction(nameof(ListApps));

BTCPayServer/Controllers/AppsPublicController.cs

@@ -5,6 +5,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Security.Claims;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Filters;
@@ -108,11 +109,13 @@ namespace BTCPayServer.Controllers
 
                 return NotFound("A Target Currency must be set for this app in order to be loadable.");
             }
-            if (settings.Enabled) return View(await _AppService.GetAppInfo(appId));
+            var appInfo = (ViewCrowdfundViewModel)(await _AppService.GetAppInfo(appId));
+            appInfo.HubPath = AppHub.GetHubPath(this.Request);
+            if (settings.Enabled) return View(appInfo);
             if(!isAdmin)
                 return NotFound();
 
-            return View(await _AppService.GetAppInfo(appId));
+            return View(appInfo);
         }
 
         [HttpPost]
@@ -120,7 +123,7 @@ namespace BTCPayServer.Controllers
         [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         [IgnoreAntiforgeryToken]
         [EnableCors(CorsPolicies.All)]
-        public async Task<IActionResult> ContributeToCrowdfund(string appId, ContributeToCrowdfund request)
+        public async Task<IActionResult> ContributeToCrowdfund(string appId, ContributeToCrowdfund request, CancellationToken cancellationToken)
         {
             var app = await _AppService.GetApp(appId, AppType.Crowdfund, true);
 
@@ -131,14 +134,12 @@ namespace BTCPayServer.Controllers
 
             var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
 
-            if (!settings.Enabled)
-            {
-                if (!isAdmin)
-                    return NotFound("Crowdfund is not currently active");
+            if (!settings.Enabled && !isAdmin) {
+                return NotFound("Crowdfund is not currently active");
             }
 
             var info = (ViewCrowdfundViewModel)await _AppService.GetAppInfo(appId);
-
+            info.HubPath = AppHub.GetHubPath(this.Request);
             if (!isAdmin &&
                 ((settings.StartDate.HasValue && DateTime.Now < settings.StartDate) ||
                  (settings.EndDate.HasValue && DateTime.Now > settings.EndDate) ||
@@ -186,7 +187,7 @@ namespace BTCPayServer.Controllers
                     FullNotifications = true,
                     ExtendedNotifications = true,
                     RedirectURL = request.RedirectUrl ?? Request.GetDisplayUrl()
-                }, store, HttpContext.Request.GetAbsoluteRoot(), new List<string> { AppService.GetAppInternalTag(appId) });
+                }, store, HttpContext.Request.GetAbsoluteRoot(), new List<string> { AppService.GetAppInternalTag(appId) }, cancellationToken: cancellationToken);
                 if (request.RedirectToCheckout)
                 {
                     return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice",
@@ -216,7 +217,7 @@ namespace BTCPayServer.Controllers
                                                         string notificationUrl,
                                                         string redirectUrl,
                                                         string choiceKey,
-                                                        string posData = null)
+                                                        string posData = null, CancellationToken cancellationToken = default)
         {
             var app = await _AppService.GetApp(appId, AppType.PointOfSale);
             if (string.IsNullOrEmpty(choiceKey) && amount <= 0)
@@ -265,7 +266,7 @@ namespace BTCPayServer.Controllers
                 RedirectURL = redirectUrl  ?? Request.GetDisplayUrl(),
                 FullNotifications = true,
                 PosData = string.IsNullOrEmpty(posData) ? null : posData
-            }, store, HttpContext.Request.GetAbsoluteRoot());
+            }, store, HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
             return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });
         }
         

BTCPayServer/Controllers/ChangellyController.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Models;
 using BTCPayServer.Payments.Changelly;
@@ -48,7 +49,7 @@ namespace BTCPayServer.Controllers
         [HttpGet]
         [Route("calculate")]
         public async Task<IActionResult> CalculateAmount(string storeId, string fromCurrency, string toCurrency,
-            decimal toCurrencyAmount)
+            decimal toCurrencyAmount, CancellationToken cancellationToken)
         {
             try
             {
@@ -57,7 +58,7 @@ namespace BTCPayServer.Controllers
                 if (fromCurrency.Equals("usd", StringComparison.InvariantCultureIgnoreCase)
                     || fromCurrency.Equals("eur", StringComparison.InvariantCultureIgnoreCase))
                 {
-                    return await HandleCalculateFiatAmount(fromCurrency, toCurrency, toCurrencyAmount);
+                    return await HandleCalculateFiatAmount(fromCurrency, toCurrency, toCurrencyAmount, cancellationToken);
                 }
                 
                 var callCounter = 0;
@@ -102,11 +103,11 @@ namespace BTCPayServer.Controllers
         }
 
         private async Task<IActionResult> HandleCalculateFiatAmount(string fromCurrency, string toCurrency,
-            decimal toCurrencyAmount)
+            decimal toCurrencyAmount, CancellationToken cancellationToken)
         {
             var store = HttpContext.GetStoreData();
             var rules = store.GetStoreBlob().GetRateRules(_btcPayNetworkProvider);
-            var rate = await _RateProviderFactory.FetchRate(new CurrencyPair(toCurrency, fromCurrency), rules);
+            var rate = await _RateProviderFactory.FetchRate(new CurrencyPair(toCurrency, fromCurrency), rules, cancellationToken);
             if (rate.BidAsk == null) return BadRequest();
             var flatRate = rate.BidAsk.Center;
             return Ok(flatRate * toCurrencyAmount);

BTCPayServer/Controllers/HomeController.cs

@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using BTCPayServer.Models;
-using NBitcoin.DataEncoders;
 using NBitcoin.Payment;
 using System.Net.Http;
 using Newtonsoft.Json.Linq;

BTCPayServer/Controllers/InvoiceController.API.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Filters;
 using BTCPayServer.Models;
@@ -32,11 +33,11 @@ namespace BTCPayServer.Controllers
         [HttpPost]
         [Route("invoices")]
         [MediaTypeConstraint("application/json")]
-        public async Task<DataWrapper<InvoiceResponse>> CreateInvoice([FromBody] CreateInvoiceRequest invoice)
+        public async Task<DataWrapper<InvoiceResponse>> CreateInvoice([FromBody] CreateInvoiceRequest invoice, CancellationToken cancellationToken)
         {
             if (invoice == null)
                 throw new BitpayHttpException(400, "Invalid invoice");
-            return await _InvoiceController.CreateInvoiceCore(invoice, HttpContext.GetStoreData(), HttpContext.Request.GetAbsoluteRoot());
+            return await _InvoiceController.CreateInvoiceCore(invoice, HttpContext.GetStoreData(), HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
         }
 
         [HttpGet]

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -273,6 +273,7 @@ namespace BTCPayServer.Controllers
             var model = new PaymentModel()
             {
                 CryptoCode = network.CryptoCode,
+                RootPath = this.Request.PathBase.Value.WithTrailingSlash(),
                 PaymentMethodId = paymentMethodId.ToString(),
                 PaymentMethodName = GetDisplayName(paymentMethodId, network),
                 CryptoImage = GetImage(paymentMethodId, network),
@@ -345,9 +346,8 @@ namespace BTCPayServer.Controllers
 
         private string GetImage(PaymentMethodId paymentMethodId, BTCPayNetwork network)
         {
-            var res = paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
-                Url.Content(network.CryptoImagePath) : Url.Content(network.LightningImagePath);
-            return "/" + res;
+            return paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
+                this.Request.GetRelativePathOrAbsolute(network.CryptoImagePath) : this.Request.GetRelativePathOrAbsolute(network.LightningImagePath);
         }
 
         private string OrderAmountFromInvoice(string cryptoCode, ProductInformation productInformation)
@@ -542,7 +542,7 @@ namespace BTCPayServer.Controllers
         [Route("invoices/create")]
         [Authorize(AuthenticationSchemes = Policies.CookieAuthentication)]
         [BitpayAPIConstraint(false)]
-        public async Task<IActionResult> CreateInvoice(CreateInvoiceModel model)
+        public async Task<IActionResult> CreateInvoice(CreateInvoiceModel model, CancellationToken cancellationToken)
         {
             var stores = await _StoreRepository.GetStoresByUserId(GetUserId());
             model.Stores = new SelectList(stores, nameof(StoreData.Id), nameof(StoreData.StoreName), model.StoreId);
@@ -590,7 +590,7 @@ namespace BTCPayServer.Controllers
                     ItemDesc = model.ItemDesc,
                     FullNotifications = true,
                     BuyerEmail = model.BuyerEmail,
-                }, store, HttpContext.Request.GetAbsoluteRoot());
+                }, store, HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
 
                 StatusMessage = $"Invoice {result.Data.Id} just created!";
                 return RedirectToAction(nameof(ListInvoices));

BTCPayServer/Controllers/InvoiceController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Events;
@@ -62,7 +63,7 @@ namespace BTCPayServer.Controllers
         }
 
 
-        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(CreateInvoiceRequest invoice, StoreData store, string serverUrl, List<string> additionalTags = null)
+        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(CreateInvoiceRequest invoice, StoreData store, string serverUrl, List<string> additionalTags = null, CancellationToken cancellationToken = default)
         {
             if (!store.HasClaim(Policies.CanCreateInvoice.Key))
                 throw new UnauthorizedAccessException();
@@ -154,7 +155,7 @@ namespace BTCPayServer.Controllers
             }
 
             var rateRules = storeBlob.GetRateRules(_NetworkProvider);
-            var fetchingByCurrencyPair = _RateProvider.FetchRates(currencyPairsToFetch, rateRules);
+            var fetchingByCurrencyPair = _RateProvider.FetchRates(currencyPairsToFetch, rateRules, cancellationToken);
 
             var fetchingAll = WhenAllFetched(logs, fetchingByCurrencyPair);
             var supportedPaymentMethods = store.GetSupportedPaymentMethods(_NetworkProvider)

BTCPayServer/Controllers/PaymentRequestController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Security.Claims;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Filters;
@@ -23,6 +24,7 @@ using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using NBitpayClient;
 
 namespace BTCPayServer.Controllers
@@ -97,7 +99,12 @@ namespace BTCPayServer.Controllers
                 return RedirectToAction("GetPaymentRequests",
                     new
                     {
-                        StatusMessage = "Error: You need to create at least one store before creating a payment request"
+                        StatusMessage = new StatusMessageModel()
+                        {
+                            Html =
+                                $"Error: You need to create at least one store. <a href='{Url.Action("CreateStore", "UserStores")}'>Create store</a>",
+                            Severity = StatusMessageModel.StatusSeverity.Error
+                        }
                     });
             }
 
@@ -197,7 +204,7 @@ namespace BTCPayServer.Controllers
                     new
                     {
                         StatusMessage =
-                            "Payment request could not be removed. Any request that has generated invoices cannot be removed."
+                            "Error: Payment request could not be removed. Any request that has generated invoices cannot be removed."
                     });
             }
         }
@@ -212,7 +219,7 @@ namespace BTCPayServer.Controllers
             {
                 return NotFound();
             }
-
+            result.HubPath = PaymentRequestHub.GetHubPath(this.Request);
             return View(result);
         }
 
@@ -220,14 +227,14 @@ namespace BTCPayServer.Controllers
         [Route("{id}/pay")]
         [AllowAnonymous]
         public async Task<IActionResult> PayPaymentRequest(string id, bool redirectToInvoice = true,
-            decimal? amount = null)
+            decimal? amount = null, CancellationToken cancellationToken = default)
         {
-            var result = ((await ViewPaymentRequest(id)) as ViewResult)?.Model as ViewPaymentRequestViewModel;
+            var result = await _PaymentRequestService.GetPaymentRequest(id, GetUserId());
             if (result == null)
             {
                 return NotFound();
             }
-
+            result.HubPath = PaymentRequestHub.GetHubPath(this.Request);
             if (result.AmountDue <= 0)
             {
                 if (redirectToInvoice)
@@ -267,21 +274,11 @@ namespace BTCPayServer.Controllers
             }
 
             if (result.AllowCustomPaymentAmounts && amount != null)
-            {
-                var invoiceAmount = result.AmountDue < amount ? result.AmountDue : amount;
-
-                return await CreateInvoiceForPaymentRequest(id, redirectToInvoice, result, invoiceAmount);
-            }
+                amount = Math.Min(result.AmountDue, amount.Value);
+            else
+                amount = result.AmountDue;
 
 
-            return await CreateInvoiceForPaymentRequest(id, redirectToInvoice, result);
-        }
-
-        private async Task<IActionResult> CreateInvoiceForPaymentRequest(string id,
-            bool redirectToInvoice,
-            ViewPaymentRequestViewModel result,
-            decimal? amount = null)
-        {
             var pr = await _PaymentRequestRepository.FindPaymentRequest(id, null);
             var blob = pr.GetBlob();
             var store = pr.StoreData;
@@ -291,14 +288,17 @@ namespace BTCPayServer.Controllers
                 var redirectUrl = Request.GetDisplayUrl().TrimEnd("/pay", StringComparison.InvariantCulture)
                     .Replace("hub?id=", string.Empty, StringComparison.InvariantCultureIgnoreCase);
                 var newInvoiceId = (await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
-                {
-                    OrderId = $"{PaymentRequestRepository.GetOrderIdForPaymentRequest(id)}",
-                    Currency = blob.Currency,
-                    Price = amount.GetValueOrDefault(result.AmountDue),
-                    FullNotifications = true,
-                    BuyerEmail = result.Email,
-                    RedirectURL = redirectUrl,
-                }, store, HttpContext.Request.GetAbsoluteRoot(), new List<string>() { PaymentRequestRepository.GetInternalTag(id) })).Data.Id;
+                        {
+                            OrderId = $"{PaymentRequestRepository.GetOrderIdForPaymentRequest(id)}",
+                            Currency = blob.Currency,
+                            Price = amount.Value,
+                            FullNotifications = true,
+                            BuyerEmail = result.Email,
+                            RedirectURL = redirectUrl,
+                        }, store, HttpContext.Request.GetAbsoluteRoot(),
+                        new List<string>() {PaymentRequestRepository.GetInternalTag(id)},
+                        cancellationToken: cancellationToken))
+                    .Data.Id;
 
                 if (redirectToInvoice)
                 {
@@ -313,9 +313,28 @@ namespace BTCPayServer.Controllers
             }
         }
 
+
         private string GetUserId()
         {
             return _UserManager.GetUserId(User);
         }
+
+        [HttpGet]
+        [Route("{id}/clone")]
+        public async Task<IActionResult> ClonePaymentRequest(string id)
+        {
+            var result = await EditPaymentRequest(id);
+            if (result is ViewResult viewResult)
+            {
+                var model = (UpdatePaymentRequestViewModel)viewResult.Model;
+                model.Id = null;
+                model.Title = $"Clone of {model.Title}";
+                
+                return View("EditPaymentRequest", model);
+                
+            }
+
+            return NotFound();
+        }
     }
 }

BTCPayServer/Controllers/PublicController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Filters;
 using BTCPayServer.Models;
@@ -28,7 +29,7 @@ namespace BTCPayServer.Controllers
         [MediaTypeAcceptConstraintAttribute("text/html")]
         [IgnoreAntiforgeryToken]
         [EnableCors(CorsPolicies.All)]
-        public async Task<IActionResult> PayButtonHandle([FromForm]PayButtonViewModel model)
+        public async Task<IActionResult> PayButtonHandle([FromForm]PayButtonViewModel model, CancellationToken cancellationToken)
         {
             var store = await _StoreRepository.FindStore(model.StoreId);
             if (store == null)
@@ -56,7 +57,7 @@ namespace BTCPayServer.Controllers
                 NotificationURL = model.ServerIpn,
                 RedirectURL = model.BrowserRedirect,
                 FullNotifications = true
-            }, store, HttpContext.Request.GetAbsoluteRoot());
+            }, store, HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
             return Redirect(invoice.Data.Url);
         }
     }

BTCPayServer/Controllers/RateController.cs

@@ -13,6 +13,7 @@ using Newtonsoft.Json;
 using Microsoft.AspNetCore.Authorization;
 using BTCPayServer.Authentication;
 using Microsoft.AspNetCore.Cors;
+using System.Threading;
 
 namespace BTCPayServer.Controllers
 {
@@ -45,7 +46,7 @@ namespace BTCPayServer.Controllers
         [Route("rates/{baseCurrency}")]
         [HttpGet]
         [BitpayAPIConstraint]
-        public async Task<IActionResult> GetBaseCurrencyRates(string baseCurrency, string storeId)
+        public async Task<IActionResult> GetBaseCurrencyRates(string baseCurrency, string storeId, CancellationToken cancellationToken)
         {
             storeId = await GetStoreId(storeId);
             var store = this.HttpContext.GetStoreData();
@@ -64,7 +65,7 @@ namespace BTCPayServer.Controllers
 
             var currencypairs = BuildCurrencyPairs(currencyCodes, baseCurrency);
             
-            var result = await GetRates2(currencypairs, store.Id);
+            var result = await GetRates2(currencypairs, store.Id, cancellationToken);
             var rates = (result as JsonResult)?.Value as Rate[];
             if (rates == null)
                 return result;
@@ -75,10 +76,10 @@ namespace BTCPayServer.Controllers
         [Route("rates/{baseCurrency}/{currency}")]
         [HttpGet]
         [BitpayAPIConstraint]
-        public async Task<IActionResult> GetCurrencyPairRate(string baseCurrency, string currency, string storeId)
+        public async Task<IActionResult> GetCurrencyPairRate(string baseCurrency, string currency, string storeId, CancellationToken cancellationToken)
         {
             storeId = await GetStoreId(storeId);
-            var result = await GetRates2($"{baseCurrency}_{currency}", storeId);
+            var result = await GetRates2($"{baseCurrency}_{currency}", storeId, cancellationToken);
             var rates = (result as JsonResult)?.Value as Rate[];
             if (rates == null)
                 return result;
@@ -88,10 +89,9 @@ namespace BTCPayServer.Controllers
         [Route("rates")]
         [HttpGet]
         [BitpayAPIConstraint]
-        public async Task<IActionResult> GetRates(string currencyPairs, string storeId)
+        public async Task<IActionResult> GetRates(string currencyPairs, string storeId, CancellationToken cancellationToken)
         {
-            storeId = await GetStoreId(storeId);
-            var result = await GetRates2(currencyPairs, storeId);
+            var result = await GetRates2(currencyPairs, storeId, cancellationToken);
             var rates = (result as JsonResult)?.Value as Rate[];
             if (rates == null)
                 return result;
@@ -118,7 +118,7 @@ namespace BTCPayServer.Controllers
 
         [Route("api/rates")]
         [HttpGet]
-        public async Task<IActionResult> GetRates2(string currencyPairs, string storeId)
+        public async Task<IActionResult> GetRates2(string currencyPairs, string storeId, CancellationToken cancellationToken)
         {
             storeId = await GetStoreId(storeId);
             if (storeId == null)
@@ -139,15 +139,10 @@ namespace BTCPayServer.Controllers
 
             if (currencyPairs == null)
             {
-                var supportedMethods = store.GetSupportedPaymentMethods(_NetworkProvider);
-                var currencyCodes = supportedMethods.Select(method => method.PaymentId.CryptoCode).Distinct();
-                var defaultPaymentId = store.GetDefaultPaymentId(_NetworkProvider);
-
-                currencyPairs = BuildCurrencyPairs(currencyCodes, defaultPaymentId.CryptoCode);
-
+                currencyPairs = store.GetStoreBlob().GetDefaultCurrencyPairString();
                 if (string.IsNullOrEmpty(currencyPairs))
                 {
-                    var result = Json(new BitpayErrorsModel() { Error = "You need to specify currencyPairs (eg. BTC_USD,LTC_CAD)" });
+                    var result = Json(new BitpayErrorsModel() { Error = "You need to setup the default currency pairs in 'Store Settings / Rates' or specify 'currencyPairs' query parameter (eg. BTC_USD,LTC_CAD)." });
                     result.StatusCode = 400;
                     return result;
                 }
@@ -168,7 +163,7 @@ namespace BTCPayServer.Controllers
                 pairs.Add(pair);
             }
 
-            var fetching = _RateProviderFactory.FetchRates(pairs, rules);
+            var fetching = _RateProviderFactory.FetchRates(pairs, rules, cancellationToken);
             await Task.WhenAll(fetching.Select(f => f.Value).ToArray());
             return Json(pairs
                             .Select(r => (Pair: r, Value: fetching[r].GetAwaiter().GetResult().BidAsk?.Bid))

BTCPayServer/Controllers/ServerController.cs

@@ -384,18 +384,17 @@ namespace BTCPayServer.Controllers
             if (user == null)
                 return NotFound();
 
-            var admins = await _UserManager.GetUsersInRoleAsync(Roles.ServerAdmin);
-            if (admins.Count == 1)
-            {
-                // return
-                return View("Confirm", new ConfirmModel("Unable to Delete Last Admin",
-                    "This is the last Admin, so it can't be removed"));
-            }
-
-
             var roles = await _UserManager.GetRolesAsync(user);
             if (IsAdmin(roles))
             {
+                var admins = await _UserManager.GetUsersInRoleAsync(Roles.ServerAdmin);
+                if (admins.Count == 1)
+                {
+                    // return
+                    return View("Confirm", new ConfirmModel("Unable to Delete Last Admin",
+                        "This is the last Admin, so it can't be removed"));
+                }
+
                 return View("Confirm", new ConfirmModel("Delete Admin " + user.Email,
                     "Are you sure you want to delete this Admin and delete all accounts, users and data associated with the server account?",
                     "Delete"));
@@ -428,13 +427,6 @@ namespace BTCPayServer.Controllers
         }
         public IHttpClientFactory HttpClientFactory { get; }
 
-        [Route("server/emails")]
-        public async Task<IActionResult> Emails()
-        {
-            var data = (await _SettingsRepository.GetSettingAsync<EmailSettings>()) ?? new EmailSettings();
-            return View(new EmailsViewModel() { Settings = data });
-        }
-
         [Route("server/policies")]
         public async Task<IActionResult> Policies()
         {
@@ -565,7 +557,7 @@ namespace BTCPayServer.Controllers
                 var lnConfig = _LnConfigProvider.GetConfig(configKey);
                 if (lnConfig != null)
                 {
-                    model.QRCodeLink = Url.Action(nameof(GetLNDConfig), new { configKey = configKey });
+                    model.QRCodeLink = Request.GetAbsoluteUri(Url.Action(nameof(GetLNDConfig), new { configKey = configKey }));
                     model.QRCode = $"config={model.QRCodeLink}";
                 }
             }
@@ -691,19 +683,28 @@ namespace BTCPayServer.Controllers
             return View(settings);
         }
 
+
+        [Route("server/emails")]
+        public async Task<IActionResult> Emails()
+        {
+            var data = (await _SettingsRepository.GetSettingAsync<EmailSettings>()) ?? new EmailSettings();
+            return View(new EmailsViewModel() { Settings = data });
+        }
+
         [Route("server/emails")]
         [HttpPost]
         public async Task<IActionResult> Emails(EmailsViewModel model, string command)
         {
+            if (!model.Settings.IsComplete())
+            {
+                model.StatusMessage = "Error: Required fields missing";
+                return View(model);
+            }
+
             if (command == "Test")
             {
                 try
                 {
-                    if (!model.Settings.IsComplete())
-                    {
-                        model.StatusMessage = "Error: Required fields missing";
-                        return View(model);
-                    }
                     var client = model.Settings.CreateSmtpClient();
                     await client.SendMailAsync(model.Settings.From, model.TestEmail, "BTCPay test", "BTCPay test");
                     model.StatusMessage = "Email sent to " + model.TestEmail + ", please, verify you received it";

BTCPayServer/Controllers/StoresController.Changelly.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Net.Http;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Models.StoreViewModels;
@@ -77,7 +78,7 @@ namespace BTCPayServer.Controllers
                 case "test":
                     try
                     {
-                        var client = new Changelly(_httpClientFactory, changellySettings.ApiKey, changellySettings.ApiSecret,
+                        var client = new Changelly(_httpClientFactory.CreateClient(), changellySettings.ApiKey, changellySettings.ApiSecret,
                             changellySettings.ApiUrl);
                         var result = await client.GetCurrenciesFull();
                         vm.StatusMessage = "Test Successful";

BTCPayServer/Controllers/StoresController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Authentication;
 using BTCPayServer.Configuration;
@@ -188,24 +189,39 @@ namespace BTCPayServer.Controllers
 
         [HttpGet]
         [Route("{storeId}/rates")]
-        public IActionResult Rates()
+        public IActionResult Rates(string storeId)
         {
             var storeBlob = StoreData.GetStoreBlob();
             var vm = new RatesViewModel();
             vm.SetExchangeRates(GetSupportedExchanges(), storeBlob.PreferredExchange ?? CoinAverageRateProvider.CoinAverageName);
             vm.Spread = (double)(storeBlob.Spread * 100m);
+            vm.StoreId = storeId;
             vm.Script = storeBlob.GetRateRules(_NetworkProvider).ToString();
             vm.DefaultScript = storeBlob.GetDefaultRateRules(_NetworkProvider).ToString();
             vm.AvailableExchanges = GetSupportedExchanges();
+            vm.DefaultCurrencyPairs = storeBlob.GetDefaultCurrencyPairString();
             vm.ShowScripting = storeBlob.RateScripting;
             return View(vm);
         }
 
         [HttpPost]
         [Route("{storeId}/rates")]
-        public async Task<IActionResult> Rates(RatesViewModel model, string command = null)
+        public async Task<IActionResult> Rates(RatesViewModel model, string command = null, string storeId = null, CancellationToken cancellationToken = default)
         {
             model.SetExchangeRates(GetSupportedExchanges(), model.PreferredExchange);
+            model.StoreId = storeId ?? model.StoreId;
+            CurrencyPair[] currencyPairs = null;
+            try
+            {
+                currencyPairs = model.DefaultCurrencyPairs?
+                     .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+                     .Select(p => CurrencyPair.Parse(p))
+                     .ToArray();
+            }
+            catch
+            {
+                ModelState.AddModelError(nameof(model.DefaultCurrencyPairs), "Invalid currency pairs (should be for example: BTC_USD,BTC_CAD,BTC_JPY)");
+            }
             if (!ModelState.IsValid)
             {
                 return View(model);
@@ -219,7 +235,7 @@ namespace BTCPayServer.Controllers
 
             blob.PreferredExchange = model.PreferredExchange;
             blob.Spread = (decimal)model.Spread / 100.0m;
-
+            blob.DefaultCurrencyPairs = currencyPairs;
             if (!model.ShowScripting)
             {
                 if (!GetSupportedExchanges().Select(c => c.Name).Contains(blob.PreferredExchange, StringComparer.OrdinalIgnoreCase))
@@ -267,7 +283,7 @@ namespace BTCPayServer.Controllers
                     pairs.Add(currencyPair);
                 }
 
-                var fetchs = _RateFactory.FetchRates(pairs.ToHashSet(), rules);
+                var fetchs = _RateFactory.FetchRates(pairs.ToHashSet(), rules, cancellationToken);
                 var testResults = new List<RatesViewModel.TestResultViewModel>();
                 foreach (var fetch in fetchs)
                 {

BTCPayServer/Controllers/WalletsController.cs

@@ -181,7 +181,7 @@ namespace BTCPayServer.Controllers
                 try
                 {
                     cts.CancelAfter(TimeSpan.FromSeconds(5));
-                    var result = await RateFetcher.FetchRate(currencyPair, rateRules).WithCancellation(cts.Token);
+                    var result = await RateFetcher.FetchRate(currencyPair, rateRules, cts.Token).WithCancellation(cts.Token);
                     if (result.BidAsk != null)
                     {
                         model.Rate = result.BidAsk.Center;

BTCPayServer/Data/StoreData.cs

@@ -307,6 +307,25 @@ namespace BTCPayServer.Data
 
         public bool RequiresRefundEmail { get; set; }
 
+        CurrencyPair[] _DefaultCurrencyPairs;
+        [JsonProperty("defaultCurrencyPairs", ItemConverterType = typeof(CurrencyPairJsonConverter))]
+        public CurrencyPair[] DefaultCurrencyPairs
+        {
+            get
+            {
+                return _DefaultCurrencyPairs ?? Array.Empty<CurrencyPair>();
+            }
+            set
+            {
+                _DefaultCurrencyPairs = value;
+            }
+        }
+
+        public string GetDefaultCurrencyPairString()
+        {
+            return string.Join(',', DefaultCurrencyPairs.Select(c => c.ToString()));
+        }
+
         public string DefaultLang { get; set; }
         [DefaultValue(60)]
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]

BTCPayServer/ExplorerClientProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Net.Http;
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,7 +18,7 @@ namespace BTCPayServer
 
         public BTCPayNetworkProvider NetworkProviders => _NetworkProviders;
         NBXplorerDashboard _Dashboard;
-        public ExplorerClientProvider(BTCPayNetworkProvider networkProviders, BTCPayServerOptions options, NBXplorerDashboard dashboard)
+        public ExplorerClientProvider(IHttpClientFactory httpClientFactory, BTCPayNetworkProvider networkProviders, BTCPayServerOptions options, NBXplorerDashboard dashboard)
         {
             _Dashboard = dashboard;
             _NetworkProviders = networkProviders;
@@ -32,14 +33,15 @@ namespace BTCPayServer
                 Logs.Configuration.LogInformation($"{setting.CryptoCode}: Cookie file is {(setting.CookieFile ?? "not set")}");
                 if (setting.ExplorerUri != null)
                 {
-                    _Clients.TryAdd(setting.CryptoCode, CreateExplorerClient(_NetworkProviders.GetNetwork(setting.CryptoCode), setting.ExplorerUri, setting.CookieFile));
+                    _Clients.TryAdd(setting.CryptoCode, CreateExplorerClient(httpClientFactory.CreateClient($"NBXPLORER_{setting.CryptoCode}"), _NetworkProviders.GetNetwork(setting.CryptoCode), setting.ExplorerUri, setting.CookieFile));
                 }
             }
         }
 
-        private static ExplorerClient CreateExplorerClient(BTCPayNetwork n, Uri uri, string cookieFile)
+        private static ExplorerClient CreateExplorerClient(HttpClient httpClient, BTCPayNetwork n, Uri uri, string cookieFile)
         {
             var explorer = new ExplorerClient(n.NBXplorerNetwork, uri);
+            explorer.SetClient(httpClient);
             if (cookieFile == null)
             {
                 Logs.Configuration.LogWarning($"{n.CryptoCode}: Not using cookie authentication");

BTCPayServer/Extensions.cs

@@ -217,8 +217,10 @@ namespace BTCPayServer
         /// <returns></returns>
         public static string GetRelativePathOrAbsolute(this HttpRequest request, string path)
         {
-            if (Uri.TryCreate(path, UriKind.Absolute, out var unused))
+            if (!Uri.TryCreate(path, UriKind.RelativeOrAbsolute, out var uri) || 
+                uri.IsAbsoluteUri)
                 return path;
+
             if (path.Length > 0 && path[0] != '/')
                 path = $"/{path}";
             return string.Concat(

BTCPayServer/HostedServices/CssThemeManager.cs

@@ -45,10 +45,12 @@ namespace BTCPayServer.HostedServices
         }
 
         public bool ShowRegister { get; set; }
+        public bool DiscourageSearchEngines { get; set; }
 
         internal void Update(PoliciesSettings data)
         {
             ShowRegister = !data.LockSubscription;
+            DiscourageSearchEngines = data.DiscourageSearchEngines;
         }
     }
 

BTCPayServer/HostedServices/RatesHostedService.cs

@@ -47,7 +47,7 @@ namespace BTCPayServer.HostedServices
                 {
                     await Task.WhenAll(_RateProviderFactory.Providers
                                     .Select(p => (Fetcher: p.Value as BackgroundFetcherRateProvider, ExchangeName: p.Key)).Where(p => p.Fetcher != null)
-                                    .Select(p => p.Fetcher.UpdateIfNecessary().ContinueWith(t =>
+                                    .Select(p => p.Fetcher.UpdateIfNecessary(timeout.Token).ContinueWith(t =>
                                     {
                                         if (t.Result.Exception != null)
                                         {

BTCPayServer/Hosting/BTCpayMiddleware.cs

@@ -32,8 +32,6 @@ namespace BTCPayServer.Hosting
 
         public async Task Invoke(HttpContext httpContext)
         {
-            RewriteHostIfNeeded(httpContext);
-
             try
             {
                 var bitpayAuth = GetBitpayAuth(httpContext, out bool isBitpayAuth);
@@ -125,57 +123,6 @@ namespace BTCPayServer.Hosting
             return false;
         }
 
-        private void RewriteHostIfNeeded(HttpContext httpContext)
-        {
-            string reverseProxyScheme = null;
-            if (httpContext.Request.Headers.TryGetValue("X-Forwarded-Proto", out StringValues proto))
-            {
-                var scheme = proto.SingleOrDefault();
-                if (scheme != null)
-                {
-                    reverseProxyScheme = scheme;
-                }
-            }
-
-            ushort? reverseProxyPort = null;
-            if (httpContext.Request.Headers.TryGetValue("X-Forwarded-Port", out StringValues port))
-            {
-                var portString = port.SingleOrDefault();
-                if (portString != null && ushort.TryParse(portString, out ushort pp))
-                {
-                    reverseProxyPort = pp;
-                }
-            }
-
-            // NGINX pass X-Forwarded-Proto and X-Forwarded-Port, so let's use that to have better guess of the real domain
-
-            ushort? p = null;
-            if (reverseProxyScheme != null)
-            {
-                httpContext.Request.Scheme = reverseProxyScheme;
-                if (reverseProxyScheme == "http")
-                    p = 80;
-                if (reverseProxyScheme == "https")
-                    p = 443;
-            }
-
-            if (reverseProxyPort != null)
-            {
-                p = reverseProxyPort.Value;
-            }
-
-            if (p.HasValue)
-            {
-                bool isDefault = httpContext.Request.Scheme == "http" && p.Value == 80;
-                isDefault |= httpContext.Request.Scheme == "https" && p.Value == 443;
-                if (isDefault)
-                    httpContext.Request.Host = new HostString(httpContext.Request.Host.Host);
-                else
-                    httpContext.Request.Host = new HostString(httpContext.Request.Host.Host, p.Value);
-            }
-
-        }
-
         private static async Task HandleBitpayHttpException(HttpContext httpContext, BitpayHttpException ex)
         {
             httpContext.Response.StatusCode = ex.StatusCode;

BTCPayServer/Hosting/Startup.cs

@@ -3,7 +3,6 @@ using System.Reflection;
 using System.Linq;
 using Microsoft.AspNetCore.Builder;
 using System;
-using System.Collections.Generic;
 using System.Text;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -14,9 +13,9 @@ using BTCPayServer.Authentication;
 using Microsoft.EntityFrameworkCore;
 using BTCPayServer.Filters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
-using BTCPayServer.Services;
 using BTCPayServer.Models;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.HttpOverrides;
 using BTCPayServer.Data;
 using Microsoft.Extensions.Logging;
 using BTCPayServer.Logging;
@@ -159,14 +158,22 @@ namespace BTCPayServer.Hosting
                 app.UseDeveloperExceptionPage();
             }
 
+            var forwardingOptions = new ForwardedHeadersOptions()
+            {
+                ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
+            };
+            forwardingOptions.KnownNetworks.Clear();
+            forwardingOptions.KnownProxies.Clear();
+            forwardingOptions.ForwardedHeaders = ForwardedHeaders.All;
+            app.UseForwardedHeaders(forwardingOptions);
             app.UseCors();
             app.UsePayServer();
             app.UseStaticFiles();
             app.UseAuthentication();
             app.UseSignalR(route =>
             {
-                route.MapHub<AppHub>("/apps/hub");
-                route.MapHub<PaymentRequestHub>("/payment-requests/hub");
+                AppHub.Register(route);
+                PaymentRequestHub.Register(route);
             });
             app.UseWebSockets();
             app.UseStatusCodePages();

BTCPayServer/JsonConverters/CurrencyPairJsonConverter.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using NBitcoin.JsonConverters;
+using BTCPayServer.Rating;
+
+namespace BTCPayServer.JsonConverters
+{
+    public class CurrencyPairJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return typeof(CurrencyValue).GetTypeInfo().IsAssignableFrom(objectType.GetTypeInfo());
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            try
+            {
+                return reader.TokenType == JsonToken.Null ? null :
+                       CurrencyPair.TryParse((string)reader.Value, out var result) ? result :
+                       throw new JsonObjectException("Invalid currency pair", reader);
+            }
+            catch (InvalidCastException)
+            {
+                throw new JsonObjectException("Invalid currency pair", reader);
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            if (value != null)
+                writer.WriteValue(value.ToString());
+        }
+    }
+}

BTCPayServer/ModelBinders/InvariantDecimalModelBinder.cs

@@ -0,0 +1,99 @@
+// Copied and adjusted from https://github.com/aspnet/Mvc/blob/master/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs
+using System;
+using System.Globalization;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace BTCPayServer.ModelBinders
+{
+    /// <summary>
+    /// An <see cref="IModelBinder"/> for <see cref="decimal"/> and <see cref="Nullable{T}"/> where <c>T</c> is
+    /// <see cref="decimal"/>.
+    /// </summary>
+    public class InvariantDecimalModelBinder : IModelBinder
+    {
+        private readonly NumberStyles _supportedStyles;
+
+        public InvariantDecimalModelBinder()
+        {
+            _supportedStyles = NumberStyles.Any;
+        }
+
+        /// <inheritdoc />
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            if (bindingContext == null)
+            {
+                throw new ArgumentNullException(nameof(bindingContext));
+            }
+
+            var modelName = bindingContext.ModelName;
+            var valueProviderResult = bindingContext.ValueProvider.GetValue(modelName);
+            if (valueProviderResult == ValueProviderResult.None)
+            {
+                return Task.CompletedTask;
+            }
+
+            var modelState = bindingContext.ModelState;
+            modelState.SetModelValue(modelName, valueProviderResult);
+
+            var metadata = bindingContext.ModelMetadata;
+            var type = metadata.UnderlyingOrModelType;
+            try
+            {
+                var value = valueProviderResult.FirstValue;
+                var culture = CultureInfo.InvariantCulture;
+
+                object model;
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    // Parse() method trims the value (with common NumberStyles) then throws if the result is empty.
+                    model = null;
+                }
+                else if (type == typeof(decimal))
+                {
+                    model = decimal.Parse(value, _supportedStyles, culture);
+                }
+                else
+                {
+                    // unreachable
+                    throw new NotSupportedException();
+                }
+
+                // When converting value, a null model may indicate a failed conversion for an otherwise required
+                // model (can't set a ValueType to null). This detects if a null model value is acceptable given the
+                // current bindingContext. If not, an error is logged.
+                if (model == null && !metadata.IsReferenceOrNullableType)
+                {
+                    modelState.TryAddModelError(
+                        modelName,
+                        metadata.ModelBindingMessageProvider.ValueMustNotBeNullAccessor(
+                            valueProviderResult.ToString()));
+                }
+                else
+                {
+                    bindingContext.Result = ModelBindingResult.Success(model);
+                }
+            }
+            catch (Exception exception)
+            {
+                var isFormatException = exception is FormatException;
+                if (!isFormatException && exception.InnerException != null)
+                {
+                    // Unlike TypeConverters, floating point types do not seem to wrap FormatExceptions. Preserve
+                    // this code in case a cursory review of the CoreFx code missed something.
+                    exception = ExceptionDispatchInfo.Capture(exception.InnerException).SourceException;
+                }
+
+                modelState.TryAddModelError(modelName, exception, metadata);
+
+                // Conversion failed.
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

BTCPayServer/Models/AppViewModels/UpdateCrowdfundViewModel.cs

@@ -46,6 +46,7 @@ namespace BTCPayServer.Models.AppViewModels
         public string TargetCurrency { get; set; } = "BTC";
 
         [Display(Name = "Set a Target amount ")]
+        [Range(0, double.PositiveInfinity)]
         public decimal? TargetAmount { get; set; }
 
 
@@ -79,5 +80,11 @@ namespace BTCPayServer.Models.AppViewModels
         public bool SortPerksByPopularity { get; set; }
         [Display(Name = "Display contribution ranking")]
         public bool DisplayPerksRanking { get; set; }
+
+
+        [Display(Name = "Sounds to play when a payment is made. One sound per line")]
+        public string Sounds{ get; set; }
+        [Display(Name = "Colors to rotate between with animation when a payment is made. First color is the default background. One color per line. Can be any valid css color value.")]
+        public string AnimationColors{ get; set; }
     }
 }

BTCPayServer/Models/AppViewModels/ViewCrowdfundViewModel.cs

@@ -1,13 +1,16 @@
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
+using BTCPayServer.Payments;
 using BTCPayServer.Services.Rates;
 
 namespace BTCPayServer.Models.AppViewModels
 {
     public class ViewCrowdfundViewModel
     {
+        public string HubPath { get; set; }
         public string StatusMessage{ get; set; }
         public string StoreId { get; set; }
         public string AppId { get; set; }
@@ -30,6 +33,8 @@ namespace BTCPayServer.Models.AppViewModels
         public bool SoundsEnabled { get; set; }
         public string DisqusShortname { get; set; }
         public bool AnimationsEnabled { get; set; }
+        public string[] AnimationColors { get; set; }
+        public string[] Sounds { get; set; }
         public int ResetEveryAmount { get; set; }
         public bool NeverReset { get; set; }
 
@@ -50,11 +55,26 @@ namespace BTCPayServer.Models.AppViewModels
             public DateTime? LastResetDate { get; set; }
             public DateTime? NextResetDate { get; set; }
         }
+        public class Contribution
+        {
+            public PaymentMethodId PaymentMehtodId { get; set; }
+            public decimal Value { get; set; }
+            public decimal CurrencyValue { get; set; }
+        }
+        public class Contributions : Dictionary<PaymentMethodId, Contribution>
+        {
+            public Contributions(IEnumerable<KeyValuePair<PaymentMethodId, Contribution>> collection) : base(collection)
+            {
+                TotalCurrency = Values.Select(v => v.CurrencyValue).Sum();
+            }
+            public decimal TotalCurrency { get; }
+        }
 
         public bool Started => !StartDate.HasValue || DateTime.Now.ToUniversalTime() > StartDate;
 
         public bool Ended => !EndDate.HasValue || DateTime.Now.ToUniversalTime() > EndDate;
         public bool DisplayPerksRanking { get; set; }
+        public bool Enabled { get; set; }
     }
 
     public class ContributeToCrowdfund

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -64,5 +64,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public bool CoinSwitchEnabled { get; set; }
         public string CoinSwitchMode { get; set; }
         public string CoinSwitchMerchantId { get; set; }
+        public string RootPath { get; set; }
     }
 }

BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs

@@ -48,7 +48,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
 
         public string Id { get; set; }
         [Required] public string StoreId { get; set; }
-        [Required] public decimal Amount { get; set; }
+        [Required][Range(0, double.PositiveInfinity)]public decimal Amount { get; set; }
 
         [Display(Name = "The currency used for payment request. (e.g. BTC, LTC, USD, etc.)")]
         public string Currency { get; set; }
@@ -134,12 +134,14 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
         public string AmountCollectedFormatted { get; set; }
         public string AmountFormatted { get; set; }
         public bool AnyPendingInvoice { get; set; }
+        public string HubPath { get; set; }
 
         public class PaymentRequestInvoice
         {
             public string Id { get; set; }
             public DateTime ExpiryDate { get; set; }
             public decimal Amount { get; set; }
+            public string AmountFormatted { get; set; }
             public string Status { get; set; }
 
             public List<PaymentRequestInvoicePayment> Payments { get; set; }

BTCPayServer/Models/ServerViewModels/EmailsViewModel.cs

@@ -18,8 +18,9 @@ namespace BTCPayServer.Models.ServerViewModels
         {
             get; set;
         }
-        
+
         [EmailAddress]
+        [Display(Name = "Test Email")]
         public string TestEmail
         {
             get; set;

BTCPayServer/Models/StoreViewModels/PayButtonViewModel.cs

@@ -3,11 +3,14 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
+using BTCPayServer.ModelBinders;
+using Microsoft.AspNetCore.Mvc;
 
 namespace BTCPayServer.Models.StoreViewModels
 {
     public class PayButtonViewModel
     {
+        [ModelBinder(BinderType = typeof(InvariantDecimalModelBinder))]
         public decimal Price { get; set; }
         public string InvoiceId { get; set; }
         [Required]

BTCPayServer/Models/StoreViewModels/RatesViewModel.cs

@@ -42,6 +42,8 @@ namespace BTCPayServer.Models.StoreViewModels
         public string Script { get; set; }
         public string DefaultScript { get; set; }
         public string ScriptTest { get; set; }
+        public string DefaultCurrencyPairs { get; set; }
+        public string StoreId { get; set; }
         public CoinAverageExchange[] AvailableExchanges { get; set; }
 
         [Display(Name = "Add a spread on exchange rate of ... %")]

BTCPayServer/PaymentRequest/PaymentRequestHub.cs

@@ -12,6 +12,7 @@ using BTCPayServer.Services.PaymentRequests;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using BTCPayServer.Services.Apps;
+using Microsoft.AspNetCore.Http;
 
 namespace BTCPayServer.PaymentRequest
 {
@@ -59,6 +60,15 @@ namespace BTCPayServer.PaymentRequest
                     break;
             }
         }
+
+        public static string GetHubPath(HttpRequest request)
+        {
+            return request.GetRelativePathOrAbsolute("/payment-requests/hub");
+        }
+        public static void Register(HubRouteBuilder route)
+        {
+            route.MapHub<PaymentRequestHub>("/payment-requests/hub");
+        }
     }
 
     public class PaymentRequestStreamer : EventHostedServiceBase

BTCPayServer/PaymentRequest/PaymentRequestService.cs

@@ -51,10 +51,8 @@ namespace BTCPayServer.PaymentRequest
             {
                 var rateRules = pr.StoreData.GetStoreBlob().GetRateRules(_BtcPayNetworkProvider);
                 var invoices = await _PaymentRequestRepository.GetInvoicesForPaymentRequest(pr.Id);
-                var paymentStats = _AppService.GetCurrentContributionAmountStats(invoices, true);
-                var amountCollected =
-                    await _AppService.GetCurrentContributionAmount(paymentStats, blob.Currency, rateRules);
-                if (amountCollected >= blob.Amount)
+                var contributions = _AppService.GetContributionsByPaymentMethodId(blob.Currency, invoices, true);
+                if (contributions.TotalCurrency >= blob.Amount)
                 {
                     currentStatus = PaymentRequestData.PaymentRequestStatus.Completed;
                 }
@@ -80,17 +78,14 @@ namespace BTCPayServer.PaymentRequest
 
             var invoices = await _PaymentRequestRepository.GetInvoicesForPaymentRequest(id);
 
-            var paymentStats = _AppService.GetCurrentContributionAmountStats(invoices, true);
-            var amountCollected =
-                await _AppService.GetCurrentContributionAmount(paymentStats, blob.Currency, rateRules);
-
-            var amountDue = blob.Amount - amountCollected;
+            var paymentStats = _AppService.GetContributionsByPaymentMethodId(blob.Currency, invoices, true);
+            var amountDue = blob.Amount - paymentStats.TotalCurrency;
 
             return new ViewPaymentRequestViewModel(pr)
             {
                 AmountFormatted = _currencies.FormatCurrency(blob.Amount, blob.Currency),
-                AmountCollected = amountCollected,
-                AmountCollectedFormatted = _currencies.FormatCurrency(amountCollected, blob.Currency),
+                AmountCollected = paymentStats.TotalCurrency,
+                AmountCollectedFormatted = _currencies.FormatCurrency(paymentStats.TotalCurrency, blob.Currency),
                 AmountDue = amountDue,
                 AmountDueFormatted = _currencies.FormatCurrency(amountDue, blob.Currency),
                 CurrencyData = _currencies.GetCurrencyData(blob.Currency, true),
@@ -100,6 +95,7 @@ namespace BTCPayServer.PaymentRequest
                 {
                     Id = entity.Id,
                     Amount = entity.ProductInformation.Price,
+                    AmountFormatted = _currencies.FormatCurrency(entity.ProductInformation.Price, blob.Currency),
                     Currency = entity.ProductInformation.Currency,
                     ExpiryDate = entity.ExpirationTime.DateTime,
                     Status = entity.GetInvoiceState().ToString(),

BTCPayServer/Payments/Changelly/Changelly.cs

@@ -19,11 +19,11 @@ namespace BTCPayServer.Payments.Changelly
         private readonly bool _showFiat;
         private readonly HttpClient _httpClient;
 
-        public Changelly(IHttpClientFactory httpClientFactory,  string apiKey, string apiSecret, string apiUrl, bool showFiat = true)
+        public Changelly(HttpClient httpClient,  string apiKey, string apiSecret, string apiUrl, bool showFiat = true)
         {
             _apisecret = apiSecret;
             _showFiat = showFiat;
-            _httpClient = httpClientFactory.CreateClient();
+            _httpClient = httpClient;
             _httpClient.BaseAddress = new Uri(apiUrl);
             _httpClient.DefaultRequestHeaders.Add("api-key", apiKey);
         }

BTCPayServer/Payments/Changelly/ChangellyClientProvider.cs

@@ -61,7 +61,7 @@ namespace BTCPayServer.Payments.Changelly
                 throw new ChangellyException("Changelly not enabled for this store");
             }
 
-            var changelly = new Changelly(_httpClientFactory, changellySettings.ApiKey, changellySettings.ApiSecret,
+            var changelly = new Changelly(_httpClientFactory.CreateClient("Changelly"), changellySettings.ApiKey, changellySettings.ApiSecret,
                 changellySettings.ApiUrl, changellySettings.ShowFiat);
             _clientCache.AddOrReplace(storeId, changelly);
             return changelly;

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -192,7 +192,7 @@ namespace BTCPayServer.Payments.Lightning
             {
                 BOLT11 = notification.BOLT11,
                 PaymentHash = BOLT11PaymentRequest.Parse(notification.BOLT11, network.NBitcoinNetwork).PaymentHash,
-                Amount = notification.Amount
+                Amount = notification.AmountReceived ?? notification.Amount, // if running old version amount received might be unavailable
             }, network, accounted: true);
             if (payment != null)
             {

BTCPayServer/Program.cs

@@ -51,6 +51,7 @@ namespace BTCPayServer
                     .ConfigureLogging(l =>
                     {
                         l.AddFilter("Microsoft", LogLevel.Error);
+                        l.AddFilter("System.Net.Http.HttpClient", LogLevel.Critical);
                         l.AddFilter("Microsoft.AspNetCore.Antiforgery.Internal", LogLevel.Critical);
                         l.AddProvider(new CustomConsoleLogProvider(processor));
 

BTCPayServer/Services/Apps/AppHub.cs

@@ -2,6 +2,7 @@ using System;
 using System.Threading.Tasks;
 using BTCPayServer.Controllers;
 using BTCPayServer.Models.AppViewModels;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
@@ -40,7 +41,7 @@ namespace BTCPayServer.Services.Apps
                {
 
                    var result =
-                       await _AppsPublicController.ContributeToCrowdfund(Context.Items["app"].ToString(), model);
+                       await _AppsPublicController.ContributeToCrowdfund(Context.Items["app"].ToString(), model, Context.ConnectionAborted);
                    switch (result)
                    {
                        case OkObjectResult okObjectResult:
@@ -62,5 +63,13 @@ namespace BTCPayServer.Services.Apps
 
         }
 
+        public static string GetHubPath(HttpRequest request)
+        {
+            return request.GetRelativePathOrAbsolute("/apps/hub");
+        }
+        public static void Register(HubRouteBuilder route)
+        {
+            route.MapHub<AppHub>("/apps/hub");
+        }
     }
 }

BTCPayServer/Services/Apps/AppService.cs

@@ -25,6 +25,7 @@ using Microsoft.EntityFrameworkCore;
 using NBitpayClient;
 using YamlDotNet.RepresentationModel;
 using static BTCPayServer.Controllers.AppsController;
+using static BTCPayServer.Models.AppViewModels.ViewCrowdfundViewModel;
 
 namespace BTCPayServer.Services.Apps
 {
@@ -33,7 +34,6 @@ namespace BTCPayServer.Services.Apps
         ApplicationDbContextFactory _ContextFactory;
         private readonly InvoiceRepository _InvoiceRepository;
         CurrencyNameTable _Currencies;
-        private readonly RateFetcher _RateFetcher;
         private readonly HtmlSanitizer _HtmlSanitizer;
         private readonly BTCPayNetworkProvider _Networks;
         public CurrencyNameTable Currencies => _Currencies;
@@ -41,13 +41,11 @@ namespace BTCPayServer.Services.Apps
                           InvoiceRepository invoiceRepository,
                           BTCPayNetworkProvider networks,
                           CurrencyNameTable currencies,
-                          RateFetcher rateFetcher,
                           HtmlSanitizer htmlSanitizer)
         {
             _ContextFactory = contextFactory;
             _InvoiceRepository = invoiceRepository;
             _Currencies = currencies;
-            _RateFetcher = rateFetcher;
             _HtmlSanitizer = htmlSanitizer;
             _Networks = networks;
         }
@@ -94,17 +92,8 @@ namespace BTCPayServer.Services.Apps
             var completeInvoices = invoices.Where(entity => entity.Status == InvoiceStatus.Complete || entity.Status == InvoiceStatus.Confirmed).ToArray();
             var pendingInvoices = invoices.Where(entity => !(entity.Status == InvoiceStatus.Complete || entity.Status == InvoiceStatus.Confirmed)).ToArray();
 
-            var rateRules = appData.StoreData.GetStoreBlob().GetRateRules(_Networks);
-
-            var pendingPaymentStats = GetCurrentContributionAmountStats(pendingInvoices, !settings.EnforceTargetAmount);
-            var paymentStats = GetCurrentContributionAmountStats(completeInvoices, !settings.EnforceTargetAmount);
-
-            var currentAmount = await GetCurrentContributionAmount(
-                paymentStats,
-                settings.TargetCurrency, rateRules);
-            var currentPendingAmount = await GetCurrentContributionAmount(
-                pendingPaymentStats,
-                settings.TargetCurrency, rateRules);
+            var pendingPayments = GetContributionsByPaymentMethodId(settings.TargetCurrency, pendingInvoices, !settings.EnforceTargetAmount);
+            var currentPayments = GetContributionsByPaymentMethodId(settings.TargetCurrency, completeInvoices, !settings.EnforceTargetAmount);
 
             var perkCount = invoices
                 .Where(entity => !string.IsNullOrEmpty(entity.ProductInformation.ItemCode))
@@ -140,6 +129,7 @@ namespace BTCPayServer.Services.Apps
                 EnforceTargetAmount = settings.EnforceTargetAmount,
                 StatusMessage = statusMessage,
                 Perks = perks,
+                Enabled = settings.Enabled,
                 DisqusEnabled = settings.DisqusEnabled,
                 SoundsEnabled = settings.SoundsEnabled,
                 DisqusShortname = settings.DisqusShortname,
@@ -148,19 +138,21 @@ namespace BTCPayServer.Services.Apps
                 DisplayPerksRanking = settings.DisplayPerksRanking,
                 PerkCount = perkCount,
                 NeverReset = settings.ResetEvery == CrowdfundResetEvery.Never,
+                Sounds = settings.Sounds,
+                AnimationColors = settings.AnimationColors,
                 CurrencyData = _Currencies.GetCurrencyData(settings.TargetCurrency, true),
                 Info = new ViewCrowdfundViewModel.CrowdfundInfo()
                 {
                     TotalContributors = invoices.Length,
-                    CurrentPendingAmount = currentPendingAmount,
-                    CurrentAmount = currentAmount,
-                    ProgressPercentage = (currentAmount / settings.TargetAmount) * 100,
-                    PendingProgressPercentage = (currentPendingAmount / settings.TargetAmount) * 100,
+                    ProgressPercentage = (currentPayments.TotalCurrency / settings.TargetAmount) * 100,
+                    PendingProgressPercentage = (pendingPayments.TotalCurrency / settings.TargetAmount) * 100,
                     LastUpdated = DateTime.Now,
-                    PaymentStats = paymentStats,
-                    PendingPaymentStats = pendingPaymentStats,
+                    PaymentStats = currentPayments.ToDictionary(c => c.Key.ToString(), c => c.Value.Value),
+                    PendingPaymentStats = pendingPayments.ToDictionary(c => c.Key.ToString(), c => c.Value.Value),
                     LastResetDate = lastResetDate,
-                    NextResetDate = nextResetDate
+                    NextResetDate = nextResetDate,
+                    CurrentPendingAmount = pendingPayments.TotalCurrency,
+                    CurrentAmount = currentPayments.TotalCurrency
                 }
             };
         }
@@ -288,46 +280,20 @@ namespace BTCPayServer.Services.Apps
                 .ToArray();
         }
 
-        public async Task<decimal> GetCurrentContributionAmount(Dictionary<string, decimal> stats, string primaryCurrency, RateRules rateRules)
+        public Contributions GetContributionsByPaymentMethodId(string currency, InvoiceEntity[] invoices, bool softcap)
         {
-            var result = new List<decimal>();
-
-            var ratesTask = _RateFetcher.FetchRates(
-                stats.Keys
-                    .Select((x) => new CurrencyPair(primaryCurrency, PaymentMethodId.Parse(x).CryptoCode))
-                    .Distinct()
-                    .ToHashSet(),
-                rateRules).Select(async rateTask =>
-                {
-                    var (key, value) = rateTask;
-                    var tResult = await value;
-                    var rate = tResult.BidAsk?.Bid;
-                    if (rate == null)
-                        return;
-
-                    foreach (var stat in stats)
-                    {
-                        if (string.Equals(PaymentMethodId.Parse(stat.Key).CryptoCode, key.Right,
-                            StringComparison.InvariantCultureIgnoreCase))
-                        {
-                            result.Add((1m / rate.Value) * stat.Value);
-                        }
-                    }
-                });
-
-            await Task.WhenAll(ratesTask);
-
-            return result.Sum();
-        }
-
-        public Dictionary<string, decimal> GetCurrentContributionAmountStats(InvoiceEntity[] invoices, bool softcap)
-        {
-            return invoices
+            var contributions = invoices
+                .Where(p => p.ProductInformation.Currency.Equals(currency, StringComparison.OrdinalIgnoreCase))
                 .SelectMany(p =>
                 {
+                    var contribution = new Contribution();
+                    contribution.PaymentMehtodId = new PaymentMethodId(p.ProductInformation.Currency, PaymentTypes.BTCLike);
+                    contribution.CurrencyValue = p.ProductInformation.Price;
+                    contribution.Value = contribution.CurrencyValue;
+
                     // For hardcap, we count newly created invoices as part of the contributions
                     if (!softcap && p.Status == InvoiceStatus.New)
-                        return new[] { (Key: p.ProductInformation.Currency, Value: p.ProductInformation.Price) };
+                        return new[] { contribution };
 
                     // If the user get a donation via other mean, he can register an invoice manually for such amount
                     // then mark the invoice as complete
@@ -335,20 +301,38 @@ namespace BTCPayServer.Services.Apps
                     if (payments.Count == 0 &&
                         p.ExceptionStatus == InvoiceExceptionStatus.Marked &&
                         p.Status == InvoiceStatus.Complete)
-                        return new[] { (Key: p.ProductInformation.Currency, Value: p.ProductInformation.Price) };
+                        return new[] { contribution };
+
+                    contribution.CurrencyValue = 0m;
+                    contribution.Value = 0m;
 
                     // If an invoice has been marked invalid, remove the contribution
                     if (p.ExceptionStatus == InvoiceExceptionStatus.Marked &&
                         p.Status == InvoiceStatus.Invalid)
-                        return new[] { (Key: p.ProductInformation.Currency, Value: 0m) };
+                        return new[] { contribution };
+
 
                     // Else, we just sum the payments
                     return payments
-                             .Select(pay => (Key: pay.GetPaymentMethodId().ToString(), Value: pay.GetCryptoPaymentData().GetValue() - pay.NetworkFee))
+                             .Select(pay =>
+                             {
+                                 var paymentMethodContribution = new Contribution();
+                                 paymentMethodContribution.PaymentMehtodId = pay.GetPaymentMethodId();
+                                 paymentMethodContribution.Value = pay.GetCryptoPaymentData().GetValue() - pay.NetworkFee;
+                                 var rate = p.GetPaymentMethod(paymentMethodContribution.PaymentMehtodId, _Networks).Rate;
+                                 paymentMethodContribution.CurrencyValue =  rate * paymentMethodContribution.Value;
+                                 return paymentMethodContribution;
+                             })
                              .ToArray();
                 })
-                .GroupBy(p => p.Key)
-                .ToDictionary(p => p.Key, p => p.Select(v => v.Value).Sum());
+                .GroupBy(p => p.PaymentMehtodId)
+                .ToDictionary(p => p.Key, p => new Contribution()
+                {
+                    PaymentMehtodId = p.Key,
+                    Value = p.Select(v => v.Value).Sum(),
+                    CurrencyValue = p.Select(v => v.CurrencyValue).Sum()
+                });
+            return new Contributions(contributions);
         }
 
         private class PosHolder

BTCPayServer/Services/Apps/CrowdfundSettings.cs

@@ -34,6 +34,54 @@ namespace BTCPayServer.Services.Apps
         public bool UseAllStoreInvoices { get; set; }
         public bool DisplayPerksRanking { get; set; }
         public bool SortPerksByPopularity { get; set; }
+        public string[] AnimationColors { get; set; } = new string[]
+        {
+            "#FF6138", "#FFBE53", "#2980B9", "#282741"
+        };
+
+        public string[] Sounds { get; set; } = new string[]
+        {
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/dominating.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/doublekill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/doublekill2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/eagleeye.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/firstblood.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/firstblood2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/firstblood3.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/flawless.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/godlike.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/hattrick.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/headhunter.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/headshot.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/headshot2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/headshot3.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/holyshit.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/killingspree.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/knife.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/knife2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/knife3.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/ludicrouskill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/megakill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/monsterkill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/multikill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/nade.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/ownage.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/payback.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/prepare.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/prepare2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/prepare3.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/prepare4.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/rampage.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/suicide.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/suicide2.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/suicide3.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/suicide4.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/teamkiller.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/triplekill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/ultrakill.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/unstoppable.wav",
+            "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/whickedsick.wav"
+        };
     }
     public enum CrowdfundResetEvery
     {

BTCPayServer/Services/BTCPayServerEnvironment.cs

@@ -13,11 +13,10 @@ namespace BTCPayServer.Services
 {
     public class BTCPayServerEnvironment
     {
+        IHttpContextAccessor httpContext;
         public BTCPayServerEnvironment(IHostingEnvironment env, BTCPayNetworkProvider provider, IHttpContextAccessor httpContext)
         {
-            ExpectedHost = httpContext.HttpContext.Request.Host.Value;
-            ExpectedDomain = httpContext.HttpContext.Request.Host.Host;
-            ExpectedProtocol = httpContext.HttpContext.Request.Scheme;
+            this.httpContext = httpContext;
             Version = typeof(BTCPayServerEnvironment).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
 #if DEBUG
             Build = "Debug";
@@ -32,9 +31,9 @@ namespace BTCPayServer.Services
             get; set;
         }
 
-        public string ExpectedDomain { get; set; }
-        public string ExpectedHost { get; set; }
-        public string ExpectedProtocol { get; set; }
+        public string ExpectedDomain => httpContext.HttpContext.Request.Host.Host;
+        public string ExpectedHost => httpContext.HttpContext.Request.Host.Value;
+        public string ExpectedProtocol => httpContext.HttpContext.Request.Scheme;
 
         public NetworkType NetworkType { get; set; }
         public string Version

BTCPayServer/Services/Mails/EmailSettings.cs

@@ -35,6 +35,7 @@ namespace BTCPayServer.Services.Mails
             get; set;
         }
 
+        [Display(Name = "Enable SSL")]
         public bool EnableSSL
         {
             get; set;

BTCPayServer/Services/PoliciesSettings.cs

@@ -18,5 +18,9 @@ namespace BTCPayServer.Services
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
         [Display(Name = "Disable registration")]
         public bool LockSubscription { get; set; }
+        
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        [Display(Name = "Discourage search engines from indexing this site")]
+        public bool DiscourageSearchEngines { get; set; }
     }
 }

BTCPayServer/Services/Rates/BackgroundFetcherRateProvider.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Logging;
 using BTCPayServer.Rating;
+using System.Threading;
 
 namespace BTCPayServer.Services.Rates
 {
@@ -93,13 +94,13 @@ namespace BTCPayServer.Services.Rates
         public bool DoNotAutoFetchIfExpired { get; set; }
         readonly static TimeSpan MaxBackoff = TimeSpan.FromMinutes(5.0);
 
-        public async Task<LatestFetch> UpdateIfNecessary()
+        public async Task<LatestFetch> UpdateIfNecessary(CancellationToken cancellationToken)
         {
             if (NextUpdate <= DateTimeOffset.UtcNow)
             {
                 try
                 {
-                    await Fetch();
+                    await Fetch(cancellationToken);
                 }
                 catch { } // Exception is inside _Latest
                 return _Latest;
@@ -108,7 +109,7 @@ namespace BTCPayServer.Services.Rates
         }
 
         LatestFetch _Latest;
-        public async Task<ExchangeRates> GetRatesAsync()
+        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
             var latest = _Latest;
             if (!DoNotAutoFetchIfExpired && latest != null && latest.Expiration <= DateTimeOffset.UtcNow + TimeSpan.FromSeconds(1.0))
@@ -116,7 +117,7 @@ namespace BTCPayServer.Services.Rates
                 Logs.PayServer.LogWarning($"GetRatesAsync was called on {GetExchangeName()} when the rate is outdated. It should never happen, let BTCPayServer developers know about this.");
                 latest = null;
             }
-            return (latest ?? (await Fetch())).GetResult();
+            return (latest ?? (await Fetch(cancellationToken))).GetResult();
         }
 
         private string GetExchangeName()
@@ -126,14 +127,14 @@ namespace BTCPayServer.Services.Rates
             return "???";
         }
 
-        private async Task<LatestFetch> Fetch()
+        private async Task<LatestFetch> Fetch(CancellationToken cancellationToken)
         {
             var previous = _Latest;
             var fetch = new LatestFetch();
             fetch.ExchangeName = GetExchangeName();
             try
             {
-                var rates = await _Inner.GetRatesAsync();
+                var rates = await _Inner.GetRatesAsync(cancellationToken);
                 fetch.Latest = rates;
                 fetch.Expiration = DateTimeOffset.UtcNow + ValidatyTime;
                 fetch.NextRefresh = DateTimeOffset.UtcNow + RefreshRate;

BTCPayServer/Services/Rates/BitpayRateProvider.cs

@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using NBitcoin;
 using BTCPayServer.Rating;
+using System.Threading;
 
 namespace BTCPayServer.Services.Rates
 {
@@ -22,7 +23,7 @@ namespace BTCPayServer.Services.Rates
 
         public string ExchangeName => BitpayName;
 
-        public async Task<ExchangeRates> GetRatesAsync()
+        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
             return new ExchangeRates((await _Bitpay.GetRatesAsync().ConfigureAwait(false))
                 .AllRates

BTCPayServer/Services/Rates/ByllsRateProvider.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Rating;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Services.Rates
+{
+    public class ByllsRateProvider : IRateProvider, IHasExchangeName
+    {
+        private readonly HttpClient _httpClient;
+        public ByllsRateProvider(HttpClient httpClient)
+        {
+            _httpClient = httpClient ?? new HttpClient();
+        }
+        public string ExchangeName => "bylls";
+
+        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
+        {
+            var response = await _httpClient.GetAsync("https://bylls.com/api/price?from_currency=BTC&to_currency=CAD", cancellationToken);
+            var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
+            var value = jobj["public_price"]["to_price"].Value<decimal>();
+            return new ExchangeRates(new[] { new ExchangeRate(ExchangeName, new CurrencyPair("BTC", "CAD"), new BidAsk(value)) });
+        }
+    }
+}

BTCPayServer/Services/Rates/CachedRateProvider.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using BTCPayServer.Services.Rates;
@@ -40,12 +41,12 @@ namespace BTCPayServer.Services.Rates
         } = TimeSpan.FromMinutes(1.0);
         public IMemoryCache MemoryCache { get => _MemoryCache; set => _MemoryCache = value; }
         
-        public Task<ExchangeRates> GetRatesAsync()
+        public Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
             return MemoryCache.GetOrCreateAsync("EXCHANGE_RATES_" + ExchangeName, (ICacheEntry entry) =>
             {
                 entry.AbsoluteExpiration = DateTimeOffset.UtcNow + CacheSpan;
-                return _Inner.GetRatesAsync();
+                return _Inner.GetRatesAsync(cancellationToken);
             });
         }
     }

BTCPayServer/Services/Rates/CoinAverageRateProvider.cs

@@ -11,6 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.ComponentModel;
 using BTCPayServer.Rating;
+using System.Threading;
 
 namespace BTCPayServer.Services.Rates
 {
@@ -65,7 +66,7 @@ namespace BTCPayServer.Services.Rates
             }
             set
             {
-                _LocalClient = null;
+                _LocalClient = value;
             }
         }
         HttpClient _LocalClient;
@@ -111,7 +112,7 @@ namespace BTCPayServer.Services.Rates
             }
         }
 
-        public async Task<ExchangeRates> GetRatesAsync()
+        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
             string url = Exchange == CoinAverageName ? $"https://apiv2.bitcoinaverage.com/indices/{Market}/ticker/short"
                                          : $"https://apiv2.bitcoinaverage.com/exchanges/{Exchange}";
@@ -122,7 +123,7 @@ namespace BTCPayServer.Services.Rates
             {
                 await auth.AddHeader(request);
             }
-            var resp = await HttpClient.SendAsync(request);
+            var resp = await HttpClient.SendAsync(request, cancellationToken);
             using (resp)
             {
 

BTCPayServer/Services/Rates/ExchangeSharpRateProvider.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using ExchangeSharp;
@@ -31,7 +32,7 @@ namespace BTCPayServer.Services.Rates
 
         public string ExchangeName => _ExchangeName;
 
-        public async Task<ExchangeRates> GetRatesAsync()
+        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
             await new SynchronizationContextRemover();
             var rates = await _ExchangeAPI.GetTickersAsync();

BTCPayServer/Services/Rates/FallbackRateProvider.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 
@@ -16,13 +17,17 @@ namespace BTCPayServer.Services.Rates
             _Providers = providers;
         }
 
-        public async Task<ExchangeRates> GetRatesAsync()
+        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
             foreach (var p in _Providers)
             {
                 try
                 {
-                    return await p.GetRatesAsync().ConfigureAwait(false);
+                    return await p.GetRatesAsync(cancellationToken).ConfigureAwait(false);
+                }
+                catch when (cancellationToken.IsCancellationRequested)
+                {
+                    throw;
                 }
                 catch(Exception ex) { Exceptions.Add(ex); }
             }

BTCPayServer/Services/Rates/IRateProvider.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 
@@ -8,6 +9,6 @@ namespace BTCPayServer.Services.Rates
 {
     public interface IRateProvider
     {
-        Task<ExchangeRates> GetRatesAsync();
+        Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken);
     }
 }

BTCPayServer/Services/Rates/KrakenExchangeRateProvider.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using ExchangeSharp;
@@ -28,7 +29,7 @@ namespace BTCPayServer.Services.Rates
             }
             set
             {
-                _LocalClient = null;
+                _LocalClient = value;
             }
         }
 
@@ -55,7 +56,7 @@ namespace BTCPayServer.Services.Rates
             { "ZCAD", "CAD" },
         };
 
-        public async Task<ExchangeRates> GetRatesAsync()
+        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
             var result = new ExchangeRates();
             var symbols = await GetSymbolsAsync();
@@ -135,7 +136,7 @@ namespace BTCPayServer.Services.Rates
             }
         }
 
-        private async Task<T> MakeJsonRequestAsync<T>(string url, string baseUrl = null, Dictionary<string, object> payload = null, string requestMethod = null)
+        private async Task<T> MakeJsonRequestAsync<T>(string url, string baseUrl = null, Dictionary<string, object> payload = null, string requestMethod = null, CancellationToken cancellationToken = default)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append("https://api.kraken.com");
@@ -147,7 +148,7 @@ namespace BTCPayServer.Services.Rates
                 sb.Append(String.Join('&', payload.Select(kv => $"{kv.Key}={kv.Value}").OfType<object>().ToArray()));
             }
             var request = new HttpRequestMessage(HttpMethod.Get, sb.ToString());
-            var response = await HttpClient.SendAsync(request);
+            var response = await HttpClient.SendAsync(request, cancellationToken);
             string stringResult = await response.Content.ReadAsStringAsync();
             var result = JsonConvert.DeserializeObject<T>(stringResult);
             if (result is JToken json)

BTCPayServer/Services/Rates/NullRateProvider.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 
@@ -20,7 +21,7 @@ namespace BTCPayServer.Services.Rates
                 return _Instance;
             }
         }
-        public Task<ExchangeRates> GetRatesAsync()
+        public Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
             return Task.FromResult(new ExchangeRates());
         }

BTCPayServer/Services/Rates/QuadrigacxRateProvider.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using Newtonsoft.Json.Linq;
@@ -31,9 +32,9 @@ namespace BTCPayServer.Services.Rates
             return true;
         }
 
-        public async Task<ExchangeRates> GetRatesAsync()
+        public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
         {
-            var response = await _Client.GetAsync($"https://api.quadrigacx.com/v2/ticker?book=all");
+            var response = await _Client.GetAsync($"https://api.quadrigacx.com/v2/ticker?book=all", cancellationToken);
             response.EnsureSuccessStatusCode();
             var rates = JObject.Parse(await response.Content.ReadAsStringAsync());
 

BTCPayServer/Services/Rates/RateFetcher.cs

@@ -3,6 +3,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using ExchangeSharp;
@@ -38,12 +39,12 @@ namespace BTCPayServer.Services.Rates
 
         public RateProviderFactory RateProviderFactory => _rateProviderFactory;
 
-        public async Task<RateResult> FetchRate(CurrencyPair pair, RateRules rules)
+        public async Task<RateResult> FetchRate(CurrencyPair pair, RateRules rules, CancellationToken cancellationToken)
         {
-            return await FetchRates(new HashSet<CurrencyPair>(new[] { pair }), rules).First().Value;
+            return await FetchRates(new HashSet<CurrencyPair>(new[] { pair }), rules, cancellationToken).First().Value;
         }
 
-        public Dictionary<CurrencyPair, Task<RateResult>> FetchRates(HashSet<CurrencyPair> pairs, RateRules rules)
+        public Dictionary<CurrencyPair, Task<RateResult>> FetchRates(HashSet<CurrencyPair> pairs, RateRules rules, CancellationToken cancellationToken)
         {
             if (rules == null)
                 throw new ArgumentNullException(nameof(rules));
@@ -59,7 +60,7 @@ namespace BTCPayServer.Services.Rates
                 {
                     if (!fetchingExchanges.TryGetValue(requiredExchange.Exchange, out var fetching))
                     {
-                        fetching = _rateProviderFactory.QueryRates(requiredExchange.Exchange);
+                        fetching = _rateProviderFactory.QueryRates(requiredExchange.Exchange, cancellationToken);
                         fetchingExchanges.Add(requiredExchange.Exchange, fetching);
                     }
                     dependentQueries.Add(fetching);

BTCPayServer/Services/Rates/RateProviderFactory.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Rating;
 using ExchangeSharp;
@@ -21,12 +22,12 @@ namespace BTCPayServer.Services.Rates
             {
                 _inner = inner;
             }
-            public async Task<ExchangeRates> GetRatesAsync()
+            public async Task<ExchangeRates> GetRatesAsync(CancellationToken cancellationToken)
             {
                 DateTimeOffset now = DateTimeOffset.UtcNow;
                 try
                 {
-                    return await _inner.GetRatesAsync();
+                    return await _inner.GetRatesAsync(cancellationToken);
                 }
                 catch (Exception ex)
                 {
@@ -109,8 +110,9 @@ namespace BTCPayServer.Services.Rates
 
             // Handmade providers
             Providers.Add(QuadrigacxRateProvider.QuadrigacxName, new QuadrigacxRateProvider());
-            Providers.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, HttpClient = _httpClientFactory?.CreateClient(), Authenticator = _CoinAverageSettings });
-            Providers.Add("kraken", new KrakenExchangeRateProvider() { HttpClient = _httpClientFactory?.CreateClient() });
+            Providers.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, HttpClient = _httpClientFactory?.CreateClient("EXCHANGE_COINAVERAGE"), Authenticator = _CoinAverageSettings });
+            Providers.Add("kraken", new KrakenExchangeRateProvider() { HttpClient = _httpClientFactory?.CreateClient("EXCHANGE_KRAKEN") });
+            Providers.Add("bylls", new ByllsRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BYLLS")));
 
             // Those exchanges make multiple requests when calling GetTickers so we remove them
             //DirectProviders.Add("gdax", new ExchangeSharpRateProvider("gdax", new ExchangeGdaxAPI()));
@@ -167,18 +169,19 @@ namespace BTCPayServer.Services.Rates
 
             // Add other exchanges supported here
             exchanges.Add(new CoinAverageExchange(CoinAverageRateProvider.CoinAverageName, "Coin Average"));
+            exchanges.Add(new CoinAverageExchange("bylls", "Bylls"));
             exchanges.Add(new CoinAverageExchange("cryptopia", "Cryptopia"));
 
             return exchanges;
         }
 
-        public async Task<QueryRateResult> QueryRates(string exchangeName)
+        public async Task<QueryRateResult> QueryRates(string exchangeName, CancellationToken cancellationToken)
         {
             Providers.TryGetValue(exchangeName, out var directProvider);
             directProvider = directProvider ?? NullRateProvider.Instance;
 
             var wrapper = new WrapperRateProvider(directProvider);
-            var value = await wrapper.GetRatesAsync();
+            var value = await wrapper.GetRatesAsync(cancellationToken);
             return new QueryRateResult()
             {
                 Latency = wrapper.Latency,

BTCPayServer/Views/Apps/ListApps.cshtml

@@ -21,8 +21,13 @@
             </div>
         </div>
 
+        <div class="row no-gutter" style="margin-bottom: 5px;">
+            <div class="col-lg-6">
+                <a asp-action="CreateApp" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new app</a>
+                <a href="https://docs.btcpayserver.org/features/apps" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
+            </div>
+        </div>
         <div class="row">
-            <a asp-action="CreateApp" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new app</a>
             <table class="table table-sm table-responsive-md">
                 <thead>
                     <tr>

BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml

@@ -1,4 +1,4 @@
-@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
+@addTagHelper *, Meziantou.AspNetCore.BundleTagHelpers
 @model UpdateCrowdfundViewModel
 @{
     ViewData["Title"] = "Update Crowdfund";
@@ -67,8 +67,8 @@
                     <div class="form-group">
                         <label asp-for="StartDate" class="control-label"></label>
                         <div class="input-group ">
-                            <input asp-for="StartDate" class="form-control datetime"/>
-                            <div class="input-group-append only-for-js">
+                            <input asp-for="StartDate" class="form-control datetime"  placeholder="No start date has been set for this crowdfund"/>
+                            <div class="input-group-append">
 
                                 <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
                                     <span class=" fa fa-times"></span>
@@ -93,8 +93,8 @@
                     <div class="form-group">
                         <label asp-for="EndDate" class="control-label"></label>
                         <div class="input-group ">
-                            <input asp-for="EndDate" class="form-control datetime" />
-                            <div class="input-group-append only-for-js">
+                            <input asp-for="EndDate" class="form-control datetime"  placeholder="No end date has been set for this crowdfund" />
+                            <div class="input-group-append">
 
                                 <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
                                     <span class=" fa fa-times"></span>
@@ -167,11 +167,23 @@
                         <input asp-for="SoundsEnabled" type="checkbox" class="form-check"/>
                         <span asp-validation-for="SoundsEnabled" class="text-danger"></span>
                     </div>
+                    
+                    <div class="form-group">
+                        <label asp-for="Sounds"></label>
+                        <textarea asp-for="Sounds" class="form-control"></textarea>
+                        <span asp-validation-for="Sounds" class="text-danger"></span>
+                    </div>
                     <div class="form-group">
                         <label asp-for="AnimationsEnabled"></label>
                         <input asp-for="AnimationsEnabled" type="checkbox" class="form-check"/>
                         <span asp-validation-for="AnimationsEnabled" class="text-danger"></span>
                     </div>
+                     
+                    <div class="form-group">
+                        <label asp-for="AnimationColors"></label>
+                        <textarea asp-for="AnimationColors" class="form-control"></textarea>
+                        <span asp-validation-for="AnimationColors" class="text-danger"></span>
+                    </div>
                     <div class="form-group">
                         <label asp-for="DisqusEnabled"></label>
                         <input asp-for="DisqusEnabled" type="checkbox" class="form-check"/>

BTCPayServer/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml

@@ -1,4 +1,10 @@
 <div class="container p-0" id="app" v-cloak>
+    @if(!Model.Enabled) 
+    {
+    <div class="alert alert-warning" role="alert" style="text-align: center;">
+        This crowdfund page is not publically viewable!
+    </div>
+    }
     <div class="row h-100 w-100 py-sm-0 py-md-4 mx-0">
         <div class="card w-100 p-0 mx-0">
             <img class="card-img-top" :src="srvModel.mainImageUrl" v-if="srvModel.mainImageUrl" id="crowdfund-main-image">

BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml

@@ -10,13 +10,13 @@
 <html class="h-100">
 <head>
     <title>@Model.Title</title>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <link href="@Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet"/>
+    <link href="@Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
     @if (Model.CustomCSSLink != null)
     {
-        <link href="@Model.CustomCSSLink" rel="stylesheet"/>
+        <link href="@Model.CustomCSSLink" rel="stylesheet" />
     }
     @if (!Context.Request.Query.ContainsKey("simple"))
     {
@@ -25,13 +25,15 @@
         </script>
         <bundle name="wwwroot/bundles/crowdfund-bundle-1.min.js"></bundle>
         <bundle name="wwwroot/bundles/crowdfund-bundle-2.min.js"></bundle>
+        @*We need to make sure btcpay.js is not bundled, else it will not work if there is a RootPath*@
+        <script src="~/modal/btcpay.js"></script>
     }
-    
+
     <bundle name="wwwroot/bundles/crowdfund-bundle.min.css"></bundle>
     @if (!string.IsNullOrEmpty(Model.EmbeddedCSS))
     {
         <style>
-            @Html.Raw(Model.EmbeddedCSS); 
+            @Html.Raw(Model.EmbeddedCSS);
         </style>
     }
 

BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml

@@ -35,6 +35,13 @@
         </script>
         <bundle name="wwwroot/bundles/cart-bundle.min.js" />
     }
+    <style>
+        .card-deck {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+            grid-gap: .5rem;
+        }
+    </style> 
 </head>
 
 <script id="template-cart-item" type="text/template">
@@ -233,27 +240,39 @@
 
                 <div id="js-pos-list" class="text-center mx-auto px-4">
                     <div class="row">
-                    @for (int i = 0; i < Model.Items.Length; i++)
+                  
+                        
+                    @{
+                        var rowsJ = Model.Items.Length/4 + (Model.Items.Length % 4 > 0 ? 1 : 0);
+                    }
+                    @for (int x = 0; x < rowsJ; x++)
                     {
-                        var item = Model.Items[i];
-                        var image = item.Image;
-                        var description = item.Description;
+                        var startingIndex = x == 0 ? 0 : x * 4;
+                        var endLoopIndex = startingIndex + Math.Min(4, Model.Items.Length - startingIndex);
+                    
+                        <div class="row  card-deck my-3 mx-auto">
+                            @for (int i = startingIndex; i < endLoopIndex; i++)
+                            {
+                                var item = Model.Items[i];
+                                var image = item.Image;
+                                var description = item.Description;
 
-                        <div class="col-sm-6 col-lg-3 my-3 px-2 card-wrapper">
-                            <div class="js-add-cart card" data-id="@i">
-                                @if (!String.IsNullOrWhiteSpace(image))
-                                {
-                                    <img class="card-img-top" src="@image" alt="Card image cap">
-                                }
-                                <div class="card-body p-3">
-                                    <h6 class="card-title mb-0">@item.Title</h6>
-                                    @if (!String.IsNullOrWhiteSpace(description))
-                                    {
-                                        <p class="card-text">@description</p>
-                                    }
-                                    <span class="text-muted small">@String.Format(Model.ButtonText, @item.Price.Formatted)</span>
-                                </div>
-                            </div>
+                                    <div class="js-add-cart card" data-id="@i">
+                                        @if (!String.IsNullOrWhiteSpace(image))
+                                        {
+                                            <img class="card-img-top" src="@image" alt="Card image cap">
+                                        }
+                                        <div class="card-body p-3">
+                                            <h6 class="card-title mb-0">@item.Title</h6>
+                                            @if (!String.IsNullOrWhiteSpace(description))
+                                            {
+                                                <p class="card-text">@description</p>
+                                            }
+                                            <span class="text-muted small">@String.Format(Model.ButtonText, @item.Price.Formatted)</span>
+                                        </div>
+                                    </div>
+                             
+                            }
                         </div>
                     }
                     </div>
@@ -295,14 +314,20 @@
         <div class="container d-flex h-100">
             <div class="justify-content-center align-self-center text-center mx-auto px-2 py-3 w-100" style="margin: auto;">
                 <h1 class="mb-4">@Model.Title</h1>
-                <div class="row">
-                    @for (int i = 0; i < Model.Items.Length; i++)
+                @{
+                    var rows = Model.Items.Length/4 + (Model.Items.Length % 4 > 0 ? 1 : 0);
+                }
+                @for (int x = 0; x < rows; x++)
+                {
+                    var startingIndex = x == 0 ? 0 : x * 4;
+                    var endLoopIndex = startingIndex + Math.Min(4, Model.Items.Length - startingIndex);
+                    
+                     <div class="row  card-deck my-3 mx-auto">
+                    @for (int i = startingIndex; i < endLoopIndex; i++)
                     {
-                        var className = (Model.Items.Length - i) > (Model.Items.Length % 4) ? "col-sm-6 col-lg-3" : "col-md align-self-start";
                         var item = Model.Items[i];
                         var image = item.Image;
                         var description = item.Description;
-                        <div class="@className my-3 px-2">
                             <div class="card" data-id="@i">
                                 @if (!String.IsNullOrWhiteSpace(image))
                                 {
@@ -339,9 +364,10 @@
                                     }
                                 </div>
                             </div>
-                        </div>
                     }
                 </div>
+                }
+               
                 @if (Model.ShowCustomAmount)
                 {
                     <div class="row mt-2 mb-4">

BTCPayServer/Views/Home/Home.cshtml

@@ -129,31 +129,31 @@
         </div>
         <div class="row">
             <div class="col-lg-3 ml-auto text-center">
-                <a href="https://chat.btcpayserver.org/">
+                <a href="https://chat.btcpayserver.org/"  target="_blank">
                     <img src="~/img/mattermost.png" height="100" />
                 </a>
-                <p><a href="https://chat.btcpayserver.org/">On Mattermost</a></p>
+                <p><a href="https://chat.btcpayserver.org/"  target="_blank">On Mattermost</a></p>
             </div>
             <div class="col-lg-3 ml-auto text-center">
-                <a href="https://slack.btcpayserver.org/">
+                <a href="https://slack.btcpayserver.org/"  target="_blank">
                     <img src="~/img/slack.png" height="100" />
                 </a>
-                <p><a href="http://slack.forkbitpay.ninja/">On Slack</a></p>
+                <p><a href="http://slack.forkbitpay.ninja/" target="_blank">On Slack</a></p>
             </div>
             <div class="col-lg-3 mr-auto text-center">
-                <a href="https://twitter.com/BtcpayServer">
+                <a href="https://twitter.com/BtcpayServer" target="_blank">
                     <img src="~/img/twitter.png" height="100" />
                 </a>
                 <p>
-                    <a href="https://twitter.com/BtcpayServer">On Twitter</a>
+                    <a href="https://twitter.com/BtcpayServer" target="_blank">On Twitter</a>
                 </p>
             </div>
             <div class="col-lg-3 mr-auto text-center">
-                <a href="https://github.com/btcpayserver/btcpayserver">
+                <a href="https://github.com/btcpayserver/btcpayserver" target="_blank">
                     <img src="~/img/github.png" height="100" />
                 </a>
                 <p>
-                    <a href="https://github.com/btcpayserver/btcpayserver">On Github</a>
+                    <a href="https://github.com/btcpayserver/btcpayserver" target="_blank">On Github</a>
                 </p>
             </div>
         </div>

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -71,12 +71,11 @@
             }
             else
             {
-                <div class="payment__currencies">
+                <div class="payment__currencies_noborder">
                     <img v-bind:src="srvModel.cryptoImage" />
                     <span>{{srvModel.paymentMethodName}} ({{srvModel.cryptoCode}})</span>
                     <span v-show="srvModel.isLightning">&#9889;</span>
                 </div>
-
             }
             <div class="payment__spinner">
                 <partial name="Checkout-Spinner" />
@@ -193,7 +192,7 @@
         </form>
     </div>
     <div class="bp-view payment scan" id="scan">
-        <div class="wrapBtnGroup" v-bind:class="{ invisible: lndModel === null }">
+        <div class="wrapBtnGroup" v-bind:class="{ invisible: lndModel === null || !scanDisplayQr }">
             <div class="btnGroupLnd">
                 <button onclick="lndToggleBolt11()" v-bind:class="{ active: lndModel != null && lndModel.toggle === 0 }"
                         v-bind:title="$t('BOLT 11 Invoice')">
@@ -206,11 +205,18 @@
             </div>
         </div>
         <div class="payment__scan">
-            <img v-bind:src="srvModel.cryptoImage" class="qr_currency_icon" />
-            <qrcode v-bind:val="scanDisplayQr" v-bind:size="256" bg-color="#f5f5f7" fg-color="#000">
+            <img v-bind:src="srvModel.cryptoImage" class="qr_currency_icon"
+                 v-if="scanDisplayQr" />
+            <qrcode v-bind:value="scanDisplayQr" :options="{ width: 256, margin: 0, color: {dark:'#000', light:'#f5f5f7'} }"
+                    v-if="scanDisplayQr">
             </qrcode>
+
+
+            <div class="payment__spinner qr_currency_icon" style="padding-right: 20px;">
+                <partial name="Checkout-Spinner" />
+            </div>
         </div>
-        <div class="payment__details__instruction__open-wallet">
+        <div class="payment__details__instruction__open-wallet" v-if="scanDisplayQr">
             <a class="payment__details__instruction__open-wallet__btn action-button" v-bind:href="srvModel.invoiceBitcoinUrl">
                 <span>{{$t("Open in wallet")}}</span>
             </a>

BTCPayServer/Views/Invoice/Checkout.cshtml

@@ -82,15 +82,15 @@
                         @* Not working because of nsSeparator: false, keySeparator: false,
                             {{$t("nested.lang")}} >>
                         *@
-                    
-                        <select asp-for="DefaultLang"  
+
+                        <select asp-for="DefaultLang"
                                 class="cmblang reverse invisible"
-                            onchange="changeLanguage($(this).val())"
-                            asp-items="@langService.GetLanguages().Select((language) => new SelectListItem(language.DisplayName,language.Code, false))"></select>
-                    
+                                onchange="changeLanguage($(this).val())"
+                                asp-items="@langService.GetLanguages().Select((language) => new SelectListItem(language.DisplayName,language.Code, false))"></select>
+
                         <script>
                             var languageSelectorPrettyDropdown;
-                            $(function() {
+                            $(function () {
                                 // REVIEW: don't use initDropdown method but rather directly initialize select whenever you are using it
                                 $("#DefaultLang").val(startingLanguage);
                                 languageSelectorPrettyDropdown = initDropdown("#DefaultLang");
@@ -113,11 +113,8 @@
             </div>
         </div>
     </invoice>
-<script type="text/javascript">
-    var availableLanguages = @Html.Raw(Json.Serialize(
-                                     langService
-                                         .GetLanguages()
-                                         .Select((language) => language.Code)));;
+    <script type="text/javascript">
+    var availableLanguages = @Html.Raw(Json.Serialize(langService.GetLanguages().Select((language) => language.Code)));;
     var storeDefaultLang = "@Model.DefaultLang";
     var fallbackLanguage = "en";
     startingLanguage = computeStartingLanguage();
@@ -126,14 +123,14 @@
         .use(window.i18nextXHRBackend)
         .init({
             backend: {
-                loadPath: '/locales/{{lng}}.json'
+                loadPath: '@(Model.RootPath)locales/{{lng}}.json'
             },
             lng: startingLanguage,
             fallbackLng: fallbackLanguage,
             nsSeparator: false,
             keySeparator: false
         });
-    
+
     function computeStartingLanguage() {
         if (urlParams.lang && isLanguageAvailable(urlParams.lang)) {
             return urlParams.lang;
@@ -150,11 +147,11 @@
             i18next.changeLanguage(lang);
         }
     }
-        
+
     function isLanguageAvailable(languageCode) {
         return availableLanguages.indexOf(languageCode) >= 0;
     }
-    
+
     const i18n = new VueI18next(i18next);
 
     // TODO: Move all logic from core.js to Vue controller
@@ -169,7 +166,7 @@
         i18n: i18n,
         el: '#checkoutCtrl',
         components: {
-            qrcode: VueQr,
+            qrcode: VueQrcode,
             changelly: ChangellyComponent,
             coinswitch: CoinSwitchComponent
         },
@@ -182,6 +179,6 @@
             selectedThirdPartyProcessor: ""
         }
     });
-</script>
+    </script>
 </body>
 </html>

BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml

@@ -17,8 +17,8 @@
         </div>
         <div class="row">
             <div class="col-lg-12">
-                <form method="post">
-                    <input type="hidden" asp-for="Id"/>
+                <form method="post" action="@Url.Action("EditPaymentRequest", "PaymentRequest", new { id = Model.Id}, Context.Request.Scheme)">
+                    <input type="hidden" name="Id" value="@Model.Id"/>
                     <div asp-validation-summary="ModelOnly" class="text-danger"></div>
                     <div class="form-group">
                         <label asp-for="Title" class="control-label"></label>*
@@ -34,7 +34,7 @@
 
                     <div class="form-group">
                         <label asp-for="Currency" class="control-label"></label>*
-                        <input placeholder="BTC" asp-for="Currency" class="form-control"/>
+                        <input  asp-for="Currency" class="form-control"/>
                         <span asp-validation-for="Currency" class="text-danger"></span>
                     </div>
                     <div class="form-group">
@@ -66,8 +66,8 @@
                     <div class="form-group">
                         <label asp-for="ExpiryDate" class="control-label"></label>
                         <div class="input-group ">
-                            <input asp-for="ExpiryDate" class="form-control datetime" min="today"/>
-                            <div class="input-group-append only-for-js">
+                            <input asp-for="ExpiryDate" class="form-control datetime" min="today" placeholder="No expiry date has been set for this payment request"/>
+                            <div class="input-group-append">
 
                                 <button class="btn btn-secondary input-group-clear" type="button" title="Clear">
                                     <span class=" fa fa-times"></span>
@@ -105,7 +105,7 @@
                                asp-action="ListInvoices"
                                asp-controller="Invoice" 
                                asp-route-searchterm="@($"orderid:{PaymentRequestRepository.GetOrderIdForPaymentRequest(Model.Id)}")">Invoices</a>
-                                                                                                                   
+                            <a class="btn btn-secondary" asp-action="ClonePaymentRequest" id="@Model.Id">Clone</a>                                                                              
                         }
                         <a class="btn btn-secondary" target="_blank" asp-action="GetPaymentRequests">Back to list</a>
                     </div>

BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml

@@ -23,6 +23,7 @@
         <div class="row no-gutter" style="margin-bottom: 5px;">
             <div class="col-lg-6">
                 <a asp-action="EditPaymentRequest" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new payment request</a>
+                <a href="https://docs.btcpayserver.org/features/paymentrequests" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
             </div>
         </div>
 
@@ -54,6 +55,8 @@
                             <span> - </span>
                             <a target="_blank" asp-action="PayPaymentRequest" asp-route-id="@item.Id">Pay</a>
                             <span> - </span>
+                            <a target="_blank" asp-action="ClonePaymentRequest" asp-route-id="@item.Id">Clone</a>
+                            <span> - </span>
                             <a asp-action="RemovePaymentRequestPrompt" asp-route-id="@item.Id">Remove</a>
                         </td>
                     </tr>

BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml

@@ -11,13 +11,13 @@
 <html class="h-100">
 <head>
     <title>@Model.Title</title>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <link href="@Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet"/>
+    <link href="@Context.Request.GetRelativePathOrAbsolute(themeManager.BootstrapUri)" rel="stylesheet" />
     @if (Model.CustomCSSLink != null)
     {
-        <link href="@Model.CustomCSSLink" rel="stylesheet"/>
+        <link href="@Model.CustomCSSLink" rel="stylesheet" />
     }
     @if (!Context.Request.Query.ContainsKey("simple"))
     {
@@ -26,13 +26,15 @@
         </script>
         <bundle name="wwwroot/bundles/payment-request-bundle-1.min.js"></bundle>
         <bundle name="wwwroot/bundles/payment-request-bundle-2.min.js"></bundle>
+        @*We need to make sure btcpay.js is not bundled, else it will not work if there is a RootPath*@
+        <script src="~/modal/btcpay.js"></script>
     }
 
     <bundle name="wwwroot/bundles/payment-request-bundle.min.css"></bundle>
     @if (!string.IsNullOrEmpty(Model.EmbeddedCSS))
     {
         <style>
-            @Html.Raw(Model.EmbeddedCSS); 
+            @Html.Raw(Model.EmbeddedCSS);
         </style>
     }
 </head>
@@ -107,7 +109,7 @@ else
                                         <template v-else v-for="invoice of srvModel.invoices" :key="invoice.id">
                                             <tr class="bg-light">
                                                 <td scope="row">{{invoice.id}}</td>
-                                                <td>{{invoice.amount}} {{invoice.currency}}</td>
+                                                <td>{{invoice.amountFormatted}}</td>
                                                 <td>{{moment(invoice.expiryDate).format('L HH:mm')}}</td>
                                                 <td>{{invoice.status}}</td>
                                             </tr>

BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml

@@ -31,7 +31,7 @@
             var app = new Vue({
                 el: '#app',
                 components: {
-                    qrcode: VueQr
+                    qrcode: VueQrcode
                 },
                 data: {
                     srvModel: srvModel
@@ -125,7 +125,7 @@
                 <div class="card-body m-sm-0 p-sm-0" v-if="srvModel.available">
                     <div class="qr-container mb-2">
                         <img v-bind:src="srvModel.cryptoImage" class="qr-icon"/>
-                        <qrcode v-bind:val="srvModel.nodeInfo" v-bind:size="256" bg-color="#f5f5f7" fg-color="#000">
+                        <qrcode v-bind:value="srvModel.nodeInfo" :options="{ width: 256, margin: 0, color: {dark:'#000', light:'#f5f5f7'} }">
                         </qrcode>
                     </div>
                     <div class="input-group copy" data-clipboard-target="#vue-peer-info">

BTCPayServer/Views/Server/Emails.cshtml

@@ -41,7 +41,7 @@
 
             <div class="form-group">
                 <label asp-for="Settings.Password"></label>
-                <input asp-for="Settings.Password" type="password" class="form-control" />
+                <input asp-for="Settings.Password" type="password" class="form-control" value="@Model.Settings.Password" />
                 <span asp-validation-for="Settings.Password" class="text-danger"></span>
             </div>
 

BTCPayServer/Views/Server/LightningWalletServices.cshtml

@@ -37,7 +37,7 @@
         <div class="form-group">
             <h5>QR Code connection</h5>
             <p>
-                <span>You can use QR Code to connect to your clightning from your mobile.<br /></span>
+                <span>You can use QR Code to connect to your @Model.WalletName from your mobile.<br /></span>
             </p>
         </div>
         <div class="form-group">

BTCPayServer/Views/Server/LndServices.cshtml

@@ -21,6 +21,55 @@
             </p>
         </div>
 
+        <div class="form-group">
+            <h5>Compatible wallets</h5>
+        </div>
+        @if (Model.Uri == null) // if GRPC
+        {
+            <div class="row">
+                <div class="col-lg-3 ml-auto text-center">
+                    <a href="https://www.pebble.indiesquare.me/ target="_blank"">
+                        <img src="~/img/pebblewallet.jpg" height="100" />
+                    </a>
+                    <p><a href="https://www.pebble.indiesquare.me/" target="_blank">Pebble</a></p>
+                </div>
+                <div class="col-lg-3 ml-auto text-center">
+                    <a href="https://zap.jackmallers.com/" target="_blank">
+                        <img src="~/img/zapwallet.jpg" height="100" />
+                    </a>
+                    <p><a href="https://zap.jackmallers.com/" target="_blank">Zap</a></p>
+                </div>
+                <div class="col-lg-3 mr-auto text-center">
+
+                </div>
+                <div class="col-lg-3 mr-auto text-center">
+
+                </div>
+            </div>
+        }
+        else
+        {
+            <div class="row">
+                <div class="col-lg-3 ml-auto text-center">
+                    <a href="https://lightningjoule.com/" target="_blank">
+                        <img src="~/img/joule.png" height="100" />
+                    </a>
+                    <p><a href="https://lightningjoule.com/" target="_blank">Joule</a></p>
+                </div>
+                <div class="col-lg-3 ml-auto text-center">
+                    <a href="https://github.com/ZeusLN/zeus" target="_blank">
+                        <img src="~/img/zeus.jpg" height="100" />
+                    </a>
+                    <p><a href="https://github.com/ZeusLN/zeus" target="_blank">Zeus</a></p>
+                </div>
+                <div class="col-lg-3 mr-auto text-center">
+
+                </div>
+                <div class="col-lg-3 mr-auto text-center">
+
+                </div>
+            </div>
+        }
         <div class="form-group">
             <h5>QR Code connection</h5>
             <p>
@@ -29,7 +78,7 @@
             </p>
         </div>
         <div class="form-group">
-            @if(Model.QRCode == null)
+            @if (Model.QRCode == null)
             {
                 <div class="form-group">
                     <form method="post">

BTCPayServer/Views/Server/Policies.cshtml

@@ -21,6 +21,10 @@
             <div class="form-group">
                 <label asp-for="LockSubscription"></label>
                 <input asp-for="LockSubscription" type="checkbox" class="form-check-inline" />
+            </div> 
+            <div class="form-group">
+                <label asp-for="DiscourageSearchEngines"></label>
+                <input asp-for="DiscourageSearchEngines" type="checkbox" class="form-check-inline" />
             </div>
             <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
         </form>

BTCPayServer/Views/Shared/_Layout.cshtml

@@ -15,6 +15,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="description" content="">
     <meta name="author" content="">
+    @if (themeManager.DiscourageSearchEngines)
+    {
+        <META NAME="robots" CONTENT="noindex">
+    }
 
     <title>BTCPay Server</title>
 
@@ -58,7 +62,7 @@
                 <ul class="navbar-nav ml-auto">
                     @if (SignInManager.IsSignedIn(User))
                     {
-                        @if (User.IsInRole(Roles.ServerAdmin))
+                        if (User.IsInRole(Roles.ServerAdmin))
                         {
                             <li class="nav-item"><a asp-area="" asp-controller="Server" asp-action="ListUsers" class="nav-link js-scroll-trigger">Server settings</a></li>
                         }
@@ -75,7 +79,7 @@
                         </li>}
                     else
                     {
-                        @if (themeManager.ShowRegister)
+                        if (themeManager.ShowRegister)
                         {
                             <li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Register" class="nav-link js-scroll-trigger">Register</a></li>
                         }
@@ -85,7 +89,7 @@
             </div>
             <div id="badUrl" class="alert alert-danger alert-dismissible" style="display:none; position:absolute; top:75px;" role="alert">
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <span>BTCPay is expecting you to access this website from <b>@(env.ExpectedProtocol)://@(env.ExpectedHost)/</b>. If you use a reverse proxy, please set the <b>X-Forwarded-Proto</b> header to <b>@(env.ExpectedProtocol)</b> (<a href="https://docs.btcpayserver.org/faq-and-common-issues/faq-deployment#btcpay-is-expecting-you-to-access-this-website-from" target="_blank">More information</a>)</span>
+                <span>BTCPay is expecting you to access this website from <b>@(env.ExpectedProtocol)://@(env.ExpectedHost)/</b>. If you use a reverse proxy, please set the <b>X-Forwarded-Proto</b> header to <b id="browserScheme">@(env.ExpectedProtocol)</b> (<a href="https://docs.btcpayserver.org/faq-and-common-issues/faq-deployment#btcpay-is-expecting-you-to-access-this-website-from" target="_blank">More information</a>)</span>
             </div>
         </div>
     </nav>
@@ -112,6 +116,7 @@
         var expectedProtocol = @Html.Raw(Json.Serialize(env.ExpectedProtocol));
         if (window.location.host != expectedDomain || window.location.protocol != expectedProtocol + ":") {
             document.getElementById("badUrl").style.display = "block";
+            document.getElementById("browserScheme").innerText = window.location.protocol.substr(0, window.location.protocol.length -1);
         }
     </script>
 </body>

BTCPayServer/Views/Stores/Rates.cshtml

@@ -15,14 +15,14 @@
 <div class="row">
     <div class="col-md-8">
         <form method="post">
-            @if(Model.ShowScripting)
+            @if (Model.ShowScripting)
             {
                 <div class="form-group">
                     <h5>Scripting</h5>
                     <span>Rate script allows you to express precisely how you want to calculate rates for currency pairs.</span>
                     <p class="text-muted">
                         <b>Supported exchanges are</b>:
-                        @for(int i = 0; i < Model.AvailableExchanges.Length; i++)
+                        @for (int i = 0; i < Model.AvailableExchanges.Length; i++)
                         {
                             <a href="@Model.AvailableExchanges[i].Url">@Model.AvailableExchanges[i].Name</a><span>@(i == Model.AvailableExchanges.Length - 1 ? "" : ",")</span>
                         }
@@ -30,16 +30,16 @@
                     <p><a href="#help" data-toggle="collapse"><b>Click here for more information</b></a></p>
                 </div>
             }
-            @if(Model.TestRateRules != null)
+            @if (Model.TestRateRules != null)
             {
                 <div class="form-group">
                     <h5>Test results:</h5>
                     <table class="table table-sm table-responsive-md">
                         <tbody>
-                            @foreach(var result in Model.TestRateRules)
+                            @foreach (var result in Model.TestRateRules)
                             {
                                 <tr>
-                                    @if(result.Error)
+                                    @if (result.Error)
                                     {
                                         <th class="small"><span class="fa fa-times" style="color:red;"></span> @result.CurrencyPair</th>
                                     }
@@ -54,7 +54,7 @@
                     </table>
                 </div>
             }
-            @if(Model.ShowScripting)
+            @if (Model.ShowScripting)
             {
                 <div id="help" class="collapse text-left">
                     <p>
@@ -157,6 +157,14 @@
                 </div>
                 <span asp-validation-for="ScriptTest" class="text-danger"></span>
             </div>
+            <div class="form-group">
+                <h5>Default currency pairs</h5>
+                <span>You can query those pairs via REST by querying <a asp-controller="Rate" asp-action="GetRates2" asp-route-storeId="@Model.StoreId" target="_blank">this link</a> without the need to specify currencyPairs.</span>
+                <div class="input-group">
+                    <input placeholder="BTC_USD, BTC_CAD" asp-for="DefaultCurrencyPairs" class="form-control" />
+                </div>
+                <span asp-validation-for="DefaultCurrencyPairs" class="text-danger"></span>
+            </div>
             <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
             <input type="hidden" asp-for="ShowScripting" />
         </form>

BTCPayServer/bundleconfig.json

@@ -44,7 +44,7 @@
             "wwwroot/vendor/clipboard.js/clipboard.js",
             "wwwroot/vendor/jquery/jquery.js",
             "wwwroot/vendor/vuejs/vue.min.js",
-            "wwwroot/vendor/vuejs/vue-qrcode.js",
+            "wwwroot/vendor/vue-qrcode/vue-qrcode.js",
             "wwwroot/vendor/i18next/i18next.js",
             "wwwroot/vendor/i18next/i18nextXHRBackend.js",
             "wwwroot/vendor/i18next/vue-i18next.js",
@@ -60,7 +60,7 @@
             "wwwroot/vendor/clipboard.js/clipboard.js",
             "wwwroot/vendor/jquery/jquery.js",
             "wwwroot/vendor/vuejs/vue.min.js",
-            "wwwroot/vendor/vuejs/vue-qrcode.js",
+            "wwwroot/vendor/vue-qrcode/vue-qrcode.js",
             "wwwroot/vendor/vue-toasted/vue-toasted.min.js"
         ]
     },
@@ -83,7 +83,6 @@
             "wwwroot/vendor/bootstrap-vue/bootstrap-vue.js",
             "wwwroot/vendor/signalr/signalr.js",
             "wwwroot/vendor/animejs/anime.min.js",
-            "wwwroot/modal/btcpay.js",
             "wwwroot/crowdfund/**/*.js"
         ]
     },
@@ -103,7 +102,7 @@
             "wwwroot/vendor/highlightjs/highlight.min.js",
             "wwwroot/vendor/summernote/summernote-bs4.js",
             "wwwroot/vendor/flatpickr/flatpickr.js",
-            "wwwroot/crowdfund-admin/**/*.js",
+            "wwwroot/crowdfund-admin/main.js",
             "wwwroot/products/js/products.js",
             "wwwroot/products/js/products.jquery.js"
         ]
@@ -113,8 +112,7 @@
         "inputFiles": [
             "wwwroot/vendor/highlightjs/default.min.css",
             "wwwroot/vendor/summernote/summernote-bs4.css",
-            "wwwroot/vendor/flatpickr/flatpickr.min.css",
-            "wwwroot/crowdfund-admin/*.js"
+            "wwwroot/vendor/flatpickr/flatpickr.min.css"
         ]
     },
     {
@@ -152,7 +150,6 @@
             "wwwroot/vendor/bootstrap-vue/bootstrap-vue.js",
             "wwwroot/vendor/signalr/signalr.js",
             "wwwroot/vendor/animejs/anime.min.js",
-            "wwwroot/modal/btcpay.js",
             "wwwroot/payment-request/**/*.js"
         ]
     },

BTCPayServer/wwwroot/checkout/coinswitch.html

@@ -46,7 +46,9 @@
                     setTimeout(waitForCoinSwitch, 1000);
                     return;
                 }
-                payment.open(config);
+                payment.on("Exchange:Ready", function(){
+                    payment.open(config);
+                });                
                 payment.on("Exchange:Complete", function () {
                     if(window.localStorage){
                         window.localStorage.removeItem(toCurrencyAddress);

BTCPayServer/wwwroot/checkout/css/normalizer.css

@@ -9444,6 +9444,8 @@ strong {
 .payment__scan {
     position: relative;
     text-align: center;
+    height: 256px;
+    margin-bottom: 5px;
 }
 
 .payment__scan__checkmark-wrapper {

BTCPayServer/wwwroot/checkout/css/vex-extrastyles.css

@@ -55,10 +55,16 @@
     padding: 6px;
 }
 
-    .payment__currencies img {
-        margin-top: -3px;
-        height: 24px;
-    }
+.payment__currencies_noborder {
+    font-size: 13px;
+    border-radius: 5px;
+    padding: 6px;
+}
+
+.payment__currencies img , .payment__currencies_noborder img{
+    margin-top: -3px;
+    height: 24px;
+}
 
     .payment__currencies:hover .clickable_underline {
         border-bottom: 1px dotted black;

BTCPayServer/wwwroot/crowdfund/app.js

@@ -216,7 +216,6 @@ addLoadEvent(function (ev) {
             this.sound = this.srvModel.soundsEnabled;
             this.animation = this.srvModel.animationsEnabled;
             eventAggregator.$on("invoice-created", function (invoiceId) {
-                btcpay.setApiUrlPrefix(window.location.origin);
                 btcpay.showInvoice(invoiceId);
                 btcpay.showFrame();
 
@@ -256,7 +255,7 @@ addLoadEvent(function (ev) {
             eventAggregator.$on("payment-received", function (amount, cryptoCode, type) {
                 var onChain = type.toLowerCase() === "btclike";
                 if(self.sound) {
-                    playRandomQuakeSound();
+                    playRandomSound();
                 }
                 if(self.animation) {
                     fireworks();

BTCPayServer/wwwroot/crowdfund/services/audioplayer.js

@@ -1,5 +1,3 @@
-
-
 function playSound(path) {
     // audio supported?
     if (typeof window.Audio === 'function') {
@@ -11,55 +9,7 @@ function playSound(path) {
     }
 }
 
-
-function playQuakeSound (name){
-    // var path = window.location.protocol +"://github.com/ClaudiuHKS/AdvancedQuakeSounds/blob/master/sound/QuakeSounds/"+name+"?raw=true"
-    var path = window.location.protocol + "//github.com/ClaudiuHKS/AdvancedQuakeSounds/raw/master/sound/QuakeSounds/" + name;
-    playSound(path);
+function playRandomSound(){
+    var sound  =  srvModel.sounds[Math.floor((Math.random() *  srvModel.sounds.length) )];
+    playSound(sound);
 }
-
-function playRandomQuakeSound(){
-    playQuakeSound(quake[Math.floor((Math.random() * quake.length) )]);
-}
-
-var quake = [
-"dominating.wav"
-,"doublekill.wav"
-,"doublekill2.wav"
-,"eagleeye.wav"
-,"firstblood.wav"
-,"firstblood2.wav"
-,"firstblood3.wav"
-,"flawless.wav"
-,"godlike.wav"
-,"hattrick.wav"
-,"headhunter.wav"
-,"headshot.wav"
-,"headshot2.wav"
-,"headshot3.wav"
-,"holyshit.wav"
-,"killingspree.wav"
-,"knife.wav"
-,"knife2.wav"
-,"knife3.wav"
-,"ludicrouskill.wav"
-,"megakill.wav"
-,"monsterkill.wav"
-,"multikill.wav"
-,"nade.wav"
-,"ownage.wav"
-,"payback.wav"
-,"prepare.wav"
-,"prepare2.wav"
-,"prepare3.wav"
-,"prepare4.wav"
-,"rampage.wav"
-,"suicide.wav"
-,"suicide2.wav"
-,"suicide3.wav"
-,"suicide4.wav"
-,"teamkiller.wav"
-,"triplekill.wav"
-,"ultrakill.wav"
-,"unstoppable.wav"
-,"whickedsick.wav"];

BTCPayServer/wwwroot/crowdfund/services/fireworks.js

@@ -1,14 +1,15 @@
 addLoadEvent(function(){
 var c = document.getElementById("fireworks");
 var ctx = c.getContext("2d");
+
 var cH;
 var cW;
-var bgColor = "#FF6138";
+var bgColor = srvModel.animationColors[0];
 var animations = [];
 var circles = [];
 
 var colorPicker = (function() {
-    var colors = ["#FF6138", "#FFBE53", "#2980B9", "#282741"];
+    var colors = srvModel.animationColors;
     var index = 0;
     function next() {
         index = index++ < colors.length-1 ? index : 0;

BTCPayServer/wwwroot/crowdfund/services/listener.js

@@ -1,7 +1,7 @@
 
 var hubListener = function(){
    
-    var connection = new signalR.HubConnectionBuilder().withUrl("/apps/hub").build();
+    var connection = new signalR.HubConnectionBuilder().withUrl(srvModel.hubPath).build();
 
     connection.onclose(function(){
         eventAggregator.$emit("connection-lost");

BTCPayServer/wwwroot/locales/fr-FR.json

@@ -44,7 +44,7 @@
   "Node Info": "Informations sur le nœud",
   "txCount": "{{count}} transaction",
   "txCount_plural": "{{count}} transactions",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly",
-  "Close": "Close"
+  "Pay with CoinSwitch": "Payer avec CoinSwitch",
+  "Pay with Changelly": "Payer avec Changelly",
+  "Close": "Fermer"
 }

BTCPayServer/wwwroot/main/css/site.css

@@ -16,6 +16,6 @@
 }
 
 
-.only-for-js{
+.only-for-js, .input-group-clear{
     display: none;
 }

BTCPayServer/wwwroot/main/site.js

@@ -8,9 +8,28 @@
     });
 
 
-    $(".input-group-clear").on("click", function(){
+    $(".input-group-clear").on("click", function () {
         $(this).parents(".input-group").find("input").val(null);
+        handleInputGroupClearButtonDisplay(this);
     });
 
+    $(".input-group-clear").each(function () {
+        var inputGroupClearBtn = this;
+        handleInputGroupClearButtonDisplay(inputGroupClearBtn);
+        $(this).parents(".input-group").find("input").on("change input", function () {
+            handleInputGroupClearButtonDisplay(inputGroupClearBtn);
+        })
+    });
+
+
     $(".only-for-js").show();
+
+    function handleInputGroupClearButtonDisplay(element) {
+        var value = $(element).parents(".input-group").find("input").val();
+        if (!value) {
+            $(element).hide();
+        } else {
+            $(element).show();
+        }
+    }
 });