From fe7fc4cee9ba177c505bc158b88f94f6765065a4 Mon Sep 17 00:00:00 2001
From: Nathan Woodburn <github@nathan.woodburn.au>
Date: Mon, 26 Jun 2023 21:44:11 +1000
Subject: [PATCH] multisig: Cleaned up code and added checks to not show >n
 signers

---
 FireWallet/BatchForm.cs             |  2 +-
 FireWallet/ImportTXForm.Designer.cs |  2 +-
 FireWallet/ImportTXForm.cs          | 30 +++++++++--------------------
 FireWallet/MainForm.cs              |  1 -
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/FireWallet/BatchForm.cs b/FireWallet/BatchForm.cs
index 90896a9..7b01fe6 100644
--- a/FireWallet/BatchForm.cs
+++ b/FireWallet/BatchForm.cs
@@ -515,7 +515,7 @@ namespace FireWallet
                 notifyForm2.Dispose();
                 this.Close();
             }
-            else if (!mainForm.WatchOnly)
+            else if (mainForm.multiSig)
             {
                 string batchTX = "[" + string.Join(", ", batches.Select(batch => batch.ToString())) + "]";
                 string content = "{\"method\": \"createbatch\",\"params\":[ " + batchTX + "]}";
diff --git a/FireWallet/ImportTXForm.Designer.cs b/FireWallet/ImportTXForm.Designer.cs
index 3007d92..2541a10 100644
--- a/FireWallet/ImportTXForm.Designer.cs
+++ b/FireWallet/ImportTXForm.Designer.cs
@@ -106,7 +106,7 @@
             Cancelbutton2.TabIndex = 2;
             Cancelbutton2.Text = "Cancel";
             Cancelbutton2.UseVisualStyleBackColor = true;
-            Cancelbutton2.Click += Cancelbutton2_Click;
+            Cancelbutton2.Click += Cancel;
             // 
             // label1
             // 
diff --git a/FireWallet/ImportTXForm.cs b/FireWallet/ImportTXForm.cs
index 7c3bc66..508dabb 100644
--- a/FireWallet/ImportTXForm.cs
+++ b/FireWallet/ImportTXForm.cs
@@ -66,7 +66,7 @@ namespace FireWallet
             ParseTX();
         }
 
-        private void Cancelbutton2_Click(object sender, EventArgs e)
+        private void Cancel(object sender, EventArgs e)
         {
             this.Close();
         }
@@ -137,18 +137,16 @@ namespace FireWallet
                 }
             }
 
-
-
-
-
             // Set sig label sizes
             labelSigsReq.Width = (labelSigsTotal.Width / totalSigs) * reqSigs;
             labelSigsSigned.Width = (labelSigsTotal.Width / totalSigs) * sigs;
             labelSigInfo.Text = "Signed: " + sigs + "\nReq: " + reqSigs + " of " + totalSigs;
 
-
-
-
+            if (sigs >= totalSigs)
+            {
+                buttonSign.Enabled = false;
+                buttonSign.Text = "Signed";
+            }
 
             for (int i = 0; i < inputs.Count; i++)
             {
@@ -202,18 +200,6 @@ namespace FireWallet
                     PanelInput.Controls.Add(amount);
 
                 }
-
-
-
-                //if (input["path"].ToString() != "")
-                //{
-                //    Label ownAddress = new Label();
-                //    ownAddress.Text = "Own Address";
-                //    ownAddress.Location = new Point(PanelInput.Width - 100, 5);
-                //    ownAddress.AutoSize = true;
-                //    PanelInput.Controls.Add(ownAddress);
-                //}
-
                 panelIn.Controls.Add(PanelInput);
             }
 
@@ -308,7 +294,9 @@ namespace FireWallet
                 labelSigInfo.Text = "Signed: " + sigs + "\nReq: " + reqSigs + " of " + totalSigs;
                 signedTX = response;
             } else {
-
+                NotifyForm notifyForm = new NotifyForm("Ledger signing not supported yet 😢");
+                notifyForm.ShowDialog();
+                notifyForm.Dispose();
             }
         }
 
diff --git a/FireWallet/MainForm.cs b/FireWallet/MainForm.cs
index 5fb48b0..d6fc032 100644
--- a/FireWallet/MainForm.cs
+++ b/FireWallet/MainForm.cs
@@ -2779,7 +2779,6 @@ namespace FireWallet
                 }
                 else
                 {
-                    AddLog(covenant.ToString());
                     string hash = covenant["items"][0].ToString();
                     if (hashes.ContainsKey(hash))
                     {