From 940cc3913edd5ad7d88b7b15d12bfea222a5413f Mon Sep 17 00:00:00 2001 From: Colton Hurst Date: Mon, 4 May 2026 14:59:54 -0400 Subject: [PATCH 1/2] Small fix for sshv2 namespace mismatch --- apps/desktop/src/autofill/components/approve-ssh-request.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/desktop/src/autofill/components/approve-ssh-request.ts b/apps/desktop/src/autofill/components/approve-ssh-request.ts index 95122700778f..72e62302ed2e 100644 --- a/apps/desktop/src/autofill/components/approve-ssh-request.ts +++ b/apps/desktop/src/autofill/components/approve-ssh-request.ts @@ -56,7 +56,7 @@ export class ApproveSshRequestComponent { namespace: string, ) { let actioni18nKey = "sshActionLogin"; - if (namespace === "git") { + if (namespace === "git" || namespace === "Git") { actioni18nKey = "sshActionGitSign"; } else if (namespace != null && namespace != "") { actioni18nKey = "sshActionSign"; From 96d0b7b099e341c643b67e1d3e3c130c8c459c6d Mon Sep 17 00:00:00 2001 From: Colton Hurst Date: Mon, 4 May 2026 17:00:19 -0400 Subject: [PATCH 2/2] Change casing from struct def, rather than adding a case to the conditional --- apps/desktop/desktop_native/napi/index.d.ts | 6 +++--- apps/desktop/desktop_native/napi/src/sshagent_v2.rs | 2 +- apps/desktop/src/autofill/components/approve-ssh-request.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts index 66abafc95ea7..662bc32dd43a 100644 --- a/apps/desktop/desktop_native/napi/index.d.ts +++ b/apps/desktop/desktop_native/napi/index.d.ts @@ -305,9 +305,9 @@ export declare namespace sshagent_v2 { } /** A sign request's SIG namespace */ export const enum SIGNamespace { - Git = 'Git', - File = 'File', - Unsupported = 'Unsupported' + Git = 'git', + File = 'file', + Unsupported = 'unsupported' } /** SSH sign request fields. */ export interface SignRequest { diff --git a/apps/desktop/desktop_native/napi/src/sshagent_v2.rs b/apps/desktop/desktop_native/napi/src/sshagent_v2.rs index 99aa0a4c97c3..7e8ead92cafc 100644 --- a/apps/desktop/desktop_native/napi/src/sshagent_v2.rs +++ b/apps/desktop/desktop_native/napi/src/sshagent_v2.rs @@ -37,7 +37,7 @@ pub mod sshagent_v2 { } /// A sign request's SIG namespace - #[napi(string_enum)] + #[napi(string_enum = "camelCase")] #[derive(Debug)] pub enum SIGNamespace { Git, diff --git a/apps/desktop/src/autofill/components/approve-ssh-request.ts b/apps/desktop/src/autofill/components/approve-ssh-request.ts index 72e62302ed2e..95122700778f 100644 --- a/apps/desktop/src/autofill/components/approve-ssh-request.ts +++ b/apps/desktop/src/autofill/components/approve-ssh-request.ts @@ -56,7 +56,7 @@ export class ApproveSshRequestComponent { namespace: string, ) { let actioni18nKey = "sshActionLogin"; - if (namespace === "git" || namespace === "Git") { + if (namespace === "git") { actioni18nKey = "sshActionGitSign"; } else if (namespace != null && namespace != "") { actioni18nKey = "sshActionSign";