make sure coins are updated when selecting a wallet (WalletWasabi#13222)

Kukks · Jul 5, 2024 · f1f7ad8 · f1f7ad8
1 parent f51b34f
commit f1f7ad8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/WalletWasabi.Fluent/Models/Wallets/CoinListModel.cs b/WalletWasabi.Fluent/Models/Wallets/CoinListModel.cs
@@ -23,11 +23,13 @@ public CoinListModel(Wallet wallet, IWalletModel walletModel)
 		var transactionProcessed = walletModel.Transactions.TransactionProcessed;
 		var anonScoreTargetChanged = this.WhenAnyValue(x => x.WalletModel.Settings.AnonScoreTarget).Skip(1).ToSignal();
 		var isCoinjoinRunningChanged = walletModel.Coinjoin.IsRunning.ToSignal();
+		var isSelected = this.WhenAnyValue(x => x.WalletModel.IsSelected).Skip(1).ToSignal();
 
 		var signals =
 			transactionProcessed
 				.Merge(anonScoreTargetChanged)
 				.Merge(isCoinjoinRunningChanged)
+				.Merge(isSelected)
 				.Publish();
 
 		Pockets = signals.Fetch(GetPockets, x => x.Labels).DisposeWith(_disposables);

diff --git a/WalletWasabi.Fluent/Models/Wallets/WalletModel.cs b/WalletWasabi.Fluent/Models/Wallets/WalletModel.cs
@@ -22,6 +22,7 @@ public partial class WalletModel : ReactiveObject
 
 	[AutoNotify] private bool _isLoggedIn;
 	[AutoNotify] private bool _isLoaded;
+	[AutoNotify] private bool _isSelected;
 
 	public WalletModel(Wallet wallet, IAmountProvider amountProvider)
 	{

diff --git a/WalletWasabi.Fluent/ViewModels/Wallets/WalletPageViewModel.cs b/WalletWasabi.Fluent/ViewModels/Wallets/WalletPageViewModel.cs
@@ -68,6 +68,10 @@ private WalletPageViewModel(IWalletModel walletModel)
 			.BindTo(this, x => x.Title)
 			.DisposeWith(_disposables);
 
+		this.WhenAnyValue(x => x.IsSelected)
+			.Do(value => WalletModel.IsSelected = value)
+			.Subscribe();
+
 		SetIcon();
 	}
 

diff --git a/WalletWasabi.Tests/UnitTests/ViewModels/ReceiveAddressViewModelTests.cs b/WalletWasabi.Tests/UnitTests/ViewModels/ReceiveAddressViewModelTests.cs
@@ -75,6 +75,8 @@ public string Name
 
 		public bool IsLoaded { get; set; }
 
+		public bool IsSelected { get; set; }
+
 		public IAddress GetNextReceiveAddress(IEnumerable<string> destinationLabels)
 		{
 			throw new NotSupportedException();

diff --git a/WalletWasabi.Tests/UnitTests/ViewModels/SuggestionLabelsViewModelTests.cs b/WalletWasabi.Tests/UnitTests/ViewModels/SuggestionLabelsViewModelTests.cs
@@ -207,6 +207,8 @@ public string Name
 
 		public bool IsLoaded { get; set; }
 
+		public bool IsSelected { get; set; }
+
 		public IAddress GetNextReceiveAddress(IEnumerable<string> destinationLabels)
 		{
 			throw new NotSupportedException();