tidy password incorrect dialog.
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/AddWalletPageViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/AddWalletPageViewModel.cs
@@ -84,7 +84,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
catch (Exception ex)
{
Logger.LogError(ex);
- await ShowErrorAsync(ex.ToUserFriendlyString(), "The wallet file was not valid or compatible with Wasabi.");
+ await ShowErrorAsync(Title, ex.ToUserFriendlyString(), "The wallet file was not valid or compatible with Wasabi.");
}
});

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/DetectedHardwareWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/DetectedHardwareWalletViewModel.cs
@@ -44,7 +44,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet.HardwareWallet
catch (Exception ex)
{
Logger.LogError(ex);
- await ShowErrorAsync(ex.ToUserFriendlyString(), "Error occured during adding your wallet.");
+ await ShowErrorAsync(Title, ex.ToUserFriendlyString(), "Error occured during adding your wallet.");
Navigate().Back();
}
});

MODIFY
WalletWasabi.Fluent/ViewModels/Login/LoginViewModel.cs
WalletWasabi.Fluent/ViewModels/Login/LoginViewModel.cs
@@ -41,7 +41,7 @@ namespace WalletWasabi.Fluent.ViewModels.Login
if (compatibilityPasswordUsed is { })
{
- await ShowErrorAsync(PasswordHelper.CompatibilityPasswordWarnMessage, "Compatibility password was used");
+ await ShowErrorAsync(Title, PasswordHelper.CompatibilityPasswordWarnMessage, "Compatibility password was used");
}
var legalResult = await ShowLegalAsync(walletManagerViewModel.LegalChecker);
@@ -91,7 +91,7 @@ namespace WalletWasabi.Fluent.ViewModels.Login
}
else
{
- await ShowErrorAsync("Error", "Wasabi was unable to login and load your wallet.");
+ await ShowErrorAsync(Title, "Error", "Wasabi was unable to login and load your wallet.");
}
}

MODIFY
WalletWasabi.Fluent/ViewModels/Navigation/RoutableViewModel.cs
WalletWasabi.Fluent/ViewModels/Navigation/RoutableViewModel.cs
@@ -117,9 +117,9 @@ namespace WalletWasabi.Fluent.ViewModels.Navigation
return result;
}
- protected async Task ShowErrorAsync(string message, string caption)
+ protected async Task ShowErrorAsync(string title, string message, string caption)
{
- var dialog = new ShowErrorDialogViewModel(message, Title, caption);
+ var dialog = new ShowErrorDialogViewModel(message, title, caption);
await NavigateDialog(dialog, NavigationTarget.DialogScreen);
}
}

MODIFY
WalletWasabi.Fluent/ViewModels/TransactionBroadcasting/BroadcastTransactionViewModel.cs
WalletWasabi.Fluent/ViewModels/TransactionBroadcasting/BroadcastTransactionViewModel.cs
@@ -89,7 +89,7 @@ namespace WalletWasabi.Fluent.ViewModels.TransactionBroadcasting
catch (Exception ex)
{
Logger.LogError(ex);
- await ShowErrorAsync(ex.ToUserFriendlyString(), "It was not possible to broadcast the transaction.");
+ await ShowErrorAsync(Title, ex.ToUserFriendlyString(), "It was not possible to broadcast the transaction.");
}
},
nextCommandCanExecute);

MODIFY
WalletWasabi.Fluent/ViewModels/TransactionBroadcasting/LoadTransactionViewModel.cs
WalletWasabi.Fluent/ViewModels/TransactionBroadcasting/LoadTransactionViewModel.cs
@@ -41,7 +41,7 @@ namespace WalletWasabi.Fluent.ViewModels.TransactionBroadcasting
catch (Exception ex)
{
Logger.LogError(ex);
- await ShowErrorAsync(ex.ToUserFriendlyString(), "It was not possible to load the transaction.");
+ await ShowErrorAsync(Title, ex.ToUserFriendlyString(), "It was not possible to load the transaction.");
}
},
outputScheduler: RxApp.MainThreadScheduler);
@@ -74,7 +74,7 @@ namespace WalletWasabi.Fluent.ViewModels.TransactionBroadcasting
catch (Exception ex)
{
Logger.LogError(ex);
- await ShowErrorAsync(ex.ToUserFriendlyString(), "It was not possible to paste the transaction.");
+ await ShowErrorAsync(Title, ex.ToUserFriendlyString(), "It was not possible to paste the transaction.");
}
});
}

MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/Receive/ReceiveAddressViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/Receive/ReceiveAddressViewModel.cs
@@ -52,7 +52,7 @@ namespace WalletWasabi.Fluent.ViewModels.Wallets.Receive
catch (Exception ex)
{
Logger.LogError(ex);
- await ShowErrorAsync(ex.ToUserFriendlyString(), "We were unable to send the address to the device");
+ await ShowErrorAsync(Title, ex.ToUserFriendlyString(), "We were unable to send the address to the device");
}
});
});

MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/Send/TransactionPreviewViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/Send/TransactionPreviewViewModel.cs
@@ -74,11 +74,13 @@ namespace WalletWasabi.Fluent.ViewModels.Wallets.Send
if (passwordValid)
{
+ // dequeue any joining coins.
+
// Broadcast transaction.
}
else
{
- await ShowErrorAsync("Password was incorrect.", "Please try again.");
+ await ShowErrorAsync("Password was incorrect.", "Please try again.", "");
}
}
});

MODIFY
WalletWasabi.Fluent/Views/Wallets/Send/TransactionPreviewView.axaml
WalletWasabi.Fluent/Views/Wallets/Send/TransactionPreviewView.axaml
EnableCancel="False"
EnableNext="True"
NextContent="Confirm"
+ IsBusy="{Binding IsBusy}"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
<StackPanel Spacing="50">
<WrapPanel>

tidy password incorrect dialog.