From 3b09296291c64a887eea4179cc34eb330c9951f4 Mon Sep 17 00:00:00 2001
From: Ramnique Singh <30795890+ramnique@users.noreply.github.com>
Date: Fri, 8 May 2026 13:16:59 +0530
Subject: [PATCH] fix: route Google reconnect through rowboat flow when signed
 in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Reconnect button on the Google account row always opened the BYOK
client-ID modal, even for users signed into Rowboat — who should get
the managed-credentials browser flow instead. The non-reconnect Connect
button already branched correctly via useConnectors.handleConnect; the
reconnect path bypassed it. Adds a handleReconnect helper that mirrors
the same branching, and routes both call sites (popover and settings)
through it.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../src/components/connectors-popover.tsx     | 11 +---------
 .../settings/connected-accounts-settings.tsx  | 11 +---------
 .../apps/renderer/src/hooks/useConnectors.ts  | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/apps/x/apps/renderer/src/components/connectors-popover.tsx b/apps/x/apps/renderer/src/components/connectors-popover.tsx
index 92b13a48..eb15026e 100644
--- a/apps/x/apps/renderer/src/components/connectors-popover.tsx
+++ b/apps/x/apps/renderer/src/components/connectors-popover.tsx
@@ -79,16 +79,7 @@ export function ConnectorsPopover({ children, tooltip, open: openProp, onOpenCha
             <Button
               variant="default"
               size="sm"
-              onClick={() => {
-                if (provider === 'google') {
-                  c.setGoogleClientIdDescription(
-                    "To keep your Google account connected, please re-enter your client ID. You only need to do this once."
-                  )
-                  c.setGoogleClientIdOpen(true)
-                  return
-                }
-                c.startConnect(provider)
-              }}
+              onClick={() => c.handleReconnect(provider)}
               className="h-7 px-2 text-xs"
             >
               Reconnect
diff --git a/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx b/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
index cdacdc39..8b90f619 100644
--- a/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
+++ b/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
@@ -52,16 +52,7 @@ export function ConnectedAccountsSettings({ dialogOpen }: ConnectedAccountsSetti
             <Button
               variant="default"
               size="sm"
-              onClick={() => {
-                if (provider === 'google') {
-                  c.setGoogleClientIdDescription(
-                    "To keep your Google account connected, please re-enter your client ID. You only need to do this once."
-                  )
-                  c.setGoogleClientIdOpen(true)
-                  return
-                }
-                c.startConnect(provider)
-              }}
+              onClick={() => c.handleReconnect(provider)}
               className="h-7 px-3 text-xs"
             >
               Reconnect
diff --git a/apps/x/apps/renderer/src/hooks/useConnectors.ts b/apps/x/apps/renderer/src/hooks/useConnectors.ts
index af56b921..0cb65af5 100644
--- a/apps/x/apps/renderer/src/hooks/useConnectors.ts
+++ b/apps/x/apps/renderer/src/hooks/useConnectors.ts
@@ -354,6 +354,25 @@ export function useConnectors(active: boolean) {
     startConnect('google', { clientId, clientSecret })
   }, [startConnect])
 
+  // Reconnect flow used by the "Reconnect" button. Mirrors handleConnect's
+  // rowboat-vs-BYOK branching for Google so signed-in users don't get the
+  // client-ID modal — they just re-run the managed-credentials browser flow.
+  const handleReconnect = useCallback(async (provider: string) => {
+    if (provider === 'google') {
+      const isSignedIntoRowboat = providerStates.rowboat?.isConnected ?? false
+      if (isSignedIntoRowboat) {
+        await startConnect('google')
+        return
+      }
+      setGoogleClientIdDescription(
+        "To keep your Google account connected, please re-enter your client ID. You only need to do this once."
+      )
+      setGoogleClientIdOpen(true)
+      return
+    }
+    await startConnect(provider)
+  }, [startConnect, providerStates])
+
   const handleDisconnect = useCallback(async (provider: string) => {
     setProviderStates(prev => ({
       ...prev,
@@ -534,6 +553,7 @@ export function useConnectors(active: boolean) {
     providerStatus,
     hasProviderError,
     handleConnect,
+    handleReconnect,
     handleDisconnect,
     startConnect,