From 34fe76bb83b14b45b36845514ee43ab182eb63aa Mon Sep 17 00:00:00 2001
From: "Justin R. Evans" <jurevans@gmail.com>
Date: Wed, 2 Oct 2024 12:45:41 -0400
Subject: [PATCH] feat: add extension & sdk versions to settings

---
 apps/extension/package.json                     |  2 +-
 .../src/App/Common/AppHeaderNavigation.tsx      | 17 +++++++++++++++++
 .../namadillo/src/App/Settings/SettingsMain.tsx |  2 ++
 packages/crypto/lib/src/crypto/zip32.rs         |  3 ---
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/extension/package.json b/apps/extension/package.json
index ba46f385d..af3ce49c4 100644
--- a/apps/extension/package.json
+++ b/apps/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@namada/extension",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Namada Browser Extension",
   "repository": "https://github.com/anoma/namada-interface/",
   "author": "Heliax Dev <info@heliax.dev>",
diff --git a/apps/extension/src/App/Common/AppHeaderNavigation.tsx b/apps/extension/src/App/Common/AppHeaderNavigation.tsx
index 9ec8eeb41..4a9378274 100644
--- a/apps/extension/src/App/Common/AppHeaderNavigation.tsx
+++ b/apps/extension/src/App/Common/AppHeaderNavigation.tsx
@@ -5,6 +5,8 @@ import { useVaultContext } from "context";
 import { FaDiscord, FaXTwitter } from "react-icons/fa6";
 import { GoAlert, GoQuestion } from "react-icons/go";
 import { useNavigate } from "react-router-dom";
+import sdkPackage from "../../../../../packages/sdk/package.json";
+import extensionPackage from "../../../package.json";
 
 type AppHeaderNavigationProps = {
   open: boolean;
@@ -97,6 +99,21 @@ export const AppHeaderNavigation = ({
               Lock Wallet
             </li>
           </Stack>
+          <div className="relative h-full">
+            <Stack
+              as="ul"
+              gap={1}
+              direction="vertical"
+              className="absolute bottom-4"
+            >
+              <li>
+                Keychain Version: <strong>{extensionPackage.version}</strong>
+              </li>
+              <li>
+                SDK Version: <strong>{sdkPackage.version}</strong>
+              </li>
+            </Stack>
+          </div>
           <footer className="flex items-center justify-between text-yellow-950 text-2xl">
             <Stack
               as="ul"
diff --git a/apps/namadillo/src/App/Settings/SettingsMain.tsx b/apps/namadillo/src/App/Settings/SettingsMain.tsx
index 480a5a7ab..3facb7cbe 100644
--- a/apps/namadillo/src/App/Settings/SettingsMain.tsx
+++ b/apps/namadillo/src/App/Settings/SettingsMain.tsx
@@ -1,4 +1,5 @@
 import { routes } from "App/routes";
+import { version as sdkVersion } from "../../../../../packages/sdk/package.json";
 import { version } from "../../../package.json";
 import { SettingsPanelMenuItem } from "./SettingsPanelMenuItem";
 
@@ -14,6 +15,7 @@ export const SettingsMain = (): JSX.Element => {
       </ul>
       <div className="text-xs">
         <div>Namadillo Version: {version}</div>
+        <div>SDK Version: {sdkVersion}</div>
       </div>
     </div>
   );
diff --git a/packages/crypto/lib/src/crypto/zip32.rs b/packages/crypto/lib/src/crypto/zip32.rs
index 631dc21e4..49b40304f 100644
--- a/packages/crypto/lib/src/crypto/zip32.rs
+++ b/packages/crypto/lib/src/crypto/zip32.rs
@@ -11,9 +11,6 @@ use masp_primitives::{
 use wasm_bindgen::prelude::*;
 use zeroize::{Zeroize, ZeroizeOnDrop};
 
-#[wasm_bindgen]
-pub struct ExtSpendingKey(pub(crate) ExtendedSpendingKey);
-
 #[wasm_bindgen]
 #[derive(Zeroize)]
 pub struct DerivationResult {