fix: merge conflicts

client/src/components/ui/MCP/CustomUserVarsSection.tsx

@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
-import { Input, Label, Button } from '~/components/ui';
-import { useLocalize } from '~/hooks';
+import { Input, Label, Button } from '@librechat/client';
 import { useMCPAuthValuesQuery } from '~/data-provider/Tools/queries';
+import { useLocalize } from '~/hooks';
 
 export interface CustomUserVarConfig {
   title: string;

client/src/components/ui/MCP/MCPConfigDialog.tsx

@@ -7,9 +7,9 @@ import {
   OGDialogHeader,
   OGDialogTitle,
   OGDialogDescription,
-} from '~/components/ui/OriginalDialog';
-import CustomUserVarsSection from './CustomUserVarsSection';
+} from '@librechat/client';
 import ServerInitializationSection from './ServerInitializationSection';
+import CustomUserVarsSection from './CustomUserVarsSection';
 import { useLocalize } from '~/hooks';
 
 export interface ConfigFieldDetail {

client/src/components/ui/MCP/ServerInitializationSection.tsx

@@ -1,7 +1,7 @@
-import { RefreshCw, Link } from 'lucide-react';
 import React, { useState, useCallback } from 'react';
+import { Button } from '@librechat/client';
+import { RefreshCw, Link } from 'lucide-react';
 import { useMCPServerInitialization } from '~/hooks/MCP/useMCPServerInitialization';
-import { Button } from '~/components/ui';
 import { useLocalize } from '~/hooks';
 
 interface ServerInitializationSectionProps {

client/src/hooks/MCP/useMCPServerInitialization.ts

@@ -1,12 +1,12 @@
 import { useCallback, useState, useEffect, useMemo } from 'react';
-import { useQueryClient } from '@tanstack/react-query';
+import { useToastContext } from '@librechat/client';
 import { QueryKeys } from 'librechat-data-provider';
+import { useQueryClient } from '@tanstack/react-query';
 import {
   useReinitializeMCPServerMutation,
   useCancelMCPOAuthMutation,
 } from 'librechat-data-provider/react-query';
 import { useMCPConnectionStatusQuery } from '~/data-provider/Tools/queries';
-import { useToastContext } from '~/Providers';
 import { useLocalize } from '~/hooks';
 import { logger } from '~/utils';