merge main

src-tauri/Cargo.toml

@@ -9,17 +9,16 @@ version = "0.5.45"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = {version = "1.5.5", features = ["isolation"] }
+tauri-build = {version = "1.5.5", features = ["isolation"]}
 
 [dependencies]
 anyhow = "1"
 async-trait = "0.1.81"
-async_zip = {version = "0.0.17", features = ["full"] }
+async_zip = {version = "0.0.17", features = ["full"]}
 auto-launch = "0.5.0"
 blake2 = "0.10"
 chrono = "0.4.38"
 device_query = "2.1.0"
-dirs-next = "2.0.0"
 dunce = "1.0.5"
 flate2 = "1.0.30"
 futures-lite = "2.3.0"
@@ -29,26 +28,26 @@ keyring = {version = "3.0.5", features = [
   "windows-native",
   "apple-native",
   "linux-native",
-] }
+]}
 libsqlite3-sys = {version = "0.25.1", features = [
   "bundled",
-] }# Required for tari_wallet
+]}# Required for tari_wallet
 log = "0.4.22"
 log4rs = "1.3.0"
 minotari_node_grpc_client = {git = "https://github.com/tari-project/tari.git", branch = "development"}
 minotari_wallet_grpc_client = {git = "https://github.com/tari-project/tari.git", branch = "development"}
-nix = {version = "0.29.0", features = ["signal"] }
+nix = {version = "0.29.0", features = ["signal"]}
 nvml-wrapper = "0.10.0"
 open = "5"
 phraze = "0.3.15"
 rand = "0.8.5"
 regex = "1.10.5"
-reqwest = {version = "0.12.5", features = ["stream", "json", "multipart"] }
+reqwest = {version = "0.12.5", features = ["stream", "json", "multipart"]}
 sanitize-filename = "0.5"
 semver = "1.0.23"
-sentry = {version = "0.34.0", features = ["anyhow"] }
+sentry = {version = "0.34.0", features = ["anyhow"]}
 sentry-tauri = "0.3.0"
-serde = {version = "1", features = ["derive"] }
+serde = {version = "1", features = ["derive"]}
 serde_json = "1"
 sha2 = "0.10.8"
 sys-locale = "0.3.1"
@@ -58,7 +57,7 @@ tari_common = {git = "https://github.com/tari-project/tari.git", branch = "devel
 tari_common_types = {git = "https://github.com/tari-project/tari.git", branch = "development"}
 tari_core = {git = "https://github.com/tari-project/tari.git", branch = "development", features = [
   "transactions",
-] }
+]}
 tari_crypto = "0.20.3"
 tari_key_manager = {git = "https://github.com/tari-project/tari.git", branch = "development"}
 tari_shutdown = {git = "https://github.com/tari-project/tari.git", branch = "development"}
@@ -77,14 +76,15 @@ tauri = {version = "1.8.0", features = [
   "macos-private-api",
   "isolation",
   "shell-open",
+  "icon-ico",
+  "icon-png",
   "process-command-api",
-] }
+]}
 tauri-plugin-single-instance = {git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1"}
 thiserror = "1.0.26"
-tokio = {version = "1", features = ["full"] }
-tokio-util = {version = "0.7.11", features = ["compat"] }
-tor-hash-passwd = "1.0.1"
-xz2 = {version = "0.1.7", features = ["static"] }# static bind lzma
+tokio = {version = "1", features = ["full"]}
+tokio-util = {version = "0.7.11", features = ["compat"]}
+xz2 = {version = "0.1.7", features = ["static"]}# static bind lzma
 zip = "2.2.0"
 
 [target.'cfg(windows)'.dependencies]
@@ -93,7 +93,7 @@ winreg = "0.52.0"
 # needed for keymanager. TODO: Find a way of creating a keymanager without bundling sqlite
 chrono = "0.4.38"
 device_query = "2.1.0"
-libsqlite3-sys = {version = "0.25.1", features = ["bundled"] }
+libsqlite3-sys = {version = "0.25.1", features = ["bundled"]}
 log = "0.4.22"
 nvml-wrapper = "0.10.0"
 rand = "0.8.5"

src-tauri/src/main.rs

@@ -7,8 +7,6 @@ use external_dependencies::{ExternalDependencies, ExternalDependency, RequiredEx
 use log::trace;
 use log::{debug, error, info, warn};
 use regex::Regex;
-use sentry::protocol::Event;
-use sentry_tauri::sentry;
 use serde::Serialize;
 use std::fs::{read_dir, remove_dir_all, remove_file};
 use std::sync::atomic::{AtomicBool, Ordering};

src-tauri/src/systemtray_manager.rs

@@ -132,7 +132,7 @@ impl SystemtrayManager {
 
         match current_os {
             CurrentOperatingSystem::Windows => {
-                return systray.with_tooltip(tooltip.clone().as_str())
+                return systray.with_tooltip(tooltip.clone().as_str());
             }
             CurrentOperatingSystem::Linux => systray.with_menu(tray_menu),
             CurrentOperatingSystem::MacOS => {

src-tauri/tauri.conf.json

@@ -11,7 +11,7 @@
     },
     "tauri": {
         "systemTray": {
-            "iconPath": "icons/icon.ico",
+            "iconPath": "icons/systray_icon.ico",
             "menuOnLeftClick": true
         },
         "updater": {
@@ -70,11 +70,16 @@
             "targets": "all",
             "identifier": "com.tari.universe.alpha",
             "icon": [
+                "icons/32x32.png",
+                "icons/128x128.png",
+                "icons/[email protected]",
                 "icons/icon.icns",
                 "icons/icon.ico",
                 "icons/icon.png",
                 "icons/StoreLogo.png",
-                "icons/tari.png"
+                "icons/systray_icon.icns",
+                "icons/systray_icon.ico",
+                "icons/systray_icon.png"
             ],
             "copyright": "Copyright (c) 2024 Tari Labs, LLC",
             "shortDescription": "Tari Universe is a mining app for Tari.",
@@ -86,4 +91,4 @@
         },
         "macOSPrivateApi": true
     }
-}
+}