remove CJ notifications
MODIFY
WalletWasabi.Fluent/Helpers/TransactionHelpers.cs
WalletWasabi.Fluent/Helpers/TransactionHelpers.cs
@@ -58,7 +58,7 @@ namespace WalletWasabi.Fluent.Helpers
}
- public static (string, string) GetNotificationInputs(ProcessedResult e)
+ public static (string?, string?) GetNotificationInputs(ProcessedResult e)
{
try
{
@@ -72,6 +72,7 @@ namespace WalletWasabi.Fluent.Helpers
bool isConfirmedReceive = e.NewlyConfirmedReceivedCoins.Any();
bool isConfirmedSpent = e.NewlyConfirmedReceivedCoins.Any();
Money miningFee = e.Transaction.Transaction.GetFee(e.SpentCoins.Select(x => x.Coin).ToArray());
+
if (isReceived || isSpent)
{
Money receivedSum = e.NewlyReceivedCoins.Sum(x => x.Amount);
@@ -88,10 +89,6 @@ namespace WalletWasabi.Fluent.Helpers
{
return ("Self Spend", $"Mining Fee: {amountString} BTC");
}
- else if (isSpent && receiveSpentDiff.Almost(Money.Zero, Money.Coins(0.01m)) && e.IsLikelyOwnCoinJoin)
- {
- return ("", $"CoinJoin Completed!");
- }
else if (incoming > Money.Zero)
{
if (e.Transaction.IsRBF && e.Transaction.IsReplacement)
@@ -128,10 +125,6 @@ namespace WalletWasabi.Fluent.Helpers
{
return ("Self Spend Confirmed", $"Mining Fee: {amountString} BTC");
}
- else if (isConfirmedSpent && receiveSpentDiff.Almost(Money.Zero, Money.Coins(0.01m)) && e.IsLikelyOwnCoinJoin)
- {
- return ("", $"CoinJoin Confirmed!");
- }
else if (incoming > Money.Zero)
{
return ("Receive Confirmed", $"{amountString} BTC");
@@ -147,7 +140,7 @@ namespace WalletWasabi.Fluent.Helpers
Logger.LogWarning(ex);
}
- return ("", "");
+ return (null, null);
}
}
}

MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/WalletViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/WalletViewModel.cs
@@ -86,7 +86,10 @@ namespace WalletWasabi.Fluent.ViewModels.Wallets
var (title, message) = TransactionHelpers.GetNotificationInputs(e);
+ if (!string.IsNullOrEmpty(title) && !string.IsNullOrEmpty(message))
+ {
NotificationHelpers.Show(title, message);
+ }
});
}

remove CJ notifications