From 7fafe71328ede39ed76b6a5616e48b3240473db4 Mon Sep 17 00:00:00 2001 From: Matt Gleason Date: Mon, 26 Aug 2024 15:03:49 -0400 Subject: [PATCH 1/2] SFT-4120: standardized menu icons and messages --- ports/stm32/boards/Passport/modules/menus.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/stm32/boards/Passport/modules/menus.py b/ports/stm32/boards/Passport/modules/menus.py index 9f9199dd4..3cac82a6d 100644 --- a/ports/stm32/boards/Passport/modules/menus.py +++ b/ports/stm32/boards/Passport/modules/menus.py @@ -35,8 +35,8 @@ def manage_account_menu(): from pages import AccountDetailsPage return [ - {'icon': 'ICON_FOLDER', 'label': 'Account Details', 'page': AccountDetailsPage}, - {'icon': 'ICON_INFO', 'label': 'Rename Account', 'flow': RenameAccountFlow}, + {'icon': 'ICON_FOLDER', 'label': 'View Details', 'page': AccountDetailsPage}, + {'icon': 'ICON_SIGN', 'label': 'Rename Account', 'flow': RenameAccountFlow}, {'icon': 'ICON_CONNECT', 'label': 'Connect Wallet', 'flow': ConnectWalletFlow, 'statusbar': {'title': 'CONNECT'}}, {'icon': 'ICON_CANCEL', 'label': 'Delete Account', 'flow': DeleteAccountFlow}, @@ -160,7 +160,7 @@ def device_menu(): {'icon': 'ICON_COUNTDOWN', 'label': 'Auto-Shutdown', 'page': AutoShutdownSettingPage}, {'icon': 'ICON_PIN', 'label': 'Change PIN', 'flow': ChangePINFlow, 'is_visible': is_logged_in}, {'icon': 'ICON_BATTERY', 'label': 'Battery', 'page': BatteryPage}, - {'icon': 'ICON_SIGN', 'label': 'Device Name', 'flow': RenameDeviceFlow}, + {'icon': 'ICON_SIGN', 'label': 'Rename Device', 'flow': RenameDeviceFlow}, {'icon': 'ICON_INFO', 'label': 'About', 'flow': AboutFlow}, ] @@ -188,7 +188,7 @@ def seed_item_menu(): TemporarySeedFlow) return [ {'icon': 'ICON_ONE_KEY', 'label': 'View Details', 'flow': ViewDerivedKeyDetailsFlow}, - {'icon': 'ICON_INFO', 'label': 'Rename', 'flow': RenameDerivedKeyFlow, 'auto_card_header': False}, + {'icon': 'ICON_SIGN', 'label': 'Rename', 'flow': RenameDerivedKeyFlow, 'auto_card_header': False}, {'icon': 'ICON_SCAN_QR', 'label': 'Export', 'flow': ExportDerivedKeyFlow}, {'icon': 'ICON_HOURGLASS', 'label': 'Temporary Seed', 'flow': TemporarySeedFlow, 'is_visible': lambda: not has_temporary_seed()}, @@ -209,7 +209,7 @@ def key_item_menu(): ExportDerivedKeyFlow) return [ {'icon': 'ICON_ONE_KEY', 'label': 'View Details', 'flow': ViewDerivedKeyDetailsFlow}, - {'icon': 'ICON_INFO', 'label': 'Rename', 'flow': RenameDerivedKeyFlow, 'auto_card_header': False}, + {'icon': 'ICON_SIGN', 'label': 'Rename', 'flow': RenameDerivedKeyFlow, 'auto_card_header': False}, {'icon': 'ICON_SCAN_QR', 'label': 'Export', 'flow': ExportDerivedKeyFlow}, {'icon': 'ICON_ERASE', 'label': 'Hide Key', @@ -354,8 +354,8 @@ def multisig_item_menu(): 'statusbar': {'title': 'EXPORT'}}, {'icon': 'ICON_MICROSD', 'label': 'Export via microSD', 'flow': ExportMultisigMicrosdFlow, 'statusbar': {'title': 'EXPORT'}}, - {'icon': 'ICON_TWO_KEYS', 'label': 'Rename', 'flow': RenameMultisigFlow, 'exit_on_success': True}, - {'icon': 'ICON_TWO_KEYS', 'label': 'Delete', 'flow': DeleteMultisigFlow, 'exit_on_success': True}, + {'icon': 'ICON_SIGN', 'label': 'Rename', 'flow': RenameMultisigFlow, 'exit_on_success': True}, + {'icon': 'ICON_CANCEL', 'label': 'Delete', 'flow': DeleteMultisigFlow, 'exit_on_success': True}, ] From e655676421bcf8478305608a8bd45bc73be479b4 Mon Sep 17 00:00:00 2001 From: Matt Gleason Date: Tue, 27 Aug 2024 13:58:31 -0400 Subject: [PATCH 2/2] SFT-4120: changed account options to "Rename" and "Delete" --- ports/stm32/boards/Passport/modules/menus.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/stm32/boards/Passport/modules/menus.py b/ports/stm32/boards/Passport/modules/menus.py index 3cac82a6d..07f5ed6c0 100644 --- a/ports/stm32/boards/Passport/modules/menus.py +++ b/ports/stm32/boards/Passport/modules/menus.py @@ -36,10 +36,10 @@ def manage_account_menu(): return [ {'icon': 'ICON_FOLDER', 'label': 'View Details', 'page': AccountDetailsPage}, - {'icon': 'ICON_SIGN', 'label': 'Rename Account', 'flow': RenameAccountFlow}, + {'icon': 'ICON_SIGN', 'label': 'Rename', 'flow': RenameAccountFlow}, {'icon': 'ICON_CONNECT', 'label': 'Connect Wallet', 'flow': ConnectWalletFlow, 'statusbar': {'title': 'CONNECT'}}, - {'icon': 'ICON_CANCEL', 'label': 'Delete Account', 'flow': DeleteAccountFlow}, + {'icon': 'ICON_CANCEL', 'label': 'Delete', 'flow': DeleteAccountFlow}, ]