common: display_address -> show

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):

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 confirm, require_confirm
-from apps.common.confirm import require_confirm
 
 
 async def show_address(ctx, address: str):

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
 
 

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
 

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):

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)

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):

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):

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):

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):

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
 
 

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
 
 

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
 
 

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)

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,