From d6d07d33f4e7273daca87052b05e30f7119f9ff3 Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Thu, 27 Jul 2023 14:33:50 +0200
Subject: [PATCH] fix prism destination submit

---
 .../BTCPayServer.Plugins.Prism.csproj         |  2 +-
 .../Components/PrismDestinationEditor.razor   | 29 ++++++-------------
 .../Components/PrismEdit.razor                |  2 +-
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Plugins/BTCPayServer.Plugins.Prism/BTCPayServer.Plugins.Prism.csproj b/Plugins/BTCPayServer.Plugins.Prism/BTCPayServer.Plugins.Prism.csproj
index 873c00c..a198b36 100644
--- a/Plugins/BTCPayServer.Plugins.Prism/BTCPayServer.Plugins.Prism.csproj
+++ b/Plugins/BTCPayServer.Plugins.Prism/BTCPayServer.Plugins.Prism.csproj
@@ -11,7 +11,7 @@
     <PropertyGroup>
         <Product>LN Prism</Product>
         <Description>Automated value splits for lightning.</Description>
-        <Version>1.1.6</Version>
+        <Version>1.1.7</Version>
     </PropertyGroup>
     <!-- Plugin development properties -->
     <PropertyGroup>
diff --git a/Plugins/BTCPayServer.Plugins.Prism/Components/PrismDestinationEditor.razor b/Plugins/BTCPayServer.Plugins.Prism/Components/PrismDestinationEditor.razor
index 4163a0b..b887bb3 100644
--- a/Plugins/BTCPayServer.Plugins.Prism/Components/PrismDestinationEditor.razor
+++ b/Plugins/BTCPayServer.Plugins.Prism/Components/PrismDestinationEditor.razor
@@ -5,7 +5,7 @@
         <input type="text" @bind="WorkingId" class="form-control"/>
         @if (InvalidId)
         {
-            <span class="text-danger">Invalid</span>
+            <span class="text-danger  w-100">Invalid</span>
         }
         <span class="form-text">An alias to reference in destinations of prisms.</span>
     </div>
@@ -14,7 +14,7 @@
         <input type="text" @bind="WorkingCopy.Destination" class="form-control"/>
         @if (Invalid)
         {
-            <span class="text-danger">Invalid</span>
+            <span class="text-danger w-100">Invalid</span>
         }
         <span class="form-text">Can be a lightning address, LNURL, or a custom value that another plugin supports</span>
     </div>
@@ -79,27 +79,16 @@
 
     public async Task Update()
     {
-        if (ValidateDestination.Invoke(WorkingCopy.Destination))
-        {
-            await SettingsChanged.InvokeAsync(WorkingCopy);
+        Invalid = !ValidateDestination.Invoke(WorkingCopy.Destination);
 
-            Invalid = false;
-        }
-        else
+        InvalidId = !ValidateId.Invoke(WorkingId);
+        
+        if(Invalid || InvalidId)
         {
-            Invalid = true;
-        }
-
-        if (ValidateId.Invoke(WorkingId))
-        {
-            await IdChanged.InvokeAsync(WorkingId);
-            InvalidId = false;
-            
-        }
-        else
-        {
-            InvalidId = true;
+            return;
         }
+        await SettingsChanged.InvokeAsync(WorkingCopy);
+        await IdChanged.InvokeAsync(WorkingId);
     }
 
     [Parameter]
diff --git a/Plugins/BTCPayServer.Plugins.Prism/Components/PrismEdit.razor b/Plugins/BTCPayServer.Plugins.Prism/Components/PrismEdit.razor
index aea9140..6731e44 100644
--- a/Plugins/BTCPayServer.Plugins.Prism/Components/PrismEdit.razor
+++ b/Plugins/BTCPayServer.Plugins.Prism/Components/PrismEdit.razor
@@ -157,7 +157,7 @@ else
     {
         get
         {
-            if (SelectedDestinationId is null || SelectedDestinationId == "null")
+            if (SelectedDestinationId is null or "null")
                 return null;
             Settings.Destinations.TryGetValue(SelectedDestinationId, out var res);
             return res;