Merge pull request #47 from bithyve/main

Release v0.1.3 [Live]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "keeper-desktop",
   "private": true,
-  "version": "0.1.2",
+  "version": "0.1.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "keeper-desktop"
-version = "0.1.2"
+version = "0.1.3"
 description = "Bitcoin Keeper Desktop App"
 authors = ["Ben Kaufman"]
 repository = "https://github.com/bithyve/keeper-desktop"

src-tauri/src/hwi/implementations/binary_implementation.rs

@@ -26,9 +26,13 @@ pub struct BinaryHWIImplementation<T: HWIBinaryExecutor> {
 }
 
 impl<T: HWIBinaryExecutor> HWIImplementation for BinaryHWIImplementation<T> {
-    fn enumerate() -> Result<String, Error> {
-        let output =
-            BinaryHWIImplementation::<T>::run_hwi_command(None, false, None, vec!["enumerate"])?;
+    fn enumerate(chain: Option<HWIChain>) -> Result<String, Error> {
+        let output = BinaryHWIImplementation::<T>::run_hwi_command(
+            None,
+            false,
+            chain.as_ref(),
+            vec!["enumerate"],
+        )?;
         Ok(output.to_string())
     }
 

src-tauri/src/hwi/interface.rs

@@ -33,7 +33,7 @@ impl<T: HWIImplementation> HWIClient<T> {
     /// # use hwi::implementations::python_implementation::PythonHWIImplementation;
     /// # use hwi::error::Error;
     /// # fn main() -> Result<(), Error> {
-    /// let devices = HWIClient::<PythonHWIImplementation>::enumerate()?;
+    /// let devices = HWIClient::<PythonHWIImplementation>::enumerate(None)?;
     /// for device in devices {
     ///     match device {
     ///         Ok(d) => println!("I can see a {} here 😄", d.model),
@@ -43,8 +43,8 @@ impl<T: HWIImplementation> HWIClient<T> {
     /// # Ok(())
     /// # }
     /// ```
-    pub fn enumerate() -> Result<Vec<Result<HWIDevice, Error>>, Error> {
-        let output = T::enumerate()?;
+    pub fn enumerate(chain: Option<HWIChain>) -> Result<Vec<Result<HWIDevice, Error>>, Error> {
+        let output = T::enumerate(chain)?;
         let devices_internal: Vec<HWIDeviceInternal> = deserialize_obj!(&output)?;
         Ok(devices_internal.into_iter().map(|d| d.try_into()).collect())
     }
@@ -59,7 +59,7 @@ impl<T: HWIImplementation> HWIClient<T> {
     /// # use hwi::error::Error;
     /// # use hwi::implementations::python_implementation::PythonHWIImplementation;
     /// # fn main() -> Result<(), Error> {
-    /// let devices = HWIClient::<PythonHWIImplementation>::enumerate()?;
+    /// let devices = HWIClient::<PythonHWIImplementation>::enumerate(None)?;
     /// for device in devices {
     ///     let device = device?;
     ///     let client = HWIClient::<PythonHWIImplementation>::get_client(

src-tauri/src/hwi/types.rs

@@ -277,7 +277,7 @@ pub enum HWIWordCount {
 }
 
 pub trait HWIImplementation {
-    fn enumerate() -> Result<String, Error>;
+    fn enumerate(chain: Option<HWIChain>) -> Result<String, Error>;
     fn get_client(device: &HWIDevice, expert: bool, chain: HWIChain) -> Result<Self, Error>
     where
         Self: Sized;

src-tauri/src/main.rs

@@ -11,7 +11,7 @@ use device::get_xpub;
 use hwi::error::Error;
 use hwi::implementations::binary_implementation::BinaryHWIImplementation;
 use hwi::interface::HWIClient;
-use hwi::types::{HWIBinaryExecutor, HWIDevice, HWIDeviceType};
+use hwi::types::{HWIBinaryExecutor, HWIChain, HWIDevice, HWIDeviceType};
 #[cfg(target_os = "linux")]
 use log::warn;
 use serde_json::{json, Value};
@@ -98,8 +98,11 @@ fn emit_to_channel(state: State<'_, AppState>, event_data: Value) -> Result<(),
 // ==================== HWI Commands ====================
 
 #[tauri::command]
-async fn hwi_enumerate(_: State<'_, AppState>) -> Result<Vec<Result<HWIDevice, String>>, String> {
-    HWIAppClient::enumerate()
+async fn hwi_enumerate(
+    _: State<'_, AppState>,
+    network: Option<bitcoin::Network>,
+) -> Result<Vec<Result<HWIDevice, String>>, String> {
+    HWIAppClient::enumerate(network.map(HWIChain::from))
         .map(|devices| {
             devices
                 .into_iter()
@@ -312,7 +315,7 @@ pub struct HWIBinaryExecutorImpl;
 impl HWIBinaryExecutor for HWIBinaryExecutorImpl {
     fn execute_command(args: Vec<String>) -> Result<String, Error> {
         let mut args = args;
-        // TODO: Downgrade binaries to HWI 2.x and remove this flag
+
         args.insert(0, "--emulators".to_string());
 
         let output = Command::new_sidecar("hwi")

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Keeper Desktop",
-    "version": "0.1.2"
+    "version": "0.1.3"
   },
   "tauri": {
     "allowlist": {

src/hooks/useDeviceActions.tsx

@@ -1,8 +1,14 @@
 import { useState } from "react";
 import hwiService from "../services/hwiService";
-import { HWI_ACTION, HWIDevice, HWIDeviceType } from "../helpers/devices";
+import {
+  HWI_ACTION,
+  HWIDevice,
+  HWIDeviceType,
+  NetworkType,
+} from "../helpers/devices";
 
 interface UseDeviceActionsProps {
+  network: NetworkType | null;
   deviceType: HWIDeviceType;
   actionType: HWI_ACTION;
   psbt: string | null;
@@ -14,6 +20,7 @@ interface UseDeviceActionsProps {
 }
 
 export const useDeviceActions = ({
+  network,
   deviceType,
   actionType,
   psbt,
@@ -31,7 +38,10 @@ export const useDeviceActions = ({
     try {
       switch (actionType) {
         case "connect": {
-          const devices = await hwiService.fetchDevices(deviceType);
+          const devices = await hwiService.fetchDevices(
+            deviceType,
+            network?.toLowerCase(),
+          );
           await onConnectResult(devices);
           break;
         }

src/index.css

@@ -3,6 +3,43 @@ html {
   margin: 0;
   padding: 0;
   height: 100%;
-  font-family: FiraSans, sans-serif;
+  font-family: Inter;
   background: linear-gradient(180deg, #2d6759 30%, #0f7a60 100%);
 }
+
+// App Font
+
+@font-face {
+  font-family: "Inter";
+  src: url("./assets/fonts/Inter/Inter-Bold.ttf") format("truetype");
+  font-weight: 700;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Inter";
+  src: url("./assets/fonts/Inter/Inter-SemiBold.ttf") format("truetype");
+  font-weight: 600;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Inter";
+  src: url("./assets/fonts/Inter/Inter-Medium.ttf") format("truetype");
+  font-weight: 500;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Inter";
+  src: url("./assets/fonts/Inter/Inter-Regular.ttf") format("truetype");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Inter";
+  src: url("./assets/fonts/Inter/Inter-Light.ttf") format("truetype");
+  font-weight: 300;
+  font-style: normal;
+}

src/modals/BaseModal/BaseModal.module.css

@@ -48,7 +48,7 @@
   font-size: 15px;
   color: #3e524d;
   margin: 0 7%;
-  font-weight: light;
+  font-weight: 300;
   line-height: 20px;
 }
 

src/modals/DeviceActionModal/DeviceActionModal.tsx

@@ -5,6 +5,7 @@ import {
   HWI_DEVICES,
   HWIDevice,
   HWIDeviceType,
+  NetworkType,
 } from "../../helpers/devices";
 import styles from "./DeviceActionModal.module.css";
 import baseStyles from "../BaseModal/BaseModal.module.css";
@@ -15,6 +16,7 @@ import { useDeviceActions } from "../../hooks/useDeviceActions";
 interface DeviceActionModalProps {
   isOpen: boolean;
   onClose: () => void;
+  network: NetworkType | null;
   deviceType: HWIDeviceType;
   actionType: HWI_ACTION;
   psbt: string | null;
@@ -37,6 +39,7 @@ const actionTitle = (deviceType: HWIDeviceType) => ({
 const DeviceActionModal = ({
   isOpen,
   onClose,
+  network,
   deviceType,
   actionType,
   psbt,
@@ -47,6 +50,7 @@ const DeviceActionModal = ({
   onError,
 }: DeviceActionModalProps) => {
   const { isLoading, handleContinue } = useDeviceActions({
+    network,
     deviceType,
     actionType,
     psbt,

src/modals/ModalManager.tsx

@@ -54,6 +54,7 @@ const ModalsManager = ({
       <DeviceActionModal
         isOpen={openModal === "deviceAction"}
         onClose={closeModalHandler}
+        network={network}
         deviceType={deviceType as HWIDeviceType}
         actionType={currentAction}
         psbt={psbt}

src/modals/TrezorPinModal/TrezorPinModal.tsx

@@ -37,7 +37,10 @@ const TrezorPinModal = ({
     setIsLoading(true);
     try {
       await hwiService.sendPin(pin);
-      const devices = await hwiService.fetchDevices("trezor");
+      const devices = await hwiService.fetchDevices(
+        "trezor",
+        network?.toLowerCase(),
+      );
       await hwiService.setHWIClient(
         devices[0].fingerprint,
         "trezor",

src/screens/ConnectScreen/ConnectScreen.module.css

@@ -76,7 +76,7 @@
 .note p {
   margin-top: 5px;
   font-size: 12px;
-  font-weight: 200;
+  font-weight: 300;
   line-height: 17px;
   font-weight: 400;
 }
@@ -124,7 +124,7 @@
   text-align: center;
   font-size: 14px;
   font-style: normal;
-  font-weight: 200;
+  font-weight: 300;
   line-height: 20px;
 }
 

src/screens/ConnectScreen/ConnectScreen.tsx

@@ -197,7 +197,7 @@ const ConnectScreen = () => {
           </button>
         </div>
         <p className={styles.qrNote}>
-          Make sure No one is around you when you scan this. You can always
+          Make sure no one is around you when you scan this. You can always
           refresh to get fresh key session.
         </p>
       </div>