fix: conflict

coinbase · Dec 13, 2024 · dabaa95 · dabaa95
1 parent 77fc8fa
commit dabaa95
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 46 deletions.
diff --git a/src/ui/react/nft/NFTCard.test.tsx b/src/ui/react/nft/NFTCard.test.tsx
@@ -10,30 +10,18 @@ import {
   vi,
 } from 'vitest';
 import { useAccount } from 'wagmi';
-<<<<<<< HEAD
-import { useIsMounted } from '../../core-react/internal/hooks/useIsMounted';
-=======
 import { NFTProvider } from '../../../core-react/nft/providers/NFTProvider';
-import { useIsMounted } from '../../../useIsMounted';
->>>>>>> 38ec07ca (fix: lint/tests)
+import { useIsMounted } from '../../../core-react/internal/hooks/useIsMounted';
 import { NFTCard } from './NFTCard';
 
 vi.mock('wagmi', () => ({
   useAccount: vi.fn(),
 }));
-<<<<<<< HEAD
-vi.mock('../../core-react/internal/hooks/useTheme', () => ({
+vi.mock('../../../core-react/internal/hooks/useTheme', () => ({
   useTheme: vi.fn(() => 'default-light'),
 }));
-vi.mock('../../core-react/internal/hooks/useIsMounted');
-vi.mock('./NFTProvider', () => ({
-=======
-vi.mock('../../../useTheme', () => ({
-  useTheme: vi.fn(() => 'default-light'),
-}));
-vi.mock('../../../useIsMounted');
+vi.mock('../../../core-react/internal/hooks/useIsMounted');
 vi.mock('../../../core-react/nft/providers/NFTProvider', () => ({
->>>>>>> 38ec07ca (fix: lint/tests)
   NFTProvider: vi.fn(({ children }) => <div>{children}</div>),
 }));
 

diff --git a/src/ui/react/nft/NFTCard.tsx b/src/ui/react/nft/NFTCard.tsx
@@ -4,8 +4,13 @@ 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 { useNFTData as defaultUseNFTData } from '../../../core-react/nft/hooks/useNFTData';
-import { LifecycleType, type NFTCardReact } from '../../../core-react/nft/types';
+import {
+  LifecycleType,
+  type NFTCardReact,
+} from '../../../core-react/nft/types';
 import NFTErrorBoundary from './NFTErrorBoundary';
+import { NFTLifecycleProvider } from '../../../core-react/nft/providers/NFTLifecycleProvider';
+import { NFTProvider } from '../../../core-react/nft/providers/NFTProvider';
 import { NFTErrorFallback } from './NFTErrorFallback';
 
 export function NFTCard({

diff --git a/src/ui/react/nft/NFTMintCard.test.tsx b/src/ui/react/nft/NFTMintCard.test.tsx
@@ -9,25 +9,14 @@ import {
   it,
   vi,
 } from 'vitest';
-<<<<<<< HEAD
-import { useIsMounted } from '../../core-react/internal/hooks/useIsMounted';
+import { useIsMounted } from '../../../core-react/internal/hooks/useIsMounted';
 import { NFTMintCard } from './NFTMintCard';
 
-vi.mock('../../core-react/internal/hooks/useTheme', () => ({
+vi.mock('../../../core-react/internal/hooks/useTheme', () => ({
   useTheme: vi.fn(() => 'default-light'),
 }));
-vi.mock('../../core-react/internal/hooks/useIsMounted');
-vi.mock('./NFTProvider', () => ({
-=======
-import { useIsMounted } from '../../../useIsMounted';
-import { NFTMintCard } from './NFTMintCard';
-
-vi.mock('../../../useTheme', () => ({
-  useTheme: vi.fn(() => 'default-light'),
-}));
-vi.mock('../../../useIsMounted');
+vi.mock('../../../core-react/internal/hooks/useIsMounted');
 vi.mock('../../../core-react/nft/providers/NFTProvider', () => ({
->>>>>>> 38ec07ca (fix: lint/tests)
   NFTProvider: vi.fn(({ children }) => <div>{children}</div>),
 }));
 

diff --git a/src/ui/react/nft/NFTMintCard.tsx b/src/ui/react/nft/NFTMintCard.tsx
@@ -2,7 +2,10 @@ import { useIsMounted } from '../../../core-react/internal/hooks/useIsMounted';
 import { useTheme } from '../../../core-react/internal/hooks/useTheme';
 import { background, border, cn, color } from '../../../styles/theme';
 import { useMintData as defaultUseMintData } from '../../../core-react/nft/hooks/useMintData';
-import { LifecycleType, type NFTMintCardReact } from '../../../core-react/nft/types';
+import {
+  LifecycleType,
+  type NFTMintCardReact,
+} from '../../../core-react/nft/types';
 import { buildMintTransactionData as defaultBuildMintTransaction } from '../../../core/nft/utils/buildMintTransactionData';
 import NFTErrorBoundary from './NFTErrorBoundary';
 import { NFTErrorFallback } from './NFTErrorFallback';

diff --git a/src/ui/react/nft/mint/NFTMintButton.test.tsx b/src/ui/react/nft/mint/NFTMintButton.test.tsx
@@ -11,25 +11,14 @@ import {
   useChainId,
 } from 'wagmi';
 import { mock } from 'wagmi/connectors';
-<<<<<<< HEAD
-import { useOnchainKit } from '../../../core-react/useOnchainKit';
-import { useNFTLifecycleContext } from '../NFTLifecycleProvider';
-import { useNFTContext } from '../NFTProvider';
-import { NFTMintButton } from './NFTMintButton';
-
-vi.mock('../NFTProvider');
-vi.mock('../NFTLifecycleProvider');
-vi.mock('../../../core-react/useOnchainKit');
-=======
 import { useNFTLifecycleContext } from '../../../../core-react/nft/providers/NFTLifecycleProvider';
 import { useNFTContext } from '../../../../core-react/nft/providers/NFTProvider';
-import { useOnchainKit } from '../../../../useOnchainKit';
+import { useOnchainKit } from '../../../../core-react/useOnchainKit';
 import { NFTMintButton } from './NFTMintButton';
 
 vi.mock('../../../../core-react/nft/providers/NFTProvider');
 vi.mock('../../../../core-react/nft/providers/NFTLifecycleProvider');
-vi.mock('../../../../useOnchainKit');
->>>>>>> 38ec07ca (fix: lint/tests)
+vi.mock('../../../../core-react/useOnchainKit');
 vi.mock('wagmi', async (importOriginal) => {
   return {
     ...(await importOriginal<typeof import('wagmi')>()),

diff --git a/src/ui/react/nft/view/NFTOwner.test.tsx b/src/ui/react/nft/view/NFTOwner.test.tsx
@@ -15,8 +15,8 @@ import { NFTOwner } from './NFTOwner';
 
 vi.mock('../../../../core-react/useOnchainKit');
 vi.mock('../../../../core-react/nft/providers/NFTProvider');
-vi.mock('../../../identity', async () => ({
-  ...(await vi.importActual('../../../identity')),
+vi.mock('../../../../identity', async () => ({
+  ...(await vi.importActual('../../../../identity')),
   Identity: ({
     className,
     address,