Remove Automatically start coinjoin toggle from the coinjoin profile settings
MODIFY
WalletWasabi.Fluent/ViewModels/CoinJoinProfiles/CoinJoinProfilesViewModel.cs
WalletWasabi.Fluent/ViewModels/CoinJoinProfiles/CoinJoinProfilesViewModel.cs
@@ -15,15 +15,12 @@ namespace WalletWasabi.Fluent.ViewModels.CoinJoinProfiles;
public partial class CoinJoinProfilesViewModel : DialogViewModelBase<bool>
{
[AutoNotify] private CoinJoinProfileViewModelBase? _selectedProfile;
- [AutoNotify] private bool _autoCoinJoin;
public CoinJoinProfilesViewModel(KeyManager keyManager, bool isNewWallet)
{
NextCommand = ReactiveCommand.Create(() => OnNext(keyManager, isNewWallet));
EnableBack = true;
- AutoCoinJoin = keyManager.AutoCoinJoin;
-
Profiles = DefaultProfiles.ToList();
ManualSetupCommand = ReactiveCommand.CreateFromTask(async () => await OnManualSetupAsync());
@@ -61,7 +58,7 @@ public partial class CoinJoinProfilesViewModel : DialogViewModelBase<bool>
private async Task OnManualSetupAsync()
{
var current = SelectedProfile ?? SelectedManualProfile ?? Profiles.First();
- var dialog = new ManualCoinJoinProfileDialogViewModel(current, AutoCoinJoin);
+ var dialog = new ManualCoinJoinProfileDialogViewModel(current);
var dialogResult = await NavigateDialogAsync(dialog, NavigationTarget.CompactDialogScreen);
@@ -69,7 +66,6 @@ public partial class CoinJoinProfilesViewModel : DialogViewModelBase<bool>
{
SelectedProfile = null;
SelectedManualProfile = result.Profile;
- AutoCoinJoin = result.AutoCoinJoin;
}
}
@@ -77,7 +73,6 @@ public partial class CoinJoinProfilesViewModel : DialogViewModelBase<bool>
{
var selected = SelectedProfile ?? SelectedManualProfile ?? Profiles.First();
- keyManager.AutoCoinJoin = AutoCoinJoin;
keyManager.RedCoinIsolation = selected.RedCoinIsolation;
keyManager.SetAnonScoreTarget(selected.AnonScoreTarget, toFile: false);
keyManager.SetFeeRateMedianTimeFrame(selected.FeeRateMedianTimeFrameHours, toFile: false);

MODIFY
WalletWasabi.Fluent/ViewModels/Dialogs/ManualCoinJoinProfileDialogViewModel.cs
WalletWasabi.Fluent/ViewModels/Dialogs/ManualCoinJoinProfileDialogViewModel.cs
@@ -9,15 +9,13 @@ namespace WalletWasabi.Fluent.ViewModels.Dialogs;
[NavigationMetaData(Title = "Coinjoin Settings")]
public partial class ManualCoinJoinProfileDialogViewModel : DialogViewModelBase<ManualCoinJoinProfileDialogViewModel.ManualCoinJoinProfileDialogViewModelResult?>
{
- [AutoNotify] private bool _autoCoinjoin;
[AutoNotify] private bool _redCoinIsolation;
[AutoNotify] private int _anonScoreTarget;
[AutoNotify] private TimeFrameItem[] _timeFrames;
[AutoNotify] private TimeFrameItem _selectedTimeFrame;
- public ManualCoinJoinProfileDialogViewModel(CoinJoinProfileViewModelBase current, bool autoCoinJoin)
+ public ManualCoinJoinProfileDialogViewModel(CoinJoinProfileViewModelBase current)
{
- _autoCoinjoin = autoCoinJoin;
_redCoinIsolation = current.RedCoinIsolation;
_anonScoreTarget = current.AnonScoreTarget;
@@ -38,12 +36,11 @@ public partial class ManualCoinJoinProfileDialogViewModel : DialogViewModelBase<
NextCommand = ReactiveCommand.Create(() =>
{
- var auto = AutoCoinjoin;
var isolateRed = RedCoinIsolation;
var target = AnonScoreTarget;
var hours = (int)Math.Floor(SelectedTimeFrame.TimeFrame.TotalHours);
- Close(DialogResultKind.Normal, new ManualCoinJoinProfileDialogViewModelResult(auto, new ManualCoinJoinProfileViewModel(target, hours, isolateRed)));
+ Close(DialogResultKind.Normal, new ManualCoinJoinProfileDialogViewModelResult(new ManualCoinJoinProfileViewModel(target, hours, isolateRed)));
});
}
@@ -55,7 +52,7 @@ public partial class ManualCoinJoinProfileDialogViewModel : DialogViewModelBase<
}
}
- public record ManualCoinJoinProfileDialogViewModelResult(bool AutoCoinJoin, ManualCoinJoinProfileViewModel Profile)
+ public record ManualCoinJoinProfileDialogViewModelResult(ManualCoinJoinProfileViewModel Profile)
{
}
}

MODIFY
WalletWasabi.Fluent/Views/Dialogs/ManualCoinJoinProfileDialogView.axaml
WalletWasabi.Fluent/Views/Dialogs/ManualCoinJoinProfileDialogView.axaml
EnableBack="{Binding EnableBack}"
EnableNext="True" NextContent="Done">
<StackPanel Classes="settingsLayout">
- <DockPanel>
- <TextBlock Text="Automatically start coinjoin" />
- <ToggleSwitch IsChecked="{Binding AutoCoinjoin}" />
- </DockPanel>
<DockPanel ToolTip.Tip="Only allow a single coin with anonymity score 1 into coinjoin registration.">
<TextBlock Text="Red coin isolation" />

Remove Automatically start coinjoin toggle from the coinjoin profile settings