diff --git a/src/apps/management/layout_wipe_device.py b/src/apps/management/layout_wipe_device.py index 213d6857e..e54958aa1 100644 --- a/src/apps/management/layout_wipe_device.py +++ b/src/apps/management/layout_wipe_device.py @@ -12,10 +12,8 @@ async def layout_wipe_device(message, session_id): ui.clear() content = Text('Wiping device', - (ui.BOLD, 'Do you really want to'), - (ui.BOLD, 'wipe the device?'), - (ui.NORMAL, ''), - (ui.NORMAL, 'All data will be lost.')) + ui.BOLD, 'Do you really want to', 'wipe the device?', + ui.NORMAL, '', 'All data will be lost.') await hold_to_confirm(session_id, content) clear_storage(session_id) diff --git a/src/trezor/ui/text.py b/src/trezor/ui/text.py index 2a2125721..cbd804f27 100644 --- a/src/trezor/ui/text.py +++ b/src/trezor/ui/text.py @@ -7,19 +7,23 @@ TEXT_MARGIN_LEFT = const(10) class Text: - def __init__(self, header, *lines): + def __init__(self, header, *content): self.header = header - self.lines = lines + self.content = content def render(self): offset = TEXT_LINE_HEIGHT ui.display.text(TEXT_MARGIN_LEFT, offset, self.header, ui.BOLD, ui.LIGHT_GREEN, ui.BLACK) offset += TEXT_HEADER_HEIGHT - for style, line in self.lines: - ui.display.text(TEXT_MARGIN_LEFT, offset, - line, style, ui.WHITE, ui.BLACK) - offset += TEXT_LINE_HEIGHT + style = ui.NORMAL + for item in self.content: + if isinstance(item, str): + ui.display.text(TEXT_MARGIN_LEFT, offset, + item, style, ui.WHITE, ui.BLACK) + offset += TEXT_LINE_HEIGHT + else: + style = item def send(self, event, pos): pass