Move back ToPrettyString() in PaymentMethodId to fix crash if a payment method as been disabled

New register form

BTCPayServer.Tests/UnitTest1.cs

@@ -2252,14 +2252,13 @@ donation:
                 var invoiceAddress = BitcoinAddress.Create(invoice.CryptoInfo[0].Address, cashCow.Network);
                 var firstPayment = invoice.CryptoInfo[0].TotalDue - Money.Coins(0.001m);
                 cashCow.SendToAddress(invoiceAddress, firstPayment);
-                var handler = tester.PayTester.GetService<BitcoinLikePaymentHandler>();
                 TestUtils.Eventually(() =>
                 {
                     var exportResultPaid = user.GetController<InvoiceController>().Export("csv").GetAwaiter().GetResult();
                     var paidresult = Assert.IsType<ContentResult>(exportResultPaid);
                     Assert.Equal("application/csv", paidresult.ContentType);
                     Assert.Contains($",\"orderId\",\"{invoice.Id}\",", paidresult.Content);
-                    Assert.Contains($",\"{handler.PrettyDescription}\",\"BTC\",\"0.0991\",\"0.0001\",\"5000.0\"", paidresult.Content);
+                    Assert.Contains($",\"On-Chain\",\"BTC\",\"0.0991\",\"0.0001\",\"5000.0\"", paidresult.Content);
                     Assert.Contains($",\"USD\",\"5.00", paidresult.Content); // Seems hacky but some plateform does not render this decimal the same
                     Assert.Contains($"0\",\"500.0\",\"\",\"Some ``, description\",\"new (paidPartial)\"", paidresult.Content);
                 });

BTCPayServer/Configuration/DefaultConfiguration.cs

@@ -52,7 +52,9 @@ namespace BTCPayServer.Configuration
                 app.Option($"--{crypto}explorerurl", $"URL of the NBXplorer for {network.CryptoCode} (default: {network.NBXplorerNetwork.DefaultSettings.DefaultUrl})", CommandOptionType.SingleValue);
                 app.Option($"--{crypto}explorercookiefile", $"Path to the cookie file (default: {network.NBXplorerNetwork.DefaultSettings.DefaultCookieFile})", CommandOptionType.SingleValue);
                 app.Option($"--{crypto}lightning", $"Easy configuration of lightning for the server administrator: Must be a UNIX socket of c-lightning (lightning-rpc) or URL to a charge server (default: empty)", CommandOptionType.SingleValue);
-                app.Option($"--{crypto}externallndgrpc", $"The LND gRPC configuration BTCPay will expose to easily connect to the internal lnd wallet from Zap wallet (default: empty)", CommandOptionType.SingleValue);
+                app.Option($"--{crypto}externallndgrpc", $"The LND gRPC configuration BTCPay will expose to easily connect to the internal lnd wallet from an external wallet (default: empty)", CommandOptionType.SingleValue);
+                app.Option($"--{crypto}externallndrest", $"The LND REST configuration BTCPay will expose to easily connect to the internal lnd wallet from an external wallet (default: empty)", CommandOptionType.SingleValue);
+                app.Option($"--{crypto}externalrtl", $"The Ride the Lightning configuration so BTCPay will expose to easily open it in server settings (default: empty)", CommandOptionType.SingleValue);
                 app.Option($"--{crypto}externalspark", $"Show spark information in Server settings / Server. The connection string to spark server (default: empty)", CommandOptionType.SingleValue);
                 app.Option($"--{crypto}externalcharge", $"Show lightning charge information in Server settings/Server. The connection string to charge server (default: empty)", CommandOptionType.SingleValue);
             }

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -79,9 +79,7 @@ namespace BTCPayServer.Controllers
                 new InvoiceDetailsModel.AddressModel
                 {
                     Destination = h.GetAddress(),
-                    PaymentMethod =
-                        invoice.PaymentMethodHandlerDictionary[h.GetPaymentMethodId()]
-                            .ToPrettyString(h.GetPaymentMethodId()),
+                    PaymentMethod = h.GetPaymentMethodId().ToPrettyString(),
                     Current = !h.UnAssigned.HasValue
                 }).ToArray();
 
@@ -101,8 +99,7 @@ namespace BTCPayServer.Controllers
                 var accounting = data.Calculate();
                 var paymentMethodId = data.GetId();
                 var cryptoPayment = new InvoiceDetailsModel.CryptoPayment();
-                cryptoPayment.PaymentMethod = invoice.PaymentMethodHandlerDictionary[paymentMethodId]
-                    .ToPrettyString(data.GetId());
+                cryptoPayment.PaymentMethod = paymentMethodId.ToPrettyString();
                 cryptoPayment.Due = _CurrencyNameTable.DisplayFormatCurrency(accounting.Due.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
                 cryptoPayment.Paid = _CurrencyNameTable.DisplayFormatCurrency(accounting.CryptoPaid.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
                 cryptoPayment.Overpaid = _CurrencyNameTable.DisplayFormatCurrency(accounting.OverpaidHelper.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
@@ -525,7 +522,7 @@ namespace BTCPayServer.Controllers
         {
             return new SelectList(_paymentMethodHandlerDictionary.Distinct().SelectMany(handler =>
                     handler.GetSupportedPaymentMethods()
-                        .Select(id => new SelectListItem(handler.ToPrettyString(id), id.ToString()))),
+                        .Select(id => new SelectListItem(id.ToPrettyString(), id.ToString()))),
                 nameof(SelectListItem.Value),
                 nameof(SelectListItem.Text));
         }

BTCPayServer/Controllers/InvoiceController.cs

@@ -243,7 +243,7 @@ namespace BTCPayServer.Controllers
         {
             try
             {
-                var logPrefix = $"{handler.ToPrettyString(supportedPaymentMethod.PaymentId)}:";
+                var logPrefix = $"{supportedPaymentMethod.PaymentId.ToPrettyString()}:";
                 var storeBlob = store.GetStoreBlob();
                 var preparePayment = handler.PreparePayment(supportedPaymentMethod, store, network);
                 var rate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, entity.ProductInformation.Currency)];

BTCPayServer/Controllers/StoresController.cs

@@ -366,7 +366,7 @@ namespace BTCPayServer.Controllers
         void SetCryptoCurrencies(CheckoutExperienceViewModel vm, Data.StoreData storeData)
         {
             var choices = storeData.GetEnabledPaymentIds(_NetworkProvider)
-                                      .Select(o => new CheckoutExperienceViewModel.Format() { Name = _paymentMethodHandlerDictionary[o].ToPrettyString(o), Value = o.ToString(), PaymentId = o }).ToArray();
+                                      .Select(o => new CheckoutExperienceViewModel.Format() { Name = o.ToPrettyString(), Value = o.ToString(), PaymentId = o }).ToArray();
 
             var defaultPaymentId = storeData.GetDefaultPaymentId(_NetworkProvider);
             var chosen = choices.FirstOrDefault(c => c.PaymentId == defaultPaymentId);

BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs

@@ -149,7 +149,6 @@ namespace BTCPayServer.Payments.Bitcoin
             };
         }
 
-        public override string PrettyDescription => "On-Chain";
         public override PaymentTypes PaymentType => PaymentTypes.BTCLike;
 
         public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(

BTCPayServer/Payments/IPaymentMethodHandler.cs

@@ -18,7 +18,6 @@ namespace BTCPayServer.Payments
     /// </summary>
     public interface IPaymentMethodHandler
     {
-        string PrettyDescription { get; }
         /// <summary>
         /// Create needed to track payments of this invoice
         /// </summary>
@@ -45,8 +44,6 @@ namespace BTCPayServer.Payments
             PaymentMethodAccounting accounting, PaymentMethod info);
 
 
-        string ToPrettyString(PaymentMethodId paymentMethodId);
-
         void PreparePaymentModel(PaymentModel model, InvoiceResponse invoiceResponse);
         string GetCryptoImage(PaymentMethodId paymentMethodId);
         string GetPaymentMethodName(PaymentMethodId paymentMethodId);
@@ -77,7 +74,6 @@ namespace BTCPayServer.Payments
         where TSupportedPaymentMethod : ISupportedPaymentMethod
         where TBTCPayNetwork : BTCPayNetworkBase
     {
-        public abstract string PrettyDescription { get; }
         public abstract PaymentTypes PaymentType { get; }
 
         public abstract Task<IPaymentMethodDetails> CreatePaymentMethodDetails(
@@ -129,10 +125,5 @@ namespace BTCPayServer.Payments
 
             throw new NotSupportedException("Invalid supportedPaymentMethod");
         }
-
-        public string ToPrettyString(PaymentMethodId paymentMethodId)
-        {
-            return $"{paymentMethodId.CryptoCode} ({PrettyDescription})";
-        }
     }
 }

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -40,7 +40,6 @@ namespace BTCPayServer.Payments.Lightning
             _socketFactory = socketFactory;
         }
 
-        public override string PrettyDescription => "Off-Chain";
         public override PaymentTypes PaymentType => PaymentTypes.LightningLike;
         public override async Task<IPaymentMethodDetails> CreatePaymentMethodDetails(
             LightningSupportedPaymentMethod supportedPaymentMethod, PaymentMethod paymentMethod, StoreData store,

BTCPayServer/Payments/PaymentMethodId.cs

@@ -66,6 +66,24 @@ namespace BTCPayServer.Payments
             return PaymentType == PaymentTypes.BTCLike ? CryptoCode : $"{CryptoCode}_{PaymentType}";
         }
 
+        public string ToPrettyPaymentType()
+        {
+            switch (PaymentType)
+            {
+                case PaymentTypes.BTCLike:
+                    return "On-Chain";
+                case PaymentTypes.LightningLike:
+                    return "Off-Chain";
+                default:
+                    return PaymentType.ToString();
+            }
+        }
+
+        public string ToPrettyString()
+        {
+            return $"{CryptoCode} ({ToPrettyPaymentType()})";
+        }
+
         public static bool TryParse(string str, out PaymentMethodId paymentMethodId)
         {
             paymentMethodId = null;

BTCPayServer/Services/Invoices/Export/InvoiceExport.cs

@@ -78,7 +78,7 @@ namespace BTCPayServer.Services.Invoices.Export
                     PaymentId = pdata.GetPaymentId(),
                     CryptoCode = cryptoCode,
                     ConversionRate = pmethod.Rate,
-                    PaymentType = invoice.PaymentMethodHandlerDictionary[payment.GetPaymentMethodId()].PrettyDescription,
+                    PaymentType = payment.GetPaymentMethodId().ToPrettyPaymentType(),
                     Destination = payment.GetCryptoPaymentData().GetDestination(Networks.GetNetwork<BTCPayNetworkBase>(cryptoCode)),
                     Paid = pdata.GetValue().ToString(CultureInfo.InvariantCulture),
                     PaidCurrency = Math.Round(pdata.GetValue() * pmethod.Rate, currency.NumberDecimalDigits).ToString(CultureInfo.InvariantCulture),

BTCPayServer/Views/Account/Login.cshtml

@@ -6,51 +6,40 @@
 }
 
 <section>
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
-                <hr class="primary">
-            </div>
-            <div class="col-md-4">
-                <section>
+    <div>
+        <div class="modal-dialog modal-login">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">Sign In</h4>
+                </div>
+                <div class="modal-body">
                     <form asp-route-returnurl="@ViewData["ReturnUrl"]" method="post">
-                        <h4>Use a local account to log in.</h4>
-                        <hr />
-                        <div asp-validation-summary="All" class="text-danger"></div>
                         <div class="form-group">
-                            <label asp-for="Email"></label>
-                            <input asp-for="Email" class="form-control" />
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <label for="Email" class="input-group-text"><span class="input-group-addon fa fa-user"></span></label>
+                                </div>
+
+                                <input asp-for="Email" class="form-control" placeholder="Email" required="required" />
+                            </div>
                             <span asp-validation-for="Email" class="text-danger"></span>
                         </div>
                         <div class="form-group">
-                            <label asp-for="Password"></label>
-                            <input asp-for="Password" class="form-control" />
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <label for="Password" class="input-group-text"><span class="input-group-addon fa fa-lock"></span></label>
+                                </div>
+                                <input asp-for="Password" class="form-control" placeholder="Password" required="required" />
+                            </div>
                             <span asp-validation-for="Password" class="text-danger"></span>
                         </div>
                         <div class="form-group">
-                            <div class="checkbox">
-                                <label asp-for="RememberMe">
-                                    <input asp-for="RememberMe" />
-                                    @Html.DisplayNameFor(m => m.RememberMe)
-                                </label>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <button type="submit" class="btn btn-primary" id="LoginButton">Log in</button>
-                        </div>
-                        <div class="form-group">
-                            <p>
-                                <a asp-action="ForgotPassword">Forgot your password?</a>
-                            </p>
-                            <p>
-                                <a asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]">Register as a new user?</a>
-                            </p>
+                            <button type="submit" class="btn btn-primary btn-block btn-lg" id="LoginButton">Sign in</button>
                         </div>
+                        <p class="hint-text"><a asp-action="ForgotPassword">Forgot your password?</a></p>
                     </form>
-                </section>
-            </div>
-            <div class="col-md-6 col-md-offset-2">
+                </div>
+                <div class="modal-footer"><span>Don't have an account?&nbsp;<a asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]">Create one</a></span></div>
             </div>
         </div>
     </div>

BTCPayServer/Views/Account/Register.cshtml

@@ -4,47 +4,54 @@
 }
 
 <section>
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
-                <hr class="primary">
-            </div>
-            <div class="col-md-4">
-                <form asp-route-returnUrl="@ViewData["ReturnUrl"]" asp-route-logon="@ViewData["Logon"]" method="post">
-                    <h4>Create a new account.</h4>
-                    <hr />
-                    <div asp-validation-summary="All" class="text-danger"></div>
-                    <div class="form-group">
-                        <label asp-for="Email"></label>
-                        <input asp-for="Email" class="form-control" />
-                        <span asp-validation-for="Email" class="text-danger"></span>
-                    </div>
-                    <div class="form-group">
-                        <label asp-for="Password"></label>
-                        <input asp-for="Password" class="form-control" />
-                        <span asp-validation-for="Password" class="text-danger"></span>
-                    </div>
-                    <div class="form-group">
-                        <label asp-for="ConfirmPassword"></label>
-                        <input asp-for="ConfirmPassword" class="form-control" />
-                        <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
-                    </div>
-                    @if (ViewData["AllowIsAdmin"] is true)
-                    {
+    <div>
+        <div class="modal-dialog modal-login">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">Create account</h4>
+                </div>
+                <div class="modal-body">
+                    <form asp-route-returnUrl="@ViewData["ReturnUrl"]" asp-route-logon="@ViewData["Logon"]" method="post">
                         <div class="form-group">
-                            <label asp-for="IsAdmin"></label>
-                            <input asp-for="IsAdmin" class="form-check" />
-                            <span asp-validation-for="IsAdmin" class="text-danger"></span>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <label for="Email" class="input-group-text"><span class="input-group-addon fa fa-user"></span></label>
+                                </div>
+                                <input asp-for="Email" class="form-control" placeholder="Email" required="required" />
+                            </div>
+                            <span asp-validation-for="Email" class="text-danger"></span>
                         </div>
-                    }
-                    <button type="submit" class="btn btn-primary" id="RegisterButton">Register</button>
-                </form>
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <label for="Password" class="input-group-text"><span class="input-group-addon fa fa-lock"></span></label>
+                                </div>
+                                <input asp-for="Password" class="form-control" placeholder="Password" required="required" />
+                            </div>
+                            <span asp-validation-for="Password" class="text-danger"></span>
+                        </div>
+                        <div class="form-group">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <label for="ConfirmPassword" class="input-group-text"><span class="input-group-addon fa fa-lock"></span></label>
+                                </div>
+                                <input asp-for="ConfirmPassword" class="form-control" placeholder="Repeat password" required="required" />
+                            </div>
+                            <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
+                        </div>
+                        @if (ViewData["AllowIsAdmin"] is true)
+                        {
+                            <div class="form-group">
+                                <label asp-for="IsAdmin"></label>
+                                <input asp-for="IsAdmin"  type="checkbox" class="form-check-inline" />
+                                <span asp-validation-for="IsAdmin" class="text-danger"></span>
+                            </div>
+                        }
+                        <div class="form-group">
+                            <button type="submit" class="btn btn-primary btn-block btn-lg" id="RegisterButton">Create account</button>
+                        </div>
+                    </form>
+                </div>
             </div>
         </div>
     </div>

Version.csproj

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-		<Version>1.0.3.108</Version>
+		<Version>1.0.3.109</Version>
   </PropertyGroup>
 </Project>