Move CJ settings command to CoinJoinStateViewModel

WalletWasabi · Mar 21, 2024 · 46a34fc · 46a34fc
1 parent 290f4a4
commit 46a34fc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/WalletWasabi.Fluent/ViewModels/Wallets/CoinJoinStateViewModel.cs b/WalletWasabi.Fluent/ViewModels/Wallets/CoinJoinStateViewModel.cs
@@ -1,4 +1,3 @@
-using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
@@ -8,6 +7,7 @@
 using WalletWasabi.Fluent.Models.UI;
 using WalletWasabi.Fluent.Models.Wallets;
 using WalletWasabi.Fluent.State;
+using WalletWasabi.Fluent.ViewModels.Wallets.Settings;
 using WalletWasabi.WabiSabi.Backend.Rounds;
 using WalletWasabi.WabiSabi.Client.CoinJoinProgressEvents;
 using WalletWasabi.WabiSabi.Client.StatusChangedEvents;
@@ -64,7 +64,7 @@ public partial class CoinJoinStateViewModel : ViewModelBase
 	private DateTimeOffset _countDownStartTime;
 	private DateTimeOffset _countDownEndTime;
 
-	public CoinJoinStateViewModel(UiContext uiContext, IWalletModel wallet, ReactiveCommand<Unit, Unit> navigateToCoinjoinSettingsCommand)
+	public CoinJoinStateViewModel(UiContext uiContext, IWalletModel wallet, WalletSettingsViewModel settings)
 	{
 		UiContext = uiContext;
 		_wallet = wallet;
@@ -152,9 +152,17 @@ public CoinJoinStateViewModel(UiContext uiContext, IWalletModel wallet, Reactive
 		_countdownTimer.Tick += (_, _) => _stateMachine.Fire(Trigger.Tick);
 
 		_stateMachine.Start();
-
-		CanNavigateToCoinjoinSettings = navigateToCoinjoinSettingsCommand.CanExecute;
-		NavigateToCoinjoinSettingsCommand = navigateToCoinjoinSettingsCommand;
+
+		var coinJoinSettingsCommand = ReactiveCommand.Create(
+			() =>
+			{
+				settings.SelectedTab = 1;
+				UiContext.Navigate(NavigationTarget.DialogScreen).To(settings);
+			},
+			Observable.Return(!_wallet.IsWatchOnlyWallet));
+
+		NavigateToSettingsCommand = coinJoinSettingsCommand;
+		CanNavigateToCoinjoinSettings = coinJoinSettingsCommand.CanExecute;
 	}
 
 	private enum State
@@ -183,7 +191,7 @@ private enum Trigger
 
 	public IObservable<bool> CanNavigateToCoinjoinSettings { get; }
 
-	public ICommand NavigateToCoinjoinSettingsCommand { get; }
+	public ICommand NavigateToSettingsCommand { get; }
 
 	public bool IsAutoCoinJoinEnabled => _wallet.Settings.AutoCoinjoin;
 

diff --git a/WalletWasabi.Fluent/ViewModels/Wallets/WalletViewModel.cs b/WalletWasabi.Fluent/ViewModels/Wallets/WalletViewModel.cs
@@ -103,17 +103,7 @@ public WalletViewModel(UiContext uiContext, IWalletModel walletModel, Wallet wal
 
 		WalletCoinsCommand = ReactiveCommand.Create(() => Navigate(NavigationTarget.DialogScreen).To().WalletCoins(WalletModel));
 
-		var coinJoinSettingsCommand = ReactiveCommand.Create(
-			() =>
-			{
-				Settings.SelectedTab = 1;
-				Navigate(NavigationTarget.DialogScreen).To(Settings);
-			},
-			Observable.Return(!WalletModel.IsWatchOnlyWallet));
-
-		CoinJoinSettingsCommand = coinJoinSettingsCommand;
-
-		CoinJoinStateViewModel = new CoinJoinStateViewModel(uiContext, WalletModel, coinJoinSettingsCommand);
+		CoinJoinStateViewModel = new CoinJoinStateViewModel(uiContext, WalletModel, Settings);
 
 		Tiles = GetTiles().ToList();
 

diff --git a/WalletWasabi.Fluent/Views/Wallets/MusicControlsView.axaml b/WalletWasabi.Fluent/Views/Wallets/MusicControlsView.axaml
@@ -108,7 +108,7 @@
           <Button Classes="plain" IsVisible="{Binding CanNavigateToCoinjoinSettings^}">
             <Button.Flyout>
               <MenuFlyout Placement="Top">
-                <MenuItem Header="Coinjoin Settings" Command="{Binding NavigateToCoinjoinSettingsCommand}">
+                <MenuItem Header="Coinjoin Settings" Command="{Binding NavigateToSettingsCommand}">
                   <MenuItem.Icon>
                     <PathIcon Data="{StaticResource settings_general_regular}" />
                   </MenuItem.Icon>