Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[VDG] Escape button goes back #9691

Merged
merged 16 commits into from Apr 3, 2023

Conversation

wieslawsoltes
Copy link
Collaborator

@wieslawsoltes wieslawsoltes commented Dec 4, 2022

Fixes: #9984
Partially fixes: #9983

Added new option to SetupCancel method to override Escape button behavior and enable back navigation.

Dialogs:

View model Escape goes back
ViewModels/Dialogs/ConfirmHideAddressViewModel.cs TODO
ViewModels/Wallets/Send/PrivacyControlViewModel.cs TODO
ViewModels/Wallets/Send/TransactionPreviewViewModel.cs TODO

Dialogs:

View model Escape goes back
ViewModels/AddWallet/AddWalletPageViewModel.cs TODO
ViewModels/Dialogs/CreatePasswordDialogViewModel.cs TODO
ViewModels/CoinJoinProfiles/CoinJoinProfilesViewModel.cs YES
ViewModels/Dialogs/CreatePasswordDialogViewModel.cs TODO
ViewModels/Dialogs/AdvancedRecoveryOptionsViewModel.cs TODO
ViewModels/Dialogs/ManualCoinJoinProfileDialogViewModel.cs TODO
ViewModels/Dialogs/ShowQrCameraDialogViewModel.cs TODO
ViewModels/Dialogs/AboutAdvancedInfoViewModel.cs TODO
ViewModels/AddWallet/TermsAndConditionsViewModel.cs TODO
ViewModels/Dialogs/CreatePasswordDialogViewModel.cs TODO
ViewModels/Dialogs/Authorization/PasswordAuthDialogViewModel.cs TODO
ViewModels/Dialogs/ShowErrorDialogViewModel.cs TODO
ViewModels/Dialogs/AddressEntryDialogViewModel.cs TODO
ViewModels/Dialogs/LabelEntryDialogViewModel.cs TODO
ViewModels/CoinJoinProfiles/CoinJoinProfilesViewModel.cs TODO
ViewModels/Wallets/Send/CustomFeeRateDialogViewModel.cs TODO
ViewModels/Dialogs/ShowQrCameraDialogViewModel.cs TODO
ViewModels/Dialogs/LabelEntryDialogViewModel.cs TODO
ViewModels/Wallets/Send/CustomFeeRateDialogViewModel.cs TODO
ViewModels/Wallets/Send/SendFeeViewModel.cs YES
ViewModels/Dialogs/Authorization/HardwareWalletAuthDialogViewModel.cs TODO
ViewModels/Dialogs/Authorization/PasswordAuthDialogViewModel.cs TODO
ViewModels/Dialogs/Authorization/PasswordAuthDialogViewModel.cs TODO

SetupCancel:

View model Escape goes back
ViewModels/AddWallet/AddWalletPageViewModel.cs TODO
ViewModels/AddWallet/AddedWalletPageViewModel.cs TODO
ViewModels/AddWallet/Create/ConfirmRecoveryWordsViewModel.cs TODO
ViewModels/AddWallet/Create/RecoveryWordsViewModel.cs TODO
ViewModels/AddWallet/HardwareWallet/ConnectHardwareWalletViewModel.cs TODO
ViewModels/AddWallet/HardwareWallet/DetectedHardwareWalletViewModel.cs TODO
ViewModels/AddWallet/LegalDocumentsViewModel.cs TODO
ViewModels/AddWallet/RecoverWalletViewModel.cs TODO
ViewModels/AddWallet/TermsAndConditionsViewModel.cs TODO
ViewModels/AddWallet/WalletNamePageViewModel.cs TODO
ViewModels/AddWallet/WelcomePageViewModel.cs TODO
ViewModels/CoinControl/SelectCoinsDialogViewModel.cs TODO
ViewModels/CoinJoinProfiles/CoinJoinProfilesViewModel.cs YES
ViewModels/Dialogs/AboutAdvancedInfoViewModel.cs TODO
ViewModels/Dialogs/AddressEntryDialogViewModel.cs TODO
ViewModels/Dialogs/AdvancedRecoveryOptionsViewModel.cs TODO
ViewModels/Dialogs/Authorization/HardwareWalletAuthDialogViewModel.cs TODO
ViewModels/Dialogs/Authorization/PasswordAuthDialogViewModel.cs TODO
ViewModels/Dialogs/ConfirmHideAddressViewModel.cs TODO
ViewModels/Dialogs/CreatePasswordDialogViewModel.cs TODO
ViewModels/Dialogs/LabelEntryDialogViewModel.cs TODO
ViewModels/Dialogs/ManualCoinJoinProfileDialogViewModel.cs TODO
ViewModels/Dialogs/ShowErrorDialogViewModel.cs TODO
ViewModels/Dialogs/ShowQrCameraDialogViewModel.cs TODO
ViewModels/HelpAndSupport/AboutViewModel.cs TODO
ViewModels/Login/PasswordFinder/ContainsNumbersViewModel.cs TODO
ViewModels/Login/PasswordFinder/ContainsSymbolsViewModel.cs TODO
ViewModels/Login/PasswordFinder/PasswordFinderIntroduceViewModel.cs TODO
ViewModels/Login/PasswordFinder/PasswordFoundViewModel.cs TODO
ViewModels/Login/PasswordFinder/PasswordNotFoundViewModel.cs TODO
ViewModels/Login/PasswordFinder/SearchPasswordViewModel.cs TODO
ViewModels/Login/PasswordFinder/SelectCharsetViewModel.cs TODO
ViewModels/Settings/SettingsPageViewModel.cs TODO
ViewModels/SuccessViewModel.cs TODO
ViewModels/TransactionBroadcasting/BroadcastTransactionViewModel.cs TODO
ViewModels/TransactionBroadcasting/LoadTransactionViewModel.cs TODO
ViewModels/Wallets/Advanced/WalletCoins/WalletCoinsViewModel.cs TODO
ViewModels/Wallets/Advanced/WalletInfoViewModel.cs TODO
ViewModels/Wallets/Advanced/WalletStatsViewModel.cs TODO
ViewModels/Wallets/CoinJoinSettingsViewModel.cs TODO
ViewModels/Wallets/Home/History/Details/CoinJoinDetailsViewModel.cs TODO
ViewModels/Wallets/Home/History/Details/CoinJoinsDetailsViewModel.cs TODO
ViewModels/Wallets/Home/History/Details/TransactionDetailsViewModel.cs TODO
ViewModels/Wallets/Home/Tiles/PrivacyRing/PrivacyRingViewModel.cs TODO
ViewModels/Wallets/Receive/AddressLabelEditViewModel.cs TODO
ViewModels/Wallets/Receive/ReceiveAddressViewModel.cs NO
ViewModels/Wallets/Receive/ReceiveAddressesViewModel.cs YES
ViewModels/Wallets/Receive/ReceiveViewModel.cs TODO
ViewModels/Wallets/Send/CustomFeeRateDialogViewModel.cs TODO
ViewModels/Wallets/Send/PrivacyControlViewModel.cs TODO
ViewModels/Wallets/Send/SendFeeViewModel.cs YES
ViewModels/Wallets/Send/SendSuccessViewModel.cs TODO
ViewModels/Wallets/Send/SendViewModel.cs TODO
ViewModels/Wallets/Send/TransactionPreviewViewModel.cs TODO
ViewModels/Wallets/VerifyRecoveryWordsViewModel.cs TODO
ViewModels/Wallets/WalletSettingsViewModel.cs TODO

All routable view models:
ViewModels/AddWallet/AddWalletPageViewModel
ViewModels/AddWallet/AddedWalletPageViewModel
ViewModels/AddWallet/Create/ConfirmRecoveryWordsViewModel
ViewModels/AddWallet/Create/RecoveryWordsViewModel
ViewModels/AddWallet/HardwareWallet/ConnectHardwareWalletViewModel
ViewModels/AddWallet/HardwareWallet/DetectedHardwareWalletViewModel
ViewModels/AddWallet/LegalDocumentsViewModel
ViewModels/AddWallet/RecoverWalletViewModel
ViewModels/AddWallet/TermsAndConditionsViewModel
ViewModels/AddWallet/WalletNamePageViewModel
ViewModels/AddWallet/WelcomePageViewModel
ViewModels/CoinControl/SelectCoinsDialogViewModel
ViewModels/CoinJoinProfiles/CoinJoinProfilesViewModel
ViewModels/Dialogs/AboutAdvancedInfoViewModel
ViewModels/Dialogs/AddressEntryDialogViewModel
ViewModels/Dialogs/AdvancedRecoveryOptionsViewModel
ViewModels/Dialogs/Authorization/AuthorizationDialogBase
ViewModels/Dialogs/Authorization/HardwareWalletAuthDialogViewModel
ViewModels/Dialogs/Authorization/PasswordAuthDialogViewModel
ViewModels/Dialogs/Base/DialogViewModelBase
ViewModels/Dialogs/Base/DialogViewModelBase
ViewModels/Dialogs/ConfirmHideAddressViewModel
ViewModels/Dialogs/CreatePasswordDialogViewModel
ViewModels/Dialogs/LabelEntryDialogViewModel
ViewModels/Dialogs/ManualCoinJoinProfileDialogViewModel
ViewModels/Dialogs/ShowErrorDialogViewModel
ViewModels/Dialogs/ShowQrCameraDialogViewModel
ViewModels/Dialogs/ShuttingDownViewModel
ViewModels/HelpAndSupport/AboutViewModel
ViewModels/HelpAndSupport/BugReportLinkViewModel
ViewModels/HelpAndSupport/DocsLinkViewModel
ViewModels/HelpAndSupport/UserSupportViewModel
ViewModels/Login/LoginViewModel
ViewModels/Login/PasswordFinder/ContainsNumbersViewModel
ViewModels/Login/PasswordFinder/ContainsSymbolsViewModel
ViewModels/Login/PasswordFinder/PasswordFinderIntroduceViewModel
ViewModels/Login/PasswordFinder/PasswordFoundViewModel
ViewModels/Login/PasswordFinder/PasswordNotFoundViewModel
ViewModels/Login/PasswordFinder/SearchPasswordViewModel
ViewModels/Login/PasswordFinder/SelectCharsetViewModel
ViewModels/NavBar/NavBarItemViewModel
ViewModels/OpenDirectory/OpenConfigFileViewModel
ViewModels/OpenDirectory/OpenDataFolderViewModel
ViewModels/OpenDirectory/OpenFileViewModel
ViewModels/OpenDirectory/OpenLogsViewModel
ViewModels/OpenDirectory/OpenTorLogsViewModel
ViewModels/OpenDirectory/OpenWalletsFolderViewModel
ViewModels/Settings/AdvancedSettingsTabViewModel
ViewModels/Settings/BitcoinTabSettingsViewModel
ViewModels/Settings/GeneralSettingsTabViewModel
ViewModels/Settings/PrivacyModeViewModel
ViewModels/Settings/SettingsPageViewModel
ViewModels/Settings/SettingsTabViewModelBase
ViewModels/Settings/ThemeChangeViewModel
ViewModels/SuccessViewModel
ViewModels/TransactionBroadcasting/BroadcastTransactionViewModel
ViewModels/TransactionBroadcasting/BroadcasterViewModel
ViewModels/TransactionBroadcasting/LoadTransactionViewModel
ViewModels/TriggerCommandViewModel
ViewModels/Wallets/Advanced/WalletCoins/WalletCoinsViewModel
ViewModels/Wallets/Advanced/WalletInfoViewModel
ViewModels/Wallets/Advanced/WalletStatsViewModel
ViewModels/Wallets/ClosedHardwareWalletViewModel
ViewModels/Wallets/ClosedWalletViewModel
ViewModels/Wallets/ClosedWatchOnlyWalletViewModel
ViewModels/Wallets/CoinJoinSettingsViewModel
ViewModels/Wallets/HardwareWalletViewModel
ViewModels/Wallets/Home/History/Details/CoinJoinDetailsViewModel
ViewModels/Wallets/Home/History/Details/CoinJoinsDetailsViewModel
ViewModels/Wallets/Home/History/Details/TransactionDetailsViewModel
ViewModels/Wallets/Home/Tiles/PrivacyRing/PrivacyRingViewModel
ViewModels/Wallets/Receive/AddressLabelEditViewModel
ViewModels/Wallets/Receive/ReceiveAddressViewModel
ViewModels/Wallets/Receive/ReceiveAddressesViewModel
ViewModels/Wallets/Receive/ReceiveViewModel
ViewModels/Wallets/Send/CustomFeeRateDialogViewModel
ViewModels/Wallets/Send/PrivacyControlViewModel
ViewModels/Wallets/Send/SendFeeViewModel
ViewModels/Wallets/Send/SendSuccessViewModel
ViewModels/Wallets/Send/SendViewModel
ViewModels/Wallets/Send/TransactionPreviewViewModel
ViewModels/Wallets/VerifyRecoveryWordsViewModel
ViewModels/Wallets/WalletSettingsViewModel
ViewModels/Wallets/WalletViewModel
ViewModels/Wallets/WalletViewModelBase
ViewModels/Wallets/WatchOnlyWalletViewModel

@pull-request-size pull-request-size bot added size/S and removed size/XS labels Mar 5, 2023
@wieslawsoltes wieslawsoltes marked this pull request as ready for review March 13, 2023 13:06
nopara73
nopara73 previously approved these changes Mar 29, 2023
Copy link
Contributor

@nopara73 nopara73 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Fight this out with @soosr. Any behavior is fine by me: #9691 (comment)

Copy link
Collaborator

@soosr soosr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code LGTM

@soosr soosr merged commit 8a7651f into zkSNACKs:master Apr 3, 2023
4 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improve Send Confirmation Dialog Escapes Implement More Careful Exit Handling
3 participants