Finish Completed notification
MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/WalletViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/WalletViewModel.cs
@@ -74,6 +74,7 @@ public partial class WalletViewModel : WalletViewModelBase
args switch {
StartedEventArgs _ => true,
StoppedEventArgs _ => false,
+ CompletedEventArgs => false,
_ => null
};

MODIFY
WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
WalletWasabi/WabiSabi/Client/CoinJoinManager.cs
@@ -138,7 +138,6 @@ public class CoinJoinManager : BackgroundService
if (trackedCoinJoins.TryGetValue(walletToStop.WalletName, out var coinJoinTrackerToStop))
{
coinJoinTrackerToStop.Cancel();
- trackedCoinJoins.Remove(walletToStop.WalletName);
}
break;
}
@@ -155,7 +154,6 @@ public class CoinJoinManager : BackgroundService
NotifyCoinJoinCompletion(finishedCoinJoin);
await HandleCoinJoinFinalizationAsync(finishedCoinJoin, trackedCoinJoins, stoppingToken).ConfigureAwait(false);
}
-
// Updates the highest coinjoin client state.
var inProgress = trackedCoinJoins.Values.Where(wtd => !wtd.IsCompleted).ToImmutableArray();
@@ -255,7 +253,7 @@ public class CoinJoinManager : BackgroundService
SafeRaiseEvent(StatusChanged, new LoadedEventArgs(openedWallet));
private void NotifyCoinJoinCompletion(CoinJoinTracker finishedCoinJoin) =>
- SafeRaiseEvent(StatusChanged, new CoinJoinCompletedEventArgs(
+ SafeRaiseEvent(StatusChanged, new CompletedEventArgs(
finishedCoinJoin.Wallet,
finishedCoinJoin.CoinJoinTask.Status switch
{

MODIFY
WalletWasabi/WabiSabi/Client/StatusChangedEventArgs.cs
WalletWasabi/WabiSabi/Client/StatusChangedEventArgs.cs
@@ -30,9 +30,9 @@ public class StartedEventArgs : StatusChangedEventArgs
public TimeSpan RegistrationTimeout { get; }
}
-public class CoinJoinCompletedEventArgs : StatusChangedEventArgs
+public class CompletedEventArgs : StatusChangedEventArgs
{
- public CoinJoinCompletedEventArgs(Wallet wallet, CompletionStatus completionStatus)
+ public CompletedEventArgs(Wallet wallet, CompletionStatus completionStatus)
: base(wallet)
{
CompletionStatus = completionStatus;

Finish Completed notification