From 576a211c3de59a8fcd22aa880d10cf5dee452ae2 Mon Sep 17 00:00:00 2001 From: Andrew Kozlik Date: Fri, 20 Sep 2019 11:10:48 +0200 Subject: [PATCH] core: Clarify the messages on the screens and get rid of overflows. --- core/src/apps/common/request_passphrase.py | 4 ++-- core/src/apps/management/apply_settings.py | 6 +++--- core/src/apps/management/change_pin.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/apps/common/request_passphrase.py b/core/src/apps/common/request_passphrase.py index e215c0a692..d55eb97fcc 100644 --- a/core/src/apps/common/request_passphrase.py +++ b/core/src/apps/common/request_passphrase.py @@ -44,7 +44,7 @@ async def request_passphrase_source(ctx: wire.Context) -> int: await ctx.call(req, ButtonAck) text = Text("Enter passphrase", ui.ICON_CONFIG) - text.normal("Where to enter your", "passphrase?") + text.normal("Where do you want to", "enter your passphrase?") source = PassphraseSource(text) return await ctx.wait(source) @@ -53,7 +53,7 @@ async def request_passphrase_source(ctx: wire.Context) -> int: async def request_passphrase_ack(ctx: wire.Context, on_device: bool) -> str: if not on_device: text = Text("Passphrase entry", ui.ICON_CONFIG) - text.normal("Please, type passphrase", "on connected host.") + text.normal("Please type your", "passphrase on the", "connected host.") await Popup(text) req = PassphraseRequest(on_device=on_device) diff --git a/core/src/apps/management/apply_settings.py b/core/src/apps/management/apply_settings.py index 5fd36b53ae..f6f9ce5441 100644 --- a/core/src/apps/management/apply_settings.py +++ b/core/src/apps/management/apply_settings.py @@ -49,14 +49,14 @@ async def apply_settings(ctx, msg): async def require_confirm_change_homescreen(ctx): - text = Text("Change homescreen", ui.ICON_CONFIG) - text.normal("Do you really want to", "change homescreen?") + text = Text("Set homescreen", ui.ICON_CONFIG) + text.normal("Do you really want to", "change the homescreen", "image?") await require_confirm(ctx, text, ButtonRequestType.ProtectCall) async def require_confirm_change_label(ctx, label): text = Text("Change label", ui.ICON_CONFIG) - text.normal("Do you really want to", "change label to") + text.normal("Do you really want to", "change the label to") text.bold("%s?" % label) await require_confirm(ctx, text, ButtonRequestType.ProtectCall) diff --git a/core/src/apps/management/change_pin.py b/core/src/apps/management/change_pin.py index 90d0a533e1..a5947b6cb0 100644 --- a/core/src/apps/management/change_pin.py +++ b/core/src/apps/management/change_pin.py @@ -50,7 +50,7 @@ def require_confirm_change_pin(ctx: wire.Context, msg: ChangePin) -> None: if not msg.remove and has_pin: # changing pin text = Text("Change PIN", ui.ICON_CONFIG) text.normal("Do you really want to") - text.bold("change the current PIN?") + text.bold("change your PIN?") return require_confirm(ctx, text) if not msg.remove and not has_pin: # setting new pin