refactor: refactor remaining src/ root to new file structure (coinbase#1715)

Author: dschlabach

src/checkout/components/Checkout.test.tsx

@@ -9,7 +9,7 @@ import {
   it,
   vi,
 } from 'vitest';
-import { useIsMounted } from '../../useIsMounted';
+import { useIsMounted } from '../../core-react/internal/hooks/useIsMounted';
 import { Checkout } from './Checkout';
 
 function mock<T>(func: T) {
@@ -22,11 +22,11 @@ vi.mock('./CheckoutProvider', () => ({
   )),
 }));
 
-vi.mock('../../useIsMounted', () => ({
+vi.mock('../../core-react/internal/hooks/useIsMounted', () => ({
   useIsMounted: vi.fn(),
 }));
 
-vi.mock('../../useTheme', () => ({
+vi.mock('../../core-react/internal/hooks/useTheme', () => ({
   useTheme: vi.fn(),
 }));
 

src/checkout/components/Checkout.tsx

@@ -1,6 +1,6 @@
+import { useIsMounted } from '../../core-react/internal/hooks/useIsMounted';
+import { useTheme } from '../../core-react/internal/hooks/useTheme';
 import { cn } from '../../styles/theme';
-import { useIsMounted } from '../../useIsMounted';
-import { useTheme } from '../../useTheme';
 import type { CheckoutReact } from '../types';
 import { CheckoutProvider } from './CheckoutProvider';
 

src/checkout/components/CheckoutProvider.test.tsx

@@ -12,8 +12,8 @@ import { useAccount, useConnect, useSwitchChain } from 'wagmi';
 import { useWaitForTransactionReceipt } from 'wagmi';
 import { useCallsStatus } from 'wagmi/experimental';
 import { useWriteContracts } from 'wagmi/experimental';
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import { openPopup } from '../../internal/utils/openPopup';
-import { useOnchainKit } from '../../useOnchainKit';
 import { useIsWalletACoinbaseSmartWallet } from '../../wallet/hooks/useIsWalletACoinbaseSmartWallet';
 import { GENERIC_ERROR_MESSAGE } from '../constants';
 import { useCommerceContracts } from '../hooks/useCommerceContracts';
@@ -39,7 +39,7 @@ vi.mock('../../wallet/hooks/useIsWalletACoinbaseSmartWallet', () => ({
   useIsWalletACoinbaseSmartWallet: vi.fn(),
 }));
 
-vi.mock('../../useOnchainKit', () => ({
+vi.mock('../../core-react/useOnchainKit', () => ({
   useOnchainKit: vi.fn(),
 }));
 

src/checkout/components/CheckoutProvider.tsx

@@ -14,10 +14,10 @@ import { coinbaseWallet } from 'wagmi/connectors';
 import { useWriteContracts } from 'wagmi/experimental';
 import { useCallsStatus } from 'wagmi/experimental';
 import { useValue } from '../../core-react/internal/hooks/useValue';
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import { getWindowDimensions } from '../../internal/utils/getWindowDimensions';
 import { openPopup } from '../../internal/utils/openPopup';
 import { isUserRejectedRequestError } from '../../transaction/utils/isUserRejectedRequestError';
-import { useOnchainKit } from '../../useOnchainKit';
 import { useIsWalletACoinbaseSmartWallet } from '../../wallet/hooks/useIsWalletACoinbaseSmartWallet';
 import {
   GENERIC_ERROR_MESSAGE,

src/OnchainKitProvider.test.tsx src/core-react/OnchainKitProvider.test.tsx

@@ -6,12 +6,11 @@ import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import { http, WagmiProvider, createConfig } from 'wagmi';
 import { useConfig } from 'wagmi';
 import { mock } from 'wagmi/connectors';
-
+import { setOnchainKitConfig } from '../core/OnchainKitConfig';
+import type { EASSchemaUid } from '../identity/types';
 import { OnchainKitProvider } from './OnchainKitProvider';
-import { setOnchainKitConfig } from './core/OnchainKitConfig';
-import type { EASSchemaUid } from './identity/types';
+import { useProviderDependencies } from './internal/hooks/useProviderDependencies';
 import { useOnchainKit } from './useOnchainKit';
-import { useProviderDependencies } from './useProviderDependencies';
 
 vi.mock('wagmi', async (importOriginal) => {
   const actual = await importOriginal();
@@ -21,14 +20,7 @@ vi.mock('wagmi', async (importOriginal) => {
   };
 });
 
-vi.mock('./useProviderDependencies', () => ({
-  useProviderDependencies: vi.fn(() => ({
-    providedWagmiConfig: null,
-    providedQueryClient: null,
-  })),
-}));
-
-vi.mock('./useProviderDependencies', () => ({
+vi.mock('./internal/hooks/useProviderDependencies', () => ({
   useProviderDependencies: vi.fn(() => ({
     providedWagmiConfig: null,
     providedQueryClient: null,
@@ -58,7 +50,7 @@ const TestComponent = () => {
   );
 };
 
-vi.mock('./core/OnchainKitConfig', () => ({
+vi.mock('../core/OnchainKitConfig', () => ({
   setOnchainKitConfig: vi.fn(),
   ONCHAIN_KIT_CONFIG: {
     address: null,

src/OnchainKitProvider.tsx src/core-react/OnchainKitProvider.tsx

@@ -1,17 +1,17 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { createContext, useMemo } from 'react';
 import { WagmiProvider } from 'wagmi';
-import type { OnchainKitProviderReact } from './core-react/types';
 import {
   ONCHAIN_KIT_CONFIG,
   setOnchainKitConfig,
-} from './core/OnchainKitConfig';
-import { DEFAULT_PRIVACY_URL, DEFAULT_TERMS_URL } from './core/constants';
-import { createWagmiConfig } from './core/createWagmiConfig';
-import type { OnchainKitContextType } from './core/types';
-import { checkHashLength } from './core/utils/checkHashLength';
-import { COINBASE_VERIFIED_ACCOUNT_SCHEMA_ID } from './identity/constants';
-import { useProviderDependencies } from './useProviderDependencies';
+} from '../core/OnchainKitConfig';
+import { DEFAULT_PRIVACY_URL, DEFAULT_TERMS_URL } from '../core/constants';
+import { createWagmiConfig } from '../core/createWagmiConfig';
+import type { OnchainKitContextType } from '../core/types';
+import { checkHashLength } from '../core/utils/checkHashLength';
+import { COINBASE_VERIFIED_ACCOUNT_SCHEMA_ID } from '../identity/constants';
+import { useProviderDependencies } from './internal/hooks/useProviderDependencies';
+import type { OnchainKitProviderReact } from './types';
 
 export const OnchainKitContext =
   createContext<OnchainKitContextType>(ONCHAIN_KIT_CONFIG);

src/useIsMounted.ts src/core-react/internal/hooks/useIsMounted.ts

@@ -1,12 +1,12 @@
 import { renderHook } from '@testing-library/react';
 import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
-import { usePreferredColorScheme } from './core-react/internal/hooks/usePreferredColorScheme';
-import type { UseThemeReact } from './types';
-import { useOnchainKit } from './useOnchainKit';
+import type { UseThemeReact } from '../../../core/types';
+import { useOnchainKit } from '../../useOnchainKit';
+import { usePreferredColorScheme } from './usePreferredColorScheme';
 import { useTheme } from './useTheme';
 
-vi.mock('./useOnchainKit');
-vi.mock('./core-react/internal/hooks/usePreferredColorScheme');
+vi.mock('../../useOnchainKit');
+vi.mock('./usePreferredColorScheme');
 
 describe('useTheme', () => {
   afterEach(() => {

src/useProviderDependencies.test.tsx src/core-react/internal/hooks/useProviderDependencies.test.tsx

@@ -1,6 +1,6 @@
-import { usePreferredColorScheme } from './core-react/internal/hooks/usePreferredColorScheme';
-import type { UseThemeReact } from './core/types';
-import { useOnchainKit } from './useOnchainKit';
+import type { UseThemeReact } from '../../../core/types';
+import { useOnchainKit } from '../../useOnchainKit';
+import { usePreferredColorScheme } from './usePreferredColorScheme';
 
 export function useTheme(): UseThemeReact {
   const preferredMode = usePreferredColorScheme();

src/useProviderDependencies.tsx src/core-react/internal/hooks/useProviderDependencies.tsx

@@ -1,7 +1,7 @@
 import '@testing-library/jest-dom';
 import { render } from '@testing-library/react';
 import { describe, expect, it } from 'vitest';
-import { setOnchainKitConfig } from './core/OnchainKitConfig';
+import { setOnchainKitConfig } from '../core/OnchainKitConfig';
 import { useOnchainKit } from './useOnchainKit';
 
 const TestComponent = () => {

src/useTheme.test.ts src/core-react/internal/hooks/useTheme.test.ts

@@ -18,7 +18,7 @@ vi.mock('../../internal/utils/openPopup', () => ({
   openPopup: vi.fn(),
 }));
 
-vi.mock('../../useTheme', () => ({
+vi.mock('../../core-react/internal/hooks/useTheme', () => ({
   useTheme: vi.fn(),
 }));
 

src/useTheme.ts src/core-react/internal/hooks/useTheme.ts

@@ -1,8 +1,8 @@
 import { useCallback } from 'react';
+import { useTheme } from '../../core-react/internal/hooks/useTheme';
 import { addSvg } from '../../internal/svg/addSvg';
 import { openPopup } from '../../internal/utils/openPopup';
 import { border, cn, color, pressable, text } from '../../styles/theme';
-import { useTheme } from '../../useTheme';
 import { useGetFundingUrl } from '../hooks/useGetFundingUrl';
 import type { FundButtonReact } from '../types';
 import { getFundingPopupSize } from '../utils/getFundingPopupSize';

src/useOnchainKit.test.tsx src/core-react/useOnchainKit.test.tsx

@@ -1,13 +1,14 @@
 import { renderHook } from '@testing-library/react';
 import { type Mock, describe, expect, it, vi } from 'vitest';
 import { useAccount } from 'wagmi';
-import { useOnchainKit } from '../../useOnchainKit';
+
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import { useIsWalletACoinbaseSmartWallet } from '../../wallet/hooks/useIsWalletACoinbaseSmartWallet';
 import { getCoinbaseSmartWalletFundUrl } from '../utils/getCoinbaseSmartWalletFundUrl';
 import { getOnrampBuyUrl } from '../utils/getOnrampBuyUrl';
 import { useGetFundingUrl } from './useGetFundingUrl';
 
-vi.mock('../../useOnchainKit', () => ({
+vi.mock('../../core-react/useOnchainKit', () => ({
   useOnchainKit: vi.fn(),
 }));
 

src/useOnchainKit.tsx src/core-react/useOnchainKit.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { useAccount } from 'wagmi';
-import { useOnchainKit } from '../../useOnchainKit';
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import { useIsWalletACoinbaseSmartWallet } from '../../wallet/hooks/useIsWalletACoinbaseSmartWallet';
 import { getCoinbaseSmartWalletFundUrl } from '../utils/getCoinbaseSmartWalletFundUrl';
 import { getOnrampBuyUrl } from '../utils/getOnrampBuyUrl';

src/fund/components/FundButton.test.tsx

@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { base, baseSepolia } from 'viem/chains';
-import { OnchainKitProvider } from '../../OnchainKitProvider';
+import { OnchainKitProvider } from '../../core-react/OnchainKitProvider';
 import { Avatar } from './Avatar';
 import { Badge } from './Badge';
 

src/fund/components/FundButton.tsx

@@ -2,7 +2,7 @@ import { base, baseSepolia, optimism } from 'viem/chains';
 import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import '@testing-library/jest-dom';
 import { render, screen, waitFor } from '@testing-library/react';
-import { useOnchainKit } from '../../useOnchainKit';
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import { useAttestations } from '../hooks/useAttestations';
 import { useAvatar } from '../hooks/useAvatar';
 import { useName } from '../hooks/useName';
@@ -14,7 +14,7 @@ function mock<T>(func: T) {
   return func as Mock;
 }
 
-vi.mock('../../useOnchainKit', () => ({
+vi.mock('../../core-react/useOnchainKit', () => ({
   useOnchainKit: vi.fn(),
 }));
 

src/fund/hooks/useGetFundingUrl.test.ts

@@ -1,7 +1,7 @@
 import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import '@testing-library/jest-dom';
 import { render, screen } from '@testing-library/react';
-import { useOnchainKit } from '../../useOnchainKit';
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import { useAttestations } from '../hooks/useAttestations';
 import { Badge } from './Badge';
 import { DisplayBadge } from './DisplayBadge';
@@ -11,7 +11,7 @@ function mock<T>(func: T) {
   return func as Mock;
 }
 
-vi.mock('../../useOnchainKit', () => ({
+vi.mock('../../core-react/useOnchainKit', () => ({
   useOnchainKit: vi.fn(),
 }));
 vi.mock('../hooks/useAttestations', () => ({

src/fund/hooks/useGetFundingUrl.ts

@@ -1,6 +1,6 @@
 import type { ReactNode } from 'react';
 import type { Address } from 'viem';
-import { useOnchainKit } from '../../useOnchainKit';
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import { useAttestations } from '../hooks/useAttestations';
 import { useIdentityContext } from './IdentityProvider';
 

src/identity/components/Avatar.stories.tsx

@@ -25,7 +25,7 @@ vi.mock('../../wallet/hooks/useGetETHBalance', () => ({
   useGetETHBalance: vi.fn(),
 }));
 
-vi.mock('../../useTheme', () => ({
+vi.mock('../../core-react/internal/hooks/useTheme', () => ({
   useTheme: vi.fn(),
 }));
 

src/identity/components/Avatar.test.tsx

@@ -1,4 +1,4 @@
-import { useOnchainKit } from '../../useOnchainKit';
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import type { IdentityReact } from '../types';
 import { IdentityLayout } from './IdentityLayout';
 import { IdentityProvider } from './IdentityProvider';

src/identity/components/DisplayBadge.test.tsx

@@ -4,7 +4,7 @@ import type React from 'react';
 import { baseSepolia as sepolia } from 'viem/chains';
 import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { Mock } from 'vitest';
-import { OnchainKitProvider } from '../../OnchainKitProvider';
+import { OnchainKitProvider } from '../../core-react/OnchainKitProvider';
 import { useAvatar } from '../hooks/useAvatar';
 import { useName } from '../hooks/useName';
 import { IdentityCard } from './IdentityCard';

src/identity/components/DisplayBadge.tsx

@@ -28,7 +28,7 @@ vi.mock('./Socials', () => ({
   Socials: vi.fn(() => <div>Socials</div>),
 }));
 
-vi.mock('../../useTheme', () => ({
+vi.mock('../../core-react/internal/hooks/useTheme', () => ({
   useTheme: vi.fn(),
 }));
 

src/identity/components/Identity.test.tsx

@@ -1,8 +1,8 @@
 import { Children, cloneElement, useMemo } from 'react';
 import type { ReactNode } from 'react';
+import { useTheme } from '../../core-react/internal/hooks/useTheme';
 import { findComponent } from '../../core-react/internal/utils/findComponent';
 import { background, cn, color } from '../../styles/theme';
-import { useTheme } from '../../useTheme';
 import { Address } from './Address';
 import { Avatar } from './Avatar';
 import { EthBalance } from './EthBalance';

src/identity/components/Identity.tsx

@@ -3,13 +3,13 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { renderHook } from '@testing-library/react';
 import type { Address, Chain } from 'viem';
 import { baseSepolia, optimism, sepolia } from 'viem/chains';
-import { OnchainKitProvider } from '../../OnchainKitProvider';
 import { IdentityProvider, useIdentityContext } from './IdentityProvider';
 
 import { describe, expect, it } from 'vitest';
 import { WagmiProvider } from 'wagmi';
 import { http, createConfig } from 'wagmi';
 import { mock } from 'wagmi/connectors';
+import { OnchainKitProvider } from '../../core-react/OnchainKitProvider';
 
 const queryClient = new QueryClient();
 const mockConfig = createConfig({

src/identity/components/IdentityCard.test.tsx

@@ -1,7 +1,7 @@
 import { createContext, useContext } from 'react';
 import type { Address } from 'viem';
 import { useValue } from '../../core-react/internal/hooks/useValue';
-import { useOnchainKit } from '../../useOnchainKit';
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import type { IdentityContextType, IdentityProviderReact } from '../types';
 
 const emptyContext = {} as IdentityContextType;

src/identity/components/IdentityLayout.test.tsx

@@ -5,8 +5,8 @@ export {
   getOnchainKitConfig,
   setOnchainKitConfig,
 } from './core/OnchainKitConfig';
-export { OnchainKitProvider } from './OnchainKitProvider';
-export { useOnchainKit } from './useOnchainKit';
+export { OnchainKitProvider } from './core-react/OnchainKitProvider';
+export { useOnchainKit } from './core-react/useOnchainKit';
 export { version } from './version';
 export type {
   AppConfig,

src/identity/components/IdentityLayout.tsx

@@ -10,17 +10,17 @@ import {
   vi,
 } from 'vitest';
 import { useAccount } from 'wagmi';
-import { useIsMounted } from '../../useIsMounted';
+import { useIsMounted } from '../../core-react/internal/hooks/useIsMounted';
 import { NFTCard } from './NFTCard';
 import { NFTProvider } from './NFTProvider';
 
 vi.mock('wagmi', () => ({
   useAccount: vi.fn(),
 }));
-vi.mock('../../useTheme', () => ({
+vi.mock('../../core-react/internal/hooks/useTheme', () => ({
   useTheme: vi.fn(() => 'default-light'),
 }));
-vi.mock('../../useIsMounted');
+vi.mock('../../core-react/internal/hooks/useIsMounted');
 vi.mock('./NFTProvider', () => ({
   NFTProvider: vi.fn(({ children }) => <div>{children}</div>),
 }));

src/identity/components/IdentityProvider.test.tsx

@@ -1,8 +1,8 @@
 import { useCallback } from 'react';
 import { useAccount } from 'wagmi';
+import { useIsMounted } from '../../core-react/internal/hooks/useIsMounted';
+import { useTheme } from '../../core-react/internal/hooks/useTheme';
 import { border, cn, color, pressable } from '../../styles/theme';
-import { useIsMounted } from '../../useIsMounted';
-import { useTheme } from '../../useTheme';
 import { useNFTData as defaultUseNFTData } from '../hooks/useNFTData';
 import { LifecycleType, type NFTCardReact } from '../types';
 import NFTErrorBoundary from './NFTErrorBoundary';

src/identity/components/IdentityProvider.tsx

@@ -1,10 +1,10 @@
 import '@testing-library/jest-dom';
 import { render } from '@testing-library/react';
 import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
-import { useTheme } from '../../useTheme';
+import { useTheme } from '../../core-react/internal/hooks/useTheme';
 import { NFTErrorFallback } from './NFTErrorFallback';
 
-vi.mock('../../useTheme');
+vi.mock('../../core-react/internal/hooks/useTheme');
 
 describe('NFTErrorFallback', () => {
   beforeEach(() => {

src/index.ts

@@ -1,5 +1,5 @@
+import { useTheme } from '../../core-react/internal/hooks/useTheme';
 import { background, border, cn, color } from '../../styles/theme';
-import { useTheme } from '../../useTheme';
 
 export function NFTErrorFallback({ error }: { error: Error }) {
   const componentTheme = useTheme();