From f111f53e64326468e40a01555ebde12d6a7329f2 Mon Sep 17 00:00:00 2001
From: netbonus <151201453+netbonus@users.noreply.github.com>
Date: Wed, 24 Sep 2025 12:53:50 -0400
Subject: [PATCH 1/2] adds wallet based xpub

---
 src/components/btc-wallet/XpubPage.tsx | 58 +++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/components/btc-wallet/XpubPage.tsx b/src/components/btc-wallet/XpubPage.tsx
index 093e511..06b01bc 100644
--- a/src/components/btc-wallet/XpubPage.tsx
+++ b/src/components/btc-wallet/XpubPage.tsx
@@ -5,6 +5,8 @@ import React, { useContext, useEffect, useState } from "react";
 import { AppContext } from "../../store/AppContext";
 import { useFeature } from "../../hooks/useFeature";
 import { PageContent } from "../index";
+import { constants, getBtcPurpose } from "../../util/helpers";
+
 const { Search, TextArea } = Input;
 const SEARCH_ID = "xpub-data";
 
@@ -13,13 +15,14 @@ interface XpubPageProps {
 }
 
 const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
-  const context = useContext(AppContext);
+  const { isMobile } = useContext(AppContext);
   const { SUPPORTS_XPUB } = useFeature();
   const [xpub, setXpub] = useState<string | null>(null);
   const [windowWidth, setWindowWidth] = useState<number | undefined>(
     document.getElementById("main-content-inner")?.offsetWidth
   );
   const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
 
   useEffect(() => {
     updateXpubAddress();
@@ -34,17 +37,31 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
   const updateXpubAddress = async () => {
     if (!session) return;
 
+    // Get the active BTC purpose (wallet type)
+    const btcPurpose = getBtcPurpose();
+    if (btcPurpose === constants.BTC_PURPOSE_NONE) {
+      setError("BTC Wallet is hidden. Please enable it in settings to view XPUB.");
+      return;
+    }
+
     setLoading(true);
+    setError(null);
+
     try {
+      // Use the active wallet's BTC purpose as the derivation path
       const addresses = await session.client?.getAddresses({
-        startPath: [44 + 0x80000000, 0 + 0x80000000, 0 + 0x80000000],
-        flag: 6,
+        startPath: [btcPurpose, constants.BTC_COIN, 0 + constants.HARDENED_OFFSET],
+        flag: 6, // LatticeGetAddressesFlag.secp256k1Xpub
       });
+
       if (addresses && addresses.length > 0) {
         setXpub(addresses[0]);
+      } else {
+        setError("No XPUB returned from device");
       }
     } catch (err) {
       console.error("Error fetching XPUB:", err);
+      setError("Failed to fetch XPUB from device");
     } finally {
       setLoading(false);
     }
@@ -61,8 +78,22 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
     }
   };
 
+  const getWalletTypeLabel = () => {
+    const btcPurpose = getBtcPurpose();
+    switch (btcPurpose) {
+      case constants.BTC_PURPOSE_LEGACY:
+        return "Legacy";
+      case constants.BTC_PURPOSE_WRAPPED_SEGWIT:
+        return "Wrapped SegWit";
+      case constants.BTC_PURPOSE_SEGWIT:
+        return "Native SegWit";
+      default:
+        return "Unknown";
+    }
+  };
+
   const renderXpubBox = () => {
-    if (context.isMobile) {
+    if (isMobile) {
       return (
         <div>
           <TextArea
@@ -70,6 +101,7 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
             value={xpub}
             autoSize={{ minRows: 1, maxRows: 3 }}
             style={{ margin: "30px 0 0 0", textAlign: "center" }}
+            readOnly
           />
           <Button
             type="primary"
@@ -89,6 +121,7 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
         enterButton={<CopyOutlined />}
         onSearch={copyXpub}
         style={{ margin: "30px 0 0 0", textAlign: "center" }}
+        readOnly
       />
     );
   };
@@ -103,6 +136,17 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
       );
     }
 
+    if (error) {
+      return (
+        <div>
+          <p style={{ color: '#ff4d4f', marginBottom: 16 }}>{error}</p>
+          <Button onClick={updateXpubAddress}>
+            Retry
+          </Button>
+        </div>
+      );
+    }
+
     if (loading) {
       return (
         <div style={{ padding: "50px 0" }}>
@@ -118,6 +162,9 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
       const xpubUrl = `https://www.blockchain.com/explorer/assets/btc/xpub/${xpub}`;
       return (
         <div>
+          <p style={{ marginBottom: 16, fontSize: '14px', color: '#666' }}>
+            Wallet Type: <strong>{getWalletTypeLabel()}</strong>
+          </p>
           <Row justify="center">
             <QRCodeSVG
               value={xpubUrl}
@@ -129,6 +176,7 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
         </div>
       );
     }
+
     return (
       <div>
         <p>No XPUB address found</p>
@@ -152,4 +200,4 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
   return <PageContent content={content} />;
 };
 
-export default XpubPage;
+export default XpubPage;
\ No newline at end of file

From 3ee21dbacf7202de2631471554bfacefa837ab47 Mon Sep 17 00:00:00 2001
From: netbonus <151201453+netbonus@users.noreply.github.com>
Date: Wed, 24 Sep 2025 13:31:22 -0400
Subject: [PATCH 2/2] simpler labeling

---
 src/components/btc-wallet/XpubPage.tsx | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/components/btc-wallet/XpubPage.tsx b/src/components/btc-wallet/XpubPage.tsx
index 06b01bc..82b3c62 100644
--- a/src/components/btc-wallet/XpubPage.tsx
+++ b/src/components/btc-wallet/XpubPage.tsx
@@ -10,6 +10,12 @@ import { constants, getBtcPurpose } from "../../util/helpers";
 const { Search, TextArea } = Input;
 const SEARCH_ID = "xpub-data";
 
+const WALLET_TYPE_LABELS = {
+  [constants.BTC_PURPOSE_LEGACY]: "Legacy",
+  [constants.BTC_PURPOSE_WRAPPED_SEGWIT]: "Wrapped SegWit",
+  [constants.BTC_PURPOSE_SEGWIT]: "Native SegWit",
+} as const;
+
 interface XpubPageProps {
   session: any;
 }
@@ -78,19 +84,7 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
     }
   };
 
-  const getWalletTypeLabel = () => {
-    const btcPurpose = getBtcPurpose();
-    switch (btcPurpose) {
-      case constants.BTC_PURPOSE_LEGACY:
-        return "Legacy";
-      case constants.BTC_PURPOSE_WRAPPED_SEGWIT:
-        return "Wrapped SegWit";
-      case constants.BTC_PURPOSE_SEGWIT:
-        return "Native SegWit";
-      default:
-        return "Unknown";
-    }
-  };
+  const walletTypeLabel = WALLET_TYPE_LABELS[getBtcPurpose()] || "Unknown";
 
   const renderXpubBox = () => {
     if (isMobile) {
@@ -163,7 +157,7 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
       return (
         <div>
           <p style={{ marginBottom: 16, fontSize: '14px', color: '#666' }}>
-            Wallet Type: <strong>{getWalletTypeLabel()}</strong>
+            Wallet Type: <strong>{walletTypeLabel}</strong>
           </p>
           <Row justify="center">
             <QRCodeSVG
@@ -200,4 +194,4 @@ const XpubPage: React.FC<XpubPageProps> = ({ session }) => {
   return <PageContent content={content} />;
 };
 
-export default XpubPage;
\ No newline at end of file
+export default XpubPage;