dont need that property anymore
MODIFY
WalletWasabi.Fluent/ViewModels/Dialog/DialogViewModelBase.cs
WalletWasabi.Fluent/ViewModels/Dialog/DialogViewModelBase.cs
@@ -10,7 +10,6 @@ namespace WalletWasabi.Fluent.ViewModels.Dialog
public abstract class DialogViewModelBase : ViewModelBase
{
private bool _isDialogOpen;
- private bool _dialogReturnedWithValue;
/// <summary>
/// Gets or sets if the dialog is opened/closed.
@@ -21,15 +20,6 @@ namespace WalletWasabi.Fluent.ViewModels.Dialog
set => this.RaiseAndSetIfChanged(ref _isDialogOpen, value);
}
- /// <summary>
- /// Gets or sets if the dialog returned with a value or not.
- /// </summary>
- public bool DialogReturnedWithValue
- {
- get => _dialogReturnedWithValue;
- set => this.RaiseAndSetIfChanged(ref _dialogReturnedWithValue, value);
- }
-
/// <summary>
/// Method that is triggered when the dialog is closed.
/// </summary>

MODIFY
WalletWasabi.Fluent/ViewModels/Dialog/DialogViewModelBaseOfTResult.cs
WalletWasabi.Fluent/ViewModels/Dialog/DialogViewModelBaseOfTResult.cs
@@ -23,7 +23,7 @@ namespace WalletWasabi.Fluent.ViewModels.Dialog
private void OnIsDialogOpenChanged(bool obj)
{
// Trigger when closed abruptly (via the Overlay or the back button).
- if (!obj & CurrentTaskCompletionSource is { } & !DialogReturnedWithValue)
+ if (!obj & CurrentTaskCompletionSource is { })
{
Close();
}
@@ -48,11 +48,10 @@ namespace WalletWasabi.Fluent.ViewModels.Dialog
if (!(value?.Equals(default(TResult)) ?? true))
{
- DialogReturnedWithValue = true;
+ _disposable?.Dispose();
}
IsDialogOpen = false;
- _disposable?.Dispose();
OnDialogClosed();
}

dont need that property anymore