Merge remote-tracking branch 'upstream/main' into merge-commits

Author: guowei0105

core/src/apps/base.py

@@ -59,6 +59,9 @@ def get_vendor():
     return "trezor.io" if storage.device.is_trezor_compatible() else "onekey.so"
 
 
+FW_VENDOR_BTC_ONLY = "OneKey Bitcoin-only"
+
+
 def busy_expiry_ms() -> int:
     """
     Returns the time left until the busy state expires or 0 if the device is not in the busy state.
@@ -131,6 +134,7 @@ def get_features() -> Features:
             Capability.Shamir,
             Capability.ShamirGroups,
         ]
+        f.fw_vendor = FW_VENDOR_BTC_ONLY
     else:
         f.capabilities = [
             Capability.Bitcoin,

core/src/apps/common/seed.py

@@ -1,6 +1,7 @@
 from typing import TYPE_CHECKING
 
-from storage import cache, device
+import storage.cache as cache
+import storage.device as device
 from trezor import utils, wire
 from trezor.crypto import bip32, hmac
 
@@ -112,6 +113,10 @@ async def derive_and_store_roots(ctx: wire.Context) -> None:
                 else:
                     passphrase_str = ""
 
+                from trezor.ui.layouts import show_popup
+                from trezor.lvglui.i18n import gettext as _, keys as i18n_keys
+
+                await show_popup(_(i18n_keys.TITLE__PLEASE_WAIT), None, timeout_ms=1000)
                 mnemonic.get_seed(passphrase_str, progress_bar=False)
 
                 if cache.SESSION_DIRIVE_CARDANO:

core/src/trezor/lvglui/i18n/locales/fr.py

@@ -1017,6 +1017,6 @@
     "Mettez à jour vers la dernière version pour utiliser « Épingler ».",
     "Demande de confirmation",
     "Abandonner la création de la phrase de récupération ?",
-    "Ceci est l'Action {num1} sur {num2}.",
+    "Ceci est la part {num1} sur {num2}.",
 ]
 # fmt: on

core/src/trezor/lvglui/i18n/locales/zh_hk.py

@@ -1017,6 +1017,6 @@
     "更新到最新版本後，再使用\"Passphrase 綁定 PIN 碼\"功能。",
     "確認請求",
     "終止創建助記詞？",
-    "這是第 {num1} 股，共 {num2} 股。",
+    "這是第 {num1} 份，共 {num2} 份。",
 ]
 # fmt: on

core/src/trezor/lvglui/scrs/common.py

@@ -539,7 +539,8 @@ def add_nav_back(self):
         when you need to handle the back event specifically.
         """
         self.nav_back = Navigation(self)
-        self.content_area.set_style_max_height(574, 0)
+        if any([hasattr(self, "btn_no"), hasattr(self, "btn_yes")]):
+            self.content_area.set_style_max_height(574, 0)
         self.content_area.align_to(self.nav_back, lv.ALIGN.OUT_BOTTOM_LEFT, 0, 0)
 
     def add_nav_back_right(self):
@@ -554,7 +555,8 @@ def add_nav_back_right(self):
             nav_btn_align=lv.ALIGN.RIGHT_MID,
             align=lv.ALIGN.TOP_RIGHT,
         )
-        self.content_area.set_style_max_height(574, 0)
+        if any([hasattr(self, "btn_no"), hasattr(self, "btn_yes")]):
+            self.content_area.set_style_max_height(574, 0)
         self.content_area.align_to(self.nav_back, lv.ALIGN.OUT_BOTTOM_RIGHT, 0, 0)
 
     def eventhandler(self, event_obj):