[VDG] Make password button texts depends on intent #11778
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarnixCroes
reviewed
Oct 23, 2023
| @@ -26,10 +28,22 @@ public PasswordAuthDialogViewModel(IWalletModel wallet) | |||
| AuthorizationFailedMessage = $"The password is incorrect.{Environment.NewLine}Please try again."; | |||
| } | |||
|
|
|||
| public string ContinueText => Intent == PasswordRequestIntent.Send ? "SEND" : "Next"; | |||
There was a problem hiding this comment.
Suggested change
| public string ContinueText => Intent == PasswordRequestIntent.Send ? "SEND" : "Next"; | |
| public string ContinueText => Intent == PasswordRequestIntent.Send ? "Send" : "Next"; |
soosr
reviewed
Oct 24, 2023
I did exactly that initially, but looked a bit redundant when we actually have only 2 values. I can restore this approach if you think it's enough/convenient. |
Yes, please. Just keep it simple |
soosr
reviewed
Oct 24, 2023
| @@ -16,7 +16,7 @@ public static AuthorizationDialogBase GetAuthorizationDialog(IWalletModel wallet | |||
| } | |||
| else | |||
| { | |||
| return new PasswordAuthDialogViewModel(wallet, PasswordRequestIntent.Send); | |||
| return new PasswordAuthDialogViewModel(wallet, "SEND"); | |||
There was a problem hiding this comment.
| [NavigationMetaData(Title = "Enter your password", NavigationTarget = NavigationTarget.CompactDialogScreen)] | ||
| public partial class PasswordAuthDialogViewModel : AuthorizationDialogBase | ||
| { | ||
| private readonly IWalletModel _wallet; | ||
| [AutoNotify] private string _password; | ||
|
|
||
| public PasswordAuthDialogViewModel(IWalletModel wallet, PasswordRequestIntent intent) | ||
| public PasswordAuthDialogViewModel(IWalletModel wallet, string continueText) |
There was a problem hiding this comment.
string continueText = "Continue" and only pass it where Send is required.
| @@ -281,7 +281,7 @@ private void RegisterViewModels() | |||
| { | |||
| // TODO: Remove reference to WalletRepository when this ViewModel is Decoupled | |||
| // TODO: Why is this code duplicated? | |||
| var pwAuthDialog = new PasswordAuthDialogViewModel(walletViewModel.WalletModel, PasswordRequestIntent.Other); | |||
| var pwAuthDialog = new PasswordAuthDialogViewModel(walletViewModel.WalletModel, "Next"); | |||
There was a problem hiding this comment.
You're right. I don't know why I changed it...
soosr
approved these changes
Oct 25, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adapts the password request view to show "Next" or "SEND", depending on the intent of the request.
Replaces #11594 (review)