fix CoinModel design issue

Kukks · Jul 3, 2024 · a549465 · a549465
1 parent e65bae3
commit a549465
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/WalletWasabi.Fluent/Models/Wallets/CoinListModel.cs b/WalletWasabi.Fluent/Models/Wallets/CoinListModel.cs
@@ -6,7 +6,6 @@
 using WalletWasabi.Blockchain.Analysis.Clustering;
 using WalletWasabi.Blockchain.TransactionOutputs;
 using WalletWasabi.Fluent.Extensions;
-using WalletWasabi.Fluent.Helpers;
 using WalletWasabi.Logging;
 using WalletWasabi.Wallets;
 
@@ -32,7 +31,7 @@ public CoinListModel(Wallet wallet, IWalletModel walletModel)
 				.Publish();
 
 		Pockets = signals.Fetch(GetPockets, x => x.Labels).DisposeWith(_disposables);
-		List = Pockets.Connect().MergeMany(x => x.Coins.Select(GetCoinModel).AsObservableChangeSet()).AddKey(x => x.Key).AsObservableCache();
+		List = Pockets.Connect().MergeMany(x => x.Coins.Select(CreateCoinModel).AsObservableChangeSet()).AddKey(x => x.Key).AsObservableCache();
 
 		signals
 			.Do(_ => Logger.LogDebug($"Refresh signal emitted in {walletModel.Name}"))
@@ -51,6 +50,11 @@ public CoinListModel(Wallet wallet, IWalletModel walletModel)
 	public IObservableCache<Pocket, LabelsArray> Pockets { get; }
 
 	public ICoinModel GetCoinModel(SmartCoin smartCoin)
+	{
+		return List.Items.First(coinModel => coinModel.Key == smartCoin.Outpoint.GetHashCode());
+	}
+
+	private ICoinModel CreateCoinModel(SmartCoin smartCoin)
 	{
 		return new CoinModel(smartCoin, WalletModel.Settings.AnonScoreTarget);
 	}

diff --git a/WalletWasabi.Fluent/Models/Wallets/CoinModel.cs b/WalletWasabi.Fluent/Models/Wallets/CoinModel.cs
@@ -74,6 +74,8 @@ public void SubscribeToCoinChanges(CompositeDisposable disposable)
 			return;
 		}
 
+		disposable.Add(Disposable.Create(() => _subscribedToCoinChanges = false));
+
 		this.WhenAnyValue(c => c.Coin.IsExcludedFromCoinJoin).BindTo(this, x => x.IsExcludedFromCoinJoin).DisposeWith(disposable);
 		this.WhenAnyValue(c => c.Coin.Confirmed).BindTo(this, x => x.IsConfirmed).DisposeWith(disposable);
 		this.WhenAnyValue(c => c.Coin.HdPubKey.AnonymitySet).Select(x => (int)x).BindTo(this, x => x.AnonScore).DisposeWith(disposable);

diff --git a/WalletWasabi.Fluent/Models/Wallets/WalletCoinsModel.cs b/WalletWasabi.Fluent/Models/Wallets/WalletCoinsModel.cs
@@ -20,12 +20,6 @@ public async Task UpdateExcludedCoinsFromCoinjoinAsync(ICoinModel[] coinsToExclu
 	{
 		await Task.Run(() =>
 		{
-			// TODO: To keep models in sync with business objects. Should be automatic.
-			foreach (var coinModel in List.Items)
-			{
-				coinModel.IsExcludedFromCoinJoin = coinsToExclude.Any(x => x.IsSame(coinModel));
-			}
-
 			var outPoints = coinsToExclude.Select(x => x.GetSmartCoin().Outpoint).ToArray();
 			Wallet.UpdateExcludedCoinsFromCoinJoin(outPoints);
 		});