arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-27 02:12:35 +00:00
Code Issues Releases Wiki Activity

refactor(core/ui): get rid of confirm_wipe

Browse Source
This commit is contained in:
Martin Milata 2021-03-16 13:37:34 +01:00
parent c0174ff217
commit da72482c2f
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/apps/management/wipe_device.py
View File

@ -1,12 +1,27 @@
import storage import storage
from trezor import ui
from trezor.messages import ButtonRequestType
from trezor.messages.Success import Success from trezor.messages.Success import Success
from trezor.ui.layouts import confirm_wipe from trezor.ui.layouts import confirm_action
from .apply_settings import reload_settings_from_storage from .apply_settings import reload_settings_from_storage
async def wipe_device(ctx, msg): async def wipe_device(ctx, msg):
await confirm_wipe(ctx) await confirm_action(
ctx,
"confirm_wipe",
title="Wipe device",
description="Do you really want to\nwipe the device?\n",
action="All data will be lost.",
reverse=True,
verb="Hold to confirm",
hold=True,
hold_danger=True,
icon=ui.ICON_WIPE,
icon_color=ui.RED,
br_code=ButtonRequestType.WipeDevice,
)
storage.wipe() storage.wipe()
reload_settings_from_storage() reload_settings_from_storage()

23
core/src/trezor/ui/layouts/tt.py
View File

@ -43,7 +43,6 @@ if False:
__all__ = ( __all__ = (
"confirm_action", "confirm_action",
"confirm_wipe",
"confirm_reset_device", "confirm_reset_device",
"confirm_backup", "confirm_backup",
"confirm_path_warning", "confirm_path_warning",
@ -79,13 +78,13 @@ async def confirm_action(
verb: Union[str, bytes, None] = Confirm.DEFAULT_CONFIRM, verb: Union[str, bytes, None] = Confirm.DEFAULT_CONFIRM,
verb_cancel: Union[str, bytes, None] = Confirm.DEFAULT_CANCEL, verb_cancel: Union[str, bytes, None] = Confirm.DEFAULT_CANCEL,
hold: bool = False, hold: bool = False,
hold_danger: bool = False,
icon: str = None, # TODO cleanup @ redesign icon: str = None, # TODO cleanup @ redesign
icon_color: int = None, # TODO cleanup @ redesign icon_color: int = None, # TODO cleanup @ redesign
reverse: bool = False, # TODO cleanup @ redesign reverse: bool = False, # TODO cleanup @ redesign
larger_vspace: bool = False, # TODO cleanup @ redesign larger_vspace: bool = False, # TODO cleanup @ redesign
exc: ExceptionType = wire.ActionCancelled, exc: ExceptionType = wire.ActionCancelled,
br_code: EnumTypeButtonRequestType = ButtonRequestType.Other, br_code: EnumTypeButtonRequestType = ButtonRequestType.Other,
**kwargs: Any,
) -> None: ) -> None:
text = Text( text = Text(
title, title,
@ -118,10 +117,13 @@ async def confirm_action(
) )
cls = HoldToConfirm if hold else Confirm cls = HoldToConfirm if hold else Confirm
kwargs = {}
if hold_danger:
kwargs = {"loader_style": LoaderDanger, "confirm_style": ButtonCancel}
await raise_if_cancelled( await raise_if_cancelled(
interact( interact(
ctx, ctx,
cls(text, confirm=verb, cancel=verb_cancel), cls(text, confirm=verb, cancel=verb_cancel, **kwargs),
br_type, br_type,
br_code, br_code,
), ),
@ -129,21 +131,6 @@ async def confirm_action(
) )
# TODO cleanup @ redesign
async def confirm_wipe(ctx: wire.GenericContext) -> None:
text = Text("Wipe device", ui.ICON_WIPE, ui.RED)
text.normal("Do you really want to", "wipe the device?", "")
text.bold("All data will be lost.")
await raise_if_cancelled(
interact(
ctx,
HoldToConfirm(text, confirm_style=ButtonCancel, loader_style=LoaderDanger),
"wipe_device",
ButtonRequestType.WipeDevice,
)
)
async def confirm_reset_device(ctx: wire.GenericContext, prompt: str) -> None: async def confirm_reset_device(ctx: wire.GenericContext, prompt: str) -> None:
text = Text("Create new wallet", ui.ICON_RESET, new_lines=False) text = Text("Create new wallet", ui.ICON_RESET, new_lines=False)
text.bold(prompt) text.bold(prompt)