diff --git a/WalletWasabi.Fluent/Models/Transactions/SendFlowModel.cs b/WalletWasabi.Fluent/Models/Transactions/SendFlowModel.cs
index fa2fcc1aaf1..4af2cccee79 100644
--- a/WalletWasabi.Fluent/Models/Transactions/SendFlowModel.cs
+++ b/WalletWasabi.Fluent/Models/Transactions/SendFlowModel.cs
@@ -17,7 +17,7 @@ private SendFlowModel(Wallet wallet, ICoinsView availableCoins, ICoinListModel c
{
Wallet = wallet;
AvailableCoins = availableCoins;
- CoinListModel = coinListModel;
+ CoinList = coinListModel;
}
/// Regular Send Flow. Uses all wallet coins
@@ -36,7 +36,7 @@ public SendFlowModel(Wallet wallet, IWalletModel walletModel, IEnumerable selecte
{
var transactionInfo = sendFlow.TransactionInfo ?? throw new InvalidOperationException($"Missing required TransactionInfo.");
- // TODO: pass the SendFlow here to show only the relevant coins in the list
- CoinList = new CoinListViewModel(wallet, selectedCoins, true);
+ CoinList = new CoinListViewModel(wallet, sendFlow.CoinList, selectedCoins, true);
EnoughSelected = CoinList.Selection.ToObservableChangeSet()
.ToCollection()
diff --git a/WalletWasabi.Fluent/ViewModels/Wallets/Advanced/WalletCoinsViewModel.cs b/WalletWasabi.Fluent/ViewModels/Wallets/Advanced/WalletCoinsViewModel.cs
index ac8f5f413f5..b9d4f4bcb52 100644
--- a/WalletWasabi.Fluent/ViewModels/Wallets/Advanced/WalletCoinsViewModel.cs
+++ b/WalletWasabi.Fluent/ViewModels/Wallets/Advanced/WalletCoinsViewModel.cs
@@ -40,7 +40,7 @@ private WalletCoinsViewModel(IWalletModel wallet)
SetupCancel(enableCancel: false, enableCancelOnEscape: true, enableCancelOnPressed: true);
NextCommand = CancelCommand;
SkipCommand = ReactiveCommand.CreateFromTask(OnSendCoinsAsync);
- _coinList = new CoinListViewModel(_wallet, new List());
+ _coinList = new CoinListViewModel(_wallet, _wallet.Coins, new List());
IsAnySelected = CoinList.Selection.ToObservableChangeSet().Count().Select(i => i > 0);
}
diff --git a/WalletWasabi.Fluent/ViewModels/Wallets/Coins/CoinListViewModel.cs b/WalletWasabi.Fluent/ViewModels/Wallets/Coins/CoinListViewModel.cs
index 300658fb95e..b5586bb0a9c 100644
--- a/WalletWasabi.Fluent/ViewModels/Wallets/Coins/CoinListViewModel.cs
+++ b/WalletWasabi.Fluent/ViewModels/Wallets/Coins/CoinListViewModel.cs
@@ -25,7 +25,7 @@ public class CoinListViewModel : ViewModelBase, IDisposable
private readonly bool _ignorePrivacyMode;
[System.Diagnostics.CodeAnalysis.SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Uses DisposeWith()")]
- public CoinListViewModel(IWalletModel wallet, IList initialCoinSelection, bool ignorePrivacyMode = false)
+ public CoinListViewModel(IWalletModel wallet, ICoinListModel availableCoins, IList initialCoinSelection, bool ignorePrivacyMode = false)
{
_wallet = wallet;
_ignorePrivacyMode = ignorePrivacyMode;
@@ -69,7 +69,7 @@ public CoinListViewModel(IWalletModel wallet, IList initialCoinSelec
.ToCollection()
.Select(GetSelectedCoins);
- wallet.Coins.Pockets
+ availableCoins.Pockets
.Connect()
.ToCollection()
.WithLatestFrom(selectedCoins, (pockets, sc) => (pockets, sc))
@@ -98,7 +98,7 @@ public CoinListViewModel(IWalletModel wallet, IList initialCoinSelec
TreeDataGridSource.DisposeWith(_disposables);
CoinItems = coinItemsCollection;
- wallet.Coins.Pockets
+ availableCoins.Pockets
.Connect()
.ToCollection()
.SkipWhile(pockets => pockets.Count == 0)
diff --git a/WalletWasabi.Fluent/ViewModels/Wallets/Send/ManualControlDialogViewModel.cs b/WalletWasabi.Fluent/ViewModels/Wallets/Send/ManualControlDialogViewModel.cs
index 47536f067ef..06eec6c15bd 100644
--- a/WalletWasabi.Fluent/ViewModels/Wallets/Send/ManualControlDialogViewModel.cs
+++ b/WalletWasabi.Fluent/ViewModels/Wallets/Send/ManualControlDialogViewModel.cs
@@ -26,7 +26,7 @@ public partial class ManualControlDialogViewModel: DialogViewModelBase