Fix warning message, organize enqueue/dequeue buttons
MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabView.xaml
<Grid Classes="content">
<DockPanel LastChildFill="True">
<StackPanel Spacing="10" Orientation="Horizontal" DockPanel.Dock="Bottom" Margin="0 10 0 0" HorizontalAlignment="Right">
- <TextBlock Text="{Binding WarningMessageEnqueue}" Classes="warningMessage" />
+ <TextBlock Text="{Binding WarningMessageEnqueueDequeue}" Classes="warningMessage" />
<TextBox Text="{Binding Password}" PasswordChar="*" Watermark="Password" UseFloatingWatermark="True" MinWidth="173" />
<DockPanel LastChildFill="True" VerticalAlignment="Top">
- <Button Content="Enqueue" Command="{Binding EnqueueCommand}" DockPanel.Dock="Right" />
+ <Button Content="Enqueue Selected Coins for CoinJoin" Command="{Binding EnqueueCommand}" DockPanel.Dock="Right" />
<Grid />
</DockPanel>
<DockPanel LastChildFill="True" VerticalAlignment="Top">

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabViewModel.cs
@@ -31,7 +31,6 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
private string _password;
private Money _amountQueued;
private string _warningMessageEnqueue;
- private string _warningMessageDequeue;
private const int PreSelectMaxAnonSetExcludingCondition = 50;
public CoinJoinTabViewModel(WalletViewModel walletViewModel)
@@ -116,18 +115,18 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
catch (Exception ex)
{
Logger.LogWarning<CoinJoinTabViewModel>(ex);
- WarningMessageDequeue = ex.ToTypeMessageString();
+ WarningMessageEnqueueDequeue = ex.ToTypeMessageString();
if (ex is AggregateException aggex)
{
foreach (var iex in aggex.InnerExceptions)
{
- WarningMessageDequeue += Environment.NewLine + iex.ToTypeMessageString();
+ WarningMessageEnqueueDequeue += Environment.NewLine + iex.ToTypeMessageString();
}
}
return;
}
- WarningMessageDequeue = string.Empty;
+ WarningMessageEnqueueDequeue = "";
});
this.WhenAnyValue(x => x.Password).Subscribe(async x =>
@@ -151,11 +150,11 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
if (!selectedCoins.Any())
{
- WarningMessageEnqueue = "No coins are selected to enqueue.";
+ WarningMessageEnqueueDequeue = "No coins are selected to enqueue.";
return;
}
- WarningMessageEnqueue = string.Empty;
+ WarningMessageEnqueueDequeue = string.Empty;
try
{
@@ -164,12 +163,12 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
catch (Exception ex)
{
Logger.LogWarning<CoinJoinTabViewModel>(ex);
- WarningMessageEnqueue = ex.ToTypeMessageString();
+ WarningMessageEnqueueDequeue = ex.ToTypeMessageString();
if (ex is AggregateException aggex)
{
foreach (var iex in aggex.InnerExceptions)
{
- WarningMessageEnqueue += Environment.NewLine + iex.ToTypeMessageString();
+ WarningMessageEnqueueDequeue += Environment.NewLine + iex.ToTypeMessageString();
}
}
Password = string.Empty;
@@ -177,7 +176,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
}
Password = string.Empty;
- WarningMessageEnqueue = string.Empty;
+ WarningMessageEnqueueDequeue = string.Empty;
}
private void ChaumianClient_CoinDequeued(object sender, SmartCoin e)
@@ -333,18 +332,12 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
set { this.RaiseAndSetIfChanged(ref _peersNeeded, value); }
}
- public string WarningMessageEnqueue
+ public string WarningMessageEnqueueDequeue
{
get { return _warningMessageEnqueue; }
set { this.RaiseAndSetIfChanged(ref _warningMessageEnqueue, value); }
}
- public string WarningMessageDequeue
- {
- get { return _warningMessageDequeue; }
- set { this.RaiseAndSetIfChanged(ref _warningMessageDequeue, value); }
- }
-
public ReactiveCommand EnqueueCommand { get; }
public ReactiveCommand DequeueCommand { get; }

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/CoinListView.xaml
WalletWasabi.Gui/Controls/WalletExplorer/CoinListView.xaml
<TextBlock Text="Privacy" Grid.Column="4" Margin="20 0 0 0" />
<TextBlock Text="History" Grid.Column="5" />
</Grid>
- <StackPanel Margin="10" Spacing="10" DockPanel.Dock="Bottom" Orientation="Horizontal">
+ <StackPanel Margin="0 10 0 0" Spacing="10" DockPanel.Dock="Bottom" Orientation="Horizontal">
<CheckBox Content = "Select All" IsThreeState="True" IsChecked = "{Binding SelectAllCheckBoxState}" Command="{Binding SelectAllCheckBoxCommand}" />
<CheckBox Content = "Select All Private" IsThreeState="True" IsChecked = "{Binding SelectPrivateCheckBoxState}" Command="{Binding SelectPrivateCheckBoxCommand}" ToolTip.Tip="Coins those anonymity sets are over 50." />
<CheckBox Content = "Select All Non-Private" IsThreeState="True" IsChecked = "{Binding SelectNonPrivateCheckBoxState}" Command="{Binding SelectNonPrivateCheckBoxCommand}" ToolTip.Tip="Coins those anonymity sets are under 50." />

Fix warning message, organize enqueue/dequeue buttons