diff --git a/jest.setup.ts b/jest.setup.ts
index f5cc4b23ed..26423e079c 100644
--- a/jest.setup.ts
+++ b/jest.setup.ts
@@ -6,7 +6,7 @@ import 'jest-extended';
 // Enable jest-dom functions
 import '@testing-library/jest-dom';
 // biome-ignore lint: Running linting with `unsafe` flag changes import to 'node:util' which breaks the CI. See https://nodejs.org/docs/latest-v18.x/api/util.html
-import { TextEncoder, TextDecoder } from 'util';
+import { TextDecoder, TextEncoder } from 'util';
 
 global.TextEncoder = TextEncoder;
 global.TextDecoder = TextDecoder as typeof global.TextDecoder;
diff --git a/package.json b/package.json
index 3a0ac3725b..88ac184248 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "build": "packemon build --addEngines --addFiles --declaration && npx packemon validate --no-license --no-people --no-repo && tailwindcss -i ./src/styles/index.css -o ./src/tailwind.css --minify && tailwindcss -i ./src/styles/index-with-tailwind.css -o ./src/styles.css --minify",
     "ci:format": "biome ci --linter-enabled=false --organize-imports-enabled=false",
     "ci:lint": "biome ci --formatter-enabled=false --organize-imports-enabled=false",
+    "check": "biome check --write .",
     "format": "biome format --write .",
     "lint": "biome lint --write .",
     "lint:unsafe": "biome lint --write --unsafe .",
diff --git a/site/docs/components/App.tsx b/site/docs/components/App.tsx
index e97b42ca6b..9b0c62cd5c 100644
--- a/site/docs/components/App.tsx
+++ b/site/docs/components/App.tsx
@@ -2,10 +2,10 @@
 import { OnchainKitProvider } from '@coinbase/onchainkit';
 // import { OnchainKitProvider } from '../../../src';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { WagmiProvider, createConfig, http } from 'wagmi';
+import type { ReactNode } from 'react';
+import { http, WagmiProvider, createConfig } from 'wagmi';
 import { base } from 'wagmi/chains';
 import { coinbaseWallet } from 'wagmi/connectors';
-import type { ReactNode } from 'react';
 
 import '@coinbase/onchainkit/styles.css';
 // import '../../../src/styles.css';
diff --git a/site/docs/components/AppWithRK.tsx b/site/docs/components/AppWithRK.tsx
index 98c4860c5b..d206fd1e96 100644
--- a/site/docs/components/AppWithRK.tsx
+++ b/site/docs/components/AppWithRK.tsx
@@ -7,14 +7,14 @@ import {
   getDefaultConfig,
 } from '@rainbow-me/rainbowkit';
 import {
+  coinbaseWallet,
   metaMaskWallet,
   rainbowWallet,
-  coinbaseWallet,
 } from '@rainbow-me/rainbowkit/wallets';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import type { ReactNode } from 'react';
 import { WagmiProvider } from 'wagmi';
 import { base } from 'wagmi/chains';
-import type { ReactNode } from 'react';
 
 import '@coinbase/onchainkit/styles.css';
 // import '../../../src/styles.css';
diff --git a/site/docs/components/SwapAmountInputContainer.tsx b/site/docs/components/SwapAmountInputContainer.tsx
index 800c22a56f..82bfea88b1 100644
--- a/site/docs/components/SwapAmountInputContainer.tsx
+++ b/site/docs/components/SwapAmountInputContainer.tsx
@@ -1,5 +1,5 @@
-import { type ReactElement, useState } from 'react';
 import type { Token } from '@coinbase/onchainkit/token';
+import { type ReactElement, useState } from 'react';
 
 type SwapAmountInputContainer = {
   children: (
diff --git a/site/docs/components/SwapWrapper.tsx b/site/docs/components/SwapWrapper.tsx
index f477cb38a0..f9d0bf891d 100644
--- a/site/docs/components/SwapWrapper.tsx
+++ b/site/docs/components/SwapWrapper.tsx
@@ -1,9 +1,9 @@
 'use client';
-import { useCallback, type ReactNode } from 'react';
-import { useAccount } from 'wagmi';
 import type { BuildSwapTransaction } from '@coinbase/onchainkit/swap';
 import type { Token } from '@coinbase/onchainkit/token';
+import { type ReactNode, useCallback } from 'react';
 import type { Address } from 'viem';
+import { useAccount } from 'wagmi';
 
 type SwapComponentsChildren = {
   address: Address | undefined;
diff --git a/site/docs/components/TokenSelector.tsx b/site/docs/components/TokenSelector.tsx
index 00446ab204..1ef418eb9d 100644
--- a/site/docs/components/TokenSelector.tsx
+++ b/site/docs/components/TokenSelector.tsx
@@ -1,6 +1,6 @@
-import { useCallback, useState } from 'react';
-import { TokenSearch, TokenChip, TokenRow } from '@coinbase/onchainkit/token';
+import { TokenChip, TokenRow, TokenSearch } from '@coinbase/onchainkit/token';
 import type { Token } from '@coinbase/onchainkit/token';
+import { useCallback, useState } from 'react';
 
 const tokens: Token[] = [
   {
diff --git a/site/docs/components/TokenSelectorContainer.tsx b/site/docs/components/TokenSelectorContainer.tsx
index 8dd049d525..cae1cc8f21 100644
--- a/site/docs/components/TokenSelectorContainer.tsx
+++ b/site/docs/components/TokenSelectorContainer.tsx
@@ -1,5 +1,5 @@
-import { type ReactElement, useState } from 'react';
 import type { Token } from '@coinbase/onchainkit/token';
+import { type ReactElement, useState } from 'react';
 
 type TokenSelectorContainer = {
   children: (token: Token, setToken: (t: Token) => void) => ReactElement;
diff --git a/site/docs/components/WalletComponents.tsx b/site/docs/components/WalletComponents.tsx
index 6380e01dd9..30eb9d07ae 100644
--- a/site/docs/components/WalletComponents.tsx
+++ b/site/docs/components/WalletComponents.tsx
@@ -1,6 +1,6 @@
 'use client';
-import App from './App.tsx';
 import type { ReactNode } from 'react';
+import App from './App.tsx';
 
 type WalletComponentsReact = {
   children: ReactNode;
diff --git a/src/OnchainKitProvider.test.tsx b/src/OnchainKitProvider.test.tsx
index 48fde8a4dd..ac732cf3bb 100644
--- a/src/OnchainKitProvider.test.tsx
+++ b/src/OnchainKitProvider.test.tsx
@@ -1,12 +1,12 @@
-import { base } from 'viem/chains';
 import { render, screen, waitFor } from '@testing-library/react';
+import { base } from 'viem/chains';
 import '@testing-library/jest-dom';
 
-import type { EASSchemaUid } from './identity/types';
+import { describe, expect, it, vi } from 'vitest';
 import { setOnchainKitConfig } from './OnchainKitConfig';
 import { OnchainKitProvider } from './OnchainKitProvider';
+import type { EASSchemaUid } from './identity/types';
 import { useOnchainKit } from './useOnchainKit';
-import { describe, expect, it, vi } from 'vitest';
 
 const TestComponent = () => {
   const { schemaId, apiKey } = useOnchainKit();
diff --git a/src/OnchainKitProvider.tsx b/src/OnchainKitProvider.tsx
index 02c4801c7f..6a780acdd3 100644
--- a/src/OnchainKitProvider.tsx
+++ b/src/OnchainKitProvider.tsx
@@ -1,7 +1,7 @@
 import { createContext, useMemo } from 'react';
-import { checkHashLength } from './utils/checkHashLength';
 import { ONCHAIN_KIT_CONFIG, setOnchainKitConfig } from './OnchainKitConfig';
 import type { OnchainKitContextType, OnchainKitProviderReact } from './types';
+import { checkHashLength } from './utils/checkHashLength';
 
 export const OnchainKitContext =
   createContext<OnchainKitContextType>(ONCHAIN_KIT_CONFIG);
diff --git a/src/farcaster/getFarcasterUserAddress.test.ts b/src/farcaster/getFarcasterUserAddress.test.ts
index 8dfe68efe8..e71e66403f 100644
--- a/src/farcaster/getFarcasterUserAddress.test.ts
+++ b/src/farcaster/getFarcasterUserAddress.test.ts
@@ -1,6 +1,6 @@
-import { getFarcasterUserAddress } from './getFarcasterUserAddress';
 import { getCustodyAddressForFidNeynar } from '../utils/neynar/user/getCustodyAddressForFidNeynar';
 import { getVerifiedAddressesForFidNeynar } from '../utils/neynar/user/getVerifiedAddressesForFidNeynar';
+import { getFarcasterUserAddress } from './getFarcasterUserAddress';
 
 vi.mock('../utils/neynar/user/getCustodyAddressForFidNeynar');
 vi.mock('../utils/neynar/user/getVerifiedAddressesForFidNeynar');
diff --git a/src/frame/components/FrameMetadata.test.tsx b/src/frame/components/FrameMetadata.test.tsx
index c3837e5206..7673779f3c 100644
--- a/src/frame/components/FrameMetadata.test.tsx
+++ b/src/frame/components/FrameMetadata.test.tsx
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
 import { FrameMetadata } from './FrameMetadata';
-import { describe, it, expect } from 'vitest';
 
 describe('FrameMetadata', () => {
   it('renders', () => {
diff --git a/src/frame/getFrameHtmlResponse.test.ts b/src/frame/getFrameHtmlResponse.test.ts
index 2d431a5d58..851eda7ea1 100644
--- a/src/frame/getFrameHtmlResponse.test.ts
+++ b/src/frame/getFrameHtmlResponse.test.ts
@@ -1,5 +1,5 @@
-import { getFrameHtmlResponse } from './getFrameHtmlResponse';
 import { describe, expect, it } from 'vitest';
+import { getFrameHtmlResponse } from './getFrameHtmlResponse';
 
 describe('getFrameHtmlResponse', () => {
   it('should return correct HTML with all parameters', () => {
diff --git a/src/frame/getFrameMessage.test.ts b/src/frame/getFrameMessage.test.ts
index a6ca0f8a43..f80365ce08 100644
--- a/src/frame/getFrameMessage.test.ts
+++ b/src/frame/getFrameMessage.test.ts
@@ -1,10 +1,10 @@
 import type { Address } from 'viem';
+import { type Mock, describe, expect, it, vi } from 'vitest';
+import { neynarFrameValidation } from '../utils/neynar/frame/neynarFrameValidation';
+import { neynarBulkUserLookup } from '../utils/neynar/user/neynarBulkUserLookup';
 import { getFrameMessage } from './getFrameMessage';
 import { getMockFrameRequest } from './getMockFrameRequest';
-import { neynarBulkUserLookup } from '../utils/neynar/user/neynarBulkUserLookup';
 import type { FrameRequest } from './types';
-import { neynarFrameValidation } from '../utils/neynar/frame/neynarFrameValidation';
-import { describe, expect, it, vi, type Mock } from 'vitest';
 
 vi.mock('../utils/neynar/user/neynarBulkUserLookup', () => {
   return {
diff --git a/src/frame/getFrameMessage.ts b/src/frame/getFrameMessage.ts
index 4425696c1a..3fa2d6e36a 100644
--- a/src/frame/getFrameMessage.ts
+++ b/src/frame/getFrameMessage.ts
@@ -1,12 +1,12 @@
+import {
+  NEYNAR_DEFAULT_API_KEY,
+  neynarFrameValidation,
+} from '../utils/neynar/frame/neynarFrameValidation';
 import type {
   FrameRequest,
   FrameValidationResponse,
   MockFrameRequest,
 } from './types';
-import {
-  NEYNAR_DEFAULT_API_KEY,
-  neynarFrameValidation,
-} from '../utils/neynar/frame/neynarFrameValidation';
 
 type FrameMessageOptions =
   | {
diff --git a/src/frame/getFrameMetadata.test.ts b/src/frame/getFrameMetadata.test.ts
index 233a8c3512..81b3bd7a06 100644
--- a/src/frame/getFrameMetadata.test.ts
+++ b/src/frame/getFrameMetadata.test.ts
@@ -1,5 +1,5 @@
-import { getFrameMetadata } from './getFrameMetadata';
 import { describe, expect, it } from 'vitest';
+import { getFrameMetadata } from './getFrameMetadata';
 
 describe('getFrameMetadata', () => {
   it('should return the correct metadata', () => {
diff --git a/src/identity/components/Address.test.tsx b/src/identity/components/Address.test.tsx
index 7d9c99493f..942c0e6079 100644
--- a/src/identity/components/Address.test.tsx
+++ b/src/identity/components/Address.test.tsx
@@ -1,9 +1,9 @@
-import { vi } from 'vitest';
 import { render, screen } from '@testing-library/react';
+import { vi } from 'vitest';
 import '@testing-library/jest-dom';
+import { getSlicedAddress } from '../getSlicedAddress';
 import { Address } from './Address';
 import { useIdentityContext } from './IdentityProvider';
-import { getSlicedAddress } from '../getSlicedAddress';
 
 function mock<T>(func: T) {
   return func as vi.Mock;
diff --git a/src/identity/components/Address.tsx b/src/identity/components/Address.tsx
index b134a5cb91..a7847be2bd 100644
--- a/src/identity/components/Address.tsx
+++ b/src/identity/components/Address.tsx
@@ -1,7 +1,7 @@
-import { useIdentityContext } from './IdentityProvider';
-import { getSlicedAddress } from '../getSlicedAddress';
 import { cn, text } from '../../styles/theme';
+import { getSlicedAddress } from '../getSlicedAddress';
 import type { AddressReact } from '../types';
+import { useIdentityContext } from './IdentityProvider';
 
 export function Address({
   address = null,
diff --git a/src/identity/components/Avatar.stories.tsx b/src/identity/components/Avatar.stories.tsx
index c2b0440d91..a0ef31884d 100644
--- a/src/identity/components/Avatar.stories.tsx
+++ b/src/identity/components/Avatar.stories.tsx
@@ -1,9 +1,9 @@
 import type { Meta, StoryObj } from '@storybook/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { base } from 'viem/chains';
+import { OnchainKitProvider } from '../../OnchainKitProvider';
 import { Avatar } from './Avatar';
 import { Badge } from './Badge';
-import { OnchainKitProvider } from '../../OnchainKitProvider';
-import { base } from 'viem/chains';
 
 const meta = {
   title: 'Identity/Avatar',
diff --git a/src/identity/components/Avatar.test.tsx b/src/identity/components/Avatar.test.tsx
index 326d32d9ce..97051c41b7 100644
--- a/src/identity/components/Avatar.test.tsx
+++ b/src/identity/components/Avatar.test.tsx
@@ -3,9 +3,9 @@ import { vi } from 'vitest';
 import '@testing-library/jest-dom';
 import { render, screen, waitFor } from '@testing-library/react';
 import { useOnchainKit } from '../../useOnchainKit';
-import { useName } from '../hooks/useName';
 import { useAttestations } from '../hooks/useAttestations';
 import { useAvatar } from '../hooks/useAvatar';
+import { useName } from '../hooks/useName';
 import { Avatar } from './Avatar';
 import { Badge } from './Badge';
 import { useIdentityContext } from './IdentityProvider';
diff --git a/src/identity/components/Avatar.tsx b/src/identity/components/Avatar.tsx
index 1cf39420ff..be971226a1 100644
--- a/src/identity/components/Avatar.tsx
+++ b/src/identity/components/Avatar.tsx
@@ -1,11 +1,11 @@
-import { useMemo, Children } from 'react';
-import { useIdentityContext } from './IdentityProvider';
+import { Children, useMemo } from 'react';
+import { cn } from '../../styles/theme';
 import { useAvatar } from '../hooks/useAvatar';
 import { useName } from '../hooks/useName';
 import type { AvatarReact } from '../types';
-import { cn } from '../../styles/theme';
-import { DisplayBadge } from './DisplayBadge';
 import { Badge } from './Badge';
+import { DisplayBadge } from './DisplayBadge';
+import { useIdentityContext } from './IdentityProvider';
 import { defaultAvatarSVG } from './defaultAvatarSVG';
 import { defaultLoadingSVG } from './defaultLoadingSVG';
 
diff --git a/src/identity/components/Badge.tsx b/src/identity/components/Badge.tsx
index e3e8d489ba..5f0b7b32cf 100644
--- a/src/identity/components/Badge.tsx
+++ b/src/identity/components/Badge.tsx
@@ -1,5 +1,5 @@
-import type { BadgeReact } from '../types';
 import { background, cn, fill } from '../../styles/theme';
+import type { BadgeReact } from '../types';
 
 /**
  * Badge component.
diff --git a/src/identity/components/DisplayBadge.test.tsx b/src/identity/components/DisplayBadge.test.tsx
index 1d953269d0..3703423b28 100644
--- a/src/identity/components/DisplayBadge.test.tsx
+++ b/src/identity/components/DisplayBadge.test.tsx
@@ -1,9 +1,9 @@
 import '@testing-library/jest-dom';
 import { render, screen } from '@testing-library/react';
-import { DisplayBadge } from './DisplayBadge';
-import { Badge } from './Badge';
 import { useOnchainKit } from '../../useOnchainKit';
 import { useAttestations } from '../hooks/useAttestations';
+import { Badge } from './Badge';
+import { DisplayBadge } from './DisplayBadge';
 import { useIdentityContext } from './IdentityProvider';
 
 function mock<T>(func: T) {
diff --git a/src/identity/components/DisplayBadge.tsx b/src/identity/components/DisplayBadge.tsx
index 4ec1034781..1ece1d1235 100644
--- a/src/identity/components/DisplayBadge.tsx
+++ b/src/identity/components/DisplayBadge.tsx
@@ -1,5 +1,5 @@
-import type { Address } from 'viem';
 import type { ReactNode } from 'react';
+import type { Address } from 'viem';
 import { useOnchainKit } from '../../useOnchainKit';
 import { useAttestations } from '../hooks/useAttestations';
 import { useIdentityContext } from './IdentityProvider';
diff --git a/src/identity/components/EthBalance.stories.tsx b/src/identity/components/EthBalance.stories.tsx
index 22cab4b1a7..be865dbd4c 100644
--- a/src/identity/components/EthBalance.stories.tsx
+++ b/src/identity/components/EthBalance.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { EthBalance } from './EthBalance';
-import { WagmiProvider, createConfig, http } from 'wagmi';
 import { baseSepolia } from 'viem/chains';
+import { http, WagmiProvider, createConfig } from 'wagmi';
+import { EthBalance } from './EthBalance';
 
 const wagmiConfig = createConfig({
   chains: [baseSepolia],
diff --git a/src/identity/components/EthBalance.test.tsx b/src/identity/components/EthBalance.test.tsx
index 3910fceabf..f51132f567 100644
--- a/src/identity/components/EthBalance.test.tsx
+++ b/src/identity/components/EthBalance.test.tsx
@@ -1,10 +1,10 @@
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { vi } from 'vitest';
+import { getRoundedAmount } from '../../utils/getRoundedAmount';
+import { useGetETHBalance } from '../../wallet/core/useGetETHBalance';
 import { EthBalance } from './EthBalance';
 import { useIdentityContext } from './IdentityProvider';
-import { useGetETHBalance } from '../../wallet/core/useGetETHBalance';
-import { getRoundedAmount } from '../../utils/getRoundedAmount';
 
 function mock<T>(func: T) {
   return func as vi.Mock;
diff --git a/src/identity/components/EthBalance.tsx b/src/identity/components/EthBalance.tsx
index e5dac69dae..0914c9ef1b 100644
--- a/src/identity/components/EthBalance.tsx
+++ b/src/identity/components/EthBalance.tsx
@@ -1,8 +1,8 @@
-import { useIdentityContext } from './IdentityProvider';
 import { cn, color, text } from '../../styles/theme';
-import type { EthBalanceReact } from '../types';
-import { useGetETHBalance } from '../../wallet/core/useGetETHBalance';
 import { getRoundedAmount } from '../../utils/getRoundedAmount';
+import { useGetETHBalance } from '../../wallet/core/useGetETHBalance';
+import type { EthBalanceReact } from '../types';
+import { useIdentityContext } from './IdentityProvider';
 export function EthBalance({ address, className }: EthBalanceReact) {
   const { address: contextAddress } = useIdentityContext();
   if (!contextAddress && !address) {
diff --git a/src/identity/components/Identity.test.tsx b/src/identity/components/Identity.test.tsx
index 191a248bec..b2c408c372 100644
--- a/src/identity/components/Identity.test.tsx
+++ b/src/identity/components/Identity.test.tsx
@@ -1,14 +1,14 @@
 import { vi } from 'vitest';
 import '@testing-library/jest-dom';
 import { render, screen, waitFor } from '@testing-library/react';
-import { Avatar } from './Avatar';
-import { Name } from './Name';
-import { Identity } from './Identity';
-import { useName } from '../hooks/useName';
-import { useAvatar } from '../hooks/useAvatar';
 import { useGetETHBalance } from '../../wallet/core/useGetETHBalance';
+import { useAvatar } from '../hooks/useAvatar';
+import { useName } from '../hooks/useName';
 import { Address } from './Address';
+import { Avatar } from './Avatar';
 import { EthBalance } from './EthBalance';
+import { Identity } from './Identity';
+import { Name } from './Name';
 
 function mock<T>(func: T) {
   return func as vi.Mock;
diff --git a/src/identity/components/Identity.tsx b/src/identity/components/Identity.tsx
index bf98229b8e..d93bd17cb9 100644
--- a/src/identity/components/Identity.tsx
+++ b/src/identity/components/Identity.tsx
@@ -1,8 +1,8 @@
 import { useCallback } from 'react';
-import { IdentityLayout } from './IdentityLayout';
-import { IdentityProvider } from './IdentityProvider';
 import { useOnchainKit } from '../../useOnchainKit';
 import type { IdentityReact } from '../types';
+import { IdentityLayout } from './IdentityLayout';
+import { IdentityProvider } from './IdentityProvider';
 
 export function Identity({
   address,
diff --git a/src/identity/components/IdentityLayout.test.tsx b/src/identity/components/IdentityLayout.test.tsx
index 778338f539..f4ea9f2a6a 100644
--- a/src/identity/components/IdentityLayout.test.tsx
+++ b/src/identity/components/IdentityLayout.test.tsx
@@ -1,10 +1,10 @@
 import '@testing-library/jest-dom';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
-import { IdentityLayout } from './IdentityLayout';
-import { Avatar } from './Avatar';
-import { Name } from './Name';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { Address } from './Address';
+import { Avatar } from './Avatar';
 import { EthBalance } from './EthBalance';
+import { IdentityLayout } from './IdentityLayout';
+import { Name } from './Name';
 
 const handleCopy = vi.fn().mockResolvedValue(true);
 
diff --git a/src/identity/components/IdentityLayout.tsx b/src/identity/components/IdentityLayout.tsx
index 55d7dc2c52..08fb7bc1f6 100644
--- a/src/identity/components/IdentityLayout.tsx
+++ b/src/identity/components/IdentityLayout.tsx
@@ -1,11 +1,11 @@
-import { Children, useMemo, useCallback, useState, useEffect } from 'react';
+import { Children, useCallback, useEffect, useMemo, useState } from 'react';
+import type { ReactNode } from 'react';
+import { findComponent } from '../../internal/utils/findComponent';
+import { background, cn, color, pressable } from '../../styles/theme';
 import { Address } from './Address';
 import { Avatar } from './Avatar';
 import { EthBalance } from './EthBalance';
 import { Name } from './Name';
-import { findComponent } from '../../internal/utils/findComponent';
-import { background, cn, color, pressable } from '../../styles/theme';
-import type { ReactNode } from 'react';
 
 // istanbul ignore next
 const noop = () => {};
diff --git a/src/identity/components/IdentityProvider.test.tsx b/src/identity/components/IdentityProvider.test.tsx
index 4e94714065..d35a3466dd 100644
--- a/src/identity/components/IdentityProvider.test.tsx
+++ b/src/identity/components/IdentityProvider.test.tsx
@@ -1,9 +1,9 @@
 import '@testing-library/jest-dom';
 import { renderHook } from '@testing-library/react';
 import type { Address, Chain } from 'viem';
-import { IdentityProvider, useIdentityContext } from './IdentityProvider';
 import { baseSepolia, optimism, sepolia } from 'viem/chains';
 import { OnchainKitProvider } from '../../OnchainKitProvider';
+import { IdentityProvider, useIdentityContext } from './IdentityProvider';
 
 describe('IdentityProvider', () => {
   it('provides context values from props', () => {
diff --git a/src/identity/components/IdentityProvider.tsx b/src/identity/components/IdentityProvider.tsx
index 2e70473142..d350278c5d 100644
--- a/src/identity/components/IdentityProvider.tsx
+++ b/src/identity/components/IdentityProvider.tsx
@@ -1,8 +1,8 @@
-import { useState, createContext, useContext } from 'react';
+import { createContext, useContext, useState } from 'react';
 import type { Address } from 'viem';
 import { useValue } from '../../internal/hooks/useValue';
-import type { IdentityContextType, IdentityProviderReact } from '../types';
 import { useOnchainKit } from '../../useOnchainKit';
+import type { IdentityContextType, IdentityProviderReact } from '../types';
 
 const emptyContext = {} as IdentityContextType;
 
diff --git a/src/identity/components/Name.stories.tsx b/src/identity/components/Name.stories.tsx
index e655def2fa..776d39ec8f 100644
--- a/src/identity/components/Name.stories.tsx
+++ b/src/identity/components/Name.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { Name } from './Name';
 import { baseSepolia, optimism } from 'viem/chains';
+import { Name } from './Name';
 
 const meta = {
   title: 'Identity/Name',
diff --git a/src/identity/components/Name.test.tsx b/src/identity/components/Name.test.tsx
index 158814ed82..3a53341f4f 100644
--- a/src/identity/components/Name.test.tsx
+++ b/src/identity/components/Name.test.tsx
@@ -1,13 +1,13 @@
-import { vi, type Mock } from 'vitest';
+import { type Mock, vi } from 'vitest';
 import '@testing-library/jest-dom';
 import { render, screen, waitFor } from '@testing-library/react';
+import { base, baseSepolia, optimism } from 'viem/chains';
 import { getSlicedAddress } from '../getSlicedAddress';
-import { useName } from '../hooks/useName';
 import { useAttestations } from '../hooks/useAttestations';
-import { Name } from './Name';
+import { useName } from '../hooks/useName';
 import { Badge } from './Badge';
 import { useIdentityContext } from './IdentityProvider';
-import { base, baseSepolia, optimism } from 'viem/chains';
+import { Name } from './Name';
 
 const silenceError = () => {
   const consoleErrorMock = vi
diff --git a/src/identity/components/Name.tsx b/src/identity/components/Name.tsx
index 852919b404..ecde46fc9c 100644
--- a/src/identity/components/Name.tsx
+++ b/src/identity/components/Name.tsx
@@ -1,10 +1,10 @@
 import { Children, useMemo } from 'react';
-import { useIdentityContext } from './IdentityProvider';
+import { cn, text } from '../../styles/theme';
 import { useName } from '../hooks/useName';
 import type { NameReact } from '../types';
 import { Badge } from './Badge';
 import { DisplayBadge } from './DisplayBadge';
-import { cn, text } from '../../styles/theme';
+import { useIdentityContext } from './IdentityProvider';
 
 /**
  * Name is a React component that renders the user name from an Ethereum address.
diff --git a/src/identity/core/convertReverseNodeToBytes.ts b/src/identity/core/convertReverseNodeToBytes.ts
index e0939a137a..ea2c341f5e 100644
--- a/src/identity/core/convertReverseNodeToBytes.ts
+++ b/src/identity/core/convertReverseNodeToBytes.ts
@@ -1,6 +1,6 @@
 import { encodePacked, keccak256 } from 'viem';
-import { ADDRESS_REVERSE_NODE } from '../constants';
 import type { Address } from 'viem';
+import { ADDRESS_REVERSE_NODE } from '../constants';
 
 /**
  * Convert an address to a reverse node for ENS resolution
diff --git a/src/identity/core/getAvatar.test.tsx b/src/identity/core/getAvatar.test.tsx
index d485765f4e..c1d15aa11f 100644
--- a/src/identity/core/getAvatar.test.tsx
+++ b/src/identity/core/getAvatar.test.tsx
@@ -1,6 +1,6 @@
-import { getAvatar } from './getAvatar';
-import { publicClient } from '../../network/client';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { publicClient } from '../../network/client';
+import { getAvatar } from './getAvatar';
 
 vi.mock('../../network/client');
 
diff --git a/src/identity/core/getName.test.tsx b/src/identity/core/getName.test.tsx
index 2a3dd1ba41..957b9e5c89 100644
--- a/src/identity/core/getName.test.tsx
+++ b/src/identity/core/getName.test.tsx
@@ -1,9 +1,9 @@
-import { getName } from './getName';
-import { publicClient } from '../../network/client';
 import type { Address } from 'viem';
-import { beforeEach, describe, expect, it, vi, type Mock } from 'vitest';
 import { base, baseSepolia, mainnet, optimism, sepolia } from 'viem/chains';
+import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
+import { publicClient } from '../../network/client';
 import { getChainPublicClient } from '../../network/getChainPublicClient';
+import { getName } from './getName';
 
 vi.mock('../../network/client');
 
diff --git a/src/identity/core/getName.ts b/src/identity/core/getName.ts
index 3bada0368b..22f1c98560 100644
--- a/src/identity/core/getName.ts
+++ b/src/identity/core/getName.ts
@@ -1,11 +1,11 @@
 import { mainnet } from 'viem/chains';
-import type { GetName, GetNameReturnType } from '../types';
-import L2ResolverAbi from '../abis/L2ResolverAbi';
+import { isBase } from '../../isBase';
+import { isEthereum } from '../../isEthereum';
 import { getChainPublicClient } from '../../network/getChainPublicClient';
+import L2ResolverAbi from '../abis/L2ResolverAbi';
 import { RESOLVER_ADDRESSES_BY_CHAIN_ID } from '../constants';
+import type { GetName, GetNameReturnType } from '../types';
 import { convertReverseNodeToBytes } from './convertReverseNodeToBytes';
-import { isEthereum } from '../../isEthereum';
-import { isBase } from '../../isBase';
 
 /**
  * An asynchronous function to fetch the Ethereum Name Service (ENS)
diff --git a/src/identity/easSupportedChains.ts b/src/identity/easSupportedChains.ts
index dfdba8c2be..57847b4bc5 100644
--- a/src/identity/easSupportedChains.ts
+++ b/src/identity/easSupportedChains.ts
@@ -1,8 +1,8 @@
 import type { Chain } from 'viem';
-import type { EASChainDefinition } from './types';
 import { easChainBase } from '../network/definitions/base';
-import { easChainOptimism } from '../network/definitions/optimism';
 import { easChainBaseSepolia } from '../network/definitions/baseSepolia';
+import { easChainOptimism } from '../network/definitions/optimism';
+import type { EASChainDefinition } from './types';
 
 export type EASSupportedChains = Record<number, EASChainDefinition>;
 
diff --git a/src/identity/getAttestations.test.ts b/src/identity/getAttestations.test.ts
index 780cd9324c..d599b8b09c 100644
--- a/src/identity/getAttestations.test.ts
+++ b/src/identity/getAttestations.test.ts
@@ -2,12 +2,12 @@
  * @vitest-environment jsdom
  */
 
+import { base, opBNBTestnet } from 'viem/chains';
+import { vi } from 'vitest';
 import { getAttestationsByFilter } from '../network/attestations';
-import { getAttestations } from './getAttestations';
 import { easSupportedChains } from './easSupportedChains';
-import { base, opBNBTestnet } from 'viem/chains';
+import { getAttestations } from './getAttestations';
 import type { GetAttestationsOptions } from './types';
-import { vi } from 'vitest';
 
 vi.mock('../network/attestations');
 
diff --git a/src/identity/getAttestations.ts b/src/identity/getAttestations.ts
index cad853a803..7ee8a71db5 100644
--- a/src/identity/getAttestations.ts
+++ b/src/identity/getAttestations.ts
@@ -1,7 +1,7 @@
+import type { Address, Chain } from 'viem';
 import { getAttestationsByFilter } from '../network/attestations';
-import { isChainSupported, easSupportedChains } from './easSupportedChains';
+import { easSupportedChains, isChainSupported } from './easSupportedChains';
 import type { Attestation, GetAttestationsOptions } from './types';
-import type { Address, Chain } from 'viem';
 
 /**
  * Fetches Ethereum Attestation Service (EAS) attestations for a given address and chain,
diff --git a/src/identity/hooks/useAttestations.test.ts b/src/identity/hooks/useAttestations.test.ts
index 86e9ea2c8a..3e037a50e4 100644
--- a/src/identity/hooks/useAttestations.test.ts
+++ b/src/identity/hooks/useAttestations.test.ts
@@ -4,8 +4,8 @@
 
 import { renderHook, waitFor } from '@testing-library/react';
 import { base } from 'viem/chains';
-import { useAttestations } from './useAttestations';
 import { getAttestations } from '../getAttestations';
+import { useAttestations } from './useAttestations';
 
 vi.mock('../getAttestations', () => ({
   getAttestations: vi.fn(),
diff --git a/src/identity/hooks/useAvatar.test.tsx b/src/identity/hooks/useAvatar.test.tsx
index af431f83b8..9ecb219fc4 100644
--- a/src/identity/hooks/useAvatar.test.tsx
+++ b/src/identity/hooks/useAvatar.test.tsx
@@ -3,9 +3,9 @@
  */
 
 import { renderHook, waitFor } from '@testing-library/react';
-import { useAvatar } from './useAvatar';
 import { publicClient } from '../../network/client';
 import { getNewReactQueryTestProvider } from './getNewReactQueryTestProvider';
+import { useAvatar } from './useAvatar';
 
 vi.mock('../../network/client');
 
diff --git a/src/identity/hooks/useAvatar.ts b/src/identity/hooks/useAvatar.ts
index 7bbf20bbdc..72989c4392 100644
--- a/src/identity/hooks/useAvatar.ts
+++ b/src/identity/hooks/useAvatar.ts
@@ -1,6 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
-import type { GetAvatarReturnType } from '../types';
 import { getAvatar } from '../core/getAvatar';
+import type { GetAvatarReturnType } from '../types';
 
 type UseAvatarOptions = {
   ensName: string;
diff --git a/src/identity/hooks/useName.test.tsx b/src/identity/hooks/useName.test.tsx
index 9ccb09206d..89a54bdb33 100644
--- a/src/identity/hooks/useName.test.tsx
+++ b/src/identity/hooks/useName.test.tsx
@@ -3,11 +3,11 @@
  */
 
 import { renderHook, waitFor } from '@testing-library/react';
-import { useName } from './useName';
+import { base, optimism } from 'viem/chains';
+import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import { publicClient } from '../../network/client';
 import { getNewReactQueryTestProvider } from './getNewReactQueryTestProvider';
-import { describe, beforeEach, it, expect, vi, type Mock } from 'vitest';
-import { base, optimism } from 'viem/chains';
+import { useName } from './useName';
 
 vi.mock('../../network/client');
 vi.mock('../../network/getChainPublicClient', () => ({
diff --git a/src/isBase.ts b/src/isBase.ts
index 7415c18ad0..e92a585254 100644
--- a/src/isBase.ts
+++ b/src/isBase.ts
@@ -1,4 +1,4 @@
-import { baseSepolia, base } from 'viem/chains';
+import { base, baseSepolia } from 'viem/chains';
 import type { isBaseOptions } from './types';
 
 /**
diff --git a/src/network/attestations.test.ts b/src/network/attestations.test.ts
index e8ceb59c4d..b3023001c2 100644
--- a/src/network/attestations.test.ts
+++ b/src/network/attestations.test.ts
@@ -1,11 +1,11 @@
+import { base } from 'viem/chains';
 import {
   type GetAttestationsByFilterOptions,
+  attestationQuery,
   getAttestationQueryVariables,
   getAttestationsByFilter,
-  attestationQuery,
 } from './attestations';
 import { createEasGraphQLClient } from './createEasGraphQLClient';
-import { base } from 'viem/chains';
 
 vi.mock('../network/createEasGraphQLClient');
 
diff --git a/src/network/attestations.ts b/src/network/attestations.ts
index d510d8dff9..6c4341ae33 100644
--- a/src/network/attestations.ts
+++ b/src/network/attestations.ts
@@ -1,8 +1,8 @@
 import { gql } from 'graphql-request';
 import { getAddress } from 'viem';
-import { createEasGraphQLClient } from './createEasGraphQLClient';
 import type { Address, Chain } from 'viem';
-import type { EASSchemaUid, Attestation } from '../identity/types';
+import type { Attestation, EASSchemaUid } from '../identity/types';
+import { createEasGraphQLClient } from './createEasGraphQLClient';
 
 /**
  * Type representing the filter options used for querying EAS Attestations.
diff --git a/src/network/client.ts b/src/network/client.ts
index 97cebce7e6..b63facb571 100644
--- a/src/network/client.ts
+++ b/src/network/client.ts
@@ -1,4 +1,4 @@
-import { createPublicClient, http } from 'viem';
+import { http, createPublicClient } from 'viem';
 import { mainnet } from 'viem/chains';
 
 export const publicClient: ReturnType<typeof createPublicClient> =
diff --git a/src/network/getChainPublicClient.ts b/src/network/getChainPublicClient.ts
index 00eb5061a3..8f98f415d7 100644
--- a/src/network/getChainPublicClient.ts
+++ b/src/network/getChainPublicClient.ts
@@ -1,4 +1,4 @@
-import { createPublicClient, http } from 'viem';
+import { http, createPublicClient } from 'viem';
 import type { Chain } from 'viem/chains';
 
 export function getChainPublicClient(chain: Chain) {
diff --git a/src/swap/components/Swap.tsx b/src/swap/components/Swap.tsx
index 65ae31fe96..2e6c752bc1 100644
--- a/src/swap/components/Swap.tsx
+++ b/src/swap/components/Swap.tsx
@@ -1,11 +1,11 @@
 import { Children, useMemo } from 'react';
 import { background, cn, text } from '../../styles/theme';
+import type { SwapReact } from '../types';
 import { SwapAmountInput } from './SwapAmountInput';
 import { SwapButton } from './SwapButton';
-import { SwapToggleButton } from './SwapToggleButton';
 import { SwapMessage } from './SwapMessage';
 import { SwapProvider } from './SwapProvider';
-import type { SwapReact } from '../types';
+import { SwapToggleButton } from './SwapToggleButton';
 
 // istanbul ignore next
 export function Swap({
diff --git a/src/swap/components/SwapAmountInput.test.tsx b/src/swap/components/SwapAmountInput.test.tsx
index a96c7b771e..c247dd8bd1 100644
--- a/src/swap/components/SwapAmountInput.test.tsx
+++ b/src/swap/components/SwapAmountInput.test.tsx
@@ -1,10 +1,10 @@
-import { render, screen, fireEvent } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { SwapAmountInput } from './SwapAmountInput';
-import { useSwapContext } from './SwapProvider';
+import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { Token } from '../../token';
 import type { SwapContextType } from '../types';
-import { beforeEach, describe, expect, it, vi, type Mock } from 'vitest';
+import { SwapAmountInput } from './SwapAmountInput';
+import { useSwapContext } from './SwapProvider';
 
 vi.mock('../../token', () => ({
   TokenChip: vi.fn(() => <div>TokenChip</div>),
diff --git a/src/swap/components/SwapAmountInput.tsx b/src/swap/components/SwapAmountInput.tsx
index fb1617289c..a2234b48bb 100644
--- a/src/swap/components/SwapAmountInput.tsx
+++ b/src/swap/components/SwapAmountInput.tsx
@@ -1,12 +1,12 @@
 import { useCallback, useEffect, useMemo } from 'react';
-import { TokenChip, TokenSelectDropdown } from '../../token';
-import { background, cn, color, pressable, text } from '../../styles/theme';
 import { TextInput } from '../../internal/form/TextInput';
-import { isValidAmount } from '../../utils/isValidAmount';
+import { background, cn, color, pressable, text } from '../../styles/theme';
+import { TokenChip, TokenSelectDropdown } from '../../token';
+import type { Token } from '../../token';
 import { getRoundedAmount } from '../../utils/getRoundedAmount';
-import { useSwapContext } from './SwapProvider';
+import { isValidAmount } from '../../utils/isValidAmount';
 import type { SwapAmountInputReact } from '../types';
-import type { Token } from '../../token';
+import { useSwapContext } from './SwapProvider';
 
 function useValue<T>(object: T): T {
   return useMemo(() => object, [object]);
diff --git a/src/swap/components/SwapButton.stories.tsx b/src/swap/components/SwapButton.stories.tsx
index 679b67c7b5..3bd434fcd6 100644
--- a/src/swap/components/SwapButton.stories.tsx
+++ b/src/swap/components/SwapButton.stories.tsx
@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/react';
-import { SwapProvider } from './SwapProvider';
-import { WagmiProvider, createConfig, http } from 'wagmi';
-import { baseSepolia } from 'viem/chains';
+import { fn } from '@storybook/test';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { baseSepolia } from 'viem/chains';
+import { http, WagmiProvider, createConfig } from 'wagmi';
 import { SwapButton } from './SwapButton';
-import { fn } from '@storybook/test';
+import { SwapProvider } from './SwapProvider';
 
 const wagmiConfig = createConfig({
   chains: [baseSepolia],
diff --git a/src/swap/components/SwapButton.test.tsx b/src/swap/components/SwapButton.test.tsx
index d2face6b60..4792abef41 100644
--- a/src/swap/components/SwapButton.test.tsx
+++ b/src/swap/components/SwapButton.test.tsx
@@ -1,7 +1,7 @@
-import { render, screen, fireEvent } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import { SwapButton } from './SwapButton';
 import { useSwapContext } from './SwapProvider';
-import { beforeEach, describe, expect, it, vi, type Mock } from 'vitest';
 
 vi.mock('./SwapProvider', () => ({
   useSwapContext: vi.fn(),
diff --git a/src/swap/components/SwapButton.tsx b/src/swap/components/SwapButton.tsx
index 787a24a7a2..818094c220 100644
--- a/src/swap/components/SwapButton.tsx
+++ b/src/swap/components/SwapButton.tsx
@@ -1,7 +1,7 @@
-import { background, cn, pressable, text } from '../../styles/theme';
 import { Spinner } from '../../internal/loading/Spinner';
-import { useSwapContext } from './SwapProvider';
+import { background, cn, pressable, text } from '../../styles/theme';
 import type { SwapButtonReact } from '../types';
+import { useSwapContext } from './SwapProvider';
 
 export function SwapButton({
   className,
diff --git a/src/swap/components/SwapMessage.test.tsx b/src/swap/components/SwapMessage.test.tsx
index b9f0f85387..8ceb6659bf 100644
--- a/src/swap/components/SwapMessage.test.tsx
+++ b/src/swap/components/SwapMessage.test.tsx
@@ -1,8 +1,8 @@
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
+import { getSwapMessage } from '../core/getSwapMessage';
 import { SwapMessage } from './SwapMessage';
 import { useSwapContext } from './SwapProvider';
-import { getSwapMessage } from '../core/getSwapMessage';
 
 vi.mock('./SwapProvider', () => ({
   useSwapContext: vi.fn(),
diff --git a/src/swap/components/SwapMessage.tsx b/src/swap/components/SwapMessage.tsx
index f7874e45af..419424c321 100644
--- a/src/swap/components/SwapMessage.tsx
+++ b/src/swap/components/SwapMessage.tsx
@@ -1,7 +1,7 @@
-import { getSwapMessage } from '../core/getSwapMessage';
 import { cn, text } from '../../styles/theme';
-import { useSwapContext } from './SwapProvider';
+import { getSwapMessage } from '../core/getSwapMessage';
 import type { SwapMessageReact } from '../types';
+import { useSwapContext } from './SwapProvider';
 
 export function SwapMessage({ className }: SwapMessageReact) {
   const { to, from, error, loading, isTransactionPending } = useSwapContext();
diff --git a/src/swap/components/SwapProvider.tsx b/src/swap/components/SwapProvider.tsx
index c9f8987440..274b929ead 100644
--- a/src/swap/components/SwapProvider.tsx
+++ b/src/swap/components/SwapProvider.tsx
@@ -1,21 +1,21 @@
 import {
   createContext,
-  useContext,
   useCallback,
+  useContext,
   useMemo,
   useState,
 } from 'react';
-import { useSendTransaction, useConfig, type BaseError } from 'wagmi';
-import { processSwapTransaction } from '../utils/processSwapTransaction';
+import type { Address, TransactionReceipt } from 'viem';
+import { type BaseError, useConfig, useSendTransaction } from 'wagmi';
+import type { Token } from '../../token';
+import { formatTokenAmount } from '../../utils/formatTokenAmount';
+import { USER_REJECTED_ERROR_CODE } from '../constants';
 import { buildSwapTransaction } from '../core/buildSwapTransaction';
-import { isSwapError } from '../core/isSwapError';
 import { getSwapQuote } from '../core/getSwapQuote';
-import { USER_REJECTED_ERROR_CODE } from '../constants';
-import { formatTokenAmount } from '../../utils/formatTokenAmount';
+import { isSwapError } from '../core/isSwapError';
+import type { SwapContextType, SwapError, SwapErrorState } from '../types';
+import { processSwapTransaction } from '../utils/processSwapTransaction';
 import { useFromTo } from '../utils/useFromTo';
-import type { SwapError, SwapErrorState, SwapContextType } from '../types';
-import type { Token } from '../../token';
-import type { Address, TransactionReceipt } from 'viem';
 
 function useValue<T>(object: T): T {
   return useMemo(() => object, [object]);
diff --git a/src/swap/components/SwapToggleButton.stories.tsx b/src/swap/components/SwapToggleButton.stories.tsx
index 3bdcdf1a0d..9a59b3f0bb 100644
--- a/src/swap/components/SwapToggleButton.stories.tsx
+++ b/src/swap/components/SwapToggleButton.stories.tsx
@@ -1,9 +1,9 @@
 import type { Meta, StoryObj } from '@storybook/react';
-import { SwapToggleButton } from './SwapToggleButton';
-import { SwapProvider } from './SwapProvider';
-import { WagmiProvider, createConfig, http } from 'wagmi';
-import { baseSepolia } from 'viem/chains';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { baseSepolia } from 'viem/chains';
+import { http, WagmiProvider, createConfig } from 'wagmi';
+import { SwapProvider } from './SwapProvider';
+import { SwapToggleButton } from './SwapToggleButton';
 
 const wagmiConfig = createConfig({
   chains: [baseSepolia],
diff --git a/src/swap/components/SwapToggleButton.tsx b/src/swap/components/SwapToggleButton.tsx
index 5b7b7c258f..0ea2ed4132 100644
--- a/src/swap/components/SwapToggleButton.tsx
+++ b/src/swap/components/SwapToggleButton.tsx
@@ -1,6 +1,6 @@
 import { cn, pressable } from '../../styles/theme';
-import { useSwapContext } from './SwapProvider';
 import type { SwapToggleButtonReact } from '../types';
+import { useSwapContext } from './SwapProvider';
 
 const toggleIcon = (
   <svg
diff --git a/src/swap/core/buildSwapTransaction.test.ts b/src/swap/core/buildSwapTransaction.test.ts
index d65b670833..c5cc9b7da1 100644
--- a/src/swap/core/buildSwapTransaction.test.ts
+++ b/src/swap/core/buildSwapTransaction.test.ts
@@ -1,14 +1,14 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { CDP_GET_SWAP_TRADE } from '../../network/definitions/swap';
+import { sendRequest } from '../../network/request';
+import type { Token } from '../../token/types';
+import type { BuildSwapTransaction } from '../types';
+import { buildSwapTransaction } from './buildSwapTransaction';
 /**
  * @vitest-environment node
  */
 import { getAPIParamsForToken } from './getAPIParamsForToken';
-import { buildSwapTransaction } from './buildSwapTransaction';
 import { getSwapTransaction } from './getSwapTransaction';
-import { sendRequest } from '../../network/request';
-import { CDP_GET_SWAP_TRADE } from '../../network/definitions/swap';
-import type { Token } from '../../token/types';
-import type { BuildSwapTransaction } from '../types';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('../../network/request');
 
diff --git a/src/swap/core/buildSwapTransaction.ts b/src/swap/core/buildSwapTransaction.ts
index fefc10adda..966baa29f2 100644
--- a/src/swap/core/buildSwapTransaction.ts
+++ b/src/swap/core/buildSwapTransaction.ts
@@ -1,15 +1,15 @@
 import { CDP_GET_SWAP_TRADE } from '../../network/definitions/swap';
 import { sendRequest } from '../../network/request';
-import { getAPIParamsForToken } from './getAPIParamsForToken';
-import { getSwapTransaction } from './getSwapTransaction';
-import { getSwapErrorCode } from './getSwapErrorCode';
 import type {
   BuildSwapTransactionParams,
   BuildSwapTransactionResponse,
+  SwapAPIParams,
   SwapAPIResponse,
   SwapError,
-  SwapAPIParams,
 } from '../types';
+import { getAPIParamsForToken } from './getAPIParamsForToken';
+import { getSwapErrorCode } from './getSwapErrorCode';
+import { getSwapTransaction } from './getSwapTransaction';
 
 /**
  * Retrieves an unsigned transaction for a swap from Token A to Token B.
diff --git a/src/swap/core/formatDecimals.test.ts b/src/swap/core/formatDecimals.test.ts
index c653264983..153d853569 100644
--- a/src/swap/core/formatDecimals.test.ts
+++ b/src/swap/core/formatDecimals.test.ts
@@ -1,8 +1,8 @@
+import { describe, expect, it } from 'vitest';
 /**
  * @vitest-environment node
  */
 import { formatDecimals } from './formatDecimals';
-import { describe, expect, it } from 'vitest';
 
 describe('formatDecimals', () => {
   it('should format the amount correctly with default decimals when inputInDecimals is true', () => {
diff --git a/src/swap/core/getAPIParamsForToken.test.ts b/src/swap/core/getAPIParamsForToken.test.ts
index ac087e5765..a20b387a57 100644
--- a/src/swap/core/getAPIParamsForToken.test.ts
+++ b/src/swap/core/getAPIParamsForToken.test.ts
@@ -1,9 +1,9 @@
+import { describe, expect, it } from 'vitest';
 /**
  * @vitest-environment node
  */
 import type { Token } from '../../token';
 import { getAPIParamsForToken } from './getAPIParamsForToken';
-import { describe, expect, it } from 'vitest';
 
 describe('getAPIParamsForToken', () => {
   it('should return the correct GetQuoteAPIParams object', () => {
diff --git a/src/swap/core/getAPIParamsForToken.ts b/src/swap/core/getAPIParamsForToken.ts
index 19568de7c0..26163b0a53 100644
--- a/src/swap/core/getAPIParamsForToken.ts
+++ b/src/swap/core/getAPIParamsForToken.ts
@@ -1,9 +1,9 @@
-import { formatDecimals } from './formatDecimals';
 import type {
   BuildSwapTransactionParams,
   GetAPIParamsForToken,
   SwapAPIParams,
 } from '../types';
+import { formatDecimals } from './formatDecimals';
 
 /**
  * Converts parameters with `Token` to ones with address.
diff --git a/src/swap/core/getSwapError.test.ts b/src/swap/core/getSwapError.test.ts
index e6401a432e..57d49253fd 100644
--- a/src/swap/core/getSwapError.test.ts
+++ b/src/swap/core/getSwapError.test.ts
@@ -1,12 +1,12 @@
-import { getSwapError } from './getSwapError';
+import { describe, expect, test } from 'vitest';
 import {
   LOW_LIQUIDITY_ERROR_CODE,
   TOO_MANY_REQUESTS_ERROR_CODE,
   USER_REJECTED_ERROR_CODE,
 } from '../constants';
-import { SwapMessage } from './getSwapMessage';
 import type { SwapErrorState } from '../types';
-import { describe, expect, test } from 'vitest';
+import { getSwapError } from './getSwapError';
+import { SwapMessage } from './getSwapMessage';
 
 describe('getSwapError', () => {
   test('returns TOO_MANY_REQUESTS when error code is TOO_MANY_REQUESTS_ERROR_CODE', () => {
diff --git a/src/swap/core/getSwapError.ts b/src/swap/core/getSwapError.ts
index 4410234726..fd62771fe2 100644
--- a/src/swap/core/getSwapError.ts
+++ b/src/swap/core/getSwapError.ts
@@ -1,10 +1,10 @@
-import { SwapMessage } from './getSwapMessage';
 import {
   LOW_LIQUIDITY_ERROR_CODE,
   TOO_MANY_REQUESTS_ERROR_CODE,
   USER_REJECTED_ERROR_CODE,
 } from '../constants';
 import type { SwapErrorState } from '../types';
+import { SwapMessage } from './getSwapMessage';
 
 export function getSwapError(error: SwapErrorState): string | undefined {
   // error states handled below
diff --git a/src/swap/core/getSwapErrorCode.test.ts b/src/swap/core/getSwapErrorCode.test.ts
index b77a57fa23..5aed691c14 100644
--- a/src/swap/core/getSwapErrorCode.test.ts
+++ b/src/swap/core/getSwapErrorCode.test.ts
@@ -1,14 +1,14 @@
+import { describe, expect, it } from 'vitest';
 import {
-  GENERAL_SWAP_ERROR_CODE,
   GENERAL_SWAP_BALANCE_ERROR_CODE,
+  GENERAL_SWAP_ERROR_CODE,
   GENERAL_SWAP_QUOTE_ERROR_CODE,
   LOW_LIQUIDITY_ERROR_CODE,
   TOO_MANY_REQUESTS_ERROR_CODE,
-  UNCAUGHT_SWAP_QUOTE_ERROR_CODE,
   UNCAUGHT_SWAP_ERROR_CODE,
+  UNCAUGHT_SWAP_QUOTE_ERROR_CODE,
 } from '../constants';
 import { getSwapErrorCode } from './getSwapErrorCode';
-import { describe, expect, it } from 'vitest';
 
 describe('getSwapErrorCode', () => {
   it('should return LOW_LIQUIDITY_ERROR_CODE for errorCode -32602', () => {
diff --git a/src/swap/core/getSwapErrorCode.ts b/src/swap/core/getSwapErrorCode.ts
index dd07442df7..45dd6e35d7 100644
--- a/src/swap/core/getSwapErrorCode.ts
+++ b/src/swap/core/getSwapErrorCode.ts
@@ -1,6 +1,6 @@
 import {
-  GENERAL_SWAP_ERROR_CODE,
   GENERAL_SWAP_BALANCE_ERROR_CODE,
+  GENERAL_SWAP_ERROR_CODE,
   GENERAL_SWAP_QUOTE_ERROR_CODE,
   LOW_LIQUIDITY_ERROR_CODE,
   TOO_MANY_REQUESTS_ERROR_CODE,
diff --git a/src/swap/core/getSwapMessage.test.ts b/src/swap/core/getSwapMessage.test.ts
index a3192f1586..f934a2b341 100644
--- a/src/swap/core/getSwapMessage.test.ts
+++ b/src/swap/core/getSwapMessage.test.ts
@@ -1,14 +1,14 @@
-/**
- * @vitest-environment node
- */
-import { getSwapMessage, SwapMessage } from './getSwapMessage';
+import { describe, expect, test, vi } from 'vitest';
+import type { Token } from '../../token';
 import {
   LOW_LIQUIDITY_ERROR_CODE,
   TOO_MANY_REQUESTS_ERROR_CODE,
   USER_REJECTED_ERROR_CODE,
 } from '../constants';
-import type { Token } from '../../token';
-import { describe, expect, test, vi } from 'vitest';
+/**
+ * @vitest-environment node
+ */
+import { SwapMessage, getSwapMessage } from './getSwapMessage';
 
 const ethToken: Token = {
   name: 'ETH',
diff --git a/src/swap/core/getSwapMessage.ts b/src/swap/core/getSwapMessage.ts
index 91294e5e07..4d4c02b9f4 100644
--- a/src/swap/core/getSwapMessage.ts
+++ b/src/swap/core/getSwapMessage.ts
@@ -1,5 +1,5 @@
-import { getSwapError } from './getSwapError';
 import type { GetSwapMessageParams } from '../types';
+import { getSwapError } from './getSwapError';
 
 export enum SwapMessage {
   BALANCE_ERROR = 'Error fetching token balance',
diff --git a/src/swap/core/getSwapQuote.test.ts b/src/swap/core/getSwapQuote.test.ts
index 897169d99d..a82c078d6d 100644
--- a/src/swap/core/getSwapQuote.test.ts
+++ b/src/swap/core/getSwapQuote.test.ts
@@ -1,12 +1,12 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { CDP_GET_SWAP_QUOTE } from '../../network/definitions/swap';
+import { sendRequest } from '../../network/request';
+import type { Token } from '../../token/types';
+import { getAPIParamsForToken } from './getAPIParamsForToken';
 /**
  * @vitest-environment node
  */
 import { getSwapQuote } from './getSwapQuote';
-import { sendRequest } from '../../network/request';
-import { CDP_GET_SWAP_QUOTE } from '../../network/definitions/swap';
-import { getAPIParamsForToken } from './getAPIParamsForToken';
-import type { Token } from '../../token/types';
-import { afterEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('../../network/request');
 
diff --git a/src/swap/core/getSwapQuote.ts b/src/swap/core/getSwapQuote.ts
index 00e7e5a2b9..f78c47269d 100644
--- a/src/swap/core/getSwapQuote.ts
+++ b/src/swap/core/getSwapQuote.ts
@@ -1,14 +1,14 @@
 import { CDP_GET_SWAP_QUOTE } from '../../network/definitions/swap';
 import { sendRequest } from '../../network/request';
-import { getAPIParamsForToken } from './getAPIParamsForToken';
-import { getSwapErrorCode } from './getSwapErrorCode';
 import type {
-  GetSwapQuoteResponse,
-  SwapQuote,
-  SwapError,
   GetSwapQuoteParams,
+  GetSwapQuoteResponse,
   SwapAPIParams,
+  SwapError,
+  SwapQuote,
 } from '../types';
+import { getAPIParamsForToken } from './getAPIParamsForToken';
+import { getSwapErrorCode } from './getSwapErrorCode';
 
 /**
  * Retrieves a quote for a swap from Token A to Token B.
diff --git a/src/swap/core/getSwapTransaction.test.ts b/src/swap/core/getSwapTransaction.test.ts
index 0b25332321..902f8cdb2f 100644
--- a/src/swap/core/getSwapTransaction.test.ts
+++ b/src/swap/core/getSwapTransaction.test.ts
@@ -1,9 +1,9 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { RawTransactionData } from '../types';
 /**
  * @vitest-environment node
  */
 import { getSwapTransaction } from './getSwapTransaction';
-import type { RawTransactionData } from '../types';
-import { describe, expect, it, vi } from 'vitest';
 
 vi.mock('../../network/request');
 
diff --git a/src/swap/core/getTokenBalanceErrorState.test.ts b/src/swap/core/getTokenBalanceErrorState.test.ts
index e66acbb37f..d6183c20b8 100644
--- a/src/swap/core/getTokenBalanceErrorState.test.ts
+++ b/src/swap/core/getTokenBalanceErrorState.test.ts
@@ -1,11 +1,11 @@
+import type { ReadContractErrorType } from 'viem';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { UseBalanceReturnType, UseReadContractReturnType } from 'wagmi';
+import type { Token } from '../../token';
 /**
  * @vitest-environment node
  */
 import { getTokenBalanceErrorState } from './getTokenBalanceErrorState';
-import type { Token } from '../../token';
-import type { UseBalanceReturnType, UseReadContractReturnType } from 'wagmi';
-import type { ReadContractErrorType } from 'viem';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const ETH: Token = {
   name: 'ETH',
diff --git a/src/swap/core/getTokenBalanceErrorState.ts b/src/swap/core/getTokenBalanceErrorState.ts
index 801333da79..6fa358711a 100644
--- a/src/swap/core/getTokenBalanceErrorState.ts
+++ b/src/swap/core/getTokenBalanceErrorState.ts
@@ -1,6 +1,6 @@
-import { getSwapErrorCode } from './getSwapErrorCode';
-import type { Token } from '../../token';
 import type { UseBalanceReturnType, UseReadContractReturnType } from 'wagmi';
+import type { Token } from '../../token';
+import { getSwapErrorCode } from './getSwapErrorCode';
 
 type GetTokenBalancesErrorStateParams = {
   ethBalance?: UseBalanceReturnType;
diff --git a/src/swap/core/getTokenBalances.test.ts b/src/swap/core/getTokenBalances.test.ts
index b349573b57..dc44049c6d 100644
--- a/src/swap/core/getTokenBalances.test.ts
+++ b/src/swap/core/getTokenBalances.test.ts
@@ -1,9 +1,9 @@
+import { describe, expect, it } from 'vitest';
+import type { Token } from '../../token';
 /**
  * @vitest-environment node
  */
 import { getTokenBalances } from './getTokenBalances';
-import type { Token } from '../../token';
-import { describe, expect, it } from 'vitest';
 
 const mockTokenBalanceResponse = { data: 3304007277394n };
 const mockZeroTokenBalanceResponse = { data: 0n };
diff --git a/src/swap/core/getTokenBalances.ts b/src/swap/core/getTokenBalances.ts
index bb29f34fc1..bee52535cd 100644
--- a/src/swap/core/getTokenBalances.ts
+++ b/src/swap/core/getTokenBalances.ts
@@ -1,6 +1,6 @@
-import { getRoundedAmount } from '../../utils/getRoundedAmount';
 import { formatUnits } from 'viem';
 import type { Token } from '../../token';
+import { getRoundedAmount } from '../../utils/getRoundedAmount';
 
 type GetTokenBalancesParams = {
   token?: Token;
diff --git a/src/swap/core/isSwapError.test.ts b/src/swap/core/isSwapError.test.ts
index f90fd59d67..e2ab5bce16 100644
--- a/src/swap/core/isSwapError.test.ts
+++ b/src/swap/core/isSwapError.test.ts
@@ -1,8 +1,8 @@
+import { describe, expect, it } from 'vitest';
 /**
  * @vitest-environment node
  */
 import { isSwapError } from './isSwapError';
-import { describe, expect, it } from 'vitest';
 
 describe('isSwapError', () => {
   it('returns true for a valid SwapError object', () => {
diff --git a/src/swap/hooks/useSwapBalances.tsx b/src/swap/hooks/useSwapBalances.tsx
index 440b262fca..9716e8fb7f 100644
--- a/src/swap/hooks/useSwapBalances.tsx
+++ b/src/swap/hooks/useSwapBalances.tsx
@@ -1,8 +1,8 @@
 import { useMemo } from 'react';
+import type { Address } from 'viem';
+import type { Token } from '../../token';
 import { useGetETHBalance } from '../../wallet/core/useGetETHBalance';
 import { useGetTokenBalance } from '../../wallet/core/useGetTokenBalance';
-import type { Token } from '../../token';
-import type { Address } from 'viem';
 
 function useValue<T>(object: T): T {
   return useMemo(() => object, [object]);
diff --git a/src/swap/utils/processSwapTransaction.test.ts b/src/swap/utils/processSwapTransaction.test.ts
index 82dd746ca2..7438c0a38f 100644
--- a/src/swap/utils/processSwapTransaction.test.ts
+++ b/src/swap/utils/processSwapTransaction.test.ts
@@ -1,10 +1,10 @@
-import { processSwapTransaction } from './processSwapTransaction';
-import type { BuildSwapTransaction } from '../types';
-import { createConfig, http } from 'wagmi';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { http, createConfig } from 'wagmi';
+import { waitForTransactionReceipt } from 'wagmi/actions';
 import { mainnet, sepolia } from 'wagmi/chains';
 import { mock } from 'wagmi/connectors';
-import { waitForTransactionReceipt } from 'wagmi/actions';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { BuildSwapTransaction } from '../types';
+import { processSwapTransaction } from './processSwapTransaction';
 
 vi.mock('wagmi/actions', () => ({
   waitForTransactionReceipt: vi.fn().mockResolvedValue({}),
diff --git a/src/swap/utils/processSwapTransaction.ts b/src/swap/utils/processSwapTransaction.ts
index 8361bcf301..4a6cd76f82 100644
--- a/src/swap/utils/processSwapTransaction.ts
+++ b/src/swap/utils/processSwapTransaction.ts
@@ -1,8 +1,8 @@
+import type { TransactionReceipt } from 'viem';
 import type { Config } from 'wagmi';
 import { waitForTransactionReceipt } from 'wagmi/actions';
 import type { SendTransactionMutateAsync } from 'wagmi/query';
 import type { BuildSwapTransaction } from '../types';
-import type { TransactionReceipt } from 'viem';
 
 export async function processSwapTransaction({
   swapTransaction,
diff --git a/src/swap/utils/useFromTo.ts b/src/swap/utils/useFromTo.ts
index f052ffb032..f7faf3143e 100644
--- a/src/swap/utils/useFromTo.ts
+++ b/src/swap/utils/useFromTo.ts
@@ -1,8 +1,8 @@
 import { useState } from 'react';
-import { useSwapBalances } from '../hooks/useSwapBalances';
+import type { Address } from 'viem';
 import { useValue } from '../../internal/hooks/useValue';
 import type { Token } from '../../token';
-import type { Address } from 'viem';
+import { useSwapBalances } from '../hooks/useSwapBalances';
 
 export const useFromTo = (address: Address) => {
   const [fromAmount, setFromAmount] = useState('');
diff --git a/src/token/components/TokenChip.test.tsx b/src/token/components/TokenChip.test.tsx
index 11b3c77372..6186dc7c81 100644
--- a/src/token/components/TokenChip.test.tsx
+++ b/src/token/components/TokenChip.test.tsx
@@ -1,8 +1,8 @@
 import '@testing-library/jest-dom';
 import { fireEvent, render, screen, within } from '@testing-library/react';
 import type { Address } from 'viem';
-import { TokenChip } from './TokenChip';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { TokenChip } from './TokenChip';
 
 describe('TokenChip Component', () => {
   beforeEach(() => {
diff --git a/src/token/components/TokenImage.test.tsx b/src/token/components/TokenImage.test.tsx
index b19bc9e528..5281be5a71 100644
--- a/src/token/components/TokenImage.test.tsx
+++ b/src/token/components/TokenImage.test.tsx
@@ -1,8 +1,8 @@
 import '@testing-library/jest-dom';
 import { render, screen } from '@testing-library/react';
-import { TokenImage } from './TokenImage';
-import type { Token } from '../types';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { Token } from '../types';
+import { TokenImage } from './TokenImage';
 
 const tokenWithImage: Token = {
   name: 'Ethereum',
diff --git a/src/token/components/TokenImage.tsx b/src/token/components/TokenImage.tsx
index aa8274388d..890ed115e3 100644
--- a/src/token/components/TokenImage.tsx
+++ b/src/token/components/TokenImage.tsx
@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
+import { cn } from '../../styles/theme';
 import type { TokenImageReact } from '../types';
 import { getTokenImageColor } from './getTokenImageColor';
-import { cn } from '../../styles/theme';
 
 export function TokenImage({ className, size = 24, token }: TokenImageReact) {
   const { image, name } = token;
diff --git a/src/token/components/TokenRow.test.tsx b/src/token/components/TokenRow.test.tsx
index 55ca3d7e68..d6c44956ff 100644
--- a/src/token/components/TokenRow.test.tsx
+++ b/src/token/components/TokenRow.test.tsx
@@ -1,8 +1,8 @@
 import '@testing-library/jest-dom';
-import { render, screen, waitFor, fireEvent } from '@testing-library/react';
-import { TokenRow } from './TokenRow';
-import type { Token } from '../types';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
+import type { Token } from '../types';
+import { TokenRow } from './TokenRow';
 
 const EXAMPLE_TOKEN: Token = {
   address: '0x1234',
diff --git a/src/token/components/TokenRow.tsx b/src/token/components/TokenRow.tsx
index 73005b1c7a..5f164260aa 100644
--- a/src/token/components/TokenRow.tsx
+++ b/src/token/components/TokenRow.tsx
@@ -1,8 +1,8 @@
 import { memo } from 'react';
-import type { TokenRowReact } from '../types';
+import { cn, pressable, text } from '../../styles/theme';
 import { formatAmount } from '../core/formatAmount';
+import type { TokenRowReact } from '../types';
 import { TokenImage } from './TokenImage';
-import { cn, pressable, text } from '../../styles/theme';
 
 export const TokenRow = memo(function TokenRow({
   className,
diff --git a/src/token/components/TokenSearch.stories.tsx b/src/token/components/TokenSearch.stories.tsx
index 7046bf6b81..6bc9f595d7 100644
--- a/src/token/components/TokenSearch.stories.tsx
+++ b/src/token/components/TokenSearch.stories.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
 import type { Meta, StoryObj } from '@storybook/react';
 import { expect, fn, userEvent, within } from '@storybook/test';
-import { TokenSearch } from './TokenSearch';
+import React from 'react';
 import { getTokens } from '../core/getTokens';
+import { TokenSearch } from './TokenSearch';
 
 const meta = {
   title: 'Token/TokenSearch',
diff --git a/src/token/components/TokenSearch.test.tsx b/src/token/components/TokenSearch.test.tsx
index bbc248b6ee..e256b9dc15 100644
--- a/src/token/components/TokenSearch.test.tsx
+++ b/src/token/components/TokenSearch.test.tsx
@@ -1,7 +1,7 @@
 import '@testing-library/jest-dom';
-import { render, fireEvent, waitFor } from '@testing-library/react';
-import { TokenSearch } from './TokenSearch';
+import { fireEvent, render, waitFor } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
+import { TokenSearch } from './TokenSearch';
 
 describe('TokenSearch component', () => {
   it('should call onChange after the specified debounce delay', async () => {
diff --git a/src/token/components/TokenSearch.tsx b/src/token/components/TokenSearch.tsx
index b63a064d1e..b35e1beb1a 100644
--- a/src/token/components/TokenSearch.tsx
+++ b/src/token/components/TokenSearch.tsx
@@ -1,8 +1,8 @@
 import { useCallback, useState } from 'react';
-import type { TokenSearchReact } from '../types';
-import { SearchIcon } from './SearchIcon';
 import { TextInput } from '../../internal/form/TextInput';
 import { cn, color, pressable } from '../../styles/theme';
+import type { TokenSearchReact } from '../types';
+import { SearchIcon } from './SearchIcon';
 
 export function TokenSearch({
   className,
diff --git a/src/token/components/TokenSelectButton.test.tsx b/src/token/components/TokenSelectButton.test.tsx
index f7c14a509a..c0cf05c053 100644
--- a/src/token/components/TokenSelectButton.test.tsx
+++ b/src/token/components/TokenSelectButton.test.tsx
@@ -1,8 +1,8 @@
 import '@testing-library/jest-dom';
 import { fireEvent, render, screen } from '@testing-library/react';
 import type { Address } from 'viem';
-import { TokenSelectButton } from './TokenSelectButton';
 import { describe, expect, it, vi } from 'vitest';
+import { TokenSelectButton } from './TokenSelectButton';
 
 describe('TokenSelectButton', () => {
   const token = {
diff --git a/src/token/components/TokenSelectButton.tsx b/src/token/components/TokenSelectButton.tsx
index 6380f14aff..5b85ef177c 100644
--- a/src/token/components/TokenSelectButton.tsx
+++ b/src/token/components/TokenSelectButton.tsx
@@ -1,7 +1,7 @@
 import { type ForwardedRef, forwardRef } from 'react';
+import { cn, pressable, text } from '../../styles/theme';
 import type { TokenSelectButtonReact } from '../types';
 import { TokenImage } from './TokenImage';
-import { cn, pressable, text } from '../../styles/theme';
 
 function CaretUp() {
   return (
diff --git a/src/token/components/TokenSelectDropdown.stories.tsx b/src/token/components/TokenSelectDropdown.stories.tsx
index 436e30a845..bf5d9e884f 100644
--- a/src/token/components/TokenSelectDropdown.stories.tsx
+++ b/src/token/components/TokenSelectDropdown.stories.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
 import type { Meta, StoryObj } from '@storybook/react';
 import { fn } from '@storybook/test';
-import { TokenSelectDropdown } from './TokenSelectDropdown';
+import React from 'react';
 import type { Token } from '../types';
+import { TokenSelectDropdown } from './TokenSelectDropdown';
 
 const tokens: Token[] = [
   {
diff --git a/src/token/components/TokenSelectDropdown.test.tsx b/src/token/components/TokenSelectDropdown.test.tsx
index ee3ebf6028..042e3000dc 100644
--- a/src/token/components/TokenSelectDropdown.test.tsx
+++ b/src/token/components/TokenSelectDropdown.test.tsx
@@ -1,9 +1,9 @@
 import '@testing-library/jest-dom';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import type { Address } from 'viem';
-import { TokenSelectDropdown } from './TokenSelectDropdown';
-import type { Token } from '../types';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { Token } from '../types';
+import { TokenSelectDropdown } from './TokenSelectDropdown';
 
 describe('TokenSelectDropdown', () => {
   const setToken = vi.fn();
diff --git a/src/token/components/TokenSelectDropdown.tsx b/src/token/components/TokenSelectDropdown.tsx
index 14c9e9f6d3..7147c4ae0a 100644
--- a/src/token/components/TokenSelectDropdown.tsx
+++ b/src/token/components/TokenSelectDropdown.tsx
@@ -1,8 +1,8 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
+import { background, cn } from '../../styles/theme';
 import type { TokenSelectDropdownReact } from '../types';
 import { TokenRow } from './TokenRow';
 import { TokenSelectButton } from './TokenSelectButton';
-import { background, cn } from '../../styles/theme';
 
 export function TokenSelectDropdown({
   options,
diff --git a/src/token/components/TokenSelectModal.test.tsx b/src/token/components/TokenSelectModal.test.tsx
index 5df328bcb2..20882463bb 100644
--- a/src/token/components/TokenSelectModal.test.tsx
+++ b/src/token/components/TokenSelectModal.test.tsx
@@ -1,9 +1,9 @@
 import '@testing-library/jest-dom';
-import { render, screen, fireEvent } from '@testing-library/react';
-import { TokenSelectModal } from './TokenSelectModal';
+import { fireEvent, render, screen } from '@testing-library/react';
 import type { Address } from 'viem';
-import type { Token } from '../types';
 import { describe, expect, it, vi } from 'vitest';
+import type { Token } from '../types';
+import { TokenSelectModal } from './TokenSelectModal';
 
 const tokens: Token[] = [
   {
diff --git a/src/token/components/TokenSelectModal.tsx b/src/token/components/TokenSelectModal.tsx
index e5318fe5b8..11a8cfbe2b 100644
--- a/src/token/components/TokenSelectModal.tsx
+++ b/src/token/components/TokenSelectModal.tsx
@@ -1,10 +1,10 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
+import { background, cn, text } from '../../styles/theme';
 import type { Token, TokenSelectModalReact } from '../types';
-import { TokenSelectButton } from './TokenSelectButton';
-import { TokenSearch } from './TokenSearch';
 import { TokenChip } from './TokenChip';
 import { TokenRow } from './TokenRow';
-import { background, cn, text } from '../../styles/theme';
+import { TokenSearch } from './TokenSearch';
+import { TokenSelectButton } from './TokenSelectButton';
 
 const backdropStyle = {
   background: 'rgba(226, 232, 240, 0.5)',
diff --git a/src/token/components/getTokenImageColor.test.ts b/src/token/components/getTokenImageColor.test.ts
index 0dd0db8b02..aac27b943a 100644
--- a/src/token/components/getTokenImageColor.test.ts
+++ b/src/token/components/getTokenImageColor.test.ts
@@ -1,8 +1,8 @@
+import { describe, expect, it } from 'vitest';
 /**
  * @vitest-environment node
  */
 import { getTokenImageColor } from './getTokenImageColor';
-import { describe, expect, it } from 'vitest';
 
 describe('getTokenImageColor', () => {
   it('should return a consistent color for the same string', () => {
diff --git a/src/token/core/formatAmount.test.ts b/src/token/core/formatAmount.test.ts
index ccbdb012c3..de30dcbc68 100644
--- a/src/token/core/formatAmount.test.ts
+++ b/src/token/core/formatAmount.test.ts
@@ -1,9 +1,9 @@
+import { describe, expect, it } from 'vitest';
 /**
  * @vitest-environment node
  */
 import type { FormatAmountOptions } from '../types';
 import { formatAmount } from './formatAmount';
-import { describe, expect, it } from 'vitest';
 
 describe('formatAmount', () => {
   it('should return with commas with default options', () => {
diff --git a/src/token/core/getToken.test.ts b/src/token/core/getToken.test.ts
index 53e3405c83..0a000c0212 100644
--- a/src/token/core/getToken.test.ts
+++ b/src/token/core/getToken.test.ts
@@ -1,10 +1,10 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { CDP_LIST_SWAP_ASSETS } from '../../network/definitions/swap';
+import { sendRequest } from '../../network/request';
 /**
  * @vitest-environment node
  */
 import { getTokens } from './getTokens';
-import { sendRequest } from '../../network/request';
-import { CDP_LIST_SWAP_ASSETS } from '../../network/definitions/swap';
-import { afterEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('../../network/request');
 
diff --git a/src/token/core/getTokens.ts b/src/token/core/getTokens.ts
index 55b997d3fb..8dfd7e94ee 100644
--- a/src/token/core/getTokens.ts
+++ b/src/token/core/getTokens.ts
@@ -1,11 +1,11 @@
 import { CDP_LIST_SWAP_ASSETS } from '../../network/definitions/swap';
+import { sendRequest } from '../../network/request';
 import type {
-  Token,
+  GetTokensError,
   GetTokensOptions,
   GetTokensResponse,
-  GetTokensError,
+  Token,
 } from '../types';
-import { sendRequest } from '../../network/request';
 
 /**
  * Retrieves a list of tokens on Base.
diff --git a/src/token/index.test.ts b/src/token/index.test.ts
index 7fc366e76c..50fa84e698 100644
--- a/src/token/index.test.ts
+++ b/src/token/index.test.ts
@@ -1,3 +1,4 @@
+import { describe, expect, it } from 'vitest';
 import {
   TokenChip,
   TokenImage,
@@ -8,7 +9,6 @@ import {
   formatAmount,
   getTokens,
 } from './index'; // Adjust the path accordingly
-import { describe, expect, it } from 'vitest';
 
 describe('Module Exports', () => {
   it('should export TokenChip', () => {
diff --git a/src/transaction/components/Transaction.tsx b/src/transaction/components/Transaction.tsx
index 67ff312e6f..d7e2b07e26 100644
--- a/src/transaction/components/Transaction.tsx
+++ b/src/transaction/components/Transaction.tsx
@@ -1,5 +1,5 @@
-import { TransactionProvider } from './TransactionProvider';
 import type { TransactionReact } from '../types';
+import { TransactionProvider } from './TransactionProvider';
 
 export function Transaction({ children }: TransactionReact) {
   return <TransactionProvider>{children}</TransactionProvider>;
diff --git a/src/transaction/components/TransactionProvider.tsx b/src/transaction/components/TransactionProvider.tsx
index cf9db9af8f..641d419a24 100644
--- a/src/transaction/components/TransactionProvider.tsx
+++ b/src/transaction/components/TransactionProvider.tsx
@@ -1,6 +1,6 @@
 import { createContext, useContext } from 'react';
-import type { TransactionContextType } from '../types';
 import { useValue } from '../../internal/hooks/useValue';
+import type { TransactionContextType } from '../types';
 
 const emptyContext = {} as TransactionContextType;
 
diff --git a/src/useOnchainKit.test.tsx b/src/useOnchainKit.test.tsx
index 9eb5bd6892..8c5ae82053 100644
--- a/src/useOnchainKit.test.tsx
+++ b/src/useOnchainKit.test.tsx
@@ -1,8 +1,8 @@
 import '@testing-library/jest-dom';
 import { render } from '@testing-library/react';
-import { useOnchainKit } from './useOnchainKit';
+import { describe, expect, it } from 'vitest';
 import { setOnchainKitConfig } from './OnchainKitConfig';
-import { describe, it, expect } from 'vitest';
+import { useOnchainKit } from './useOnchainKit';
 
 const TestComponent = () => {
   const { schemaId, apiKey } = useOnchainKit();
diff --git a/src/utils/neynar/frame/neynarFrameValidation.ts b/src/utils/neynar/frame/neynarFrameValidation.ts
index 954ab14338..2bd7aa2b8d 100644
--- a/src/utils/neynar/frame/neynarFrameValidation.ts
+++ b/src/utils/neynar/frame/neynarFrameValidation.ts
@@ -1,6 +1,6 @@
 import type { FrameValidationData } from '../../../frame/types';
-import { convertToNeynarResponseModel } from './convertToNeynarResponseModel';
 import { postDataToNeynar } from '../postDataToNeynar';
+import { convertToNeynarResponseModel } from './convertToNeynarResponseModel';
 
 export const NEYNAR_DEFAULT_API_KEY = 'NEYNAR_ONCHAIN_KIT';
 
diff --git a/src/utils/neynar/user/getCustodyAddressForFidNeynar.ts b/src/utils/neynar/user/getCustodyAddressForFidNeynar.ts
index 5a5843e8a8..18f1211dd5 100644
--- a/src/utils/neynar/user/getCustodyAddressForFidNeynar.ts
+++ b/src/utils/neynar/user/getCustodyAddressForFidNeynar.ts
@@ -1,5 +1,5 @@
-import { getDataFromNeynar } from '../getDataFromNeynar';
 import { NEYNAR_DEFAULT_API_KEY } from '../frame/neynarFrameValidation';
+import { getDataFromNeynar } from '../getDataFromNeynar';
 
 export async function getCustodyAddressForFidNeynar(
   fid: number,
diff --git a/src/wallet/components/ConnectButton.tsx b/src/wallet/components/ConnectButton.tsx
index 6f81e7d44e..8ee8cdc663 100644
--- a/src/wallet/components/ConnectButton.tsx
+++ b/src/wallet/components/ConnectButton.tsx
@@ -1,4 +1,4 @@
-import { cn, color, pressable, text as dsText } from '../../styles/theme';
+import { cn, color, text as dsText, pressable } from '../../styles/theme';
 import type { ConnectButtonReact } from '../types';
 
 export function ConnectButton({
diff --git a/src/wallet/components/ConnectWallet.test.tsx b/src/wallet/components/ConnectWallet.test.tsx
index eb841e8d06..5ade86b0e1 100644
--- a/src/wallet/components/ConnectWallet.test.tsx
+++ b/src/wallet/components/ConnectWallet.test.tsx
@@ -1,11 +1,11 @@
+import { fireEvent, render, screen } from '@testing-library/react';
 /**
  * @vitest-environment jsdom
  */
 import type { ReactNode } from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { ConnectWallet } from './ConnectWallet';
 import { useAccount, useConnect } from 'wagmi';
+import { ConnectWallet } from './ConnectWallet';
 import { useWalletContext } from './WalletProvider';
 
 vi.mock('wagmi', () => ({
diff --git a/src/wallet/components/ConnectWallet.tsx b/src/wallet/components/ConnectWallet.tsx
index 198d3cd727..5032d4136f 100644
--- a/src/wallet/components/ConnectWallet.tsx
+++ b/src/wallet/components/ConnectWallet.tsx
@@ -1,12 +1,12 @@
 import { ConnectButton as ConnectButtonRainboKit } from '@rainbow-me/rainbowkit';
 import { useCallback } from 'react';
 import { useAccount, useConnect } from 'wagmi';
-import { ConnectButton } from './ConnectButton';
-import { useWalletContext } from './WalletProvider';
 import { IdentityProvider } from '../../identity/components/IdentityProvider';
 import { Spinner } from '../../internal/loading/Spinner';
-import { cn, color, pressable, text as dsText } from '../../styles/theme';
+import { cn, color, text as dsText, pressable } from '../../styles/theme';
 import type { ConnectWalletReact } from '../types';
+import { ConnectButton } from './ConnectButton';
+import { useWalletContext } from './WalletProvider';
 
 export function ConnectWallet({
   children,
diff --git a/src/wallet/components/Wallet.test.tsx b/src/wallet/components/Wallet.test.tsx
index 243e099ae0..59c8b132bd 100644
--- a/src/wallet/components/Wallet.test.tsx
+++ b/src/wallet/components/Wallet.test.tsx
@@ -2,8 +2,8 @@ import '@testing-library/jest-dom';
 import { render, screen, waitFor } from '@testing-library/react';
 import { useAccount, useConnect, useDisconnect } from 'wagmi';
 import { ConnectWallet } from './ConnectWallet';
-import { WalletDropdown } from './WalletDropdown';
 import { Wallet } from './Wallet';
+import { WalletDropdown } from './WalletDropdown';
 
 vi.mock('wagmi', () => ({
   useAccount: vi.fn(),
diff --git a/src/wallet/components/Wallet.tsx b/src/wallet/components/Wallet.tsx
index 9846c0394c..160a7436df 100644
--- a/src/wallet/components/Wallet.tsx
+++ b/src/wallet/components/Wallet.tsx
@@ -1,8 +1,8 @@
 import { Children, useMemo } from 'react';
+import type { WalletReact } from '../types';
 import { ConnectWallet } from './ConnectWallet';
 import { WalletDropdown } from './WalletDropdown';
 import { WalletProvider } from './WalletProvider';
-import type { WalletReact } from '../types';
 
 export function Wallet({ children }: WalletReact) {
   const { connect, dropdown } = useMemo(() => {
diff --git a/src/wallet/components/WalletDropdown.test.tsx b/src/wallet/components/WalletDropdown.test.tsx
index 02f595a9ff..9a3fa4d4b4 100644
--- a/src/wallet/components/WalletDropdown.test.tsx
+++ b/src/wallet/components/WalletDropdown.test.tsx
@@ -1,13 +1,13 @@
 import '@testing-library/jest-dom';
 import { render, renderHook, screen, waitFor } from '@testing-library/react';
 import { useAccount } from 'wagmi';
-import { WalletDropdown } from './WalletDropdown';
-import { useWalletContext } from './WalletProvider';
 import { Identity } from '../../identity/components/Identity';
 import {
   IdentityProvider,
   useIdentityContext,
 } from '../../identity/components/IdentityProvider';
+import { WalletDropdown } from './WalletDropdown';
+import { useWalletContext } from './WalletProvider';
 
 vi.mock('wagmi', () => ({
   useAccount: vi.fn(),
diff --git a/src/wallet/components/WalletDropdown.tsx b/src/wallet/components/WalletDropdown.tsx
index 9ebfe3c548..88c98bcbb3 100644
--- a/src/wallet/components/WalletDropdown.tsx
+++ b/src/wallet/components/WalletDropdown.tsx
@@ -1,9 +1,9 @@
 import { Children, cloneElement, isValidElement, useMemo } from 'react';
 import { useAccount } from 'wagmi';
+import { Identity } from '../../identity/components/Identity';
+import { background, cn } from '../../styles/theme';
 import type { WalletDropdownReact } from '../types';
 import { useWalletContext } from './WalletProvider';
-import { background, cn } from '../../styles/theme';
-import { Identity } from '../../identity/components/Identity';
 
 export function WalletDropdown({ children, className }: WalletDropdownReact) {
   const { isOpen } = useWalletContext();
diff --git a/src/wallet/components/WalletDropdownDisconnect.tsx b/src/wallet/components/WalletDropdownDisconnect.tsx
index 8a72c38e8b..b01d1472ac 100644
--- a/src/wallet/components/WalletDropdownDisconnect.tsx
+++ b/src/wallet/components/WalletDropdownDisconnect.tsx
@@ -1,8 +1,8 @@
-import { useConnect, useDisconnect } from 'wagmi';
-import { cn, pressable, text as dsText } from '../../styles/theme';
-import { disconnectSvg } from './disconnectSvg';
 import { useCallback } from 'react';
+import { useConnect, useDisconnect } from 'wagmi';
+import { cn, text as dsText, pressable } from '../../styles/theme';
 import type { WalletDropdownDisconnectReact } from '../types';
+import { disconnectSvg } from './disconnectSvg';
 
 export function WalletDropdownDisconnect({
   className,
diff --git a/src/wallet/components/WalletDropdownLink.tsx b/src/wallet/components/WalletDropdownLink.tsx
index 97e3e08f32..ddfdc160a7 100644
--- a/src/wallet/components/WalletDropdownLink.tsx
+++ b/src/wallet/components/WalletDropdownLink.tsx
@@ -1,7 +1,7 @@
-import { useMemo, isValidElement } from 'react';
+import { isValidElement, useMemo } from 'react';
 import { cn, pressable, text } from '../../styles/theme';
-import { walletSvg } from './walletSvg';
 import type { WalletDropdownLinkReact } from '../types';
+import { walletSvg } from './walletSvg';
 
 export function WalletDropdownLink({
   children,
diff --git a/src/wallet/components/WalletProvider.tsx b/src/wallet/components/WalletProvider.tsx
index f03fafab17..98d70559a2 100644
--- a/src/wallet/components/WalletProvider.tsx
+++ b/src/wallet/components/WalletProvider.tsx
@@ -1,6 +1,6 @@
 import { createContext, useContext, useState } from 'react';
-import { useValue } from '../../internal/hooks/useValue';
 import type { ReactNode } from 'react';
+import { useValue } from '../../internal/hooks/useValue';
 import type { WalletContextType } from '../types';
 
 const emptyContext = {} as WalletContextType;
diff --git a/src/wallet/core/useGetETHBalance.test.ts b/src/wallet/core/useGetETHBalance.test.ts
index e5e2af42a0..6b7f4d6440 100644
--- a/src/wallet/core/useGetETHBalance.test.ts
+++ b/src/wallet/core/useGetETHBalance.test.ts
@@ -2,9 +2,9 @@
  * @vitest-environment jsdom
  */
 import { renderHook } from '@testing-library/react';
-import { useGetETHBalance } from './useGetETHBalance';
+import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import { useBalance } from 'wagmi';
-import { beforeEach, describe, expect, it, vi, type Mock } from 'vitest';
+import { useGetETHBalance } from './useGetETHBalance';
 
 vi.mock('wagmi', () => {
   return {
diff --git a/src/wallet/core/useGetETHBalance.ts b/src/wallet/core/useGetETHBalance.ts
index 757d7118b7..db4866294e 100644
--- a/src/wallet/core/useGetETHBalance.ts
+++ b/src/wallet/core/useGetETHBalance.ts
@@ -1,11 +1,11 @@
 import { useMemo } from 'react';
-import { useBalance } from 'wagmi';
 import { formatUnits } from 'viem';
-import { getRoundedAmount } from '../../utils/getRoundedAmount';
-import { getSwapErrorCode } from '../../swap/core/getSwapErrorCode';
 import type { Address } from 'viem';
+import { useBalance } from 'wagmi';
 import type { UseBalanceReturnType } from 'wagmi';
 import type { SwapError } from '../../swap';
+import { getSwapErrorCode } from '../../swap/core/getSwapErrorCode';
+import { getRoundedAmount } from '../../utils/getRoundedAmount';
 import type { UseGetETHBalanceResponse } from '../types';
 
 const ETH_DECIMALS = 18;
diff --git a/src/wallet/core/useGetTokenBalance.test.ts b/src/wallet/core/useGetTokenBalance.test.ts
index b9f1d76edc..e83ea43ddf 100644
--- a/src/wallet/core/useGetTokenBalance.test.ts
+++ b/src/wallet/core/useGetTokenBalance.test.ts
@@ -2,10 +2,10 @@
  * @vitest-environment jsdom
  */
 import { renderHook } from '@testing-library/react';
-import { useGetTokenBalance } from './useGetTokenBalance';
+import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import { useReadContract } from 'wagmi';
 import type { Token } from '../../token';
-import { beforeEach, describe, expect, it, vi, type Mock } from 'vitest';
+import { useGetTokenBalance } from './useGetTokenBalance';
 
 vi.mock('wagmi', () => {
   return {
diff --git a/src/wallet/core/useGetTokenBalance.ts b/src/wallet/core/useGetTokenBalance.ts
index f206f2af1d..22f0b18a8e 100644
--- a/src/wallet/core/useGetTokenBalance.ts
+++ b/src/wallet/core/useGetTokenBalance.ts
@@ -1,12 +1,12 @@
 import { useMemo } from 'react';
-import { useReadContract } from 'wagmi';
 import { erc20Abi, formatUnits } from 'viem';
-import { getRoundedAmount } from '../../utils/getRoundedAmount';
-import { getSwapErrorCode } from '../../swap/core/getSwapErrorCode';
 import type { Address } from 'viem';
-import type { Token } from '../../token';
+import { useReadContract } from 'wagmi';
 import type { UseReadContractReturnType } from 'wagmi';
 import type { SwapError } from '../../swap';
+import { getSwapErrorCode } from '../../swap/core/getSwapErrorCode';
+import type { Token } from '../../token';
+import { getRoundedAmount } from '../../utils/getRoundedAmount';
 import type { UseGetTokenBalanceResponse } from '../types';
 
 export function useGetTokenBalance(
diff --git a/src/wallet/isValidAAEntrypoint.test.ts b/src/wallet/isValidAAEntrypoint.test.ts
index c1a2a4bb94..9a6bcfb557 100644
--- a/src/wallet/isValidAAEntrypoint.test.ts
+++ b/src/wallet/isValidAAEntrypoint.test.ts
@@ -1,5 +1,5 @@
-import { isValidAAEntrypoint } from './isValidAAEntrypoint';
 import { ENTRYPOINT_ADDRESS_V06 } from 'permissionless';
+import { isValidAAEntrypoint } from './isValidAAEntrypoint';
 
 describe('isValidAAEntrypoint', () => {
   it('should return true for a valid v6 entrypoint address', () => {
diff --git a/src/wallet/isWalletACoinbaseSmartWallet.test.ts b/src/wallet/isWalletACoinbaseSmartWallet.test.ts
index 21b9e7d924..a24c601d94 100644
--- a/src/wallet/isWalletACoinbaseSmartWallet.test.ts
+++ b/src/wallet/isWalletACoinbaseSmartWallet.test.ts
@@ -1,10 +1,10 @@
+import type { UserOperation } from 'permissionless';
+import type { PublicClient } from 'viem';
 import {
   CB_SW_PROXY_BYTECODE,
   CB_SW_V1_IMPLEMENTATION_ADDRESS,
 } from './constants';
 import { isWalletACoinbaseSmartWallet } from './isWalletACoinbaseSmartWallet';
-import type { UserOperation } from 'permissionless';
-import type { PublicClient } from 'viem';
 
 describe('isWalletACoinbaseSmartWallet', () => {
   const client = {
diff --git a/src/wallet/isWalletACoinbaseSmartWallet.ts b/src/wallet/isWalletACoinbaseSmartWallet.ts
index b9c8baf90f..f5a8d5dff6 100644
--- a/src/wallet/isWalletACoinbaseSmartWallet.ts
+++ b/src/wallet/isWalletACoinbaseSmartWallet.ts
@@ -1,11 +1,11 @@
 import { checksumAddress, decodeAbiParameters } from 'viem';
+import type { Address, BlockTag, Hex } from 'viem';
 import {
   CB_SW_FACTORY_ADDRESS,
   CB_SW_PROXY_BYTECODE,
   CB_SW_V1_IMPLEMENTATION_ADDRESS,
   ERC_1967_PROXY_IMPLEMENTATION_SLOT,
 } from './constants';
-import type { Address, BlockTag, Hex } from 'viem';
 import type {
   IsWalletACoinbaseSmartWalletOptions,
   IsWalletACoinbaseSmartWalletResponse,
diff --git a/src/wallet/types.ts b/src/wallet/types.ts
index e9d2667e99..419ef50388 100644
--- a/src/wallet/types.ts
+++ b/src/wallet/types.ts
@@ -1,8 +1,8 @@
 import type { UserOperation } from 'permissionless';
+import type { Dispatch, ReactNode, SetStateAction } from 'react';
 import type { Address, PublicClient } from 'viem';
-import type { SwapError } from '../swap';
 import type { UseBalanceReturnType, UseReadContractReturnType } from 'wagmi';
-import type { Dispatch, ReactNode, SetStateAction } from 'react';
+import type { SwapError } from '../swap';
 
 export type ConnectButtonReact = {
   className?: string; // Optional className override for button element
diff --git a/vitest.config.ts b/vitest.config.ts
index 60970b1556..91060278f0 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -20,10 +20,10 @@ export default defineConfig({
       ],
       reportOnFailure: true,
       thresholds: {
-        statements: 95.34,
+        statements: 95.33,
         branches: 97.7,
         functions: 90.5,
-        lines: 95.34,
+        lines: 95.33,
       },
     },
     environment: 'jsdom',