fix (onboarding): improved onboarding flow

Author: itsskofficial

src/client/app/onboarding/page.js

@@ -155,13 +155,13 @@ const questions = [
 		id: "location",
 		question: "Where are you located?",
 		description:
-			"This helps with local info like weather. You can type a city or detect automatically.",
+			"This helps with local info like weather. You can type a city or detect it automatically.",
 		type: "location",
 		required: true
 	},
 	{
 		id: "professional-context",
-		question: "What's your professional world like?",
+		question: "What is your professional background?",
 		type: "textarea",
 		required: true,
 		placeholder: "e.g., I'm a software developer at a startup..."
@@ -174,12 +174,19 @@ const questions = [
 		placeholder: "e.g., I enjoy hiking, learning guitar, and soccer.",
 		icon: <IconHeart />
 	},
+	{
+		id: "needs-pa",
+		question:
+			"Do you often juggle multiple priorities, manage a small team, lead projects, and handle countless day-to-day tasks on your own? Many professionals spend too much time scheduling meetings, organizing their calendar, responding to emails, and doing other administrative work that eats into their day. Do you ever wish you had someone to take these repetitive tasks off your plate?\n\nDo you ever feel the need for a personal assistant?",
+		type: "yes-no",
+		required: true
+	},
 	{
 		id: "whatsapp_notifications_number",
 		question:
-			"If you'd like to enable this, please enter your number with the country code. Otherwise, just press Enter to skip.",
+			"Please enter your WhatsApp number with the country code.",
 		type: "text-input",
-		required: false,
+		required: true,
 		placeholder: "+14155552671",
 		icon: <IconBrandWhatsapp />
 	}
@@ -191,7 +198,8 @@ const sentientComments = [
 	"Perfect. Now, to help with local info like weather and places...",
 	"This helps me understand your professional goals and context.",
 	"And when you're not working? Tell me about your hobbies.",
-	"One last thing. I can send you important notifications, task updates, and reminders on WhatsApp. We're in the process of getting an official number, so for now, messages will come from our co-founder Sarthak (+91827507823), who may also occasionally reach out for feedback.",
+	"Got it. One more thing before we get to the last step...",
+	"Finally, I will send you important notifications, task updates, and reminders on WhatsApp. We're in the process of getting an official number, so for now, messages will come from our co-founder Sarthak (+91827507823), who may also occasionally reach out for feedback.",
 	"Awesome! That's all I need. Let's get you set up."
 ]
 
@@ -837,6 +845,39 @@ const OnboardingPage = () => {
 						)}
 					</div>
 				)
+			case "yes-no":
+				return (
+					<div className="flex gap-4">
+						<button
+							onClick={() => {
+								handleAnswer(currentQuestion.id, "yes")
+								setTimeout(handleNext, 100)
+							}}
+							className={cn(
+								"px-6 py-2 rounded-lg font-semibold transition-colors",
+								answers[currentQuestion.id] === "yes"
+									? "bg-brand-orange text-brand-black"
+									: "bg-neutral-700 hover:bg-neutral-600"
+							)}
+						>
+							Yes
+						</button>
+						<button
+							onClick={() => {
+								handleAnswer(currentQuestion.id, "no")
+								setTimeout(handleNext, 100)
+							}}
+							className={cn(
+								"px-6 py-2 rounded-lg font-semibold transition-colors",
+								answers[currentQuestion.id] === "no"
+									? "bg-brand-orange text-brand-black"
+									: "bg-neutral-700 hover:bg-neutral-600"
+							)}
+						>
+							No
+						</button>
+					</div>
+				)
 			default:
 				return null
 		}

src/client/app/settings/page.js

@@ -147,6 +147,7 @@ const WhatsAppSettings = () => {
 	const [notificationNumber, setNotificationNumber] = useState("")
 	const [isNotifLoading, setIsNotifLoading] = useState(true)
 	const [isSaving, setIsSaving] = useState(false)
+	const [notificationsEnabled, setNotificationsEnabled] = useState(false)
 
 	const fetchNotificationSettings = useCallback(async () => {
 		setIsNotifLoading(true)
@@ -158,6 +159,7 @@ const WhatsAppSettings = () => {
 				)
 			const data = await response.json()
 			setNotificationNumber(data.whatsapp_notifications_number || "")
+			setNotificationsEnabled(data.notifications_enabled || false)
 		} catch (error) {
 			toast.error(error.message)
 		} finally {
@@ -193,24 +195,29 @@ const WhatsAppSettings = () => {
 		}
 	}
 
-	const handleRemoveNotifNumber = async () => {
-		setIsSaving(true)
+	const handleToggleNotifications = async (enabled) => {
+		setNotificationsEnabled(enabled)
+		const toastId = toast.loading(
+			enabled ? "Enabling notifications..." : "Disabling notifications..."
+		)
 		try {
 			const response = await fetch(
-				"/api/settings/whatsapp-notifications",
+				"/api/settings/whatsapp-notifications/toggle",
 				{
 					method: "POST",
 					headers: { "Content-Type": "application/json" },
-					body: JSON.stringify({ whatsapp_notifications_number: "" })
+					body: JSON.stringify({ enabled })
 				}
 			)
-			if (!response.ok) throw new Error("Failed to remove number.")
-			setNotificationNumber("")
-			toast.success("Notification number removed.")
+			const data = await response.json()
+			if (!response.ok) {
+				setNotificationsEnabled(!enabled)
+				throw new Error(data.detail || "Failed to update preference.")
+			}
+			toast.success(data.message, { id: toastId })
 		} catch (error) {
+			setNotificationsEnabled(!enabled)
 			toast.error(error.message)
-		} finally {
-			setIsSaving(false)
 		}
 	}
 
@@ -237,6 +244,40 @@ const WhatsAppSettings = () => {
 						</div>
 					) : (
 						<div className="space-y-4">
+							<div className="flex items-center justify-between p-3 bg-neutral-800/30 rounded-lg">
+								<label
+									htmlFor="whatsapp-toggle"
+									className="font-medium text-neutral-200"
+								>
+									Enable Notifications
+								</label>
+								<button
+									id="whatsapp-toggle"
+									onClick={() =>
+										handleToggleNotifications(
+											!notificationsEnabled
+										)
+									}
+									disabled={!hasNotifNumber}
+									className={cn(
+										"relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-brand-orange focus:ring-offset-2 focus:ring-offset-neutral-900",
+										"disabled:opacity-50 disabled:cursor-not-allowed",
+										notificationsEnabled
+											? "bg-green-500"
+											: "bg-neutral-600"
+									)}
+								>
+									<span
+										aria-hidden="true"
+										className={cn(
+											"pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out",
+											notificationsEnabled
+												? "translate-x-5"
+												: "translate-x-0"
+										)}
+									/>
+								</button>
+							</div>
 							<div className="flex flex-col sm:flex-row gap-2">
 								<div className="relative flex-grow">
 									<IconBrandWhatsapp
@@ -271,16 +312,6 @@ const WhatsAppSettings = () => {
 										)}{" "}
 										{hasNotifNumber ? "Update" : "Save"}
 									</button>
-									{hasNotifNumber && (
-										<button
-											onClick={handleRemoveNotifNumber}
-											disabled={isSaving}
-											className="flex items-center py-2 px-4 rounded-lg bg-red-600/80 hover:bg-red-600 text-white font-medium transition-colors"
-										>
-											<IconX className="w-4 h-4 mr-2" />{" "}
-											Remove
-										</button>
-									)}
 								</div>
 							</div>
 						</div>

src/server/main/misc/routes.py

@@ -15,6 +15,8 @@
 from main.dependencies import mongo_manager, auth_helper, websocket_manager as main_websocket_manager
 from pydantic import BaseModel
 from workers.tasks import cud_memory_task
+from main.settings.google_sheets_utils import update_onboarding_data_in_sheet, update_plan_in_sheet
+from main.notifications.whatsapp_client import check_phone_number_exists, send_whatsapp_message
 
 # Google API libraries for validation
 from google.oauth2 import service_account
@@ -37,8 +39,12 @@ class UpdatePrivacyFiltersRequest(BaseModel):
 @router.post("/onboarding", status_code=status.HTTP_200_OK, summary="Save Onboarding Data")
 async def save_onboarding_data_endpoint(
     request_body: OnboardingRequest, 
-    user_id: str = Depends(PermissionChecker(required_permissions=["write:profile"]))
+    payload: dict = Depends(auth_helper.get_decoded_payload_with_claims)
 ):
+    user_id = payload.get("sub")
+    user_email = payload.get("email")
+    plan = payload.get("plan", "free")
+    
     logger.info(f"[{datetime.datetime.now()}] [ONBOARDING] User {user_id}, Data keys: {list(request_body.data.keys())}")
     try:
         default_privacy_filters = {
@@ -87,6 +93,31 @@ async def save_onboarding_data_endpoint(
         if personal_info:
             user_data_to_set["personalInfo"] = personal_info
 
+        # --- NEW: Process WhatsApp number from onboarding data ---
+        onboarding_chat_id = None # Variable to hold the chat ID for the feedback message
+        whatsapp_number = onboarding_data.get("whatsapp_notifications_number", "").strip()
+        if whatsapp_number:
+            try:
+                validation_result = await check_phone_number_exists(whatsapp_number)
+                if validation_result and validation_result.get("numberExists"):
+                    chat_id = validation_result.get("chatId")
+                    if chat_id:
+                        onboarding_chat_id = chat_id
+                        user_data_to_set["notificationPreferences"] = {
+                            "whatsapp": {
+                                "number": whatsapp_number,
+                                "chatId": chat_id,
+                                "enabled": True # Enable by default
+                            }
+                        }
+                        logger.info(f"WhatsApp number for user {user_id} validated and set for notifications during onboarding.")
+                    else:
+                        logger.warning(f"Could not get chatId for {whatsapp_number} during onboarding for user {user_id}.")
+                else:
+                    logger.warning(f"WhatsApp number {whatsapp_number} provided by user {user_id} during onboarding is not valid.")
+            except Exception as e:
+                logger.error(f"Error validating WhatsApp number during onboarding for user {user_id}: {e}")
+
         # Create the final update payload for MongoDB
         # We construct the payload carefully to avoid replacing the entire userData object
         update_payload = {}
@@ -98,6 +129,25 @@ async def save_onboarding_data_endpoint(
         if not success:
             raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Failed to save onboarding data.")
 
+        # --- Update Google Sheet ---
+        try:
+            if user_email:
+                await update_onboarding_data_in_sheet(user_email, onboarding_data, plan)
+            else:
+                logger.warning(f"Could not update Google Sheet for user {user_id} because no email was found in their token.")
+        except Exception as e:
+            logger.error(f"Non-critical error: Failed to update Google Sheet during onboarding for user {user_id}. Error: {e}")
+
+        # --- Send conditional WhatsApp message ---
+        if onboarding_data.get("needs-pa") == "yes" and onboarding_chat_id:
+            try:
+                feedback_message = "Hi there, I am Sarthak from team Sentient. Thanks for signing up, are you okay with giving feedback and helping us improve the platform to better suit your needs?"
+                # Call the WhatsApp sender directly, bypassing in-app notifications
+                await send_whatsapp_message(onboarding_chat_id, feedback_message)
+                logger.info(f"Sent onboarding feedback request to user {user_id} on WhatsApp.")
+            except Exception as e:
+                logger.error(f"Failed to send onboarding feedback WhatsApp message for user {user_id}: {e}")
+
         # --- Dispatch facts to memory ---
         try:
             fact_templates = {
@@ -163,6 +213,15 @@ async def get_user_data_endpoint(payload: dict = Depends(auth_helper.get_decoded
     if not profile_exists or stored_plan != token_plan:
         logger.info(f"Updating plan for user {user_id} to '{token_plan}'. Profile exists: {profile_exists}")
         await mongo_manager.update_user_profile(user_id, {"userData.plan": token_plan})
+
+        # NEW: Update GSheet when plan changes
+        user_email = payload.get("email")
+        if user_email and stored_plan != token_plan: # Only update if the plan actually changed
+            try:
+                await update_plan_in_sheet(user_email, token_plan)
+            except Exception as e:
+                logger.error(f"Failed to update plan in GSheet for {user_email}: {e}")
+
         # Re-fetch the profile after update to ensure we return the latest data
         profile_doc = await mongo_manager.get_user_profile(user_id)