KeeperCommunity · ben-kaufman · Jan 1, 2025 · Jan 29, 2025 · Jan 29, 2025 · Mar 5, 2025
diff --git a/app-icons/dev-icon.png b/app-icons/dev-icon.png
diff --git a/app-icons/release-icon.png b/app-icons/release-icon.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "keeper-desktop",
   "private": true,
-  "version": "0.2.0",
+  "version": "0.2.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -51,6 +51,6 @@
     "tar": "^7.4.3",
     "tsx": "^4.19.1",
     "typescript": "^5.2.2",
-    "vite": "^5.4.8"
+    "vite": "^6.3.2"
   }
 }
diff --git a/public/btcpay.html b/public/btcpay.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>BTCPay</title>
+  <style>
+    body {
+      font-family: Arial, sans-serif;
+      padding: 20px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 100vh;
+      background-color: #f9f9f9;
+    }
+    .loader {
+      border: 16px solid #f3f3f3;
+      border-top: 16px solid #3498db;
+      border-radius: 50%;
+      width: 120px;
+      height: 120px;
+      animation: spin 2s linear infinite;
+    }
+    @keyframes spin {
+      0% { transform: rotate(0deg); }
+      100% { transform: rotate(360deg); }
+    }
+  </style>
+</head>
+<body>
+  <div class="loader" id="loader"></div>
+  <form id="btcpayForm" method="POST" action="" style="display: none;">
+    <input type="hidden" name="posData" id="posData" value="">
+    <input type="hidden" name="choiceKey" id="choiceKey" value="">
+  </form>
+  <script>
+    window.addEventListener('DOMContentLoaded', () => {
+      const urlParams = new URLSearchParams(window.location.search);
+      const action = urlParams.get('action');
+      const posData = urlParams.get('posData');
+      const choiceKey = urlParams.get('choiceKey');
+
+      document.getElementById('btcpayForm').action = action;
+      document.getElementById('posData').value = posData;
+      document.getElementById('choiceKey').value = choiceKey;
+
+      try {
+        document.getElementById('btcpayForm').submit();
+      } catch (error) {
+        console.error('Error submitting form:', error);
+      }
+    });
+  </script>
+</body>
+</html>
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "keeper-desktop"
-version = "0.2.0"
+version = "0.2.2"
 description = "Bitcoin Keeper Desktop App"
 authors = ["Ben Kaufman"]
 repository = "https://github.com/bithyve/keeper-desktop"
@@ -12,7 +12,7 @@ edition = "2021"
 tauri-build = { version = "1", features = [] }
 
 [dependencies]
-tauri = { version = "1", features = [ "shell-sidecar", "process-command-api", "shell-open"] }
+tauri = { version = "1", features = [ "window-create", "shell-sidecar", "process-command-api", "shell-open"] }
 tokio = { version = "1", features = ["time"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png
diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png
diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png
diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png
diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png
diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png
diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png
diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png
diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png
diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png
diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png
diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png
diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png
diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico
diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -41,6 +41,12 @@ pub struct AppStateInner {
     hwi: Option<HWIClientState>,
 }
 
+#[cfg(not(feature = "release"))]
+static ENV: &str = "dev";
+
+#[cfg(feature = "release")]
+static ENV: &str = "prod";
+
 // ==================== Channel Commands ====================
 
 #[tauri::command]
@@ -487,6 +493,11 @@ fn check_udev_rules() -> Result<bool, String> {
     Ok(udev_file.exists())
 }
 
+#[tauri::command]
+fn get_environment() -> String {
+    ENV.into()
+}
+
 fn main() {
     env_logger::init();
     tauri::Builder::default()
@@ -524,6 +535,7 @@ fn main() {
             hwi_send_pin,
             hwi_prompt_pin,
             async_hwi_enumerate,
+            get_environment,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Keeper Desktop (Dev)",
-    "version": "0.2.0"
+    "version": "0.2.2"
   },
   "tauri": {
     "allowlist": {
@@ -23,6 +23,9 @@
         ],
         "all": false,
         "open": true
+      },
+      "window": {
+        "create": true
       }
     },
     "windows": [
@@ -35,7 +38,7 @@
       }
     ],
     "security": {
-      "csp": "default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self' data: 'unsafe-inline'; font-src 'self'; connect-src 'self'; object-src 'none'; base-uri 'self'; form-action 'self'; require-trusted-types-for 'script';"
+      "csp": "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self'; connect-src 'self' https://btcpay0.voltageapp.io https://testnet.demo.btcpayserver.org https://bithyve-dev-relay.el.r.appspot.com; object-src 'none'; base-uri 'self'; form-action 'self' https://btcpay0.voltageapp.io https://testnet.demo.btcpayserver.org; frame-ancestors 'self';"
     },
     "bundle": {
       "active": true,

diff --git a/src-tauri/tauri.release.conf.json b/src-tauri/tauri.release.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Keeper Desktop",
-    "version": "0.2.0"
+    "version": "0.2.2"
   },
   "tauri": {
     "allowlist": {
@@ -24,6 +24,9 @@
         ],
         "all": false,
         "open": true
+      },
+      "window": {
+        "create": true
       }
     },
     "windows": [
@@ -36,7 +39,7 @@
       }
     ],
     "security": {
-      "csp": "default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self' data: 'unsafe-inline'; font-src 'self'; connect-src 'self'; object-src 'none'; base-uri 'self'; form-action 'self'; require-trusted-types-for 'script';"
+      "csp": "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self'; connect-src 'self' https://btcpay0.voltageapp.io https://keeper-relay.uc.r.appspot.com; object-src 'none'; base-uri 'self'; form-action 'self' https://btcpay0.voltageapp.io; frame-ancestors 'self';"
     },
     "bundle": {
       "active": true,

diff --git a/src/assets/bithyve-logo.svg b/src/assets/bithyve-logo.svg
diff --git a/src/assets/close-btn.svg b/src/assets/close-btn.svg