From 6cc6cd4a790181e91069f790d69af14f6cfb72b9 Mon Sep 17 00:00:00 2001 From: Nathan Woodburn Date: Mon, 26 Jun 2023 21:25:42 +1000 Subject: [PATCH] multisig: Disabled bulk actions and a set to reqiure batch - Added condition to disable buttonActionMain when mainForm.multiSig is true - Removed buttons (buttonRevealAll, buttonRedeemAll, and buttonSendAll) when WatchOnly or multiSig is true - Added buttons (buttonAddressVerify) when WatchOnly is true - Updated conditions for showing/hiding toolStripStatusLabelLedger and toolStripStatusLabelMultisig --- FireWallet/DomainForm.cs | 4 ++-- FireWallet/MainForm.cs | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/FireWallet/DomainForm.cs b/FireWallet/DomainForm.cs index 3cca470..adad9d6 100644 --- a/FireWallet/DomainForm.cs +++ b/FireWallet/DomainForm.cs @@ -157,9 +157,9 @@ namespace FireWallet network = Convert.ToInt32(nodeSettings["Network"]); GetName(); - if (mainForm.WatchOnly) + if (mainForm.WatchOnly || mainForm.multiSig) { - buttonActionMain.Enabled = false; // Only allow sending in batches for ledger + buttonActionMain.Enabled = false; // Only allow sending in batches for ledger and multisig to prevent confusion } } #region API diff --git a/FireWallet/MainForm.cs b/FireWallet/MainForm.cs index c45f459..5fb48b0 100644 --- a/FireWallet/MainForm.cs +++ b/FireWallet/MainForm.cs @@ -770,18 +770,12 @@ namespace FireWallet { WatchOnly = true; toolStripStatusLabelLedger.Visible = true; - buttonRevealAll.Visible = false; - buttonRedeemAll.Visible = false; - buttonSendAll.Visible = false; buttonAddressVerify.Visible = true; } else { WatchOnly = false; toolStripStatusLabelLedger.Visible = false; - buttonRevealAll.Visible = true; - buttonRedeemAll.Visible = true; - buttonSendAll.Visible = true; buttonAddressVerify.Visible = false; } @@ -813,6 +807,18 @@ namespace FireWallet { toolStripStatusLabelMultisig.Visible = false; } + if (WatchOnly || multiSig) + { + buttonRevealAll.Visible = false; + buttonRedeemAll.Visible = false; + buttonSendAll.Visible = false; + } + else + { + buttonRevealAll.Visible = true; + buttonRedeemAll.Visible = true; + buttonSendAll.Visible = true; + } return true; }