remove custom fee from settings
MODIFY
WalletWasabi.Fluent/UiConfig.cs
WalletWasabi.Fluent/UiConfig.cs
@@ -16,7 +16,6 @@ namespace WalletWasabi.Fluent
private bool _privacyMode;
private bool _lockScreenActive;
private string _lockScreenPinHash = "";
- private bool _isCustomFee;
private bool _isCustomChangeAddress;
private bool _autocopy;
private int _feeDisplayFormat;
@@ -36,7 +35,6 @@ namespace WalletWasabi.Fluent
this.WhenAnyValue(
x => x.LockScreenPinHash,
x => x.Autocopy,
- x => x.IsCustomFee,
x => x.IsCustomChangeAddress,
x => x.DarkModeEnabled,
x => x.FeeDisplayFormat,
@@ -46,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)
@@ -93,14 +91,6 @@ namespace WalletWasabi.Fluent
set => RaiseAndSetIfChanged(ref _autocopy, value);
}
- [DefaultValue(false)]
- [JsonProperty(PropertyName = "IsCustomFee", DefaultValueHandling = DefaultValueHandling.Populate)]
- public bool IsCustomFee
- {
- get => _isCustomFee;
- set => RaiseAndSetIfChanged(ref _isCustomFee, value);
- }
-
[DefaultValue(false)]
[JsonProperty(PropertyName = "IsCustomChangeAddress", DefaultValueHandling = DefaultValueHandling.Populate)]
public bool IsCustomChangeAddress

MODIFY
WalletWasabi.Fluent/ViewModels/Settings/GeneralSettingsTabViewModel.cs
WalletWasabi.Fluent/ViewModels/Settings/GeneralSettingsTabViewModel.cs
@@ -26,7 +26,6 @@ namespace WalletWasabi.Fluent.ViewModels.Settings
{
[AutoNotify] private bool _darkModeEnabled;
[AutoNotify] private bool _autoCopy;
- [AutoNotify] private bool _customFee;
[AutoNotify] private bool _customChangeAddress;
[AutoNotify] private FeeDisplayFormat _selectedFeeDisplayFormat;
[AutoNotify] private bool _runOnSystemStartup;
@@ -36,7 +35,6 @@ namespace WalletWasabi.Fluent.ViewModels.Settings
{
_darkModeEnabled = Services.UiConfig.DarkModeEnabled;
_autoCopy = Services.UiConfig.Autocopy;
- _customFee = Services.UiConfig.IsCustomFee;
_customChangeAddress = Services.UiConfig.IsCustomChangeAddress;
_runOnSystemStartup = Services.UiConfig.RunOnSystemStartup;
_hideOnClose = Services.UiConfig.HideOnClose;
@@ -73,11 +71,6 @@ namespace WalletWasabi.Fluent.ViewModels.Settings
}
});
- this.WhenAnyValue(x => x.CustomFee)
- .ObserveOn(RxApp.TaskpoolScheduler)
- .Skip(1)
- .Subscribe(x => Services.UiConfig.IsCustomFee = x);
-
this.WhenAnyValue(x => x.CustomChangeAddress)
.ObserveOn(RxApp.TaskpoolScheduler)
.Skip(1)

MODIFY
WalletWasabi.Fluent/Views/Settings/GeneralSettingsTabView.axaml
WalletWasabi.Fluent/Views/Settings/GeneralSettingsTabView.axaml
<ToggleSwitch IsChecked="{Binding AutoCopy}" />
</DockPanel>
- <DockPanel>
- <TextBlock Text="Manual fee entry." />
- <ToggleSwitch IsChecked="{Binding CustomFee}" />
- </DockPanel>
-
<DockPanel>
<TextBlock VerticalAlignment="Center" Text="Custom change address." />
<ToggleSwitch IsChecked="{Binding CustomChangeAddress}" />

remove custom fee from settings