fix(xmr): fixes #2453, incorrect address display

trezor · Sep 9, 2022 · 2fe40f7 · 2fe40f7
1 parent 16b0ea0
commit 2fe40f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/.changelog.d/2453.fixed b/core/.changelog.d/2453.fixed
@@ -0,0 +1 @@
+Fix XMR primary address display
diff --git a/core/src/apps/monero/get_address.py b/core/src/apps/monero/get_address.py
@@ -25,7 +25,11 @@ async def get_address(
     creds = misc.get_creds(keychain, msg.address_n, msg.network_type)
     addr = creds.address
 
-    have_subaddress = msg.account is not None and msg.minor is not None
+    have_subaddress = (
+        msg.account is not None
+        and msg.minor is not None
+        and (msg.account, msg.minor) != (0, 0)
+    )
     have_payment_id = msg.payment_id is not None
 
     if (msg.account is None) != (msg.minor is None):