refactor(core): convert apps.ripple to layouts

core/src/apps/ripple/layout.py

@@ -1,31 +1,33 @@
-from trezor import ui
 from trezor.enums import ButtonRequestType
 from trezor.strings import format_amount
-from trezor.ui.components.tt.text import Text
-
-from apps.common.confirm import require_confirm, require_hold_to_confirm
-from apps.common.layout import split_address
+from trezor.ui.layouts import confirm_metadata, confirm_total_ripple
 
 from . import helpers
 
 
 async def require_confirm_fee(ctx, fee):
-    text = Text("Confirm fee", ui.ICON_SEND, ui.GREEN)
-    text.normal("Transaction fee:")
-    text.bold(format_amount(fee, helpers.DECIMALS) + " XRP")
-    await require_confirm(ctx, text, ButtonRequestType.ConfirmOutput)
+    await confirm_metadata(
+        ctx,
+        "confirm_fee",
+        title="Confirm fee",
+        content="Transaction fee:\n{}",
+        param=format_amount(fee, helpers.DECIMALS) + " XRP",
+        hide_continue=True,
+        br_code=ButtonRequestType.ConfirmOutput,
+    )
 
 
 async def require_confirm_destination_tag(ctx, tag):
-    text = Text("Confirm tag", ui.ICON_SEND, ui.GREEN)
-    text.normal("Destination tag:")
-    text.bold(str(tag))
-    await require_confirm(ctx, text, ButtonRequestType.ConfirmOutput)
+    await confirm_metadata(
+        ctx,
+        "confirm_destination_tag",
+        title="Confirm tag",
+        content="Destination tag:\n{}",
+        param=str(tag),
+        hide_continue=True,
+        br_code=ButtonRequestType.ConfirmOutput,
+    )
 
 
 async def require_confirm_tx(ctx, to, value):
-    text = Text("Confirm sending", ui.ICON_SEND, ui.GREEN)
-    text.bold(format_amount(value, helpers.DECIMALS) + " XRP")
-    text.normal("to")
-    text.mono(*split_address(to))
-    await require_hold_to_confirm(ctx, text, ButtonRequestType.SignTx)
+    await confirm_total_ripple(ctx, to, format_amount(value, helpers.DECIMALS))

core/src/trezor/ui/layouts/tt.py

@@ -54,6 +54,7 @@ __all__ = (
     "confirm_hex",
     "confirm_total",
     "confirm_total_ethereum",
+    "confirm_total_ripple",
     "confirm_joint_total",
     "confirm_metadata",
     "confirm_replacement",
@@ -555,6 +556,23 @@ async def confirm_total_ethereum(
     )
 
 
+# TODO cleanup @ redesign
+async def confirm_total_ripple(
+    ctx: wire.GenericContext,
+    address: str,
+    amount: str,
+) -> None:
+    title = "Confirm sending"
+    text = Text(title, ui.ICON_SEND, ui.GREEN, new_lines=False)
+    text.bold("{} XRP\n".format(amount))
+    text.normal("to\n")
+    text.mono(*_split_address(address))
+
+    await raise_if_cancelled(
+        interact(ctx, HoldToConfirm(text), "confirm_output", ButtonRequestType.SignTx)
+    )
+
+
 async def confirm_joint_total(
     ctx: wire.GenericContext, spending_amount: str, total_amount: str
 ) -> None: