TaskCanceledException inherits from OperationCanceledException
MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewModel.cs
@@ -126,7 +126,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
await Task.Delay(1000, cancelToken);
ClipboardNotificationVisible = false;
}
- catch (Exception ex) when (ex is OperationCanceledException || ex is TaskCanceledException || ex is TimeoutException)
+ catch (Exception ex) when (ex is OperationCanceledException || ex is TimeoutException)
{
Logger.LogTrace(ex);
}

MODIFY
WalletWasabi.Gui/ViewModels/AddressViewModel.cs
WalletWasabi.Gui/ViewModels/AddressViewModel.cs
@@ -236,7 +236,7 @@ namespace WalletWasabi.Gui.ViewModels
await Task.Delay(1000, cancelToken);
ClipboardNotificationVisible = false;
}
- catch (Exception ex) when (ex is OperationCanceledException || ex is TaskCanceledException || ex is TimeoutException)
+ catch (Exception ex) when (ex is OperationCanceledException || ex is TimeoutException)
{
Logger.LogTrace(ex);
}

MODIFY
WalletWasabi/CoinJoin/Client/Clients/AliceClientBase.cs
WalletWasabi/CoinJoin/Client/Clients/AliceClientBase.cs
@@ -165,7 +165,7 @@ namespace WalletWasabi.CoinJoin.Client.Clients
await response.ThrowRequestExceptionFromContentAsync().ConfigureAwait(false);
}
}
- catch (Exception ex) when (ex is OperationCanceledException || ex is TaskCanceledException || ex is TimeoutException) // If could not do it within 3 seconds then it'll likely time out and take it as unconfirmed.
+ catch (Exception ex) when (ex is OperationCanceledException || ex is TimeoutException) // If could not do it within 3 seconds then it'll likely time out and take it as unconfirmed.
{
return;
}

MODIFY
WalletWasabi/Hwi/HwiClient.cs
WalletWasabi/Hwi/HwiClient.cs
@@ -54,7 +54,7 @@ namespace WalletWasabi.Hwi
return responseString;
}
- catch (Exception ex) when (ex is OperationCanceledException || ex is TaskCanceledException || ex is TimeoutException)
+ catch (Exception ex) when (ex is OperationCanceledException || ex is TimeoutException)
{
throw new OperationCanceledException($"'hwi {arguments}' operation is canceled.", ex);
}

MODIFY
WalletWasabi/Stores/IndexStore.cs
WalletWasabi/Stores/IndexStore.cs
@@ -400,7 +400,7 @@ namespace WalletWasabi.Stores
await Task.WhenAll(tasks).ConfigureAwait(false);
}
}
- catch (Exception ex) when (ex is OperationCanceledException || ex is TaskCanceledException || ex is TimeoutException)
+ catch (Exception ex) when (ex is OperationCanceledException || ex is TimeoutException)
{
Logger.LogTrace(ex);
}

MODIFY
WalletWasabi/Tor/Http/TorHttpClient.cs
WalletWasabi/Tor/Http/TorHttpClient.cs
@@ -158,7 +158,7 @@ namespace WalletWasabi.Tor.Http
catch (TaskCanceledException ex)
{
SetTorNotWorkingState(ex);
- throw new OperationCanceledException(ex.Message, ex, cancel);
+ throw;
}
catch (Exception ex)
{

MODIFY
WalletWasabi/Wallets/P2pBlockProvider.cs
WalletWasabi/Wallets/P2pBlockProvider.cs
@@ -116,7 +116,7 @@ namespace WalletWasabi.Wallets
await NodeTimeoutsAsync(false).ConfigureAwait(false);
}
- catch (Exception ex) when (ex is OperationCanceledException || ex is TaskCanceledException || ex is TimeoutException)
+ catch (Exception ex) when (ex is OperationCanceledException || ex is TimeoutException)
{
await NodeTimeoutsAsync(true).ConfigureAwait(false);

TaskCanceledException inherits from OperationCanceledException