changelog and bump

Fixes #4053.

(cherry picked from commit e4542c4ac4e74eba28c0ee96b9e09081cb53a3e8)

BTCPayServer/Controllers/UILNURLController.cs

@@ -559,9 +559,12 @@ namespace BTCPayServer
                     LightningInvoice invoice;
                     try
                     {
-                        invoice = await client.CreateInvoice(new CreateInvoiceParams(amount.Value,
-                            descriptionHash,
-                            i.ExpirationTime.ToUniversalTime() - DateTimeOffset.UtcNow));
+                        var expiry = i.ExpirationTime.ToUniversalTime() - DateTimeOffset.UtcNow;
+                        var param = new CreateInvoiceParams(amount.Value, descriptionHash, expiry)
+                        {
+                            PrivateRouteHints = blob.LightningPrivateRouteHints
+                        };
+                        invoice = await client.CreateInvoice(param);
                         if (!BOLT11PaymentRequest.Parse(invoice.BOLT11, network.NBitcoinNetwork)
                                 .VerifyDescriptionHash(metadata))
                         {

BTCPayServer/Services/Labels/LabelFactory.cs

@@ -60,12 +60,13 @@ namespace BTCPayServer.Services.Labels
                 TextColor = TextColor(color)
             };
 
-            string PayoutLabelText(KeyValuePair<string, List<string>> pair)
+            string PayoutLabelText(KeyValuePair<string, List<string>>? pair = null)
             {
-                if (pair.Value.Count == 1)
-                    return $"Paid a payout {(string.IsNullOrEmpty(pair.Key)? string.Empty: $"of a pull payment ({pair.Key})")}";
-                else
-                    return $"Paid {pair.Value.Count} payouts {(string.IsNullOrEmpty(pair.Key)? string.Empty: $"of a pull payment ({pair.Key})")}";
+                if (pair is null)
+                {
+                    return "Paid a payout";
+                }
+                return pair.Value.Value.Count == 1 ? $"Paid a payout {(string.IsNullOrEmpty(pair.Value.Key)? string.Empty: $"of a pull payment ({pair.Value.Key})")}" : $"Paid {pair.Value.Value.Count} payouts {(string.IsNullOrEmpty(pair.Value.Key)? string.Empty: $"of a pull payment ({pair.Value.Key})")}";
             }
 
             if (uncoloredLabel is ReferenceLabel refLabel)
@@ -101,9 +102,14 @@ namespace BTCPayServer.Services.Labels
             }
             else if (uncoloredLabel is PayoutLabel payoutLabel)
             {
-                coloredLabel.Tooltip = payoutLabel.PullPaymentPayouts.Count > 1
-                        ? $"<ul>{string.Join(string.Empty, payoutLabel.PullPaymentPayouts.Select(pair => $"<li>{PayoutLabelText(pair)}</li>"))}</ul>"
-                        : PayoutLabelText(payoutLabel.PullPaymentPayouts.First());
+                coloredLabel.Tooltip = payoutLabel.PullPaymentPayouts?.Count switch
+                {
+                    null => PayoutLabelText(),
+                    0 => PayoutLabelText(),
+                    1 => PayoutLabelText(payoutLabel.PullPaymentPayouts.First()),
+                    _ =>
+                        $"<ul>{string.Join(string.Empty, payoutLabel.PullPaymentPayouts.Select(pair => $"<li>{PayoutLabelText(pair)}</li>"))}</ul>"
+                };
 
                 coloredLabel.Link = string.IsNullOrEmpty(payoutLabel.WalletId)
                     ? null

BTCPayServer/Views/Shared/PayButton/PayButton.cshtml

@@ -119,7 +119,7 @@
                         this.srvModel.payButtonImageUrl = this.originalButtonImageUrl;
                     } else {
                         this.srvModel.payButtonText = 'Pay with';
-                        this.srvModel.payButtonImageUrl = `${this.srvModel.urlRoot}img/logo.svg`;
+                        this.srvModel.payButtonImageUrl = `${this.srvModel.urlRoot}img/paybutton/logo.svg`;
                     }
                     this.inputChanges();
                 }

BTCPayServer/wwwroot/img/paybutton/logo.svg

@@ -0,0 +1,8 @@
+<svg width="192" height="84" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192 84">
+<path d="M5.206 83.433a4.86 4.86 0 01-4.859-4.861V5.431a4.86 4.86 0 119.719 0v73.141a4.861 4.861 0 01-4.86 4.861" fill="#CEDC21" class="logo-brand-light"/>
+<path d="M5.209 83.433a4.862 4.862 0 01-2.086-9.253L32.43 60.274 2.323 38.093a4.861 4.861 0 015.766-7.826l36.647 26.999a4.864 4.864 0 01-.799 8.306L7.289 82.964a4.866 4.866 0 01-2.08.469" fill="#51B13E" class="logo-brand-medium"/>
+<path d="M5.211 54.684a4.86 4.86 0 01-2.887-8.774L32.43 23.73 3.123 9.821a4.861 4.861 0 014.166-8.784l36.648 17.394a4.86 4.86 0 01.799 8.305l-36.647 27a4.844 4.844 0 01-2.878.948" fill="#CEDC21" class="logo-brand-light"/>
+<path d="M10.066 31.725v20.553L24.01 42.006z" fill="#1E7A44" class="logo-brand-dark"/>
+<path d="M10.066 5.431A4.861 4.861 0 005.206.57 4.86 4.86 0 00.347 5.431v61.165h9.72V5.431h-.001z" fill="#CEDC21" class="logo-brand-light"/>
+<path d="M74.355 41.412c3.114.884 4.84 3.704 4.84 7.238 0 5.513-3.368 8.082-7.955 8.082H60.761V27.271h9.259c4.504 0 7.997 2.146 7.997 7.743 0 2.821-1.179 5.43-3.662 6.398m-4.293-.716c3.324 0 6.018-1.179 6.018-5.724 0-4.586-2.776-5.808-6.145-5.808h-7.197v11.531h7.324v.001zm1.052 14.099c3.366 0 6.06-1.768 6.06-6.145 0-4.713-3.072-6.144-6.901-6.144h-7.534v12.288h8.375v.001zM98.893 27.271v1.81h-8.122v27.651h-1.979V29.081h-8.123v-1.81zM112.738 26.85c5.01 0 9.554 2.524 10.987 8.543h-1.895c-1.348-4.923-5.303-6.732-9.134-6.732-6.944 0-10.605 5.681-10.605 13.341 0 8.08 3.661 13.256 10.646 13.256 4.125 0 7.828-1.85 9.26-7.279h1.895c-1.264 6.271-6.229 9.174-11.154 9.174-7.87 0-12.583-5.808-12.583-15.15 0-8.966 4.969-15.153 12.583-15.153M138.709 27.271c5.091 0 8.795 3.326 8.795 9.764 0 6.06-3.704 9.722-8.795 9.722h-7.746v9.976h-1.935V27.271h9.681zm0 17.549c3.745 0 6.816-2.397 6.816-7.827 0-5.429-2.947-7.869-6.816-7.869h-7.746V44.82h7.746zM147.841 56.732v-.255l11.741-29.29h.885l11.615 29.29v.255h-2.062l-3.322-8.501H153.27l-3.324 8.501h-2.105zm12.164-26.052l-6.059 15.697h12.078l-6.019-15.697zM189.551 27.271h2.104v.293l-9.176 16.92v12.248h-2.02V44.484l-9.216-16.961v-.252h2.147l3.997 7.492 4.043 7.786h.04l4.081-7.786z" fill="#FFF" class="logo-brand-text"/>
+</svg>

BTCPayServer/wwwroot/swagger/v1/swagger.template.json

@@ -15,7 +15,7 @@
     },
     "servers": [
         {
-            "url": "https://btcpay.example.com/api/v1",
+            "url": "/",
             "description": "BTCPay Server Greenfield API"
         }
     ],

Build/Version.csproj

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-		<Version>1.6.9</Version>
+		<Version>1.6.10</Version>
   </PropertyGroup>
 </Project>

Changelog.md

@@ -1,4 +1,13 @@
 # Changelog
+## 1.6.10
+
+### Bug fixes:
+
+* Fix Wallet Transactions screen not loading in case of older payout labels (#4078) @Kukks
+* Fix missing route hints for LNURL (#4077) @dennisreimann
+* Fix API Docs url (#4061) @dennisreimann
+* Fix Pay button logo and url (#4054) @dennisreimann
+
 ## 1.6.9
 
 ### Bug fixes: