diff --git a/core/src/all_modules.py b/core/src/all_modules.py index a8b619c02..646bc930c 100644 --- a/core/src/all_modules.py +++ b/core/src/all_modules.py @@ -298,8 +298,6 @@ apps.common.coininfo import apps.common.coininfo apps.common.coins import apps.common.coins -apps.common.confirm -import apps.common.confirm apps.common.keychain import apps.common.keychain apps.common.passphrase diff --git a/core/src/apps/common/confirm.py b/core/src/apps/common/confirm.py deleted file mode 100644 index f1b7d2fb2..000000000 --- a/core/src/apps/common/confirm.py +++ /dev/null @@ -1,121 +0,0 @@ -from trezor import wire -from trezor.enums import ButtonRequestType -from trezor.ui.components.tt.confirm import ( - CONFIRMED, - INFO, - Confirm, - HoldToConfirm, - InfoConfirm, -) -from trezor.ui.layouts.common import button_request - -if __debug__: - from trezor.ui.components.tt.scroll import Paginated - - -if False: - from typing import Any, Callable - from trezor import ui - from trezor.ui.components.tt.confirm import ButtonContent, ButtonStyleType - from trezor.ui.loader import LoaderStyleType - - -async def confirm( - ctx: wire.GenericContext, - content: ui.Component, - code: ButtonRequestType = ButtonRequestType.Other, - confirm: ButtonContent | None = Confirm.DEFAULT_CONFIRM, - confirm_style: ButtonStyleType = Confirm.DEFAULT_CONFIRM_STYLE, - cancel: ButtonContent | None = Confirm.DEFAULT_CANCEL, - cancel_style: ButtonStyleType = Confirm.DEFAULT_CANCEL_STYLE, - major_confirm: bool = False, -) -> bool: - - if content.__class__.__name__ == "Paginated": - # The following works because asserts are omitted in non-debug builds. - # IOW if the assert runs, that means __debug__ is True and Paginated is imported - assert isinstance(content, Paginated) - - content.pages[-1] = Confirm( - content.pages[-1], - confirm, - confirm_style, - cancel, - cancel_style, - major_confirm, - ) - result = await content.interact(ctx, code=code) - else: - await button_request(ctx, code=code) - dialog = Confirm( - content, confirm, confirm_style, cancel, cancel_style, major_confirm - ) - result = await ctx.wait(dialog) - - return result is CONFIRMED - - -async def info_confirm( - ctx: wire.GenericContext, - content: ui.Component, - info_func: Callable, - code: ButtonRequestType = ButtonRequestType.Other, - confirm: ButtonContent = InfoConfirm.DEFAULT_CONFIRM, - confirm_style: ButtonStyleType = InfoConfirm.DEFAULT_CONFIRM_STYLE, - cancel: ButtonContent = InfoConfirm.DEFAULT_CANCEL, - cancel_style: ButtonStyleType = InfoConfirm.DEFAULT_CANCEL_STYLE, - info: ButtonContent = InfoConfirm.DEFAULT_INFO, - info_style: ButtonStyleType = InfoConfirm.DEFAULT_INFO_STYLE, -) -> bool: - await button_request(ctx, code=code) - - dialog = InfoConfirm( - content, confirm, confirm_style, cancel, cancel_style, info, info_style - ) - - while True: - result = await ctx.wait(dialog) - - if result is INFO: - await info_func(ctx) - - else: - return result is CONFIRMED - - -async def hold_to_confirm( - ctx: wire.GenericContext, - content: ui.Component, - code: ButtonRequestType = ButtonRequestType.Other, - confirm: str = HoldToConfirm.DEFAULT_CONFIRM, - confirm_style: ButtonStyleType = HoldToConfirm.DEFAULT_CONFIRM_STYLE, - loader_style: LoaderStyleType = HoldToConfirm.DEFAULT_LOADER_STYLE, - cancel: bool = True, -) -> bool: - - if content.__class__.__name__ == "Paginated": - # The following works because asserts are omitted in non-debug builds. - # IOW if the assert runs, that means __debug__ is True and Paginated is imported - assert isinstance(content, Paginated) - content.pages[-1] = HoldToConfirm( - content.pages[-1], confirm, confirm_style, loader_style, cancel - ) - result = await content.interact(ctx, code=code) - else: - await button_request(ctx, code=code) - dialog = HoldToConfirm(content, confirm, confirm_style, loader_style, cancel) - result = await ctx.wait(dialog) - - return result is CONFIRMED - - -async def require_confirm(*args: Any, **kwargs: Any) -> None: - confirmed = await confirm(*args, **kwargs) - if not confirmed: - raise wire.ActionCancelled - - -async def require_hold_to_confirm(*args: Any, **kwargs: Any) -> None: - confirmed = await hold_to_confirm(*args, **kwargs) - if not confirmed: - raise wire.ActionCancelled