From d200c550484a4fdd648649a6c154e1f4c6bc4ca4 Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Wed, 21 Oct 2026 11:14:22 -0700 Subject: [PATCH] fix(app): tidy the provider accounts dialog (#57667) --- packages/app/src/providers/connect/dialog.tsx | 429 +++++++++--------- 1 file changed, 212 insertions(+), 217 deletions(-) diff --git a/packages/app/src/providers/connect/dialog.tsx b/packages/app/src/providers/connect/dialog.tsx index 70a6133c116..3fa5ba19f74 100644 --- a/packages/app/src/providers/connect/dialog.tsx +++ b/packages/app/src/providers/connect/dialog.tsx @@ -90,12 +90,14 @@ export const DialogConnectProvider: Component<{ chatgptWelcome: boolean picked: boolean stepBack: boolean + title: string }>({ completed: false, authorization: false, chatgptWelcome: false, picked: false, stepBack: false, + title: "", }) const language = useLanguage() @@ -141,6 +143,7 @@ export const DialogConnectProvider: Component<{ onFirstConnection={(provider) => setState("modelProvider", provider)} onAuthorization={(authorization) => setState("authorization", authorization)} onStepBack={(stepBack) => setState("stepBack", stepBack)} + onTitle={(title) => setState("title", title)} /> )} @@ -176,11 +179,7 @@ export const DialogConnectProvider: Component<{ }) }} class="[font-family:var(--v2-font-family-sans)] [&_[data-slot=dialog-header]]:!px-5 [&_[data-slot=dialog-header-title]]:!text-[15px] [&_[data-slot=dialog-header-title]]:!tracking-[-0.13px]" - classList={{ - "[&_[data-slot=dialog-header]]:!pt-4 [&_[data-slot=dialog-header]]:!pb-3": - consoleSelected() && !state.modelProvider, - "[&_[data-slot=dialog-header]]:!pt-5": !!state.modelProvider, - }} + classList={{ "[&_[data-slot=dialog-header]]:!pt-5": !!state.modelProvider }} > @@ -192,22 +191,29 @@ export const DialogConnectProvider: Component<{ )} - - - - - {language.t("command.provider.connect")} + + {(provider) => ( +
+ + + + + {state.title} +
+ )}
- {/* Holds the back button's space so the content doesn't shift when it appears. */} -
@@ -436,6 +442,7 @@ function ProviderConnection(props: { onFirstConnection: (provider: { id: string; name: string }) => void onAuthorization: (authorization: boolean) => void onStepBack: (stepBack: boolean) => void + onTitle: (title: string) => void accounts?: boolean }) { const dialog = useDialog() @@ -662,6 +669,29 @@ function ProviderConnection(props: { controller.auth.state() !== "error" && controller.authorization()?.mode === "auto" + createEffect(() => { + if (showAccounts()) return props.onTitle(provider().name) + + if (isConsole && controller.auth.state() === "error") + return props.onTitle(language.t("provider.connect.opencode.errorTitle")) + + if (consoleSignIn()) + return props.onTitle( + language.t( + props.provider === "opencode-go" ? "provider.connect.console.titleGo" : "provider.connect.console.title", + ), + ) + + if (props.provider === "anthropic" && controller.currentMethod()?.label?.toLowerCase().includes("max")) + return props.onTitle(language.t("provider.connect.title.anthropicProMax")) + + props.onTitle( + language.t("provider.connect.title", { + provider: props.provider === "opencode" ? language.t("provider.connect.opencode.name") : provider().name, + }), + ) + }) + // Asks one visible field at a time, like the TUI, so `when` conditions see every earlier answer. function AuthFormView() { const method = controller.currentMethod() @@ -1358,113 +1388,112 @@ function ProviderConnection(props: { function AccountsView() { return ( -
+
+
+ + {(account) => ( + + + {language.t("dialog.provider.accounts.removeConfirm", { account: account.label })} + + + +
+ } + > +
+ + accountActions.rename(account, label)} + onClose={() => setState("renaming", undefined)} + /> +
+ } + > + + +
+ + } + disabled={state.switching !== undefined} + aria-label={language.t("dialog.provider.accounts.options", { account: account.label })} + /> + {/* The modal dialog aria-hides anything added outside it, this portal included, a frame + after it opens. Kobalte leaves a node marked as a top layer visible. */} + { + el.dataset.reactAriaTopLayer = "true" + }} + > + state.renaming && event.preventDefault()}> + setState({ renaming: account.id, confirming: undefined })}> + {language.t("common.rename")} + + setState({ confirming: account.id, renaming: undefined })}> + {language.t("dialog.provider.accounts.remove")} + + + + +
+
+ + )} + +
-
-
- {language.t("dialog.provider.accounts.connected")} -
-
- - {(account) => ( - - - {language.t("dialog.provider.accounts.removeConfirm", { account: account.label })} - - - -
- } - > -
- - accountActions.rename(account, label)} - onClose={() => setState("renaming", undefined)} - /> -
- } - > - - -
- - } - disabled={state.switching !== undefined} - aria-label={language.t("dialog.provider.accounts.options", { account: account.label })} - /> - {/* The modal dialog aria-hides anything added outside it, this portal included, a frame - after it opens. Kobalte leaves a node marked as a top layer visible. */} - { - el.dataset.reactAriaTopLayer = "true" - }} - > - state.renaming && event.preventDefault()}> - setState({ renaming: account.id, confirming: undefined })}> - {language.t("common.rename")} - - setState({ confirming: account.id, renaming: undefined })}> - {language.t("dialog.provider.accounts.remove")} - - - - -
- - - )} - - -
) } @@ -1651,106 +1680,72 @@ function ProviderConnection(props: { return ( }> -
-
- -
- - - {provider().name} - - {language.t("provider.connect.opencode.errorTitle")} - - - {language.t( - props.provider === "opencode-go" - ? "provider.connect.console.titleGo" - : "provider.connect.console.title", - )} - - - {language.t("provider.connect.title.anthropicProMax")} - - - {language.t("provider.connect.title", { provider: language.t("provider.connect.opencode.name") })} - - {language.t("provider.connect.title", { provider: provider().name })} - - +
+ +
+
-
-
- -
- + + + + + + +
+ void copyLink()} + onOpen={() => void controller.auth.open()} + />
- - - - - - -
- void copyLink()} - onOpen={() => void controller.auth.open()} - /> -
-
- - - - -
- {language.t("provider.connect.status.inProgress")} -
-
- -
- {language.t("dialog.provider.environmentOnly")} -
-
- - - - - - - -
- -
-
- - - - - - - - - - - - -
-
+ + + + + +
+ {language.t("provider.connect.status.inProgress")} +
+
+ +
+ {language.t("dialog.provider.environmentOnly")} +
+
+ + + + + + + +
+ +
+
+ + + + + + + + + + + + +
)