Remove exist and reference to GUI vmb
MODIFY
WalletWasabi.Fluent/ViewLocator.cs
WalletWasabi.Fluent/ViewLocator.cs
using System;
using Avalonia.Controls;
using Avalonia.Controls.Templates;
-using WalletWasabi.Fluent.ViewModels;
+using WalletWasabi.Gui.ViewModels;
namespace WalletWasabi.Fluent
{

MODIFY
WalletWasabi.Fluent/ViewModels/NavBarItemViewModel.cs
WalletWasabi.Fluent/ViewModels/NavBarItemViewModel.cs
using ReactiveUI;
using System;
+using WalletWasabi.Gui.ViewModels;
namespace WalletWasabi.Fluent.ViewModels
{

MODIFY
WalletWasabi.Fluent/ViewModels/NavBarViewModel.cs
WalletWasabi.Fluent/ViewModels/NavBarViewModel.cs
@@ -8,6 +8,7 @@ using System.Reactive;
using System.Reactive.Linq;
using WalletWasabi.Gui;
using WalletWasabi.Wallets;
+using WalletWasabi.Gui.ViewModels;
namespace WalletWasabi.Fluent.ViewModels
{

DELETE
WalletWasabi.Fluent/ViewModels/ViewModelBase.cs
-using ReactiveUI;
-using System;
-using System.Collections;
-using System.ComponentModel;
-using WalletWasabi.Gui.Validation;
-
-namespace WalletWasabi.Fluent.ViewModels
-{
- /// <summary>
- /// Base class for all ViewModels.
- /// </summary>
- public class ViewModelBase : ReactiveObject, INotifyDataErrorInfo, IRegisterValidationMethod
- {
- private Validations _validations;
-
- public ViewModelBase()
- {
- _validations = new Validations();
- _validations.ErrorsChanged += OnValidations_ErrorsChanged;
- PropertyChanged += ViewModelBase_PropertyChanged;
- }
-
- public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
-
- protected IValidations Validations => _validations;
-
- bool INotifyDataErrorInfo.HasErrors => Validations.Any;
-
- private void OnValidations_ErrorsChanged(object? sender, DataErrorsChangedEventArgs e)
- {
- ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(e.PropertyName));
- }
-
- private void ViewModelBase_PropertyChanged(object sender, PropertyChangedEventArgs e)
- {
- if (string.IsNullOrWhiteSpace(e.PropertyName))
- {
- _validations.Validate();
- }
- else
- {
- _validations.ValidateProperty(e.PropertyName);
- }
- }
-
- IEnumerable INotifyDataErrorInfo.GetErrors(string propertyName)
- {
- return _validations.GetErrors(propertyName);
- }
-
- void IRegisterValidationMethod.RegisterValidationMethod(string propertyName, ValidateMethod validateMethod)
- {
- ((IRegisterValidationMethod)_validations).RegisterValidationMethod(propertyName, validateMethod);
- }
- }
-}

MODIFY
WalletWasabi.Fluent/ViewModels/WalletViewModel.cs
WalletWasabi.Fluent/ViewModels/WalletViewModel.cs
@@ -10,6 +10,7 @@ using System.Reactive.Linq;
using WalletWasabi.Gui;
using WalletWasabi.Logging;
using WalletWasabi.Wallets;
+using WalletWasabi.Gui.ViewModels;
namespace WalletWasabi.Fluent.ViewModels
{
@@ -28,7 +29,7 @@ namespace WalletWasabi.Fluent.ViewModels
Observable.Merge(
Observable.FromEventPattern(Wallet.TransactionProcessor, nameof(Wallet.TransactionProcessor.WalletRelevantTransactionProcessed)).Select(_ => Unit.Default))
.Throttle(TimeSpan.FromSeconds(0.1))
- .Merge(uiConfig.WhenAnyValue(x => x.LurkingWifeMode).Select(_ => Unit.Default))
+ .Merge(uiConfig.WhenAnyValue(x => x.PrivacyMode).Select(_ => Unit.Default))
.Merge(Wallet.Synchronizer.WhenAnyValue(x => x.UsdExchangeRate).Select(_ => Unit.Default))
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(_ =>
@@ -36,9 +37,9 @@ namespace WalletWasabi.Fluent.ViewModels
try
{
var balance = Wallet.Coins.TotalAmount();
- Title = $"{WalletName} ({(uiConfig.LurkingWifeMode ? "#########" : balance.ToString(false, true))} BTC)";
+ Title = $"{WalletName} ({(uiConfig.PrivacyMode ? "#########" : balance.ToString(false, true))} BTC)";
- TitleTip = balance.ToUsdString(Wallet.Synchronizer.UsdExchangeRate, uiConfig.LurkingWifeMode);
+ TitleTip = balance.ToUsdString(Wallet.Synchronizer.UsdExchangeRate, uiConfig.PrivacyMode);
}
catch (Exception ex)
{

Remove exist and reference to GUI vmb