arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-25 14:50:57 +00:00
Code Issues Releases Wiki Activity

refactor(core/ui): merge confirm_hexdata and show_pubkey

Browse Source
This commit is contained in:
Martin Milata 2021-02-10 18:37:06 +01:00
parent 6ded531f8f
commit 0b5d17bf49
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,7 @@ async def confirm_action(
) )
# TODO cleanup @ redesign
async def confirm_wipe(ctx: wire.GenericContext) -> bool: async def confirm_wipe(ctx: wire.GenericContext) -> bool:
text = Text("Wipe device", ui.ICON_WIPE, ui.RED) text = Text("Wipe device", ui.ICON_WIPE, ui.RED)
text.normal("Do you really want to", "wipe the device?", "") text.normal("Do you really want to", "wipe the device?", "")
@ -136,6 +137,7 @@ async def confirm_reset_device(ctx: wire.GenericContext, prompt: str) -> bool:
) )
# TODO cleanup @ redesign
async def confirm_backup(ctx: wire.GenericContext) -> bool: async def confirm_backup(ctx: wire.GenericContext) -> bool:
text1 = Text("Success", ui.ICON_CONFIRM, ui.GREEN) text1 = Text("Success", ui.ICON_CONFIRM, ui.GREEN)
text1.bold("New wallet created", "successfully!") text1.bold("New wallet created", "successfully!")
@ -299,15 +301,16 @@ async def show_address(
return return
# FIXME: this is basically same as confirm_hex def show_pubkey(
# TODO: pagination for long keys
async def show_pubkey(
ctx: wire.Context, pubkey: str, title: str = "Confirm public key" ctx: wire.Context, pubkey: str, title: str = "Confirm public key"
) -> bool: ) -> Awaitable[bool]:
text = Text(title, ui.ICON_RECEIVE, ui.GREEN) return confirm_hex(
text.mono(*_hex_lines(pubkey)) ctx,
return is_confirmed( br_type="show_pubkey",
await interact(ctx, Confirm(text), "show_pubkey", ButtonRequestType.PublicKey) title="Confirm public key",
data=pubkey,
br_code=ButtonRequestType.PublicKey,
icon=ui.ICON_RECEIVE,
) )
@ -443,8 +446,10 @@ async def confirm_hex(
title: str, title: str,
data: str, data: str,
br_code: EnumTypeButtonRequestType = ButtonRequestType.Other, br_code: EnumTypeButtonRequestType = ButtonRequestType.Other,
icon: str = ui.ICON_SEND, # TODO cleanup @ redesign
icon_color: int = ui.GREEN, # TODO cleanup @ redesign
) -> bool: ) -> bool:
text = Text(title, ui.ICON_SEND, ui.GREEN) text = Text(title, icon, icon_color)
text.mono(*_hex_lines(data)) text.mono(*_hex_lines(data))
return is_confirmed(await interact(ctx, Confirm(text), br_type, br_code)) return is_confirmed(await interact(ctx, Confirm(text), br_type, br_code))