Merge branch 'main' of github.com:escapade-mckv/suna into fix-files-tool-registration

This commit is contained in:
Saumya 2025-08-12 02:19:18 +05:30
commit 2d4d134c25
2 changed files with 10 additions and 7 deletions

View File

@ -153,10 +153,11 @@ export const ChatInput = forwardRef<ChatInputHandles, ChatInputProps>(
const deleteFileMutation = useFileDelete();
const queryClient = useQueryClient();
// Fetch actual integration icons
const { data: googleDriveIcon } = useComposioToolkitIcon('googledrive', { enabled: true });
const { data: slackIcon } = useComposioToolkitIcon('slack', { enabled: true });
const { data: notionIcon } = useComposioToolkitIcon('notion', { enabled: true });
// Fetch integration icons only when logged in and advanced config UI is in use
const shouldFetchIcons = isLoggedIn && !!enableAdvancedConfig;
const { data: googleDriveIcon } = useComposioToolkitIcon('googledrive', { enabled: shouldFetchIcons });
const { data: slackIcon } = useComposioToolkitIcon('slack', { enabled: shouldFetchIcons });
const { data: notionIcon } = useComposioToolkitIcon('notion', { enabled: shouldFetchIcons });
// Show usage preview logic:
// - Always show to free users when showToLowCreditUsers is true

View File

@ -75,9 +75,11 @@ const LoggedInMenu: React.FC<UnifiedConfigMenuProps> = ({
const { data: googleDriveIcon } = useComposioToolkitIcon('googledrive', { enabled: isLoggedIn });
const { data: slackIcon } = useComposioToolkitIcon('slack', { enabled: isLoggedIn });
const { data: notionIcon } = useComposioToolkitIcon('notion', { enabled: isLoggedIn });
// Only fetch integration icons when authenticated AND the menu is open
const iconsEnabled = isLoggedIn && isOpen;
const { data: googleDriveIcon } = useComposioToolkitIcon('googledrive', { enabled: iconsEnabled });
const { data: slackIcon } = useComposioToolkitIcon('slack', { enabled: iconsEnabled });
const { data: notionIcon } = useComposioToolkitIcon('notion', { enabled: iconsEnabled });
useEffect(() => {
if (isOpen) {