separate autopaste settings
MODIFY
WalletWasabi.Fluent/UiConfig.cs
WalletWasabi.Fluent/UiConfig.cs
@@ -23,6 +23,7 @@ namespace WalletWasabi.Fluent
private bool _runOnSystemStartup;
private bool _oobe;
private bool _hideOnClose;
+ private bool _autoPaste;
public UiConfig() : base()
{
@@ -32,6 +33,7 @@ namespace WalletWasabi.Fluent
{
this.WhenAnyValue(
x => x.Autocopy,
+ x => x.AutoPaste,
x => x.IsCustomFee,
x => x.IsCustomChangeAddress,
x => x.DarkModeEnabled,
@@ -42,7 +44,7 @@ namespace WalletWasabi.Fluent
x => x.RunOnSystemStartup,
x => x.PrivacyMode,
x => x.HideOnClose,
- (_, _, _, _, _, _, _, _, _, _, _) => Unit.Default)
+ (_, _, _, _, _, _, _, _, _, _, _, _) => Unit.Default)
.Throttle(TimeSpan.FromMilliseconds(500))
.Skip(1) // Won't save on UiConfig creation.
.ObserveOn(RxApp.TaskpoolScheduler)
@@ -85,6 +87,14 @@ namespace WalletWasabi.Fluent
set => RaiseAndSetIfChanged(ref _autocopy, value);
}
+ [DefaultValue(false)]
+ [JsonProperty(PropertyName = nameof(AutoPaste), DefaultValueHandling = DefaultValueHandling.Populate)]
+ public bool AutoPaste
+ {
+ get => _autoPaste;
+ set => RaiseAndSetIfChanged(ref _autoPaste, value);
+ }
+
[DefaultValue(false)]
[JsonProperty(PropertyName = "IsCustomFee", DefaultValueHandling = DefaultValueHandling.Populate)]
public bool IsCustomFee

MODIFY
WalletWasabi.Fluent/ViewModels/Settings/GeneralSettingsTabViewModel.cs
WalletWasabi.Fluent/ViewModels/Settings/GeneralSettingsTabViewModel.cs
@@ -26,6 +26,7 @@ namespace WalletWasabi.Fluent.ViewModels.Settings
{
[AutoNotify] private bool _darkModeEnabled;
[AutoNotify] private bool _autoCopy;
+ [AutoNotify] private bool _autoPaste;
[AutoNotify] private bool _customFee;
[AutoNotify] private bool _customChangeAddress;
[AutoNotify] private FeeDisplayFormat _selectedFeeDisplayFormat;
@@ -36,6 +37,7 @@ namespace WalletWasabi.Fluent.ViewModels.Settings
{
_darkModeEnabled = Services.UiConfig.DarkModeEnabled;
_autoCopy = Services.UiConfig.Autocopy;
+ _autoPaste = Services.UiConfig.AutoPaste;
_customFee = Services.UiConfig.IsCustomFee;
_customChangeAddress = Services.UiConfig.IsCustomChangeAddress;
_runOnSystemStartup = Services.UiConfig.RunOnSystemStartup;
@@ -58,6 +60,11 @@ namespace WalletWasabi.Fluent.ViewModels.Settings
.Skip(1)
.Subscribe(x => Services.UiConfig.Autocopy = x);
+ this.WhenAnyValue(x => x.AutoPaste)
+ .ObserveOn(RxApp.TaskpoolScheduler)
+ .Skip(1)
+ .Subscribe(x => Services.UiConfig.AutoPaste = x);
+
StartupCommand = ReactiveCommand.Create(async () =>
{
try

MODIFY
WalletWasabi.Fluent/Views/Settings/GeneralSettingsTabView.axaml
WalletWasabi.Fluent/Views/Settings/GeneralSettingsTabView.axaml
</DockPanel>
<DockPanel>
- <TextBlock Text="Auto Copy/Paste Bitcoin addresses" />
+ <TextBlock Text="Auto Copy receive addresses" />
<ToggleSwitch IsChecked="{Binding AutoCopy}" />
</DockPanel>
+ <DockPanel>
+ <TextBlock Text="Auto Paste send addresses" />
+ <ToggleSwitch IsChecked="{Binding AutoPaste}" />
+ </DockPanel>
+
<DockPanel>
<TextBlock Text="Manual fee entry." />
<ToggleSwitch IsChecked="{Binding CustomFee}" />

separate autopaste settings