diff --git a/AGENTS.md b/AGENTS.md
index c4c320b0..f196796d 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -9,7 +9,7 @@ Next.js routes live under `app/`. Shared logic and reusable UI sit in `src/`, wi
- `pnpm build` — produce a clean production bundle after clearing `.next`.
- `pnpm start` — serve the production build locally for release validation.
- `pnpm check` — run formatting, ESLint, and Stylelint together.
-- `pnpm lint` / `pnpm stylelint` — target React or CSS changes individually.
+- `pnpm lint` — target React or CSS changes individually.
- `pnpm test` — execute Jest suites with the configured setup.
## Coding Style & Naming Conventions
diff --git a/app/HomePage.tsx b/app/HomePage.tsx
index 06bb2dd3..ee24833a 100644
--- a/app/HomePage.tsx
+++ b/app/HomePage.tsx
@@ -102,15 +102,7 @@ function CustomTypingAnimation() {
const timeout = setTimeout(
() => {
- if (!isDeleting) {
- // Typing
- if (displayText.length < targetText.length) {
- setDisplayText(targetText.slice(0, displayText.length + 1));
- } else {
- // Finished typing, pause
- setIsPaused(true);
- }
- } else {
+ if (isDeleting) {
// Deleting
if (displayText.length > deleteToLength) {
setDisplayText(displayText.slice(0, -1));
@@ -119,6 +111,12 @@ function CustomTypingAnimation() {
setIsDeleting(false);
setPhraseIndex(getNextPhraseIndex(phraseIndex));
}
+ } else if (displayText.length < targetText.length) {
+ // Typing
+ setDisplayText(targetText.slice(0, displayText.length + 1));
+ } else {
+ // Finished typing, pause
+ setIsPaused(true);
}
},
isDeleting ? deletingSpeed : typingSpeed,
diff --git a/app/admin/stats/components/AssetMetricsTable.tsx b/app/admin/stats/components/AssetMetricsTable.tsx
index df7790db..1ddd279f 100644
--- a/app/admin/stats/components/AssetMetricsTable.tsx
+++ b/app/admin/stats/components/AssetMetricsTable.tsx
@@ -78,9 +78,8 @@ export function AssetMetricsTable({ data }: AssetMetricsTableProps) {
if (sortDirection === 'asc') {
return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
- } else {
- return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
}
+ return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
});
}, [processedData, sortKey, sortDirection]);
diff --git a/app/admin/stats/components/TransactionsTable.tsx b/app/admin/stats/components/TransactionsTable.tsx
index 4b991773..dfa3bc2c 100644
--- a/app/admin/stats/components/TransactionsTable.tsx
+++ b/app/admin/stats/components/TransactionsTable.tsx
@@ -169,9 +169,8 @@ export function TransactionsTable({
if (sortDirection === 'asc') {
return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
- } else {
- return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
}
+ return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
});
}, [filteredData, sortKey, sortDirection]);
diff --git a/app/api/block/route.ts b/app/api/block/route.ts
index e4fee497..129468e2 100644
--- a/app/api/block/route.ts
+++ b/app/api/block/route.ts
@@ -57,8 +57,6 @@ export async function GET(request: NextRequest) {
blockNumber: Number(block.number),
timestamp: Number(block.timestamp),
});
- } else {
- console.log('etherscanBlock is null', timestamp, chainId);
}
if (!client) {
diff --git a/app/autovault/[chainId]/[vaultAddress]/components/DepositToVaultModal.tsx b/app/autovault/[chainId]/[vaultAddress]/components/DepositToVaultModal.tsx
index 5834493b..1e4aa2e7 100644
--- a/app/autovault/[chainId]/[vaultAddress]/components/DepositToVaultModal.tsx
+++ b/app/autovault/[chainId]/[vaultAddress]/components/DepositToVaultModal.tsx
@@ -87,11 +87,7 @@ export function DepositToVaultModal({
onClose={onClose}
/>
- {!isConnected ? (
-
- ) : (
+ {isConnected ? (
@@ -135,6 +131,10 @@ export function DepositToVaultModal({
+ ) : (
+
)}
diff --git a/app/autovault/[chainId]/[vaultAddress]/components/settings/AgentsTab.tsx b/app/autovault/[chainId]/[vaultAddress]/components/settings/AgentsTab.tsx
index 2ece99bc..ab396af9 100644
--- a/app/autovault/[chainId]/[vaultAddress]/components/settings/AgentsTab.tsx
+++ b/app/autovault/[chainId]/[vaultAddress]/components/settings/AgentsTab.tsx
@@ -110,23 +110,7 @@ export function AgentsTab({
)}
- {!isEditingAllocators ? (
- // Read-only view
- allocators.length === 0 ? (
- No allocators assigned
- ) : (
-
- {allocators.map((address) => (
-
- ))}
-
{allocators.length > 0 && (
@@ -202,6 +186,20 @@ export function AgentsTab({
+ ) : // Read-only view
+ allocators.length === 0 ? (
+ No allocators assigned
+ ) : (
+
+ {allocators.map((address) => (
+
+ ))}
+
-
No caps configured yet
-
Set caps to control how agents allocate funds across markets
-
{/* Collateral Caps */}
{collateralCapsWithMarkets.length > 0 && (
@@ -306,6 +301,11 @@ export function CurrentCaps({ existingCaps, isOwner, onStartEdit, chainId, vault
);
})()}
+ ) : (
+
+
No caps configured yet
+
Set caps to control how agents allocate funds across markets
+
- {type}:
-
- {formatValue(getAverageVolumeStats(type as 'supply' | 'borrow' | 'liquidity'))}
-
-
- ))}
-
+ ['supply', 'borrow', 'liquidity'].map((type) => (
+
+ {type}:
+
+ {formatValue(getAverageVolumeStats(type as 'supply' | 'borrow' | 'liquidity'))}
+
+
+ ))
)}
diff --git a/app/market/[chainId]/[marketid]/content.tsx b/app/market/[chainId]/[marketid]/content.tsx
index c17cfe51..458a4294 100644
--- a/app/market/[chainId]/[marketid]/content.tsx
+++ b/app/market/[chainId]/[marketid]/content.tsx
@@ -55,7 +55,6 @@ const calculateTimeRange = (timeframe: '1d' | '7d' | '30d'): TimeseriesOptions =
// Use DAY interval for longer ranges if desired, adjust as needed
interval = 'DAY';
break;
- case '7d':
default:
startTimestamp = endTimestamp - WEEK_IN_SECONDS;
break;
diff --git a/app/markets/components/RiskIndicator.tsx b/app/markets/components/RiskIndicator.tsx
index 79cc0e5f..43b0c705 100644
--- a/app/markets/components/RiskIndicator.tsx
+++ b/app/markets/components/RiskIndicator.tsx
@@ -36,6 +36,13 @@ const levelToIcon = (level: 'green' | 'yellow' | 'red') => {
className="text-red-600"
/>
);
+ default:
+ return (
+
+ );
}
};
@@ -56,6 +63,11 @@ const levelToStyle = (level: 'green' | 'yellow' | 'red') => {
text: 'text-red-700 dark:text-red-300',
bar: 'bg-red-500',
};
+ default:
+ return {
+ text: 'text-green-700 dark:text-green-300',
+ bar: 'bg-green-500',
+ };
}
};
diff --git a/app/markets/components/constants.ts b/app/markets/components/constants.ts
index 7b313484..9ed581bf 100644
--- a/app/markets/components/constants.ts
+++ b/app/markets/components/constants.ts
@@ -17,18 +17,18 @@ export enum SortColumn {
export const GAS_COSTS = {
// direct supply through bundler, no approval
- BUNDLER_SUPPLY: 180000,
+ BUNDLER_SUPPLY: 180_000,
// An additional supply through the bundler, already approved
- SINGLE_SUPPLY: 80000,
+ SINGLE_SUPPLY: 80_000,
- SINGLE_WITHDRAW: 100000,
+ SINGLE_WITHDRAW: 100_000,
// single withdraw + supply
- BUNDLER_REBALANCE: 240000,
+ BUNDLER_REBALANCE: 240_000,
// directly borrow from Morpho Blue
- DIRECT_WITHDRAW: 100000,
+ DIRECT_WITHDRAW: 100_000,
};
// additional multiplier for buffer gas. Rabby uses 1.5
diff --git a/app/markets/components/markets.tsx b/app/markets/components/markets.tsx
index 0b0e90f1..212d23a8 100644
--- a/app/markets/components/markets.tsx
+++ b/app/markets/components/markets.tsx
@@ -28,7 +28,7 @@ import { filterMarkets, sortMarkets, createPropertySort, createStarredSort } fro
import { parseNumericThreshold } from '@/utils/markets';
import type { SupportedNetworks } from '@/utils/networks';
import type { PriceFeedVendors } from '@/utils/oracle';
-import * as keys from '@/utils/storageKeys';
+import { storageKeys } from '@/utils/storageKeys';
import type { ERC20Token, UnknownERC20Token } from '@/utils/tokens';
import type { Market } from '@/utils/types';
@@ -78,8 +78,8 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
const [uniqueCollaterals, setUniqueCollaterals] = useState<(ERC20Token | UnknownERC20Token)[]>([]);
const [uniqueLoanAssets, setUniqueLoanAssets] = useState<(ERC20Token | UnknownERC20Token)[]>([]);
- const [sortColumn, setSortColumn] = useLocalStorage(keys.MarketSortColumnKey, SortColumn.Supply);
- const [sortDirection, setSortDirection] = useLocalStorage(keys.MarketSortDirectionKey, -1);
+ const [sortColumn, setSortColumn] = useLocalStorage(storageKeys.MarketSortColumnKey, SortColumn.Supply);
+ const [sortDirection, setSortDirection] = useLocalStorage(storageKeys.MarketSortDirectionKey, -1);
const [showSupplyModal, setShowSupplyModal] = useState(false);
const [selectedMarket, setSelectedMarket] = useState(undefined);
@@ -92,29 +92,32 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
const { currentPage, setCurrentPage, entriesPerPage, handleEntriesPerPageChange, resetPage } = usePagination();
- const [includeUnknownTokens, setIncludeUnknownTokens] = useLocalStorage(keys.MarketsShowUnknownTokens, false);
- const [showUnknownOracle, setShowUnknownOracle] = useLocalStorage(keys.MarketsShowUnknownOracle, false);
+ const [includeUnknownTokens, setIncludeUnknownTokens] = useLocalStorage(storageKeys.MarketsShowUnknownTokens, false);
+ const [showUnknownOracle, setShowUnknownOracle] = useLocalStorage(storageKeys.MarketsShowUnknownOracle, false);
const { allTokens, findToken } = useTokens();
// USD Filter values
- const [usdMinSupply, setUsdMinSupply] = useLocalStorage(keys.MarketsUsdMinSupplyKey, DEFAULT_MIN_SUPPLY_USD.toString());
- const [usdMinBorrow, setUsdMinBorrow] = useLocalStorage(keys.MarketsUsdMinBorrowKey, '');
- const [usdMinLiquidity, setUsdMinLiquidity] = useLocalStorage(keys.MarketsUsdMinLiquidityKey, DEFAULT_MIN_LIQUIDITY_USD.toString());
+ const [usdMinSupply, setUsdMinSupply] = useLocalStorage(storageKeys.MarketsUsdMinSupplyKey, DEFAULT_MIN_SUPPLY_USD.toString());
+ const [usdMinBorrow, setUsdMinBorrow] = useLocalStorage(storageKeys.MarketsUsdMinBorrowKey, '');
+ const [usdMinLiquidity, setUsdMinLiquidity] = useLocalStorage(
+ storageKeys.MarketsUsdMinLiquidityKey,
+ DEFAULT_MIN_LIQUIDITY_USD.toString(),
+ );
// USD Filter enabled states
const [minSupplyEnabled, setMinSupplyEnabled] = useLocalStorage(
- keys.MarketsMinSupplyEnabledKey,
+ storageKeys.MarketsMinSupplyEnabledKey,
true, // Default to enabled for backward compatibility
);
- const [minBorrowEnabled, setMinBorrowEnabled] = useLocalStorage(keys.MarketsMinBorrowEnabledKey, false);
- const [minLiquidityEnabled, setMinLiquidityEnabled] = useLocalStorage(keys.MarketsMinLiquidityEnabledKey, false);
+ const [minBorrowEnabled, setMinBorrowEnabled] = useLocalStorage(storageKeys.MarketsMinBorrowEnabledKey, false);
+ const [minLiquidityEnabled, setMinLiquidityEnabled] = useLocalStorage(storageKeys.MarketsMinLiquidityEnabledKey, false);
- const [trustedVaultsOnly, setTrustedVaultsOnly] = useLocalStorage(keys.MarketsTrustedVaultsOnlyKey, false);
+ const [trustedVaultsOnly, setTrustedVaultsOnly] = useLocalStorage(storageKeys.MarketsTrustedVaultsOnlyKey, false);
// Column visibility state
const [columnVisibilityState, setColumnVisibilityState] = useLocalStorage(
- keys.MarketsColumnVisibilityKey,
+ storageKeys.MarketsColumnVisibilityKey,
DEFAULT_COLUMN_VISIBILITY,
);
@@ -128,7 +131,7 @@ export default function Markets({ initialNetwork, initialCollaterals, initialLoa
);
// Table view mode: 'compact' (scrollable) or 'expanded' (full width)
- const [tableViewMode, setTableViewMode] = useLocalStorage<'compact' | 'expanded'>(keys.MarketsTableViewModeKey, 'compact');
+ const [tableViewMode, setTableViewMode] = useLocalStorage<'compact' | 'expanded'>(storageKeys.MarketsTableViewModeKey, 'compact');
// Force compact mode on mobile - track window size
const [isMobile, setIsMobile] = useState(false);
diff --git a/app/positions/components/PositionsContent.tsx b/app/positions/components/PositionsContent.tsx
index 19ee4f04..b7b96324 100644
--- a/app/positions/components/PositionsContent.tsx
+++ b/app/positions/components/PositionsContent.tsx
@@ -157,7 +157,22 @@ export default function Positions() {
message={loadingMessage}
className="mt-10"
/>
- ) : !hasSuppliedMarkets ? (
+ ) : hasSuppliedMarkets ? (
+
+
void refetch()}
+ isRefetching={isRefetching}
+ isLoadingEarnings={isEarningsLoading}
+ earningsPeriod={earningsPeriod}
+ setEarningsPeriod={setEarningsPeriod}
+ />
+
-
void refetch()}
- isRefetching={isRefetching}
- isLoadingEarnings={isEarningsLoading}
- earningsPeriod={earningsPeriod}
- setEarningsPeriod={setEarningsPeriod}
- />
-
- {!isConnected ? (
+ {isConnected ? (
+ needSwitchChain ? (
+
+ ) : (!permit2Authorized && !useEth) || (!usePermit2Setting && !isApproved) ? (
+
+ ) : (
+
+ )
+ ) : (
- ) : needSwitchChain ? (
-
- ) : (!permit2Authorized && !useEth) || (!usePermit2Setting && !isApproved) ? (
-
- ) : (
-
)}
{(borrowAmount > 0n || collateralAmount > 0n) && (
diff --git a/src/components/Borrow/WithdrawCollateralAndRepay.tsx b/src/components/Borrow/WithdrawCollateralAndRepay.tsx
index d5ef5fa4..d73696c7 100644
--- a/src/components/Borrow/WithdrawCollateralAndRepay.tsx
+++ b/src/components/Borrow/WithdrawCollateralAndRepay.tsx
@@ -102,9 +102,7 @@ export function WithdrawCollateralAndRepay({
// Calculate current and new LTV whenever relevant values change
useEffect(() => {
- if (!currentPosition) {
- setCurrentLTV(BigInt(0));
- } else {
+ if (currentPosition) {
// Calculate current LTV from position data using oracle price
const currentCollateralValue = (BigInt(currentPosition.state.collateral) * oraclePrice) / BigInt(10 ** 36);
const currentBorrowValue = BigInt(currentPosition.state.borrowAssets || 0);
@@ -115,6 +113,8 @@ export function WithdrawCollateralAndRepay({
} else {
setCurrentLTV(BigInt(0));
}
+ } else {
+ setCurrentLTV(BigInt(0));
}
}, [currentPosition, oraclePrice]);
@@ -301,47 +301,49 @@ export function WithdrawCollateralAndRepay({
className="flex justify-end"
style={{ zIndex: 1 }}
>
- {!isConnected ? (
+ {isConnected ? (
+ needSwitchChain ? (
+
+ ) : (
+
+ )
+ ) : (
- ) : needSwitchChain ? (
-
- ) : (
-
)}
{(withdrawAmount > 0n || repayAssets > 0n) && (
diff --git a/src/components/Input/Input.tsx b/src/components/Input/Input.tsx
index 1a84731a..cccd0aad 100644
--- a/src/components/Input/Input.tsx
+++ b/src/components/Input/Input.tsx
@@ -58,11 +58,9 @@ export default function Input({
setValue(inputBigInt);
if (setError) setError(null);
-
- // eslint-disable-next-line @typescript-eslint/no-shadow
- } catch (e) {
+ } catch (err) {
if (setError) setError('Invalid input');
- console.log('e', e);
+ console.log('e', err);
}
},
[decimals, setError, setInputAmount, setValue, max, exceedMaxErrMessage, allowExceedMax, bypassMax],
diff --git a/src/components/MarketOracle/GeneralFeedTooltip.tsx b/src/components/MarketOracle/GeneralFeedTooltip.tsx
index 4dc68df0..5ac38669 100644
--- a/src/components/MarketOracle/GeneralFeedTooltip.tsx
+++ b/src/components/MarketOracle/GeneralFeedTooltip.tsx
@@ -1,7 +1,7 @@
import Image from 'next/image';
import Link from 'next/link';
import type { Address } from 'viem';
-import type { GeneralPriceFeed } from '@/constants/oracle/general-feeds';
+import type { GeneralPriceFeed } from '@/constants/oracle/general-feeds/types';
import etherscanLogo from '@/imgs/etherscan.png';
import { getExplorerURL } from '@/utils/external';
import { PriceFeedVendors, OracleVendorIcons } from '@/utils/oracle';
diff --git a/src/components/Status/LoadingScreen.tsx b/src/components/Status/LoadingScreen.tsx
index 927f7e43..010d013d 100644
--- a/src/components/Status/LoadingScreen.tsx
+++ b/src/components/Status/LoadingScreen.tsx
@@ -62,19 +62,17 @@ function TypingAnimation({ phrases, singleMode = false }: { phrases: string[]; s
const timeout = setTimeout(
() => {
- if (!isDeleting) {
- if (displayText.length < targetText.length) {
- setDisplayText(targetText.slice(0, displayText.length + 1));
- } else {
- setIsPaused(true);
- }
- } else {
+ if (isDeleting) {
if (displayText.length > 0) {
setDisplayText(displayText.slice(0, -1));
} else {
setIsDeleting(false);
setPhraseIndex(getNextPhraseIndex(phraseIndex));
}
+ } else if (displayText.length < targetText.length) {
+ setDisplayText(targetText.slice(0, displayText.length + 1));
+ } else {
+ setIsPaused(true);
}
},
isDeleting ? deletingSpeed : typingSpeed,
diff --git a/src/components/SupplyModalContent.tsx b/src/components/SupplyModalContent.tsx
index 94209a7d..f4621a2e 100644
--- a/src/components/SupplyModalContent.tsx
+++ b/src/components/SupplyModalContent.tsx
@@ -80,11 +80,7 @@ export function SupplyModalContent({ onClose, market, refetch, onAmountChange }:
)}
{!showProcessModal && (
- {!isConnected ? (
-
- ) : (
+ {isConnected ? (
<>
{/* Supply Input Section */}
@@ -180,6 +176,10 @@ export function SupplyModalContent({ onClose, market, refetch, onAmountChange }:
- {!isConnected ? (
-
- ) : (
+ {isConnected ? (
<>
{/* Withdraw Input Section */}
@@ -171,6 +167,10 @@ export function WithdrawModalContent({ position, market, onClose, refetch, onAmo
-
@@ -28,7 +28,7 @@ export const ListItem = forwardRef(function ListItem(
>
{children}
-
+
);
});
diff --git a/src/components/providers/QueryProvider.tsx b/src/components/providers/QueryProvider.tsx
index e88d33fc..dd307f7f 100644
--- a/src/components/providers/QueryProvider.tsx
+++ b/src/components/providers/QueryProvider.tsx
@@ -13,7 +13,7 @@ const queryClient = new QueryClient({
defaultOptions: {
queries: {
// From ClientProviders - good for caching and UX
- staleTime: 30000, // 30 seconds
+ staleTime: 30_000, // 30 seconds
refetchOnWindowFocus: false,
retry: (failureCount, error) => {
@@ -24,7 +24,7 @@ const queryClient = new QueryClient({
// Retry up to 2 times for other errors
return failureCount < 2;
},
- retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30000),
+ retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 30_000),
throwOnError: false,
},
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index fe212cc7..07569cb2 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
import { Slot } from '@radix-ui/react-slot';
import { cva, type VariantProps } from 'class-variance-authority';
@@ -35,7 +35,7 @@ export type ButtonProps = {
} & React.ButtonHTMLAttributes &
VariantProps;
-const Button = React.forwardRef(({ className, variant, size, asChild = false, ...props }, ref) => {
+const Button = forwardRef(({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : 'button';
return (
) {
}
Pagination.displayName = 'Pagination';
-const PaginationContent = React.forwardRef>(({ className, ...props }, ref) => (
+const PaginationContent = forwardRef>(({ className, ...props }, ref) => (
>(({ className, ...props }, ref) => (
+const PaginationItem = forwardRef>(({ className, ...props }, ref) => (
- feed.address.toLowerCase() === address && feed.chainId === chainId);
}
-
-export type { GeneralPriceFeed };
diff --git a/src/constants/vaults/known_vaults.ts b/src/constants/vaults/known_vaults.ts
index c54598ad..533bcfcf 100644
--- a/src/constants/vaults/known_vaults.ts
+++ b/src/constants/vaults/known_vaults.ts
@@ -84,7 +84,7 @@ export const known_vaults: KnownVault[] = [
{
address: '0x64A651D825FC70Ebba88f2E1BAD90be9A496C4b9',
curator: VaultCurator.Avantgarde,
- chainId: 42161,
+ chainId: 42_161,
name: 'Avantgarde USDC Core Arbitrum',
asset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
},
@@ -119,7 +119,7 @@ export const known_vaults: KnownVault[] = [
{
address: '0x7e97fa6893871A2751B5fE961978DCCb2c201E65',
curator: VaultCurator.Gauntlet,
- chainId: 42161,
+ chainId: 42_161,
name: 'Gauntlet USDC Core',
asset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
},
@@ -224,7 +224,7 @@ export const known_vaults: KnownVault[] = [
{
address: '0x5c0C306Aaa9F877de636f4d5822cA9F2E81563BA',
curator: VaultCurator.Steakhouse,
- chainId: 42161,
+ chainId: 42_161,
name: 'Steakhouse High Yield USDC',
asset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
},
@@ -287,14 +287,14 @@ export const known_vaults: KnownVault[] = [
{
address: '0x87DEAE530841A9671326C9D5B9f91bdB11F3162c',
curator: VaultCurator.Yearn,
- chainId: 42161,
+ chainId: 42_161,
name: 'Yearn OG USDC',
asset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
},
{
address: '0x36b69949d60d06ECcC14DE0Ae63f4E00cc2cd8B9',
curator: VaultCurator.Yearn,
- chainId: 42161,
+ chainId: 42_161,
name: 'Yearn Degen USDC',
asset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
},
diff --git a/src/contexts/MarketsContext.tsx b/src/contexts/MarketsContext.tsx
index 385c1ac7..4048ac88 100644
--- a/src/contexts/MarketsContext.tsx
+++ b/src/contexts/MarketsContext.tsx
@@ -163,8 +163,8 @@ export function MarketsProvider({ children }: MarketsProviderProps) {
// Define the networks to fetch markets for
- let combinedMarkets: Market[] = [];
- let fetchErrors: unknown[] = [];
+ const combinedMarkets: Market[] = [];
+ const fetchErrors: unknown[] = [];
try {
// Fetch markets for each network based on its data source
diff --git a/src/data-sources/morpho-api/historical.ts b/src/data-sources/morpho-api/historical.ts
index be074b1d..9647f961 100644
--- a/src/data-sources/morpho-api/historical.ts
+++ b/src/data-sources/morpho-api/historical.ts
@@ -1,12 +1,8 @@
import { marketHistoricalDataQuery } from '@/graphql/morpho-api-queries';
import type { SupportedNetworks } from '@/utils/networks';
-import type { TimeseriesOptions, Market, TimeseriesDataPoint, MarketRates, MarketVolumes } from '@/utils/types';
+import type { Market, MarketRates, MarketVolumes, TimeseriesOptions, TimeseriesDataPoint } from '@/utils/types';
import { morphoGraphqlFetcher } from './fetchers';
-// --- Types related to Historical Data ---
-// Re-exported from types.ts for clarity or define locally if not exported
-export type { TimeseriesDataPoint, TimeseriesOptions };
-
// Adjust the response structure type: historicalState contains rates/volumes directly
type MarketWithHistoricalState = Market & {
historicalState: (Partial & Partial) | null;
diff --git a/src/data-sources/morpho-api/vaults.ts b/src/data-sources/morpho-api/vaults.ts
index 735cd8a2..604b952b 100644
--- a/src/data-sources/morpho-api/vaults.ts
+++ b/src/data-sources/morpho-api/vaults.ts
@@ -2,7 +2,7 @@ import { allVaultsQuery } from '@/graphql/vault-queries';
import { morphoGraphqlFetcher } from './fetchers';
// Constants for Morpho vault fetching
-const MORPHO_SUPPORTED_CHAIN_IDS = [1, 8453, 999, 137, 42161, 130];
+const MORPHO_SUPPORTED_CHAIN_IDS = [1, 8453, 999, 137, 42_161, 130];
const MAX_VAULTS_LIMIT = 500;
// Type for vault from Morpho API
diff --git a/src/data-sources/subgraph/historical.ts b/src/data-sources/subgraph/historical.ts
index 9bf61c1b..a54ce04f 100644
--- a/src/data-sources/subgraph/historical.ts
+++ b/src/data-sources/subgraph/historical.ts
@@ -73,11 +73,11 @@ const transformSubgraphSnapshotsToHistoricalResult = (
rates.supplyApy.push({
x: timestamp,
- y: !isNaN(supplyApyValue) ? supplyApyValue : 0,
+ y: isNaN(supplyApyValue) ? 0 : supplyApyValue,
});
rates.borrowApy.push({
x: timestamp,
- y: !isNaN(borrowApyValue) ? borrowApyValue : 0,
+ y: isNaN(borrowApyValue) ? 0 : borrowApyValue,
});
rates.apyAtTarget.push({ x: timestamp, y: 0 });
rates.utilization.push({ x: timestamp, y: 0 });
diff --git a/src/data-sources/subgraph/market.ts b/src/data-sources/subgraph/market.ts
index bcde88de..acd0d678 100644
--- a/src/data-sources/subgraph/market.ts
+++ b/src/data-sources/subgraph/market.ts
@@ -132,7 +132,7 @@ const transformSubgraphMarketToMarket = (
const supplyApy = Number(subgraphMarket.rates?.find((r) => r.side === 'LENDER')?.rate ?? 0);
const borrowApy = Number(subgraphMarket.rates?.find((r) => r.side === 'BORROWER')?.rate ?? 0);
- let warnings: MarketWarning[] = []; // Initialize warnings
+ const warnings: MarketWarning[] = []; // Initialize warnings
// get the prices
let loanAssetPrice = safeParseFloat(subgraphMarket.borrowedToken?.lastPriceUSD ?? '0');
@@ -197,7 +197,7 @@ const transformSubgraphMarketToMarket = (
utilization: utilization,
supplyApy: supplyApy,
borrowApy: borrowApy,
- fee: safeParseFloat(fee) / 10000, // Subgraph fee is likely basis points (needs verification)
+ fee: safeParseFloat(fee) / 10_000, // Subgraph fee is likely basis points (needs verification)
timestamp: timestamp,
// AdaptiveCurveIRM APY if utilization was at target
diff --git a/src/data-sources/subgraph/positions.ts b/src/data-sources/subgraph/positions.ts
index b25951f2..c913fc78 100644
--- a/src/data-sources/subgraph/positions.ts
+++ b/src/data-sources/subgraph/positions.ts
@@ -171,6 +171,9 @@ export const fetchSubgraphUserPositionForMarket = async (
console.warn(`Subgraph position side 'BORROWER' doesn't match loan asset for market ${marketUniqueKey}`);
}
break;
+ default:
+ console.warn(`Unknown position side '${pos.side}' for market ${marketUniqueKey}`);
+ break;
}
});
diff --git a/src/hooks/useAllowance.ts b/src/hooks/useAllowance.ts
index 5aa81c01..38806c35 100644
--- a/src/hooks/useAllowance.ts
+++ b/src/hooks/useAllowance.ts
@@ -21,7 +21,7 @@ type Props = {
* @param refetchInterval Interval in milliseconds to refetch the contract data
* @returns JsonMetadata
*/
-export function useAllowance({ user, spender, chainId = 1, token, refetchInterval = 10000, tokenSymbol }: Props) {
+export function useAllowance({ user, spender, chainId = 1, token, refetchInterval = 10_000, tokenSymbol }: Props) {
const { chain } = useAccount();
const chainIdFromArgumentOrConnectedWallet = chainId ?? chain?.id;
diff --git a/src/hooks/useBorrowTransaction.ts b/src/hooks/useBorrowTransaction.ts
index 00e68a8c..dd439847 100644
--- a/src/hooks/useBorrowTransaction.ts
+++ b/src/hooks/useBorrowTransaction.ts
@@ -57,7 +57,7 @@ export function useBorrowTransaction({ market, collateralAmount, borrowAmount, o
user: account as `0x${string}`,
spender: bundlerAddress,
token: market.collateralAsset.address as `0x${string}`,
- refetchInterval: 10000,
+ refetchInterval: 10_000,
chainId: market.morphoBlue.chain.id,
tokenSymbol: market.collateralAsset.symbol,
amount: collateralAmount,
diff --git a/src/hooks/useFreshMarketsState.ts b/src/hooks/useFreshMarketsState.ts
index 06bc733c..82631693 100644
--- a/src/hooks/useFreshMarketsState.ts
+++ b/src/hooks/useFreshMarketsState.ts
@@ -6,7 +6,7 @@ import { getMorphoAddress } from '@/utils/morpho';
import type { SupportedNetworks } from '@/utils/networks';
import type { Market } from '@/utils/types';
-const REFRESH_INTERVAL = 15000; // 15 seconds
+const REFRESH_INTERVAL = 15_000; // 15 seconds
type MarketSnapshot = {
totalSupplyAssets: string;
@@ -114,7 +114,7 @@ export const useFreshMarketsState = (
},
enabled: !!markets && markets.length > 0 && !!effectiveChainId && !!publicClient,
staleTime: 0, // Always fetch fresh when requested
- gcTime: 20000, // Keep in cache for 20 seconds
+ gcTime: 20_000, // Keep in cache for 20 seconds
refetchOnWindowFocus: false,
});
diff --git a/src/hooks/useLiquidations.ts b/src/hooks/useLiquidations.ts
index 403d3861..5c436200 100644
--- a/src/hooks/useLiquidations.ts
+++ b/src/hooks/useLiquidations.ts
@@ -21,7 +21,7 @@ const useLiquidations = () => {
// Define the networks to check for liquidations
const combinedLiquidatedKeys = new Set();
- let fetchErrors: unknown[] = [];
+ const fetchErrors: unknown[] = [];
try {
await Promise.all(
@@ -36,7 +36,7 @@ const useLiquidations = () => {
console.log(`Attempting to fetch liquidated markets via Morpho API for ${network}`);
networkLiquidatedKeys = await fetchMorphoApiLiquidatedMarketKeys(network);
} catch (morphoError) {
- console.error(`Failed to fetch liquidated markets via Morpho API:`, morphoError);
+ console.error('Failed to fetch liquidated markets via Morpho API:', morphoError);
// Continue to Subgraph fallback
networkLiquidatedKeys = new Set();
trySubgraph = true;
@@ -52,7 +52,7 @@ const useLiquidations = () => {
console.log(`Attempting to fetch liquidated markets via Subgraph for ${network}`);
networkLiquidatedKeys = await fetchSubgraphLiquidatedMarketKeys(network);
} catch (subgraphError) {
- console.error(`Failed to fetch liquidated markets via Subgraph:`, subgraphError);
+ console.error('Failed to fetch liquidated markets via Subgraph:', subgraphError);
throw subgraphError; // Throw to be caught by outer catch
}
}
diff --git a/src/hooks/useMarketBorrows.ts b/src/hooks/useMarketBorrows.ts
index e9b1b652..f5fac444 100644
--- a/src/hooks/useMarketBorrows.ts
+++ b/src/hooks/useMarketBorrows.ts
@@ -45,7 +45,7 @@ export const useMarketBorrows = (
console.log(`Attempting to fetch borrows via Morpho API for ${marketId} (page ${targetPage})`);
result = await fetchMorphoMarketBorrows(marketId, minAssets, pageSize, targetSkip);
} catch (morphoError) {
- console.error(`Failed to fetch borrows via Morpho API:`, morphoError);
+ console.error('Failed to fetch borrows via Morpho API:', morphoError);
}
}
@@ -55,7 +55,7 @@ export const useMarketBorrows = (
console.log(`Attempting to fetch borrows via Subgraph for ${marketId} (page ${targetPage})`);
result = await fetchSubgraphMarketBorrows(marketId, loanAssetId, network, minAssets, pageSize, targetSkip);
} catch (subgraphError) {
- console.error(`Failed to fetch borrows via Subgraph:`, subgraphError);
+ console.error('Failed to fetch borrows via Subgraph:', subgraphError);
throw subgraphError;
}
}
diff --git a/src/hooks/useMarketData.ts b/src/hooks/useMarketData.ts
index d29ad962..202143ea 100644
--- a/src/hooks/useMarketData.ts
+++ b/src/hooks/useMarketData.ts
@@ -48,7 +48,7 @@ export const useMarketData = (uniqueKey: string | undefined, network: SupportedN
finalMarket = await fetchMorphoMarket(uniqueKey, network);
}
} catch (morphoError) {
- console.error(`Failed to fetch market data via Morpho API:`, morphoError);
+ console.error('Failed to fetch market data via Morpho API:', morphoError);
// Continue to Subgraph fallback
}
@@ -58,7 +58,7 @@ export const useMarketData = (uniqueKey: string | undefined, network: SupportedN
console.log(`Attempting to fetch market data via Subgraph for ${uniqueKey}`);
finalMarket = await fetchSubgraphMarket(uniqueKey, network);
} catch (subgraphError) {
- console.error(`Failed to fetch market data via Subgraph:`, subgraphError);
+ console.error('Failed to fetch market data via Subgraph:', subgraphError);
finalMarket = null;
}
}
diff --git a/src/hooks/useMarketHistoricalData.ts b/src/hooks/useMarketHistoricalData.ts
index 36299095..4929aa48 100644
--- a/src/hooks/useMarketHistoricalData.ts
+++ b/src/hooks/useMarketHistoricalData.ts
@@ -32,7 +32,7 @@ export const useMarketHistoricalData = (
console.log(`Attempting to fetch historical data via Morpho API for ${uniqueKey}`);
historicalData = await fetchMorphoMarketHistoricalData(uniqueKey, network, options);
} catch (morphoError) {
- console.error(`Failed to fetch historical data via Morpho API:`, morphoError);
+ console.error('Failed to fetch historical data via Morpho API:', morphoError);
// Continue to Subgraph fallback
}
}
@@ -43,7 +43,7 @@ export const useMarketHistoricalData = (
console.log(`Attempting to fetch historical data via Subgraph for ${uniqueKey}`);
historicalData = await fetchSubgraphMarketHistoricalData(uniqueKey, network, options);
} catch (subgraphError) {
- console.error(`Failed to fetch historical data via Subgraph:`, subgraphError);
+ console.error('Failed to fetch historical data via Subgraph:', subgraphError);
historicalData = null;
}
}
diff --git a/src/hooks/useMarketLiquidations.ts b/src/hooks/useMarketLiquidations.ts
index 1d079f26..d15b5b3a 100644
--- a/src/hooks/useMarketLiquidations.ts
+++ b/src/hooks/useMarketLiquidations.ts
@@ -30,7 +30,7 @@ export const useMarketLiquidations = (marketId: string | undefined, network: Sup
console.log(`Attempting to fetch liquidations via Morpho API for ${marketId}`);
liquidations = await fetchMorphoMarketLiquidations(marketId);
} catch (morphoError) {
- console.error(`Failed to fetch liquidations via Morpho API:`, morphoError);
+ console.error('Failed to fetch liquidations via Morpho API:', morphoError);
// Continue to Subgraph fallback
}
}
@@ -41,7 +41,7 @@ export const useMarketLiquidations = (marketId: string | undefined, network: Sup
console.log(`Attempting to fetch liquidations via Subgraph for ${marketId}`);
liquidations = await fetchSubgraphMarketLiquidations(marketId, network);
} catch (subgraphError) {
- console.error(`Failed to fetch liquidations via Subgraph:`, subgraphError);
+ console.error('Failed to fetch liquidations via Subgraph:', subgraphError);
liquidations = null;
}
}
diff --git a/src/hooks/useMarketSupplies.ts b/src/hooks/useMarketSupplies.ts
index 434a87fd..3da92603 100644
--- a/src/hooks/useMarketSupplies.ts
+++ b/src/hooks/useMarketSupplies.ts
@@ -45,7 +45,7 @@ export const useMarketSupplies = (
console.log(`Attempting to fetch supplies via Morpho API for ${marketId} (page ${targetPage})`);
result = await fetchMorphoMarketSupplies(marketId, minAssets, pageSize, targetSkip);
} catch (morphoError) {
- console.error(`Failed to fetch supplies via Morpho API:`, morphoError);
+ console.error('Failed to fetch supplies via Morpho API:', morphoError);
}
}
@@ -55,7 +55,7 @@ export const useMarketSupplies = (
console.log(`Attempting to fetch supplies via Subgraph for ${marketId} (page ${targetPage})`);
result = await fetchSubgraphMarketSupplies(marketId, loanAssetId, network, minAssets, pageSize, targetSkip);
} catch (subgraphError) {
- console.error(`Failed to fetch supplies via Subgraph:`, subgraphError);
+ console.error('Failed to fetch supplies via Subgraph:', subgraphError);
throw subgraphError;
}
}
diff --git a/src/hooks/useMultiMarketSupply.ts b/src/hooks/useMultiMarketSupply.ts
index 90e178c8..c6146152 100644
--- a/src/hooks/useMultiMarketSupply.ts
+++ b/src/hooks/useMultiMarketSupply.ts
@@ -45,7 +45,7 @@ export function useMultiMarketSupply(
user: account as `0x${string}`,
spender: getBundlerV2(chainId ?? SupportedNetworks.Mainnet),
token: loanAsset?.address as `0x${string}`,
- refetchInterval: 10000,
+ refetchInterval: 10_000,
chainId,
tokenSymbol,
amount: totalAmount,
diff --git a/src/hooks/usePagination.ts b/src/hooks/usePagination.ts
index 80220cec..00916fd5 100644
--- a/src/hooks/usePagination.ts
+++ b/src/hooks/usePagination.ts
@@ -1,6 +1,6 @@
import { useState, useEffect, useCallback } from 'react';
import storage from 'local-storage-fallback';
-import { MarketEntriesPerPageKey } from '@/utils/storageKeys';
+import { storageKeys } from '@/utils/storageKeys';
export function usePagination(initialEntriesPerPage = 6) {
const [currentPage, setCurrentPage] = useState(1);
@@ -11,7 +11,7 @@ export function usePagination(initialEntriesPerPage = 6) {
}, [setCurrentPage]);
useEffect(() => {
- const storedEntriesPerPage = storage.getItem(MarketEntriesPerPageKey);
+ const storedEntriesPerPage = storage.getItem(storageKeys.MarketEntriesPerPageKey);
if (storedEntriesPerPage) {
setEntriesPerPage(Number.parseInt(storedEntriesPerPage, 10));
}
@@ -19,7 +19,7 @@ export function usePagination(initialEntriesPerPage = 6) {
const handleEntriesPerPageChange = (value: number) => {
setEntriesPerPage(value);
- storage.setItem(MarketEntriesPerPageKey, value.toString());
+ storage.setItem(storageKeys.MarketEntriesPerPageKey, value.toString());
setCurrentPage(1); // Reset to first page
};
diff --git a/src/hooks/usePermit2.ts b/src/hooks/usePermit2.ts
index db74a6f1..e44b304b 100644
--- a/src/hooks/usePermit2.ts
+++ b/src/hooks/usePermit2.ts
@@ -25,7 +25,7 @@ type Props = {
* @param refetchInterval Interval in milliseconds to refetch the contract data
* @returns JsonMetadata
*/
-export function usePermit2({ user, chainId = 1, token, spender, refetchInterval = 10000, amount }: Props) {
+export function usePermit2({ user, chainId = 1, token, spender, refetchInterval = 10_000, amount }: Props) {
const {
allowance: allowanceToPermit2,
approveInfinite: authorizePermit2,
diff --git a/src/hooks/usePositionReport.ts b/src/hooks/usePositionReport.ts
index 8fcf513b..038d2d2a 100644
--- a/src/hooks/usePositionReport.ts
+++ b/src/hooks/usePositionReport.ts
@@ -34,13 +34,15 @@ export const usePositionReport = (
account: Address,
selectedAsset: { address: string; chainId: number } | null,
startDate?: Date,
- endDate?: Date,
+ _endDate?: Date,
) => {
const { fetchTransactions } = useUserTransactions();
const { customRpcUrls } = useCustomRpc();
const generateReport = async (): Promise => {
+ let endDate = _endDate;
+
if (!startDate || !endDate || !selectedAsset) return null;
if (endDate.getTime() > Date.now()) {
diff --git a/src/hooks/useRebalance.ts b/src/hooks/useRebalance.ts
index 46c640ae..85db2890 100644
--- a/src/hooks/useRebalance.ts
+++ b/src/hooks/useRebalance.ts
@@ -52,7 +52,7 @@ export const useRebalance = (groupedPosition: GroupedPosition, onRebalance?: ()
user: account as Address,
spender: bundlerAddress,
token: groupedPosition.loanAssetAddress as Address,
- refetchInterval: 10000,
+ refetchInterval: 10_000,
chainId: groupedPosition.chainId,
tokenSymbol: groupedPosition.loanAsset,
amount: totalAmount,
diff --git a/src/hooks/useRepayTransaction.ts b/src/hooks/useRepayTransaction.ts
index 6bac9c1d..de579746 100644
--- a/src/hooks/useRepayTransaction.ts
+++ b/src/hooks/useRepayTransaction.ts
@@ -50,7 +50,7 @@ export function useRepayTransaction({
user: account as `0x${string}`,
spender: getBundlerV2(market.morphoBlue.chain.id),
token: market.loanAsset.address as `0x${string}`,
- refetchInterval: 10000,
+ refetchInterval: 10_000,
chainId: market.morphoBlue.chain.id,
tokenSymbol: market.loanAsset.symbol,
amount: repayAmountToApprove,
diff --git a/src/hooks/useStaredMarkets.ts b/src/hooks/useStaredMarkets.ts
index 08b20d0e..427387b6 100644
--- a/src/hooks/useStaredMarkets.ts
+++ b/src/hooks/useStaredMarkets.ts
@@ -1,11 +1,11 @@
import { useState, useCallback } from 'react';
import storage from 'local-storage-fallback';
import { useStyledToast } from '@/hooks/useStyledToast';
-import * as keys from '@/utils/storageKeys';
+import { storageKeys } from '@/utils/storageKeys';
const getInitialStaredMarkets = (): string[] => {
try {
- const item = storage.getItem(keys.MarketFavoritesKey) ?? '[]';
+ const item = storage.getItem(storageKeys.MarketFavoritesKey) ?? '[]';
return JSON.parse(item) as string[];
} catch (error) {
console.error('Error parsing stared markets from localStorage', error);
@@ -23,7 +23,7 @@ export const useStaredMarkets = () => {
const newStaredIds = [...staredIds, id];
setStaredIds(newStaredIds);
- storage.setItem(keys.MarketFavoritesKey, JSON.stringify(newStaredIds));
+ storage.setItem(storageKeys.MarketFavoritesKey, JSON.stringify(newStaredIds));
toastSuccess('Market starred', 'Market added to favorites');
},
[staredIds, toastSuccess],
@@ -35,7 +35,7 @@ export const useStaredMarkets = () => {
const newStaredIds = staredIds.filter((i) => i !== id);
setStaredIds(newStaredIds);
- storage.setItem(keys.MarketFavoritesKey, JSON.stringify(newStaredIds));
+ storage.setItem(storageKeys.MarketFavoritesKey, JSON.stringify(newStaredIds));
toastSuccess('Market unstarred', 'Market removed from favorites');
},
[staredIds, toastSuccess],
diff --git a/src/hooks/useSupplyMarket.ts b/src/hooks/useSupplyMarket.ts
index 90c183c9..a28929fe 100644
--- a/src/hooks/useSupplyMarket.ts
+++ b/src/hooks/useSupplyMarket.ts
@@ -79,7 +79,7 @@ export function useSupplyMarket(market: Market, onSuccess?: () => void): UseSupp
user: account as `0x${string}`,
spender: getBundlerV2(market.morphoBlue.chain.id),
token: market.loanAsset.address as `0x${string}`,
- refetchInterval: 10000,
+ refetchInterval: 10_000,
chainId: market.morphoBlue.chain.id,
tokenSymbol: market.loanAsset.symbol,
amount: supplyAmount,
@@ -261,7 +261,9 @@ export function useSupplyMarket(market: Market, onSuccess?: () => void): UseSupp
}
// Standard ERC20 flow
- if (!isApproved) {
+ if (isApproved) {
+ setCurrentStep('supplying');
+ } else {
try {
await approve();
setCurrentStep('supplying');
@@ -281,8 +283,6 @@ export function useSupplyMarket(market: Market, onSuccess?: () => void): UseSupp
}
throw error;
}
- } else {
- setCurrentStep('supplying');
}
await executeSupplyTransaction();
diff --git a/src/hooks/useUserBalances.ts b/src/hooks/useUserBalances.ts
index db794115..ea4cc05c 100644
--- a/src/hooks/useUserBalances.ts
+++ b/src/hooks/useUserBalances.ts
@@ -43,7 +43,7 @@ export function useUserBalances(options: UseUserBalancesOptions = {}) {
if (!response.ok) {
const errorMessage = await response
.json()
- .then((data) => (data?.error as string | undefined) ?? 'Failed to fetch balances')
+ .then((errorData) => (errorData?.error as string | undefined) ?? 'Failed to fetch balances')
.catch(() => 'Failed to fetch balances');
throw new Error(errorMessage);
}
diff --git a/src/hooks/useUserMarketsCache.ts b/src/hooks/useUserMarketsCache.ts
index d8cd718d..63af9a1a 100644
--- a/src/hooks/useUserMarketsCache.ts
+++ b/src/hooks/useUserMarketsCache.ts
@@ -1,6 +1,6 @@
import { useCallback } from 'react';
import storage from 'local-storage-fallback';
-import { CacheMarketPositionKeys } from '../utils/storageKeys';
+import { storageKeys } from '../utils/storageKeys';
type MarketIdentifier = {
marketUniqueKey: string;
@@ -15,7 +15,7 @@ export function useUserMarketsCache(address: string | undefined) {
// Load cache from localStorage
const loadCache = useCallback((): UserMarketsCache => {
try {
- const cached = storage.getItem(CacheMarketPositionKeys);
+ const cached = storage.getItem(storageKeys.CacheMarketPositionKeys);
if (cached) {
return JSON.parse(cached) as UserMarketsCache;
}
@@ -28,7 +28,7 @@ export function useUserMarketsCache(address: string | undefined) {
// Save cache to localStorage
const saveCache = useCallback((cache: UserMarketsCache) => {
try {
- storage.setItem(CacheMarketPositionKeys, JSON.stringify(cache));
+ storage.setItem(storageKeys.CacheMarketPositionKeys, JSON.stringify(cache));
} catch (error) {
console.error('Failed to save markets cache:', error);
}
diff --git a/src/hooks/useUserPosition.ts b/src/hooks/useUserPosition.ts
index 3d798148..336a2463 100644
--- a/src/hooks/useUserPosition.ts
+++ b/src/hooks/useUserPosition.ts
@@ -87,7 +87,7 @@ const useUserPosition = (user: string | undefined, chainId: SupportedNetworks |
console.log(`Attempting to fetch position via Morpho API for ${marketKey}`);
fallbackPosition = await fetchMorphoUserPositionForMarket(marketKey, user, chainId);
} catch (morphoError) {
- console.error(`Failed to fetch position via Morpho API:`, morphoError);
+ console.error('Failed to fetch position via Morpho API:', morphoError);
// Continue to Subgraph fallback
}
}
@@ -98,7 +98,7 @@ const useUserPosition = (user: string | undefined, chainId: SupportedNetworks |
console.log(`Attempting to fetch position via Subgraph for ${marketKey}`);
fallbackPosition = await fetchSubgraphUserPositionForMarket(marketKey, user, chainId);
} catch (subgraphError) {
- console.error(`Failed to fetch position via Subgraph:`, subgraphError);
+ console.error('Failed to fetch position via Subgraph:', subgraphError);
fallbackPosition = null;
}
}
@@ -131,7 +131,7 @@ const useUserPosition = (user: string | undefined, chainId: SupportedNetworks |
console.log(`Attempting to fetch position via Morpho API for ${marketKey}`);
finalPosition = await fetchMorphoUserPositionForMarket(marketKey, user, chainId);
} catch (morphoError) {
- console.error(`Failed to fetch position via Morpho API:`, morphoError);
+ console.error('Failed to fetch position via Morpho API:', morphoError);
// Continue to Subgraph fallback
}
}
@@ -142,7 +142,7 @@ const useUserPosition = (user: string | undefined, chainId: SupportedNetworks |
console.log(`Attempting to fetch position via Subgraph for ${marketKey}`);
finalPosition = await fetchSubgraphUserPositionForMarket(marketKey, user, chainId);
} catch (subgraphError) {
- console.error(`Failed to fetch position via Subgraph:`, subgraphError);
+ console.error('Failed to fetch position via Subgraph:', subgraphError);
finalPosition = null;
}
}
diff --git a/src/hooks/useUserPositions.ts b/src/hooks/useUserPositions.ts
index 128129db..f8796c31 100644
--- a/src/hooks/useUserPositions.ts
+++ b/src/hooks/useUserPositions.ts
@@ -228,7 +228,7 @@ const useUserPositions = (user: string | undefined, showEmpty = false, chainIds?
return validPositions;
},
enabled: !!initialData && !!user,
- staleTime: 30000,
+ staleTime: 30_000,
gcTime: 5 * 60 * 1000,
});
diff --git a/src/hooks/useUserPositionsSummaryData.ts b/src/hooks/useUserPositionsSummaryData.ts
index 82862334..a1699720 100644
--- a/src/hooks/useUserPositionsSummaryData.ts
+++ b/src/hooks/useUserPositionsSummaryData.ts
@@ -26,7 +26,7 @@ export const earningsKeys = {
// Helper to get timestamp for a period
const getPeriodTimestamp = (period: EarningsPeriod): number => {
const now = Math.floor(Date.now() / 1000);
- const DAY = 86400;
+ const DAY = 86_400;
switch (period) {
case 'all':
@@ -37,6 +37,8 @@ const getPeriodTimestamp = (period: EarningsPeriod): number => {
return now - 7 * DAY;
case 'month':
return now - 30 * DAY;
+ default:
+ return 0;
}
};
@@ -126,7 +128,7 @@ const useUserPositionsSummaryData = (user: string | undefined, period: EarningsP
return allSnapshots;
},
enabled: !!positions && !!user && (period === 'all' || !!periodBlockNumbers),
- staleTime: 30000,
+ staleTime: 30_000,
gcTime: 5 * 60 * 1000,
});
@@ -148,7 +150,7 @@ const useUserPositionsSummaryData = (user: string | undefined, period: EarningsP
return result?.items ?? [];
},
enabled: !!positions && !!user,
- staleTime: 60000, // 1 minute
+ staleTime: 60_000, // 1 minute
gcTime: 5 * 60 * 1000,
});
diff --git a/src/hooks/useUserTransactions.ts b/src/hooks/useUserTransactions.ts
index bbd7483f..912f5a71 100644
--- a/src/hooks/useUserTransactions.ts
+++ b/src/hooks/useUserTransactions.ts
@@ -99,10 +99,9 @@ const useUserTransactions = () => {
},
error: null,
};
- } else {
- networkError = morphoResponse.error;
- console.warn(`Error from Morpho API for network ${network}:`, networkError);
}
+ networkError = morphoResponse.error;
+ console.warn(`Error from Morpho API for network ${network}:`, networkError);
} catch (morphoError) {
console.error(`Failed to fetch from Morpho API for network ${network}:`, morphoError);
networkError = `Failed to fetch from Morpho API: ${(morphoError as Error)?.message || 'Unknown error'}`;
@@ -131,10 +130,9 @@ const useUserTransactions = () => {
},
error: null,
};
- } else {
- networkError = subgraphResponse.error;
- console.warn(`Error from Subgraph for network ${network}:`, networkError);
}
+ networkError = subgraphResponse.error;
+ console.warn(`Error from Subgraph for network ${network}:`, networkError);
} catch (subgraphError) {
console.error(`Failed to fetch from Subgraph for network ${network}:`, subgraphError);
networkError = `Failed to fetch from Subgraph: ${(subgraphError as Error)?.message || 'Unknown error'}`;
diff --git a/src/hooks/useVaultV2.ts b/src/hooks/useVaultV2.ts
index c949a11b..8b82e2ea 100644
--- a/src/hooks/useVaultV2.ts
+++ b/src/hooks/useVaultV2.ts
@@ -230,11 +230,11 @@ export function useVaultV2({
);
const updateNameAndSymbol = useCallback(
- async ({ name, symbol }: { name?: string; symbol?: string }): Promise => {
+ async ({ name: newName, symbol: newSymbol }: { name?: string; symbol?: string }): Promise => {
if (!account || !vaultAddress) return false;
- const nextName = name?.trim();
- const nextSymbol = symbol?.trim();
+ const nextName = newName?.trim();
+ const nextSymbol = newSymbol?.trim();
const calls: `0x${string}`[] = [];
diff --git a/src/hooks/useVaultV2Deposit.ts b/src/hooks/useVaultV2Deposit.ts
index 71c35507..53b3139a 100644
--- a/src/hooks/useVaultV2Deposit.ts
+++ b/src/hooks/useVaultV2Deposit.ts
@@ -83,7 +83,7 @@ export function useVaultV2Deposit({
user: account as Address,
spender: getBundlerV2(chainId),
token: assetAddress,
- refetchInterval: 10000,
+ refetchInterval: 10_000,
chainId,
tokenSymbol: assetSymbol,
amount: depositAmount,
@@ -226,7 +226,9 @@ export function useVaultV2Deposit({
}
// Standard ERC20 flow
- if (!isApproved) {
+ if (isApproved) {
+ setCurrentStep('depositing');
+ } else {
try {
await approve();
setCurrentStep('depositing');
@@ -246,8 +248,6 @@ export function useVaultV2Deposit({
}
throw error;
}
- } else {
- setCurrentStep('depositing');
}
await executeDepositTransaction();
diff --git a/src/services/statsService.ts b/src/services/statsService.ts
index 427bc525..03258d06 100644
--- a/src/services/statsService.ts
+++ b/src/services/statsService.ts
@@ -89,7 +89,7 @@ export const fetchTransactionsByTimeRange = async (
} else {
// Log some details about the first transaction to verify structure
const sampleTx = allTransactions[0];
- console.log(`Sample transaction:`, {
+ console.log('Sample transaction:', {
id: sampleTx.id,
timestamp: sampleTx.timestamp,
supplyCount: sampleTx.supplyCount,
@@ -152,7 +152,7 @@ export const fetchAssetMetrics = async (
console.log(`Processing ${transactions.length} transactions for asset metrics`);
if (transactions.length > 0) {
- console.log(`Sample transaction structure:`, {
+ console.log('Sample transaction structure:', {
id: transactions[0].id,
timestamp: transactions[0].timestamp,
supplyCount: transactions[0].supplyCount,
diff --git a/src/utils/balance.ts b/src/utils/balance.ts
index 95f8ac77..c0b6261e 100644
--- a/src/utils/balance.ts
+++ b/src/utils/balance.ts
@@ -22,7 +22,9 @@ export const formatBalance = (value: bigint | string, decimals: number) => {
return Number(value) / 10 ** decimals;
};
-export function formatReadable(num: number | string, precision = 2): string {
+export function formatReadable(_num: number | string, precision = 2): string {
+ let num = _num;
+
if (typeof num === 'string') {
const parsed = Number.parseFloat(num);
if (isNaN(parsed)) return num;
@@ -32,13 +34,14 @@ export function formatReadable(num: number | string, precision = 2): string {
try {
if (Math.abs(num) >= 1_000_000_000) {
return `${(num / 1_000_000_000).toFixed(2)}B`;
- } else if (Math.abs(num) >= 1_000_000) {
+ }
+ if (Math.abs(num) >= 1_000_000) {
return `${(num / 1_000_000).toFixed(2)}M`;
- } else if (Math.abs(num) >= 1_000) {
- return `${(num / 1_000).toFixed(2)}K`;
- } else {
- return num.toFixed(precision);
}
+ if (Math.abs(num) >= 1000) {
+ return `${(num / 1000).toFixed(2)}K`;
+ }
+ return num.toFixed(precision);
} catch (e) {
console.log('Error formatting number', e, typeof num);
return num.toString();
diff --git a/src/utils/blockFinder.ts b/src/utils/blockFinder.ts
index fd33c380..4b82e1a2 100644
--- a/src/utils/blockFinder.ts
+++ b/src/utils/blockFinder.ts
@@ -7,11 +7,11 @@ type BlockInfo = {
};
export class SmartBlockFinder {
- private client: PublicClient;
+ private readonly client: PublicClient;
- private averageBlockTime: number;
+ private readonly averageBlockTime: number;
- private latestBlockDelay: number;
+ private readonly latestBlockDelay: number;
private readonly TOLERANCE_SECONDS = 10;
diff --git a/src/utils/external.ts b/src/utils/external.ts
index 32482f7e..224e2923 100644
--- a/src/utils/external.ts
+++ b/src/utils/external.ts
@@ -1,10 +1,11 @@
import { getNetworkName, SupportedNetworks, getExplorerUrl } from './networks';
const getMorphoNetworkSlug = (chainId: number): string | undefined => {
- let network = getNetworkName(chainId)?.toLowerCase();
+ const network = getNetworkName(chainId)?.toLowerCase();
if (chainId === SupportedNetworks.HyperEVM) {
return 'hyperevm';
- } else if (chainId === SupportedNetworks.Mainnet) {
+ }
+ if (chainId === SupportedNetworks.Mainnet) {
return 'ethereum';
}
return network;
diff --git a/src/utils/gtag.ts b/src/utils/gtag.ts
index 0824a6e3..f67958bc 100644
--- a/src/utils/gtag.ts
+++ b/src/utils/gtag.ts
@@ -2,26 +2,34 @@ import isClient from './isClient';
export const GOOGLE_ANALYTICS_ID = process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID ?? '';
-declare global {
- // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
- interface Window {
- gtag: any;
- }
-}
+type WindowWithGtag = Window & {
+ gtag?: any;
+};
export const logPageview = (url: string) => {
if (!isClient()) {
return;
}
+ const gtag = (window as WindowWithGtag).gtag;
+ if (!gtag) {
+ return;
+ }
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
- window.gtag('config', GOOGLE_ANALYTICS_ID, {
+ gtag('config', GOOGLE_ANALYTICS_ID, {
page_path: url,
});
};
export const logEvent = ({ action, category, label, value }: { action: string; category: string; label: string; value: number }) => {
+ if (!isClient()) {
+ return;
+ }
+ const gtag = (window as WindowWithGtag).gtag;
+ if (!gtag) {
+ return;
+ }
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
- window.gtag('event', action, {
+ gtag('event', action, {
event_category: category,
event_label: label,
value: value,
diff --git a/src/utils/interest.ts b/src/utils/interest.ts
index aeab1f61..6a4065e7 100644
--- a/src/utils/interest.ts
+++ b/src/utils/interest.ts
@@ -9,7 +9,7 @@ export type EarningsCalculation = {
apy: number;
};
-const ONE_YEAR = 86400 * 365;
+const ONE_YEAR = 86_400 * 365;
export function calculateEarningsFromSnapshot(
endingBalance: bigint,
diff --git a/src/utils/merklApi.ts b/src/utils/merklApi.ts
index d773962f..4bd90409 100644
--- a/src/utils/merklApi.ts
+++ b/src/utils/merklApi.ts
@@ -3,7 +3,7 @@ import type { MerklCampaignsResponse, MerklApiParams, MerklCampaign, SimplifiedC
const MERKL_API_BASE_URL = 'https://api.merkl.xyz/v4';
export class MerklApiClient {
- private baseUrl: string;
+ private readonly baseUrl: string;
constructor(baseUrl: string = MERKL_API_BASE_URL) {
this.baseUrl = baseUrl;
diff --git a/src/utils/networks.ts b/src/utils/networks.ts
index da15b665..9f00da18 100644
--- a/src/utils/networks.ts
+++ b/src/utils/networks.ts
@@ -10,7 +10,7 @@ export enum SupportedNetworks {
Base = 8453,
Polygon = 137,
Unichain = 130,
- Arbitrum = 42161,
+ Arbitrum = 42_161,
HyperEVM = 999,
Monad = 143,
}
@@ -31,7 +31,7 @@ export const hyperEvm = defineChain({
contracts: {
multicall3: {
address: '0xcA11bde05977b3631167028862bE2a173976CA11',
- blockCreated: 13051,
+ blockCreated: 13_051,
},
},
});
diff --git a/src/utils/oracle.ts b/src/utils/oracle.ts
index cf019c30..f37f3592 100644
--- a/src/utils/oracle.ts
+++ b/src/utils/oracle.ts
@@ -1,7 +1,8 @@
import { zeroAddress, type Address } from 'viem';
import { getChainlinkOracle, type ChainlinkOracleEntry, isChainlinkOracle } from '@/constants/oracle/chainlink-data';
import { getCompoundFeed, type CompoundFeedEntry, isCompoundFeed } from '@/constants/oracle/compound';
-import { getGeneralFeed, isGeneralFeed, type GeneralPriceFeed } from '@/constants/oracle/general-feeds';
+import { getGeneralFeed, isGeneralFeed } from '@/constants/oracle/general-feeds';
+import type { GeneralPriceFeed } from '@/constants/oracle/general-feeds/types';
import { getRedstoneOracle, type RedstoneOracleEntry, isRedstoneOracle } from '@/constants/oracle/redstone-data';
import { isSupportedChain } from './networks';
import type { MorphoChainlinkOracleData, OracleFeed } from './types';
diff --git a/src/utils/positions.ts b/src/utils/positions.ts
index 26d4a367..2b18b05b 100644
--- a/src/utils/positions.ts
+++ b/src/utils/positions.ts
@@ -175,7 +175,7 @@ export async function fetchPositionsSnapshots(
return result;
} catch (error) {
- console.error(`Error fetching position snapshots:`, {
+ console.error('Error fetching position snapshots:', {
marketIds,
userAddress,
blockNumber,
@@ -225,12 +225,6 @@ export async function fetchMarketSnapshot(
try {
const isNow = !blockNumber || blockNumber === 0;
- if (!isNow) {
- console.log(`Get market snapshot ${marketId.slice(0, 6)} at blockNumber ${blockNumber}`);
- } else {
- console.log(`Get market snapshot ${marketId.slice(0, 6)} at current block`);
- }
-
// Get the market data
const marketArray = (await client.readContract({
address: getMorphoAddress(chainId as SupportedNetworks),
@@ -253,7 +247,7 @@ export async function fetchMarketSnapshot(
liquidityAssets: liquidityAssets.toString(),
};
} catch (error) {
- console.error(`Error reading market:`, {
+ console.error('Error reading market:', {
marketId,
chainId,
blockNumber,
diff --git a/src/utils/statsUtils.ts b/src/utils/statsUtils.ts
index 1f07bd21..c2bc41ba 100644
--- a/src/utils/statsUtils.ts
+++ b/src/utils/statsUtils.ts
@@ -88,6 +88,9 @@ export const getTimeRange = (timeframe: TimeFrame): { startTime: number; endTime
case 'ALL':
startTime = 0; // Beginning of time
break;
+ default:
+ startTime = 0;
+ break;
}
return { startTime, endTime: now };
@@ -131,6 +134,9 @@ export const groupTransactionsByPeriod = (transactions: Transaction[], period: M
case 'monthly':
periodKey = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}`;
break;
+ default:
+ periodKey = date.toISOString().split('T')[0];
+ break;
}
const volume =
diff --git a/src/utils/storageKeys.ts b/src/utils/storageKeys.ts
index 6cf97db9..d746ad62 100644
--- a/src/utils/storageKeys.ts
+++ b/src/utils/storageKeys.ts
@@ -1,34 +1,26 @@
-export const MarketSortColumnKey = 'monarch_marketsSortColumn';
-export const MarketSortDirectionKey = 'monarch_marketsSortDirection';
-
-export const MarketFavoritesKey = 'monarch_marketsFavorites';
-export const MarketEntriesPerPageKey = 'monarch_marketsEntriesPerPage';
-
-export const MarketsUsdMinSupplyKey = 'monarch_marketsUsdMinSupply_2';
-export const MarketsUsdMinBorrowKey = 'monarch_marketsUsdMinBorrow';
-export const MarketsUsdMinLiquidityKey = 'monarch_marketsUsdMinLiquidity';
-
-// USD Filter enabled/disabled states
-export const MarketsMinSupplyEnabledKey = 'monarch_minSupplyEnabled';
-export const MarketsMinBorrowEnabledKey = 'monarch_minBorrowEnabled';
-export const MarketsMinLiquidityEnabledKey = 'monarch_minLiquidityEnabled';
-
-export const PositionsShowEmptyKey = 'positions:show-empty';
-export const PositionsShowCollateralExposureKey = 'positions:show-collateral-exposure';
-
-export const ThemeKey = 'theme';
-
-export const CacheMarketPositionKeys = 'monarch_cache_market_unique_keys';
-
-// Deprecated: Use MarketsMinSupplyEnabledKey instead
-export const MarketsShowSmallMarkets = 'monarch_show_small_markets';
-export const MarketsShowUnknownTokens = 'includeUnknownTokens';
-export const MarketsShowUnknownOracle = 'showUnknownOracle';
-
-// Column visibility settings
-export const MarketsColumnVisibilityKey = 'monarch_marketsColumnVisibility';
-
-// Table view mode
-export const MarketsTableViewModeKey = 'monarch_marketsTableViewMode';
-
-export const MarketsTrustedVaultsOnlyKey = 'monarch_marketsTrustedVaultsOnly';
+export const storageKeys = {
+ MarketSortColumnKey: 'monarch_marketsSortColumn',
+ MarketSortDirectionKey: 'monarch_marketsSortDirection',
+ MarketFavoritesKey: 'monarch_marketsFavorites',
+ MarketEntriesPerPageKey: 'monarch_marketsEntriesPerPage',
+ MarketsUsdMinSupplyKey: 'monarch_marketsUsdMinSupply_2',
+ MarketsUsdMinBorrowKey: 'monarch_marketsUsdMinBorrow',
+ MarketsUsdMinLiquidityKey: 'monarch_marketsUsdMinLiquidity',
+ // USD Filter enabled/disabled states
+ MarketsMinSupplyEnabledKey: 'monarch_minSupplyEnabled',
+ MarketsMinBorrowEnabledKey: 'monarch_minBorrowEnabled',
+ MarketsMinLiquidityEnabledKey: 'monarch_minLiquidityEnabled',
+ PositionsShowEmptyKey: 'positions:show-empty',
+ PositionsShowCollateralExposureKey: 'positions:show-collateral-exposure',
+ ThemeKey: 'theme',
+ CacheMarketPositionKeys: 'monarch_cache_market_unique_keys',
+ // Deprecated: Use MarketsMinSupplyEnabledKey instead
+ MarketsShowSmallMarkets: 'monarch_show_small_markets',
+ MarketsShowUnknownTokens: 'includeUnknownTokens',
+ MarketsShowUnknownOracle: 'showUnknownOracle',
+ // Column visibility settings
+ MarketsColumnVisibilityKey: 'monarch_marketsColumnVisibility',
+ // Table view mode
+ MarketsTableViewModeKey: 'monarch_marketsTableViewMode',
+ MarketsTrustedVaultsOnlyKey: 'monarch_marketsTrustedVaultsOnly',
+} as const;
diff --git a/src/utils/subgraph-urls.ts b/src/utils/subgraph-urls.ts
index 7340298d..ef4dbb0b 100644
--- a/src/utils/subgraph-urls.ts
+++ b/src/utils/subgraph-urls.ts
@@ -27,7 +27,7 @@ const arbitrumSubgraph = apiKey
? `https://gateway.thegraph.com/api/${apiKey}/subgraphs/id/XsJn88DNCHJ1kgTqYeTgHMQSK4LuG1LR75339QVeQ26`
: undefined;
-const hyperevmSubgraph = `https://api.goldsky.com/api/public/project_cmg4ky61ivud801r23qsug3es/subgraphs/morpho-blue-hyperevm/1.0.3/gn`;
+const hyperevmSubgraph = 'https://api.goldsky.com/api/public/project_cmg4ky61ivud801r23qsug3es/subgraphs/morpho-blue-hyperevm/1.0.3/gn';
// Map network IDs (from SupportedNetworks) to Subgraph URLs
export const SUBGRAPH_URLS: Partial> = {