Update app.py

app.py

@@ -1763,7 +1763,18 @@ async def process_incoming_message(from_number: str, msg: dict):
             )
             return
         
-        # 🎯 PRIORITY 2: Menu selections - check if this is a valid menu selection for current state
+        # 🎯 PRIORITY 2: State-specific handling (contact_request, availability_request, ai_chat_mode)
+        if current_state == 'contact_request':
+            await handle_contact_request_response(from_number, message_body)
+            return
+        elif current_state == 'availability_request':
+            await handle_availability_request_response(from_number, message_body)
+            return
+        elif current_state == 'ai_chat_mode':
+            await handle_ai_chat_mode(from_number, message_body, reply_language)
+            return
+        
+        # 🎯 PRIORITY 3: Menu selections - check if this is a valid menu selection for current state
         if current_state in ['main_menu', 'category_selection_menu', 'category_products_menu', 'all_products_menu', 'product_inquiry']:
             # Validate menu selection
             is_valid, error_msg = validate_menu_selection(message_body, current_state, user_context)
@@ -1854,7 +1865,7 @@ async def process_incoming_message(from_number: str, msg: dict):
                     await handle_veterinary_product_followup(message_body, from_number)
                 return  # Exit after handling menu selection
         
-        # 🎯 PRIORITY 3: Product names - works from ANY menu state
+        # 🎯 PRIORITY 4: Product names - works from ANY menu state
         # This ensures users can say product names like "hydropex", "respira aid plus", etc. from any menu
         logger.info(f"[Process] Checking for product name in message: '{message_body}' from state: {current_state}")
         products = get_veterinary_product_matches(message_body)
@@ -1933,16 +1944,8 @@ async def process_incoming_message(from_number: str, msg: dict):
             else:
                 send_whatsjet_message(from_number, message)
             
-        # 🎯 PRIORITY 4: Handle other states (contact_request, availability_request, ai_chat_mode)
-        if current_state == 'contact_request':
-            await handle_contact_request_response(from_number, message_body)
-        elif current_state == 'availability_request':
-            await handle_availability_request_response(from_number, message_body)
-        elif current_state == 'ai_chat_mode':
-            await handle_ai_chat_mode(from_number, message_body, reply_language)
-        else:
-            # 🎯 PRIORITY 5: Default: treat as general query with intelligent product inquiry
-            await handle_intelligent_product_inquiry(from_number, message_body, user_context, reply_language)
+        # 🎯 PRIORITY 5: Default: treat as general query with intelligent product inquiry
+        await handle_intelligent_product_inquiry(from_number, message_body, user_context, reply_language)
             
     except Exception as e:
         logger.error(f"Error in process_incoming_message: {e}")