diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fc81f0..8730190 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: - name: Run tests run: nix develop --command cargo test --verbose - build-matrix: + verify-build: name: Build (${{ matrix.platform }} / ${{ matrix.target }}) needs: checks strategy: diff --git a/src/hal/types.rs b/src/hal/types.rs index d827585..031748e 100644 --- a/src/hal/types.rs +++ b/src/hal/types.rs @@ -104,7 +104,7 @@ pub enum FirmwareType { impl fmt::Display for FirmwareType { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - Self::PicoFido => write!(f, "Pico-FIDO"), + Self::PicoFido => write!(f, "pico-fido"), Self::RSKey => write!(f, "RS-Key"), Self::Unknown => write!(f, "Unknown"), } diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs index 14253a6..4628d4f 100644 --- a/src/ui/components/sidebar.rs +++ b/src/ui/components/sidebar.rs @@ -1,6 +1,6 @@ use crate::ui::app::Destination; use crate::ui::components::button::PFIconButton; -use crate::ui::models::device::{DeviceMethod, DeviceRepo, FirmwareType}; +use crate::ui::models::device::{DeviceMethod, DeviceRepo}; use gpui::*; use gpui_component::{ ActiveTheme, Icon, IconName, Side, @@ -252,20 +252,10 @@ impl Render for AppSidebar { ) .child({ let (text, color_bg, color_text) = if let Some(s) = &status_owned { - let is_rskey = s.firmware_type == FirmwareType::RSKey; - let fw_label = if is_rskey { "RS-Key" } else { "Pico-FIDO" }; if s.method == DeviceMethod::Fido { - ( - format!("Online - FIDO ({})", fw_label), - rgb(0xf59e0b), - rgb(0xffffff), - ) + ("Online - FIDO".to_string(), rgb(0xf59e0b), rgb(0xffffff)) } else { - ( - format!("Online - {}", fw_label), - rgb(0x16a34a), - rgb(0xffffff), - ) + ("Online".to_string(), rgb(0x16a34a), rgb(0xffffff)) } } else if error_owned.is_some() { ("Error".to_string(), rgb(0xd97706), rgb(0xffffff))