From 3b3fac98ad7ec7f09da4bd46f8b621868e8e9ab0 Mon Sep 17 00:00:00 2001
From: Dennis Reimann <mail@dennisreimann.de>
Date: Wed, 24 Nov 2021 10:55:11 +0100
Subject: [PATCH] Improve Lightning settings display

---
 .../Views/Stores/LightningSettings.cshtml     | 23 +++++++++++++++----
 .../Views/Stores/PaymentMethods.cshtml        | 16 +++++++++++--
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/BTCPayServer/Views/Stores/LightningSettings.cshtml b/BTCPayServer/Views/Stores/LightningSettings.cshtml
index 7cb1de178..a12675c97 100644
--- a/BTCPayServer/Views/Stores/LightningSettings.cshtml
+++ b/BTCPayServer/Views/Stores/LightningSettings.cshtml
@@ -1,3 +1,4 @@
+@using BTCPayServer.Lightning
 @model LightningSettingsViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
@@ -21,10 +22,24 @@
                 </tr>
                 @if (Model.LightningNodeType != LightningNodeType.Internal)
                 {
-                    <tr>
-                        <th>Connection String</th>
-                        <td class="text-break">@Model.ConnectionString</td>
-                    </tr>
+                    if (LightningConnectionString.TryParse(Model.ConnectionString, out var cs))
+                    {
+                        <tr>
+                            <th>Connection Type</th>
+                            <td>@typeof(LightningConnectionType).DisplayName(cs.ConnectionType.ToString())</td>
+                        </tr>
+                        <tr>
+                            <th>Base URI</th>
+                            <td>@cs.BaseUri</td>
+                        </tr>
+                    }
+                    else
+                    {
+                        <tr>
+                            <th>Connection String</th>
+                            <td>@Model.ConnectionString</td>
+                        </tr>
+                    }
                 }
                 </tbody>
             </table>
diff --git a/BTCPayServer/Views/Stores/PaymentMethods.cshtml b/BTCPayServer/Views/Stores/PaymentMethods.cshtml
index 13fe7adf4..3acad3a5c 100644
--- a/BTCPayServer/Views/Stores/PaymentMethods.cshtml
+++ b/BTCPayServer/Views/Stores/PaymentMethods.cshtml
@@ -1,4 +1,6 @@
 @using System.Text.RegularExpressions
+@using BTCPayServer.Lightning
+@using BTCPayServer.Services
 @model PaymentMethodsViewModel
 @{
     Layout = "../Shared/_NavLayout.cshtml";
@@ -120,8 +122,18 @@
                                 <strong class="me-3">@scheme.CryptoCode</strong>
                                 @if (isSetUp)
                                 {
-                                    <span class="smMaxWidth text-truncate text-secondary me-3">@scheme.Address</span>
-                                    <a class="text-secondary"
+                                    <span class="text-truncate text-secondary me-3" style="max-width:150px;">
+                                        @if (LightningConnectionString.TryParse(scheme.Address, out var cs))
+                                        {
+                                            <span>@typeof(LightningConnectionType).DisplayName(cs.ConnectionType.ToString())</span>
+                                            <span>@cs.BaseUri.Host</span>
+                                        }
+                                        else
+                                        {
+                                            @scheme.Address
+                                        }
+                                    </span>
+                                    <a class="text-secondary me-3"
                                        asp-controller="PublicLightningNodeInfo"
                                        asp-action="ShowLightningNodeInfo"
                                        asp-route-cryptoCode="@scheme.CryptoCode"