diff --git a/apps/web/app/(app)/accounts/AddAccount.tsx b/apps/web/app/(app)/accounts/AddAccount.tsx index 1786d908fb..98c16c3ea5 100644 --- a/apps/web/app/(app)/accounts/AddAccount.tsx +++ b/apps/web/app/(app)/accounts/AddAccount.tsx @@ -15,10 +15,11 @@ import { Dialog } from "@/components/ui/dialog"; import type { GetAuthLinkUrlResponse } from "@/app/api/google/linking/auth-url/route"; export function AddAccount() { - const [isLoading, setIsLoading] = useState(false); + const [isConnecting, setIsConnecting] = useState(false); + const [isMerging, setIsMerging] = useState(false); const handleConnectGoogle = async () => { - setIsLoading(true); + setIsConnecting(true); try { await signIn("google", { callbackUrl: "/accounts", redirect: true }); } catch (error) { @@ -28,11 +29,11 @@ export function AddAccount() { description: "Please try again or contact support", }); } - setIsLoading(false); + setIsConnecting(false); }; const handleMergeGoogle = async () => { - setIsLoading(true); + setIsMerging(true); try { const response = await fetch("/api/google/linking/auth-url", { method: "GET", @@ -51,7 +52,7 @@ export function AddAccount() { description: "Please try again or contact support", }); } - setIsLoading(false); + setIsMerging(false); }; return ( @@ -59,7 +60,7 @@ export function AddAccount() { - - Add or Merge Google Account + Add Google Account - Choose an action: -
    -
  • - Connect Account: Add an account that you haven't yet - added to Inbox Zero. -
  • -
  • - Merge Another Account: Sign in with a Google account - that's currently linked to a *different* Inbox Zero user. -
  • -
+ Does the account you want to add already have an Inbox Zero + account? If yes, we'll link it to your current account.
- - + -
diff --git a/version.txt b/version.txt index 293825ef0a..fdd07b5da8 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v1.7.26 +v1.7.27