fix(ui): systray format

src-tauri/Cargo.toml

@@ -81,6 +81,7 @@ log = "0.4.22"
 rand = "0.8.5"
 device_query = "2.1.0"
 nvml-wrapper = "0.10.0"
+human_format = "1.1.0"
 # tonic = "0.12.0"
 
 [features]

src-tauri/src/binary_resolver.rs

@@ -2,7 +2,7 @@ use crate::download_utils::{download_file_with_retries, extract, validate_checks
 use crate::{github, ProgressTracker};
 use anyhow::{anyhow, Error};
 use async_trait::async_trait;
-use log::{debug, error, info, warn};
+use log::{debug, error, warn};
 use regex::Regex;
 use semver::{Version, VersionReq};
 use std::collections::HashMap;

src-tauri/src/hardware_monitor.rs

@@ -1,6 +1,6 @@
 use std::{ops::Deref, sync::LazyLock};
 
-use log::{debug, info, warn};
+use log::{debug, warn};
 use nvml_wrapper::{enum_wrappers::device::TemperatureSensor, Nvml};
 use serde::Serialize;
 use sysinfo::{Component, Components, CpuRefreshKind, RefreshKind, System};

src-tauri/src/main.rs

@@ -7,7 +7,6 @@ mod binary_resolver;
 mod consts;
 mod cpu_miner;
 mod download_utils;
-mod format_utils;
 mod github;
 mod gpu_miner;
 mod hardware_monitor;

src-tauri/src/systemtray_manager.rs

@@ -1,8 +1,8 @@
+use human_format::Formatter;
 use log::{error, info};
 use std::sync::LazyLock;
 use tauri::{AppHandle, CustomMenuItem, SystemTray, SystemTrayMenu, SystemTrayMenuItem};
 
-use crate::format_utils::format_balance;
 use crate::hardware_monitor::HardwareStatus;
 
 const LOG_TARGET: &str = "tari::universe::systemtray_manager";
@@ -34,7 +34,13 @@ impl SystrayItemId {
  SystrayItemId::CpuUsage => format!("CPU Usage: {:.2}%", value),
  SystrayItemId::GpuUsage => format!("GPU Usage: {:.2}%", value),
  SystrayItemId::EstimatedEarning => {
- format!("Est earning: {} tXTM/day", format_balance(value))
+ format!(
+ "Est earning: {:?} tXTM/day",
+ Formatter::new()
+ .with_decimals(2)
+ .with_separator("")
+ .format(value / 1_000_000.0)
+ )
  }
  }
  }
@@ -101,19 +107,23 @@ impl SystemtrayManager {
  match current_os {
  CurrentOperatingSystem::Windows => {
  format!(
- "Hashrate | Usage\nCPU: {:.0} H/s | {:.0}%\nGPU: {:.0} H/s | {:.0}%\nEst. earning: {} tXTM/day",
- data.cpu_hashrate,
+ "Hashrate | Usage\nCPU: {} H/s | {:.0}%\nGPU: {} H/s | {:.0}%\nEst. earning: {} tXTM/day",
+ Formatter::new().with_decimals(2).with_separator("").format(data.cpu_hashrate),
  data.cpu_usage,
- data.gpu_hashrate,
+ Formatter::new().with_decimals(2).with_separator("").format(data.gpu_hashrate),
  data.gpu_usage,
- format_balance(data.estimated_earning)
+ Formatter::new().with_decimals(2).with_separator("").format(data.estimated_earning / 1_000_000.0)
  )
  }
  CurrentOperatingSystem::Linux => "Not supported".to_string(),
  CurrentOperatingSystem::MacOS => {
  format!(
- "CPU:\n Hashrate: {:.0} H/s\n Usage: {:.0}%\nGPU:\n Hashrate: {:.0} H/s\n Usage: {:.0}%\nEst. earning: {} tXTM/day",
- data.cpu_hashrate, data.cpu_usage, data.gpu_hashrate, data.gpu_usage, format_balance(data.estimated_earning)
+ "CPU:\n Hashrate: {} H/s\n Usage: {:.0}%\nGPU:\n Hashrate: {} H/s\n Usage: {:.0}%\nEst. earning: {} tXTM/day",
+ Formatter::new().with_decimals(0).with_separator("").format(data.cpu_hashrate),
+ data.cpu_usage,
+ Formatter::new().with_decimals(2).with_separator("").format(data.gpu_hashrate),
+ data.gpu_usage,
+ Formatter::new().with_decimals(2).with_separator("").format(data.estimated_earning / 1_000_000.0)
  )
  }
  }