From d8a42920910053677b1bd4a5a79b1ea7456b51fb Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 25 May 2026 21:53:27 +0800 Subject: [PATCH] chore: satisfy clippy::nonminimal_bool and prettier to unblock CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - codex_config: rewrite `!(A && !B)` as `!A || B` (De Morgan- equivalent) — also reads more directly as "no OAuth, or already has provider API key". - UsageScriptModal: reflow conditional onto one line per prettier. --- src-tauri/src/codex_config.rs | 2 +- src/components/UsageScriptModal.tsx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src-tauri/src/codex_config.rs b/src-tauri/src/codex_config.rs index b4767f39c..37b536dbd 100644 --- a/src-tauri/src/codex_config.rs +++ b/src-tauri/src/codex_config.rs @@ -505,7 +505,7 @@ pub fn should_restore_codex_provider_token_for_backfill( let has_provider_api_key = extract_codex_auth_api_key(auth).is_some(); let has_oauth_login = codex_auth_has_oauth_login_material(auth); - !(has_oauth_login && !has_provider_api_key) + !has_oauth_login || has_provider_api_key } fn parse_codex_positive_u64(value: Option<&Value>) -> Option { diff --git a/src/components/UsageScriptModal.tsx b/src/components/UsageScriptModal.tsx index 6c1124012..f8375dd33 100644 --- a/src/components/UsageScriptModal.tsx +++ b/src/components/UsageScriptModal.tsx @@ -177,8 +177,7 @@ const UsageScriptModal: React.FC = ({ const auth = (config as any).auth || {}; const configToml = (config as any).config || ""; const apiKey = - typeof auth.OPENAI_API_KEY === "string" && - auth.OPENAI_API_KEY.trim() + typeof auth.OPENAI_API_KEY === "string" && auth.OPENAI_API_KEY.trim() ? auth.OPENAI_API_KEY : extractCodexExperimentalBearerToken(configToml); return {