Update app.py

app.py

@@ -2318,10 +2318,15 @@ async def process_incoming_message(from_number: str, msg: dict):
                         send_whatsjet_message(from_number, get_menu_validation_message(current_state, user_context))
                 elif current_state == 'all_products_menu':
                     # Handle product selection from all products
-                    if products_df is not None and not products_df.empty:
-                        all_products = products_df.to_dict('records')
-                        if message_body.isdigit() and 1 <= int(message_body) <= len(all_products):
-                            selected_product = all_products[int(message_body) - 1]
+                    available_products = user_context.get('available_products', [])
+                    if not available_products:
+                        # Fallback to products_df if available_products not set
+                        if products_df is not None and not products_df.empty:
+                            available_products = products_df.to_dict('records')
+                    
+                    if available_products:
+                        if message_body.isdigit() and 1 <= int(message_body) <= len(available_products):
+                            selected_product = available_products[int(message_body) - 1]
                             context_manager.update_context(
                                 from_number,
                                 current_product=selected_product,
@@ -2330,10 +2335,13 @@ async def process_incoming_message(from_number: str, msg: dict):
                                 current_menu_options=list(MENU_CONFIG['product_inquiry']['option_descriptions'].values())
                             )
                             await send_product_image_with_caption(from_number, selected_product, user_context, reply_language)
+                            return  # Exit after handling product selection
                         else:
                             send_whatsjet_message(from_number, get_menu_validation_message(current_state, user_context))
+                            return  # Exit after showing validation message
                     else:
                         send_whatsjet_message(from_number, "❌ No products available. Type 'main' to return to main menu.")
+                        return  # Exit after showing error message
                 elif current_state == 'product_inquiry':
                     await handle_veterinary_product_followup(message_body, from_number)
                 elif current_state == 'intelligent_products_menu':