diff --git a/src/apps/cardano/get_public_key.py b/src/apps/cardano/get_public_key.py index 49b7a0c6f0..73a7178cc6 100644 --- a/src/apps/cardano/get_public_key.py +++ b/src/apps/cardano/get_public_key.py @@ -7,7 +7,7 @@ from trezor.messages.HDNodeType import HDNodeType from .address import _derive_hd_passphrase, derive_address_and_node -from apps.common import seed, storage +from apps.common import seed, show, storage async def cardano_get_public_key(ctx, msg): diff --git a/src/apps/common/display_address.py b/src/apps/common/show.py similarity index 93% rename from src/apps/common/display_address.py rename to src/apps/common/show.py index cdb7eae753..ac1d8fdfc2 100644 --- a/src/apps/common/display_address.py +++ b/src/apps/common/show.py @@ -8,8 +8,7 @@ from trezor.ui.qr import Qr from trezor.ui.text import Text from trezor.utils import chunks -from apps.common.confirm import confirm -from apps.common.confirm import require_confirm +from apps.common.confirm import confirm, require_confirm async def show_address(ctx, address: str): diff --git a/src/apps/ethereum/get_address.py b/src/apps/ethereum/get_address.py index d7db732f25..cba609d0bf 100644 --- a/src/apps/ethereum/get_address.py +++ b/src/apps/ethereum/get_address.py @@ -1,4 +1,4 @@ -from apps.common.display_address import show_address, show_qr +from apps.common.show import show_address, show_qr from apps.ethereum import networks diff --git a/src/apps/ethereum/verify_message.py b/src/apps/ethereum/verify_message.py index 891f3149c7..b49eab3ece 100644 --- a/src/apps/ethereum/verify_message.py +++ b/src/apps/ethereum/verify_message.py @@ -6,7 +6,7 @@ from trezor.messages.Success import Success from trezor.ui.text import Text from apps.common.confirm import require_confirm -from apps.common.display_address import split_address +from apps.common.show import split_address from apps.common.signverify import split_message from apps.ethereum.sign_message import message_digest diff --git a/src/apps/lisk/get_address.py b/src/apps/lisk/get_address.py index ba61db76dd..c716804193 100644 --- a/src/apps/lisk/get_address.py +++ b/src/apps/lisk/get_address.py @@ -3,7 +3,7 @@ from trezor.messages.LiskAddress import LiskAddress from .helpers import LISK_CURVE, get_address_from_public_key from apps.common import seed -from apps.common.display_address import show_address, show_qr +from apps.common.show import show_address, show_qr async def layout_lisk_get_address(ctx, msg): diff --git a/src/apps/lisk/get_public_key.py b/src/apps/lisk/get_public_key.py index 66b97c27c7..0f452eaddb 100644 --- a/src/apps/lisk/get_public_key.py +++ b/src/apps/lisk/get_public_key.py @@ -2,7 +2,7 @@ from trezor.messages.LiskPublicKey import LiskPublicKey from .helpers import LISK_CURVE -from apps.common import seed, display_address +from apps.common import seed, show async def lisk_get_public_key(ctx, msg): @@ -13,6 +13,6 @@ async def lisk_get_public_key(ctx, msg): pubkey = pubkey[1:] # skip ed25519 pubkey marker if msg.show_display: - await display_address.show_pubkey(ctx, pubkey) + await show.show_pubkey(ctx, pubkey) return LiskPublicKey(public_key=pubkey) diff --git a/src/apps/lisk/layout.py b/src/apps/lisk/layout.py index 14b55ba57e..e39e671bcf 100644 --- a/src/apps/lisk/layout.py +++ b/src/apps/lisk/layout.py @@ -6,7 +6,7 @@ from trezor.utils import chunks from .helpers import get_vote_tx_text from apps.common.confirm import require_confirm, require_hold_to_confirm -from apps.common.display_address import show_pubkey +from apps.common.show import show_pubkey async def require_confirm_tx(ctx, to, value): diff --git a/src/apps/nem/get_address.py b/src/apps/nem/get_address.py index b1f1dd0cef..8bf1c0000f 100644 --- a/src/apps/nem/get_address.py +++ b/src/apps/nem/get_address.py @@ -9,7 +9,7 @@ from .validators import validate_network from apps.common import seed from apps.common.confirm import confirm -from apps.common.display_address import show_qr +from apps.common.show import show_qr async def get_address(ctx, msg): diff --git a/src/apps/ripple/get_address.py b/src/apps/ripple/get_address.py index 86d251044a..e42c7d45c1 100644 --- a/src/apps/ripple/get_address.py +++ b/src/apps/ripple/get_address.py @@ -4,7 +4,7 @@ from trezor.messages.RippleGetAddress import RippleGetAddress from . import helpers from apps.common import seed -from apps.common.display_address import show_address, show_qr +from apps.common.show import show_address, show_qr async def get_address(ctx, msg: RippleGetAddress): diff --git a/src/apps/ripple/layout.py b/src/apps/ripple/layout.py index 1c997caf24..65c027d3df 100644 --- a/src/apps/ripple/layout.py +++ b/src/apps/ripple/layout.py @@ -6,7 +6,7 @@ from trezor.utils import format_amount from . import helpers from apps.common.confirm import require_confirm, require_hold_to_confirm -from apps.common.display_address import split_address +from apps.common.show import split_address async def require_confirm_fee(ctx, fee): diff --git a/src/apps/stellar/get_address.py b/src/apps/stellar/get_address.py index cad782dcc8..31dc39843e 100644 --- a/src/apps/stellar/get_address.py +++ b/src/apps/stellar/get_address.py @@ -2,7 +2,7 @@ from trezor.messages.StellarAddress import StellarAddress from trezor.messages.StellarGetAddress import StellarGetAddress from apps.common import seed -from apps.common.display_address import show_address, show_qr +from apps.common.show import show_address, show_qr from apps.stellar import helpers diff --git a/src/apps/stellar/get_public_key.py b/src/apps/stellar/get_public_key.py index 679489e9b5..7e79526d64 100644 --- a/src/apps/stellar/get_public_key.py +++ b/src/apps/stellar/get_public_key.py @@ -8,7 +8,7 @@ from trezor.ui.text import Text from apps.common import seed from apps.common.confirm import confirm -from apps.common.display_address import split_address +from apps.common.show import split_address from apps.stellar import helpers diff --git a/src/apps/wallet/get_address.py b/src/apps/wallet/get_address.py index 136f730497..f5b0fc28a9 100644 --- a/src/apps/wallet/get_address.py +++ b/src/apps/wallet/get_address.py @@ -2,7 +2,7 @@ from trezor.messages import InputScriptType from trezor.messages.Address import Address from apps.common import coins, seed -from apps.common.display_address import show_address, show_qr +from apps.common.show import show_address, show_qr from apps.wallet.sign_tx import addresses diff --git a/src/apps/wallet/get_public_key.py b/src/apps/wallet/get_public_key.py index ed590b22d0..8fdb1ff290 100644 --- a/src/apps/wallet/get_public_key.py +++ b/src/apps/wallet/get_public_key.py @@ -1,7 +1,7 @@ from trezor.messages.HDNodeType import HDNodeType from trezor.messages.PublicKey import PublicKey -from apps.common import coins, seed, display_address +from apps.common import coins, seed, show async def get_public_key(ctx, msg): @@ -26,6 +26,6 @@ async def get_public_key(ctx, msg): ) if msg.show_display: - await display_address.show_pubkey(ctx, pubkey) + await show.show_pubkey(ctx, pubkey) return PublicKey(node=node_type, xpub=node_xpub) diff --git a/src/apps/wallet/verify_message.py b/src/apps/wallet/verify_message.py index 48fac8299d..5cc4bb1e21 100644 --- a/src/apps/wallet/verify_message.py +++ b/src/apps/wallet/verify_message.py @@ -6,7 +6,7 @@ from trezor.ui.text import Text from apps.common import coins from apps.common.confirm import require_confirm -from apps.common.display_address import split_address +from apps.common.show import split_address from apps.common.signverify import message_digest, split_message from apps.wallet.sign_tx.addresses import ( address_p2wpkh,