@openzeppelin/ui-builder-adapter-evm 1.0.0 → 1.3.0

package/src/wallet/__tests__/utils.test.ts

@@ -1,11 +1,11 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { logger } from '@openzeppelin/ui-builder-utils';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { resolveAndInitializeKitConfig } from '../utils';
 
 // Mock the logger to prevent console output during tests and allow spying
-vi.mock('@openzeppelin/ui-builder-utils', () => ({
+vi.mock('@openzeppelin/ui-utils', () => ({
   logger: {
     debug: vi.fn(),
     info: vi.fn(),

package/src/wallet/components/EvmWalletUiRoot.tsx

@@ -4,8 +4,8 @@ import { mainnet } from 'viem/chains';
 import { WagmiProvider } from 'wagmi';
 import React, { useEffect, useMemo, useState } from 'react';
 
-import type { EcosystemReactUiProviderProps } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { EcosystemReactUiProviderProps } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { WagmiProviderInitializedContext } from '../context/wagmi-context';
 import { evmUiKitManager, type EvmUiKitManagerState } from '../evmUiKitManager';

package/src/wallet/components/account/AccountDisplay.tsx

@@ -1,10 +1,10 @@
 import { LogOut } from 'lucide-react';
 import React from 'react';
 
-import { useDerivedAccountStatus, useDerivedDisconnect } from '@openzeppelin/ui-builder-react-core';
-import type { BaseComponentProps } from '@openzeppelin/ui-builder-types';
-import { Button } from '@openzeppelin/ui-builder-ui';
-import { cn, truncateMiddle } from '@openzeppelin/ui-builder-utils';
+import { Button } from '@openzeppelin/ui-components';
+import { useDerivedAccountStatus, useDerivedDisconnect } from '@openzeppelin/ui-react';
+import type { BaseComponentProps } from '@openzeppelin/ui-types';
+import { cn, getWalletAccountDisplaySizeProps, truncateMiddle } from '@openzeppelin/ui-utils';
 
 import { SafeWagmiComponent } from '../../utils/SafeWagmiComponent';
 
@@ -12,40 +12,59 @@ import { SafeWagmiComponent } from '../../utils/SafeWagmiComponent';
  * A component that displays the connected account address and chain ID.
  * Also includes a disconnect button.
  */
-export const CustomAccountDisplay: React.FC<BaseComponentProps> = ({ className }) => {
+export const CustomAccountDisplay: React.FC<BaseComponentProps> = ({
+  className,
+  size,
+  variant,
+  fullWidth,
+}) => {
   // Use the SafeWagmiComponent with null fallback
   return (
     <SafeWagmiComponent fallback={null}>
-      <AccountDisplayContent className={className} />
+      <AccountDisplayContent
+        className={className}
+        size={size}
+        variant={variant}
+        fullWidth={fullWidth}
+      />
     </SafeWagmiComponent>
   );
 };
 
 // Inner component that uses derived hooks
-const AccountDisplayContent: React.FC<{ className?: string }> = ({ className }) => {
+const AccountDisplayContent: React.FC<BaseComponentProps> = ({
+  className,
+  size,
+  variant,
+  fullWidth,
+}) => {
   const { isConnected, address, chainId } = useDerivedAccountStatus();
   const { disconnect } = useDerivedDisconnect();
 
+  const sizeProps = getWalletAccountDisplaySizeProps(size);
+
   if (!isConnected || !address || !disconnect) {
     return null;
   }
 
   return (
-    <div className={cn('flex items-center gap-2', className)}>
-      <div className="flex flex-col">
-        <span className="text-xs font-medium">{truncateMiddle(address, 4, 4)}</span>
-        <span className="text-[9px] text-muted-foreground -mt-0.5">
+    <div className={cn('flex items-center gap-2', fullWidth && 'w-full', className)}>
+      <div className={cn('flex flex-col', fullWidth && 'flex-1')}>
+        <span className={cn(sizeProps.textSize, 'font-medium')}>
+          {truncateMiddle(address, 4, 4)}
+        </span>
+        <span className={cn(sizeProps.subTextSize, 'text-muted-foreground -mt-0.5')}>
           {chainId ? `Chain ID: ${chainId}` : 'Chain ID: N/A'}
         </span>
       </div>
       <Button
         onClick={() => disconnect()}
-        variant="ghost"
+        variant={variant || 'ghost'}
         size="icon"
-        className="size-6 p-0"
+        className={cn(sizeProps.iconButtonSize, 'p-0')}
         title="Disconnect wallet"
       >
-        <LogOut className="size-3.5" />
+        <LogOut className={sizeProps.iconSize} />
       </Button>
     </div>
   );

package/src/wallet/components/connect/ConnectButton.tsx

@@ -1,13 +1,10 @@
 import { Loader2, Wallet } from 'lucide-react';
 import React, { useEffect, useState } from 'react';
 
-import {
-  useDerivedAccountStatus,
-  useDerivedConnectStatus,
-} from '@openzeppelin/ui-builder-react-core';
-import type { BaseComponentProps } from '@openzeppelin/ui-builder-types';
-import { Button } from '@openzeppelin/ui-builder-ui';
-import { cn } from '@openzeppelin/ui-builder-utils';
+import { Button } from '@openzeppelin/ui-components';
+import { useDerivedAccountStatus, useDerivedConnectStatus } from '@openzeppelin/ui-react';
+import type { BaseComponentProps, WalletComponentSize } from '@openzeppelin/ui-types';
+import { cn, getWalletButtonSizeProps } from '@openzeppelin/ui-utils';
 
 import { SafeWagmiComponent } from '../../utils/SafeWagmiComponent';
 import { ConnectorDialog } from './ConnectorDialog';
@@ -23,14 +20,23 @@ export interface ConnectButtonProps extends BaseComponentProps {
 
 export const CustomConnectButton: React.FC<ConnectButtonProps> = ({
   className,
+  size,
+  variant,
+  fullWidth,
   hideWhenConnected = true,
 }) => {
   const [dialogOpen, setDialogOpen] = useState(false);
+  const sizeProps = getWalletButtonSizeProps(size);
 
   const unavailableButton = (
-    <div className={cn('flex items-center', className)}>
-      <Button disabled={true} variant="outline" size="sm" className="h-8 px-2 text-xs">
-        <Wallet className="size-3.5 mr-1" />
+    <div className={cn('flex items-center', fullWidth && 'w-full', className)}>
+      <Button
+        disabled={true}
+        variant={variant || 'outline'}
+        size={sizeProps.size}
+        className={cn(sizeProps.className, fullWidth && 'w-full')}
+      >
+        <Wallet className={cn(sizeProps.iconSize, 'mr-1')} />
         Wallet Unavailable
       </Button>
     </div>
@@ -40,6 +46,9 @@ export const CustomConnectButton: React.FC<ConnectButtonProps> = ({
     <SafeWagmiComponent fallback={unavailableButton}>
       <ConnectButtonContent
         className={className}
+        size={size}
+        variant={variant}
+        fullWidth={fullWidth}
         dialogOpen={dialogOpen}
         setDialogOpen={setDialogOpen}
         hideWhenConnected={hideWhenConnected}
@@ -50,16 +59,21 @@ export const CustomConnectButton: React.FC<ConnectButtonProps> = ({
 
 const ConnectButtonContent: React.FC<{
   className?: string;
+  size?: WalletComponentSize;
+  variant?: BaseComponentProps['variant'];
+  fullWidth?: boolean;
   dialogOpen: boolean;
   setDialogOpen: (open: boolean) => void;
   hideWhenConnected: boolean;
-}> = ({ className, dialogOpen, setDialogOpen, hideWhenConnected }) => {
+}> = ({ className, size, variant, fullWidth, dialogOpen, setDialogOpen, hideWhenConnected }) => {
   const { isConnected } = useDerivedAccountStatus();
   const { isConnecting: isHookConnecting, error: connectError } = useDerivedConnectStatus();
 
   // Local state to indicate the button has been clicked and dialog is open, awaiting user selection
   const [isManuallyInitiated, setIsManuallyInitiated] = useState(false);
 
+  const sizeProps = getWalletButtonSizeProps(size);
+
   useEffect(() => {
     if (isConnected && hideWhenConnected) {
       setDialogOpen(false);
@@ -96,19 +110,19 @@ const ConnectButtonContent: React.FC<{
   const showButtonLoading = isHookConnecting || isManuallyInitiated;
 
   return (
-    <div className={cn('flex items-center', className)}>
+    <div className={cn('flex items-center', fullWidth && 'w-full', className)}>
       <Button
         onClick={handleConnectClick}
         disabled={showButtonLoading || isConnected}
-        variant="outline"
-        size="sm"
-        className="h-8 px-2 text-xs"
+        variant={variant || 'outline'}
+        size={sizeProps.size}
+        className={cn(sizeProps.className, fullWidth && 'w-full')}
         title={isConnected ? 'Connected' : connectError?.message || 'Connect Wallet'}
       >
         {showButtonLoading ? (
-          <Loader2 className="size-3.5 animate-spin mr-1" />
+          <Loader2 className={cn(sizeProps.iconSize, 'animate-spin mr-1')} />
         ) : (
-          <Wallet className="size-3.5 mr-1" />
+          <Wallet className={cn(sizeProps.iconSize, 'mr-1')} />
         )}
         {showButtonLoading ? 'Connecting...' : 'Connect Wallet'}
       </Button>

package/src/wallet/components/connect/ConnectorDialog.tsx

@@ -1,10 +1,5 @@
 import React, { useEffect, useState } from 'react';
 
-import {
-  useDerivedAccountStatus,
-  useDerivedConnectStatus,
-} from '@openzeppelin/ui-builder-react-core';
-import type { Connector } from '@openzeppelin/ui-builder-types';
 import {
   Button,
   Dialog,
@@ -12,7 +7,9 @@ import {
   DialogDescription,
   DialogHeader,
   DialogTitle,
-} from '@openzeppelin/ui-builder-ui';
+} from '@openzeppelin/ui-components';
+import { useDerivedAccountStatus, useDerivedConnectStatus } from '@openzeppelin/ui-react';
+import type { Connector } from '@openzeppelin/ui-types';
 
 import { isConfigEnabled, useUiKitConfig } from '../../hooks/useUiKitConfig';
 import { SafeWagmiComponent } from '../../utils/SafeWagmiComponent';

package/src/wallet/components/network/NetworkSwitcher.tsx

@@ -2,20 +2,24 @@ import { Loader2 } from 'lucide-react';
 import type { Chain } from 'viem';
 import React from 'react';
 
-import {
-  useDerivedAccountStatus,
-  useDerivedChainInfo,
-  useDerivedSwitchChainStatus,
-} from '@openzeppelin/ui-builder-react-core';
-import type { BaseComponentProps } from '@openzeppelin/ui-builder-types';
 import {
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '@openzeppelin/ui-builder-ui';
-import { cn } from '@openzeppelin/ui-builder-utils';
+} from '@openzeppelin/ui-components';
+import {
+  useDerivedAccountStatus,
+  useDerivedChainInfo,
+  useDerivedSwitchChainStatus,
+} from '@openzeppelin/ui-react';
+import type { BaseComponentProps } from '@openzeppelin/ui-types';
+import {
+  cn,
+  getWalletNetworkSwitcherSizeProps,
+  getWalletNetworkSwitcherVariantClassName,
+} from '@openzeppelin/ui-utils';
 
 import { SafeWagmiComponent } from '../../utils/SafeWagmiComponent';
 
@@ -23,21 +27,39 @@ import { SafeWagmiComponent } from '../../utils/SafeWagmiComponent';
  * A component that displays the current network and allows switching to other networks.
  * Uses the chainId and switchChain hooks from wagmi.
  */
-export const CustomNetworkSwitcher: React.FC<BaseComponentProps> = ({ className }) => {
+export const CustomNetworkSwitcher: React.FC<BaseComponentProps> = ({
+  className,
+  size,
+  variant,
+  fullWidth,
+}) => {
   // Use the SafeWagmiComponent with null fallback
   return (
     <SafeWagmiComponent fallback={null}>
-      <NetworkSwitcherContent className={className} />
+      <NetworkSwitcherContent
+        className={className}
+        size={size}
+        variant={variant}
+        fullWidth={fullWidth}
+      />
     </SafeWagmiComponent>
   );
 };
 
 // Inner component that uses wagmi hooks
-const NetworkSwitcherContent: React.FC<{ className?: string }> = ({ className }) => {
+const NetworkSwitcherContent: React.FC<BaseComponentProps> = ({
+  className,
+  size,
+  variant,
+  fullWidth,
+}) => {
   const { isConnected } = useDerivedAccountStatus();
   const { currentChainId, availableChains: unknownChains } = useDerivedChainInfo();
   const { switchChain, isSwitching: isPending, error } = useDerivedSwitchChainStatus();
 
+  const sizeProps = getWalletNetworkSwitcherSizeProps(size);
+  const variantClassName = getWalletNetworkSwitcherVariantClassName(variant);
+
   // Cast to Chain[] for use within this EVM-specific component
   const typedAvailableChains = unknownChains as Chain[];
 
@@ -55,13 +77,19 @@ const NetworkSwitcherContent: React.FC<{ className?: string }> = ({ className })
   const currentChainName = currentChain?.name || 'Network';
 
   return (
-    <div className={cn('flex items-center', className)}>
+    <div className={cn('flex items-center', fullWidth && 'w-full', className)}>
       <Select
         value={currentChainId?.toString() ?? ''}
         onValueChange={(value: string) => handleNetworkChange(Number(value))}
         disabled={isPending || typedAvailableChains.length === 0}
       >
-        <SelectTrigger className="h-8 text-xs px-2 min-w-[90px] max-w-[120px]">
+        <SelectTrigger
+          className={cn(
+            sizeProps.triggerClassName,
+            variantClassName,
+            fullWidth && 'w-full max-w-none'
+          )}
+        >
           <SelectValue placeholder="Network">{currentChainName}</SelectValue>
         </SelectTrigger>
         <SelectContent
@@ -71,7 +99,11 @@ const NetworkSwitcherContent: React.FC<{ className?: string }> = ({ className })
           className="w-auto min-w-[160px] max-h-[300px]"
         >
           {typedAvailableChains.map((chain) => (
-            <SelectItem key={chain.id} value={chain.id.toString()} className="text-xs py-1.5">
+            <SelectItem
+              key={chain.id}
+              value={chain.id.toString()}
+              className={sizeProps.itemClassName}
+            >
               {chain.name}
             </SelectItem>
           ))}
@@ -79,8 +111,8 @@ const NetworkSwitcherContent: React.FC<{ className?: string }> = ({ className })
       </Select>
 
       {isPending && (
-        <span className="text-xs text-muted-foreground ml-2">
-          <Loader2 className="h-3 w-3 animate-spin" />
+        <span className="text-muted-foreground ml-2">
+          <Loader2 className={cn(sizeProps.loaderSize, 'animate-spin')} />
         </span>
       )}
 

package/src/wallet/evmUiKitManager.ts

@@ -1,8 +1,8 @@
 import type { Config as WagmiConfig } from '@wagmi/core';
 import type React from 'react';
 
-import type { UiKitConfiguration } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { UiKitConfiguration } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { getEvmWalletImplementation } from './utils/walletImplementationManager';
 

package/src/wallet/hooks/facade-hooks.ts

@@ -23,7 +23,7 @@ import {
   type UseWaitForTransactionReceiptReturnType,
 } from 'wagmi';
 
-import type { EcosystemSpecificReactHooks } from '@openzeppelin/ui-builder-types';
+import type { EcosystemSpecificReactHooks } from '@openzeppelin/ui-types';
 
 /**
  * Direct export of wagmi hooks as our facade hooks

package/src/wallet/hooks/useUiKitConfig.ts

@@ -1,5 +1,5 @@
-import type { UiKitConfiguration } from '@openzeppelin/ui-builder-types';
-import { appConfigService, logger } from '@openzeppelin/ui-builder-utils';
+import type { UiKitConfiguration } from '@openzeppelin/ui-types';
+import { appConfigService, logger } from '@openzeppelin/ui-utils';
 
 /**
  * Default configuration when no specific configuration is provided

package/src/wallet/implementation/wagmi-implementation.ts

@@ -20,8 +20,8 @@ import {
 } from '@wagmi/core';
 import { http, PublicClient, WalletClient, type Chain } from 'viem';
 
-import type { Connector, UiKitConfiguration } from '@openzeppelin/ui-builder-types';
-import { appConfigService, logger } from '@openzeppelin/ui-builder-utils';
+import type { Connector, UiKitConfiguration } from '@openzeppelin/ui-types';
+import { appConfigService, logger } from '@openzeppelin/ui-utils';
 
 import { getUserRpcUrl } from '../../configuration/rpc';
 import { evmNetworks } from '../../networks';
@@ -133,7 +133,7 @@ export class WagmiWalletImplementation {
    */
   private setupRpcConfigListener(): void {
     // Import dynamically to avoid circular dependencies
-    import('@openzeppelin/ui-builder-utils')
+    import('@openzeppelin/ui-utils')
       .then(({ userRpcConfigService }) => {
         // Subscribe to all RPC config changes
         this.rpcConfigUnsubscribe = userRpcConfigService.subscribe('*', (event) => {

package/src/wallet/rainbowkit/__tests__/export-service.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import type { UiKitConfiguration } from '@openzeppelin/ui-builder-types';
+import type { UiKitConfiguration } from '@openzeppelin/ui-types';
 
 import { generateRainbowKitExportables } from '../export-service';
 

package/src/wallet/rainbowkit/componentFactory.ts

@@ -1,4 +1,4 @@
-import type { EcosystemWalletComponents } from '@openzeppelin/ui-builder-types';
+import type { EcosystemWalletComponents } from '@openzeppelin/ui-types';
 
 import { RainbowKitConnectButton } from './components';
 

package/src/wallet/rainbowkit/components.tsx

@@ -1,9 +1,9 @@
 import { Loader2 } from 'lucide-react';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 
-import type { BaseComponentProps } from '@openzeppelin/ui-builder-types';
-import { Button } from '@openzeppelin/ui-builder-ui';
-import { cn, logger } from '@openzeppelin/ui-builder-utils';
+import { Button } from '@openzeppelin/ui-components';
+import type { BaseComponentProps } from '@openzeppelin/ui-types';
+import { cn, getWalletButtonSizeProps, logger } from '@openzeppelin/ui-utils';
 
 import { CustomConnectButton } from '../components';
 import { WagmiProviderInitializedContext } from '../context/wagmi-context';
@@ -79,14 +79,16 @@ export const RainbowKitConnectButton: React.FC<BaseComponentProps> = (props) =>
     };
   }, []); // Effect for dynamic import runs once
 
+  const sizeProps = getWalletButtonSizeProps(props.size);
+
   const renderLoadingPlaceholder = (message: string) => (
     <Button
       disabled={true}
-      variant="outline"
-      size="sm"
-      className={cn('h-8 px-2 text-xs', props.className)}
+      variant={props.variant || 'outline'}
+      size={sizeProps.size}
+      className={cn(sizeProps.className, props.fullWidth && 'w-full', props.className)}
     >
-      <Loader2 className="h-3.5 w-3.5 animate-spin mr-1.5" />
+      <Loader2 className={cn(sizeProps.iconSize, 'animate-spin mr-1.5')} />
       {message}
     </Button>
   );

package/src/wallet/rainbowkit/config-generator.ts

@@ -1,4 +1,4 @@
-import { UiKitConfiguration } from '@openzeppelin/ui-builder-types';
+import { UiKitConfiguration } from '@openzeppelin/ui-types';
 
 /**
  * Generates the content for a `rainbowkit.config.ts` file for an exported project.

package/src/wallet/rainbowkit/config-service.ts

@@ -1,8 +1,8 @@
 import { Config, http } from '@wagmi/core';
 import { type Chain } from 'viem';
 
-import type { UiKitConfiguration } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { UiKitConfiguration } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { type WagmiConfigChains } from '../types';
 

package/src/wallet/rainbowkit/export-service.ts

@@ -1,4 +1,4 @@
-import type { UiKitConfiguration } from '@openzeppelin/ui-builder-types';
+import type { UiKitConfiguration } from '@openzeppelin/ui-types';
 
 import { generateRainbowKitConfigFile } from './config-generator';
 

package/src/wallet/rainbowkit/rainbowkitAssetManager.ts

@@ -1,6 +1,6 @@
 import type React from 'react';
 
-import { logger } from '@openzeppelin/ui-builder-utils';
+import { logger } from '@openzeppelin/ui-utils';
 
 export interface RainbowKitAssets {
   ProviderComponent: React.ComponentType<React.PropsWithChildren<unknown>> | null;

package/src/wallet/rainbowkit/utils.ts

@@ -1,5 +1,5 @@
-import type { UiKitConfiguration } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { UiKitConfiguration } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 /**
  * RainbowKit configuration options definition

package/src/wallet/services/configResolutionService.ts

@@ -1,5 +1,5 @@
-import type { NativeConfigLoader, UiKitConfiguration } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { NativeConfigLoader, UiKitConfiguration } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { resolveAndInitializeKitConfig } from '../utils';
 

package/src/wallet/types.ts

@@ -1,6 +1,6 @@
 import type { Chain } from 'viem';
 
-import type { WalletConnectionStatus } from '@openzeppelin/ui-builder-types';
+import type { WalletConnectionStatus } from '@openzeppelin/ui-types';
 
 /**
  * EVM-specific wallet connection status extending the base interface.

package/src/wallet/utils/SafeWagmiComponent.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 
-import { logger } from '@openzeppelin/ui-builder-utils';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { useIsWagmiProviderInitialized } from '../hooks/useIsWagmiProviderInitialized';
 

package/src/wallet/utils/__tests__/uiKitService.test.ts

@@ -1,13 +1,13 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import type { ComponentExclusionConfig, UiKitConfiguration } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { ComponentExclusionConfig, UiKitConfiguration } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { CustomAccountDisplay, CustomConnectButton, CustomNetworkSwitcher } from '../../components';
 import { getResolvedWalletComponents } from '../uiKitService';
 
 // Mock the logger
-vi.mock('@openzeppelin/ui-builder-utils', () => ({
+vi.mock('@openzeppelin/ui-utils', () => ({
   logger: {
     info: vi.fn(),
     warn: vi.fn(),

package/src/wallet/utils/connection.ts

@@ -1,7 +1,7 @@
 import type { GetAccountReturnType } from '@wagmi/core';
 
-import type { Connector } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { Connector } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import {
   getEvmWalletImplementation,

package/src/wallet/utils/filterWalletComponents.ts

@@ -1,6 +1,6 @@
-import type { EcosystemWalletComponents, UiKitConfiguration } from '@openzeppelin/ui-builder-types';
-import { ECOSYSTEM_WALLET_COMPONENT_KEYS } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { EcosystemWalletComponents, UiKitConfiguration } from '@openzeppelin/ui-types';
+import { ECOSYSTEM_WALLET_COMPONENT_KEYS } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 /**
  * Filters a set of wallet components based on an exclusion list.

package/src/wallet/utils/uiKitService.ts

@@ -1,5 +1,5 @@
-import type { EcosystemWalletComponents, UiKitConfiguration } from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+import type { EcosystemWalletComponents, UiKitConfiguration } from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 import { CustomAccountDisplay, CustomConnectButton, CustomNetworkSwitcher } from '../components';
 import { createRainbowKitComponents, validateRainbowKitConfig } from '../rainbowkit';

package/src/wallet/utils/walletImplementationManager.ts

@@ -1,5 +1,5 @@
-import type { UiKitConfiguration } from '@openzeppelin/ui-builder-types';
-import { appConfigService, logger } from '@openzeppelin/ui-builder-utils';
+import type { UiKitConfiguration } from '@openzeppelin/ui-types';
+import { appConfigService, logger } from '@openzeppelin/ui-utils';
 
 import { WagmiWalletImplementation } from '../implementation/wagmi-implementation';
 

package/src/wallet/utils.ts

@@ -2,8 +2,8 @@ import type {
   EcosystemWalletComponents,
   NativeConfigLoader,
   UiKitConfiguration,
-} from '@openzeppelin/ui-builder-types';
-import { logger } from '@openzeppelin/ui-builder-utils';
+} from '@openzeppelin/ui-types';
+import { logger } from '@openzeppelin/ui-utils';
 
 // Import the actual service functions instead of using placeholders
 import { getResolvedWalletComponents as getWalletComponentsFromService } from './utils/uiKitService';