From 101e426792b1134a7890ecb20c34a0a8b89db5d2 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sat, 28 Mar 2026 23:57:57 +0530
Subject: [PATCH] fix: remove error message display for Google Drive and
 OneDrive authentication issues; add toast notifications for picker errors

---
 .../connector-configs/components/google-drive-config.tsx    | 2 --
 .../connector-configs/components/onedrive-config.tsx        | 2 --
 surfsense_web/hooks/use-google-picker.ts                    | 6 +++++-
 surfsense_web/hooks/use-onedrive-picker.ts                  | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
index 6b01df9f8..bab993b5d 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/google-drive-config.tsx
@@ -242,8 +242,6 @@ export const GoogleDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfi
 					{totalSelected > 0 ? "Change Selection" : "Select from Google Drive"}
 				</Button>
 
-				{pickerError && !isAuthExpired && <p className="text-xs text-destructive">{pickerError}</p>}
-
 				{isAuthExpired && (
 					<p className="text-xs text-amber-600 dark:text-amber-500">
 						Your Google Drive authentication has expired. Please re-authenticate using the button
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx
index 65df4d01e..792c3f1c0 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/onedrive-config.tsx
@@ -220,8 +220,6 @@ export const OneDriveConfig: FC<ConnectorConfigProps> = ({ connector, onConfigCh
 					{totalSelected > 0 ? "Change Selection" : "Select from OneDrive"}
 				</Button>
 
-				{pickerError && !isAuthExpired && <p className="text-xs text-destructive">{pickerError}</p>}
-
 				{isAuthExpired && (
 					<p className="text-xs text-amber-600 dark:text-amber-500">
 						Your OneDrive authentication has expired. Please re-authenticate using the button
diff --git a/surfsense_web/hooks/use-google-picker.ts b/surfsense_web/hooks/use-google-picker.ts
index 6dd65f9e3..3a29bcd3e 100644
--- a/surfsense_web/hooks/use-google-picker.ts
+++ b/surfsense_web/hooks/use-google-picker.ts
@@ -1,6 +1,7 @@
 "use client";
 
 import { useCallback, useEffect, useRef, useState } from "react";
+import { toast } from "sonner";
 import { connectorsApiService } from "@/lib/apis/connectors-api.service";
 
 export interface PickerItem {
@@ -159,7 +160,9 @@ export function useGooglePicker({ connectorId, onPicked }: UseGooglePickerOption
 					}
 
 					if (action === google.picker.Action.ERROR) {
-						setError("Google Drive encountered an error. Please try again.");
+						const msg = "Google Drive encountered an error. Please try again.";
+						setError(msg);
+						toast.error("Google Drive Picker failed", { description: msg });
 					}
 
 					if (
@@ -180,6 +183,7 @@ export function useGooglePicker({ connectorId, onPicked }: UseGooglePickerOption
 			openingRef.current = false;
 			const msg = err instanceof Error ? err.message : "Failed to open Google Picker";
 			setError(msg);
+			toast.error("Google Drive Picker failed", { description: msg });
 			console.error("Google Picker error:", err);
 		} finally {
 			setLoading(false);
diff --git a/surfsense_web/hooks/use-onedrive-picker.ts b/surfsense_web/hooks/use-onedrive-picker.ts
index b5546074a..d94d7da50 100644
--- a/surfsense_web/hooks/use-onedrive-picker.ts
+++ b/surfsense_web/hooks/use-onedrive-picker.ts
@@ -1,6 +1,7 @@
 "use client";
 
 import { useCallback, useEffect, useRef, useState } from "react";
+import { toast } from "sonner";
 import { authenticatedFetch } from "@/lib/auth-utils";
 
 export interface OneDrivePickerItem {
@@ -241,6 +242,7 @@ export function useOneDrivePicker({ connectorId, onPicked }: UseOneDrivePickerOp
 			openingRef.current = false;
 			const msg = err instanceof Error ? err.message : "Failed to open OneDrive Picker";
 			setError(msg);
+			toast.error("OneDrive Picker failed", { description: msg });
 			console.error("OneDrive Picker error:", err);
 			window.dispatchEvent(new Event(ONEDRIVE_PICKER_CLOSE_EVENT));
 		} finally {