merge from master

Kukks · Jun 21, 2024 · f51204b · f51204b
1 parent 41c3ded
commit f51204b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/WalletWasabi.Fluent/Models/Wallets/CoinListModel.cs b/WalletWasabi.Fluent/Models/Wallets/CoinListModel.cs
@@ -6,6 +6,7 @@
 using WalletWasabi.Blockchain.Analysis.Clustering;
 using WalletWasabi.Blockchain.TransactionOutputs;
 using WalletWasabi.Fluent.Extensions;
+using WalletWasabi.Fluent.Helpers;
 using WalletWasabi.Logging;
 using WalletWasabi.Wallets;
 
@@ -30,8 +31,8 @@ public CoinListModel(Wallet wallet, IWalletModel walletModel)
 				.Merge(isCoinjoinRunningChanged)
 				.Publish();
 
-		List = signals.Fetch(GetCoins, x => x.Key).DisposeWith(_disposables);
-		Pockets = signals.Fetch(GetPockets, x => x.Labels).DisposeWith(_disposables);
+		Pockets = signals.Fetch(GetPockets, x => x.Labels, new LambdaComparer<Pocket>((a, b) => Equals(a?.Labels, b?.Labels))).DisposeWith(_disposables);
+		List = Pockets.Connect().MergeMany(x => x.Coins.Select(GetCoinModel).AsObservableChangeSet()).AddKey(x => x.Key).AsObservableCache();
 
 		signals
 			.Do(_ => Logger.LogDebug($"Refresh signal emitted in {walletModel.Name}"))