Remove walletname at some places
MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/BuildTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/BuildTabViewModel.cs
@@ -32,7 +32,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
ResetUi();
- NotificationHelpers.Success("Transaction was built.", sender: Wallet);
+ NotificationHelpers.Success("Transaction was built.");
}
catch (Exception ex)
{

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabViewModel.cs
@@ -318,7 +318,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
{
if (!coins.Any())
{
- NotificationHelpers.Warning("No coins are selected.", "", sender: Wallet);
+ NotificationHelpers.Warning("No coins are selected.", "");
return;
}

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabViewModel.cs
@@ -40,7 +40,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
.Subscribe(ex =>
{
Logger.LogError(ex);
- NotificationHelpers.Error(ex.ToUserFriendlyString(), sender: wallet);
+ NotificationHelpers.Error(ex.ToUserFriendlyString());
});
}

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/ReceiveTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/ReceiveTabViewModel.cs
@@ -42,7 +42,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
LabelSuggestion.Label = label;
if (label.IsEmpty)
{
- NotificationHelpers.Warning("Observers are required.", sender: Wallet);
+ NotificationHelpers.Warning("Observers are required.");
return;
}
@@ -53,7 +53,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
{
int minGapLimit = Wallet.KeyManager.MinGapLimit.Value;
int prevMinGapLimit = minGapLimit - 1;
- NotificationHelpers.Warning($"{nameof(KeyManager.MinGapLimit)} increased from {prevMinGapLimit} to {minGapLimit}.", sender: Wallet);
+ NotificationHelpers.Warning($"{nameof(KeyManager.MinGapLimit)} increased from {prevMinGapLimit} to {minGapLimit}.");
}
var newAddress = new AddressViewModel(newKey, Wallet.KeyManager, this);
@@ -80,7 +80,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
.Subscribe(ex =>
{
Logger.LogError(ex);
- NotificationHelpers.Error(ex.ToUserFriendlyString(), sender: Wallet);
+ NotificationHelpers.Error(ex.ToUserFriendlyString());
});
}

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/SendControlViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/SendControlViewModel.cs
@@ -229,7 +229,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
LabelSuggestion.Label = label;
if (!IsMax && label.IsEmpty)
{
- NotificationHelpers.Warning("Observers are required.", "", sender: Wallet);
+ NotificationHelpers.Warning("Observers are required.", "");
return;
}
@@ -238,7 +238,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
if (!selectedCoinReferences.Any())
{
- NotificationHelpers.Warning("No coins are selected to spend.", "", sender: Wallet);
+ NotificationHelpers.Warning("No coins are selected to spend.", "");
return;
}
@@ -249,7 +249,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
}
catch (FormatException)
{
- NotificationHelpers.Warning("Invalid address.", "", sender: Wallet);
+ NotificationHelpers.Warning("Invalid address.", "");
return;
}
@@ -263,7 +263,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
if (customChangeAddress == address)
{
- NotificationHelpers.Warning("The active address and the change address cannot be the same.", "", sender: Wallet);
+ NotificationHelpers.Warning("The active address and the change address cannot be the same.", "");
return;
}
@@ -271,7 +271,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
}
catch (FormatException)
{
- NotificationHelpers.Warning("Invalid custom change address.", "", sender: Wallet);
+ NotificationHelpers.Warning("Invalid custom change address.", "");
return;
}
}
@@ -285,13 +285,13 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
{
if (!Money.TryParse(AmountText, out Money amount) || amount == Money.Zero)
{
- NotificationHelpers.Warning("Invalid amount.", sender: Wallet);
+ NotificationHelpers.Warning("Invalid amount.");
return;
}
if (amount == selectedCoinViewModels.Sum(x => x.Amount))
{
- NotificationHelpers.Warning("Looks like you want to spend whole coins. Try Max button instead.", "", sender: Wallet);
+ NotificationHelpers.Warning("Looks like you want to spend whole coins. Try Max button instead.", "");
return;
}
moneyRequest = MoneyRequest.Create(amount, subtractFee: false);
@@ -299,7 +299,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
if (FeeRate is null || FeeRate.SatoshiPerByte < 1)
{
- NotificationHelpers.Warning("Invalid fee rate.", "", sender: Wallet);
+ NotificationHelpers.Warning("Invalid fee rate.", "");
return;
}
@@ -320,7 +320,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
}
catch
{
- NotificationHelpers.Error("Cannot spend mixing coins.", "", sender: Wallet);
+ NotificationHelpers.Error("Cannot spend mixing coins.", "");
return;
}
finally
@@ -336,18 +336,18 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
if (compatiblityPasswordUsed != null)
{
Password = compatiblityPasswordUsed; // Overwrite the password for BuildTransaction function.
- NotificationHelpers.Warning(PasswordHelper.CompatibilityPasswordWarnMessage, sender: Wallet);
+ NotificationHelpers.Warning(PasswordHelper.CompatibilityPasswordWarnMessage);
}
}
catch (SecurityException ex)
{
- NotificationHelpers.Error(ex.Message, "", sender: Wallet);
+ NotificationHelpers.Error(ex.Message, "");
return;
}
catch (Exception ex)
{
Logger.LogError(ex);
- NotificationHelpers.Error(ex.ToUserFriendlyString(), sender: Wallet);
+ NotificationHelpers.Error(ex.ToUserFriendlyString());
return;
}
}
@@ -359,16 +359,16 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
catch (InsufficientBalanceException ex)
{
Money needed = ex.Minimum - ex.Actual;
- NotificationHelpers.Error($"Not enough coins selected. You need an estimated {needed.ToString(false, true)} BTC more to make this transaction.", "", sender: Wallet);
+ NotificationHelpers.Error($"Not enough coins selected. You need an estimated {needed.ToString(false, true)} BTC more to make this transaction.", "");
}
catch (HttpRequestException ex)
{
- NotificationHelpers.Error(ex.ToUserFriendlyString(), sender: Wallet);
+ NotificationHelpers.Error(ex.ToUserFriendlyString());
Logger.LogError(ex);
}
catch (Exception ex)
{
- NotificationHelpers.Error(ex.ToUserFriendlyString(), sender: Wallet);
+ NotificationHelpers.Error(ex.ToUserFriendlyString());
Logger.LogError(ex);
}
finally
@@ -411,14 +411,14 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
.ObserveOn(RxApp.TaskpoolScheduler)
.Subscribe(ex =>
{
- NotificationHelpers.Error(ex.ToUserFriendlyString(), sender: Wallet);
+ NotificationHelpers.Error(ex.ToUserFriendlyString());
Logger.LogError(ex);
});
}
protected Global Global { get; }
- public Wallet Wallet { get; }
+ protected Wallet Wallet { get; }
Wallet IWalletViewModel.Wallet => Wallet;

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
@@ -50,7 +50,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
}
catch (Exception ex)
{
- NotificationHelpers.Error(ex.ToUserFriendlyString(), sender: Wallet);
+ NotificationHelpers.Error(ex.ToUserFriendlyString());
return;
}
finally

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoViewModel.cs
@@ -47,7 +47,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
if (isCompatibilityPasswordUsed != null)
{
- NotificationHelpers.Warning(PasswordHelper.CompatibilityPasswordWarnMessage, sender: Wallet);
+ NotificationHelpers.Warning(PasswordHelper.CompatibilityPasswordWarnMessage);
}
string master = secret.GetWif(Global.Network).ToWif();
@@ -62,7 +62,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
.ObserveOn(RxApp.TaskpoolScheduler)
.Subscribe(ex =>
{
- NotificationHelpers.Error(ex.ToUserFriendlyString(), sender: wallet);
+ NotificationHelpers.Error(ex.ToUserFriendlyString());
Logger.LogError(ex);
});
}

MODIFY
WalletWasabi.Gui/Tabs/WalletManager/LoadWallets/LoadWalletViewModel.cs
WalletWasabi.Gui/Tabs/WalletManager/LoadWallets/LoadWalletViewModel.cs
@@ -156,10 +156,10 @@ namespace WalletWasabi.Gui.Tabs.WalletManager.LoadWallets
{
if (PasswordHelper.TryPassword(keyManager, password, out string compatibilityPasswordUsed))
{
- NotificationHelpers.Success("Correct password.", sender: selectedWallet);
+ NotificationHelpers.Success("Correct password.");
if (compatibilityPasswordUsed != null)
{
- NotificationHelpers.Warning(PasswordHelper.CompatibilityPasswordWarnMessage, sender: selectedWallet);
+ NotificationHelpers.Warning(PasswordHelper.CompatibilityPasswordWarnMessage);
}
keyManager.SetPasswordVerified();

MODIFY
WalletWasabi.Gui/ViewModels/AddressViewModel.cs
WalletWasabi.Gui/ViewModels/AddressViewModel.cs
@@ -149,7 +149,7 @@ namespace WalletWasabi.Gui.ViewModels
.Subscribe(ex =>
{
Logger.LogError(ex);
- NotificationHelpers.Error(ex.ToUserFriendlyString(), sender: owner.Wallet);
+ NotificationHelpers.Error(ex.ToUserFriendlyString());
});
}

Remove walletname at some places