From 24c6ca7e12d2dfaa7b1f505b67f4b1dad19bc355 Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Thu, 17 Aug 2023 10:43:28 +0200
Subject: [PATCH] fix wallet setup binding

---
 BTCPayApp.UI/Pages/WalletSetup.razor                        | 5 +++--
 .../Configuration/BTCPayServerOnchainWalletConfigure.razor  | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/BTCPayApp.UI/Pages/WalletSetup.razor b/BTCPayApp.UI/Pages/WalletSetup.razor
index fad4220..4b2126c 100644
--- a/BTCPayApp.UI/Pages/WalletSetup.razor
+++ b/BTCPayApp.UI/Pages/WalletSetup.razor
@@ -20,7 +20,8 @@
     private async Task Callback(BTCPayServerOnchainWalletConfigure.ChosenConfiguration obj)
     {
         var kp = new KeyPath("m/84'/0'/0'");
-        var mKey = new Mnemonic(obj.Mnemonic).DeriveExtKey();
+        var seed = new Mnemonic(obj.Mnemonic ?? State.Value.PairConfig.PairingResult.ExistingWalletSeed);
+        var mKey = seed.DeriveExtKey();
         var xpub = mKey.Derive(kp).Neuter().ToString(Network.Main);
         if (obj is {UseExisting: false,SetStore: true})
         {
@@ -33,7 +34,7 @@
         }
         Dispatcher.Dispatch(new RootState.WalletConfigLoadedAction(new WalletConfig()
         {
-            Mnemonic = obj.Mnemonic,
+            Mnemonic = seed.ToString(),
             DerivationPath = kp.ToString(),
             StandaloneMode = false
         }));
diff --git a/BTCPayApp.UI/Shared/Configuration/BTCPayServerOnchainWalletConfigure.razor b/BTCPayApp.UI/Shared/Configuration/BTCPayServerOnchainWalletConfigure.razor
index 7e0cd97..8653f4e 100644
--- a/BTCPayApp.UI/Shared/Configuration/BTCPayServerOnchainWalletConfigure.razor
+++ b/BTCPayApp.UI/Shared/Configuration/BTCPayServerOnchainWalletConfigure.razor
@@ -18,10 +18,10 @@
 }
 
 <ValidationEditContext Model="this" @ref="_validationEditContext" Validate="Validate" OnValidSubmit="OnSubmit">
-    <MudRadioGroup Label="Wallet Creation Options" @bind-Value="SelectedOption" For="() => SelectedOption">
+    <MudRadioGroup Label="Wallet Creation Options" @bind-SelectedOption="@SelectedOption" For="() => SelectedOption">
         @foreach (var option in Options)
         {
-            <MudRadio T="string" Value="@option.Key">@option.Value</MudRadio>
+            <MudRadio T="string" Option="@option.Key">@option.Value</MudRadio>
         }
     </MudRadioGroup>
     @if (IsMnemonicRequired)
@@ -148,5 +148,5 @@
         Mnemonic = new Mnemonic(Wordlist.English, WordCount.Twelve).ToString();
     }
 
-    public record ChosenConfiguration(bool UseExisting, bool SetStore, string Mnemonic);
+    public record ChosenConfiguration(bool UseExisting, bool SetStore, string? Mnemonic);
 }