Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Link from 'next/link';
import { useTheme } from 'next-themes';
import { RiBookLine, RiDiscordFill, RiGithubFill, RiArrowDownLine, RiExternalLinkLine } from 'react-icons/ri';
import RebalanceAnimation from '@/components/animations/RebalanceAnimation';
import { Badge } from '@/components/common/Badge';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import Header from '@/components/layout/header/Header';
import { EXTERNAL_LINKS } from '@/utils/external';
Expand Down
12 changes: 6 additions & 6 deletions app/admin/stats/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import { useState, useEffect } from 'react';
import { Button } from '@/components/ui/button';
import { Dropdown, DropdownTrigger, DropdownMenu, DropdownItem } from '@heroui/react';
import Image from 'next/image';
import ButtonGroup from '@/components/ButtonGroup';
import { Spinner } from '@/components/common/Spinner';
import { TokenIcon } from '@/components/TokenIcon';
import ButtonGroup from '@/components/ui/button-group';
import { Spinner } from '@/components/ui/spinner';
import { TokenIcon } from '@/components/shared/token-icon';
import { useMarkets } from '@/contexts/MarketsContext';
import { fetchAllStatistics } from '@/services/statsService';
import { SupportedNetworks, getNetworkImg, getNetworkName, getViemChain } from '@/utils/networks';
import type { PlatformStats, TimeFrame, AssetVolumeData, Transaction } from '@/utils/statsUtils';
import type { ERC20Token, UnknownERC20Token, TokenSource } from '@/utils/tokens';
import { findToken as findTokenStatic } from '@/utils/tokens';
import { AssetMetricsTable } from './components/AssetMetricsTable';
import { StatsOverviewCards } from './components/StatsOverviewCards';
import { TransactionsTable } from './components/TransactionsTable';
import { AssetMetricsTable } from '@/features/admin/components/asset-metrics-table';
import { StatsOverviewCards } from '@/features/admin/components/stats-overview-cards';
import { TransactionsTable } from '@/features/admin/components/transactions-table';

const getAPIEndpoint = (network: SupportedNetworks) => {
switch (network) {
Expand Down
2 changes: 1 addition & 1 deletion app/autovault/[chainId]/[vaultAddress]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { generateMetadata as buildMetadata } from '@/utils/generateMetadata';

import VaultContent from './content';
import VaultContent from '../../../../src/features/autovault/vault-view';

export async function generateMetadata({ params }: { params: Promise<{ chainId: string; vaultAddress: string }> }) {
const { chainId, vaultAddress } = await params;
Expand Down
2 changes: 1 addition & 1 deletion app/autovault/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { generateMetadata } from '@/utils/generateMetadata';

import AutovaultContent from './components/AutovaultContent';
import AutovaultContent from '@/features/autovault/vault-list-view';
Comment thread
antoncoding marked this conversation as resolved.

export const metadata = generateMetadata({
title: 'Autovault | Monarch',
Expand Down
2 changes: 1 addition & 1 deletion app/history/[account]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Metadata } from 'next';
import HistoryContent from '../components/HistoryContent';
import HistoryContent from '@/features/history/history-view';

export const metadata: Metadata = {
title: 'Transaction History | Monarch',
Expand Down
2 changes: 1 addition & 1 deletion app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import './global.css';
import GoogleAnalytics from '@/components/GoogleAnalytics/GoogleAnalytics';
import { ClientProviders } from '@/components/providers/ClientProviders';
import { QueryProvider } from '@/components/providers/QueryProvider';
import RiskNotificationModal from '@/components/RiskNotificationModal';
import RiskNotificationModal from '@/modals/risk-notification-modal';
import { VaultRegistryProvider } from '@/contexts/VaultRegistryContext';
import OnchainProviders from '@/OnchainProviders';

Expand Down
2 changes: 1 addition & 1 deletion app/market/[chainId]/[marketid]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Metadata } from 'next';
import MarketContent from './content';
import MarketContent from '../../../../src/features/market-detail/market-view';

export const metadata: Metadata = {
title: 'Market Details | Morpho Blue',
Expand Down
2 changes: 1 addition & 1 deletion app/markets/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { generateMetadata } from '@/utils/generateMetadata';
import { SupportedNetworks } from '@/utils/networks';
import MarketContent from './components/markets';
import MarketContent from '@/features/markets/markets-view';

export const metadata = generateMetadata({
title: 'Markets | Monarch',
Expand Down
4 changes: 2 additions & 2 deletions app/positions/[account]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { generateMetadata } from '@/utils/generateMetadata';

import Content from '../components/PositionsContent';
import Content from '@/features/positions/positions-view';

export const metadata = generateMetadata({
title: 'Portfolio | Monarch',
Expand All @@ -9,6 +9,6 @@ export const metadata = generateMetadata({
pathname: '',
});

export default function MarketPage() {
export default function PositionPage() {
return <Content />;
}
2 changes: 1 addition & 1 deletion app/positions/report/[account]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Metadata } from 'next';
import type { Address } from 'viem';
import ReportContent from '../components/ReportContent';
import ReportContent from '@/features/positions-report/positions-report-view';

export const metadata: Metadata = {
title: 'Position Report | Monarch',
Expand Down
2 changes: 1 addition & 1 deletion app/rewards/[account]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { generateMetadata } from '@/utils/generateMetadata';

import Content from '../components/RewardContent';
import Content from '@/features/rewards/rewards-view';

export const metadata = generateMetadata({
title: 'Rewards | Monarch',
Expand Down
10 changes: 5 additions & 5 deletions app/settings/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import React from 'react';
import { GoShield, GoShieldCheck } from 'react-icons/go';
import { Button } from '@/components/ui/button';
import { IconSwitch } from '@/components/common/IconSwitch';
import { IconSwitch } from '@/components/ui/icon-switch';
import Header from '@/components/layout/header/Header';
import { BlacklistedMarketsModal } from '@/components/settings/BlacklistedMarketsModal';
import { AdvancedRpcSettings } from '@/components/settings/CustomRpcSettings';
import TrustedVaultsModal from '@/components/settings/TrustedVaultsModal';
import { VaultIdentity } from '@/components/vaults/VaultIdentity';
import { BlacklistedMarketsModal } from '@/modals/settings/blacklisted-markets-modal';
import { AdvancedRpcSettings } from '@/modals/settings/custom-rpc-settings';
import TrustedVaultsModal from '@/modals/settings/trusted-vaults-modal';
import { VaultIdentity } from '@/features/autovault/components/vault-identity';
import { defaultTrustedVaults, type TrustedVault } from '@/constants/vaults/known_vaults';
import { useLocalStorage } from '@/hooks/useLocalStorage';
import { useMarkets } from '@/hooks/useMarkets';
Expand Down
2 changes: 1 addition & 1 deletion app/tools/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Header from '@/components/layout/header/Header';
import { useMorphoAuthorization } from '@/hooks/useMorphoAuthorization';
import { useStyledToast } from '@/hooks/useStyledToast';
import { getNetworkName, type SupportedNetworks } from '@/utils/networks';
import NetworkFilter from 'app/markets/components/NetworkFilter';
import NetworkFilter from '@/features/markets/components/filters/network-filter';

export default function ToolsPage() {
const currentChainId = useChainId();
Expand Down
3 changes: 2 additions & 1 deletion biome.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@
"biome.jsonc",
"tsconfig.json",
"src/constants/oracle/**/*.json",
"public/manifest.json"
"public/manifest.json",
"src/components/ui/*.tsx"
],
"formatter": {
"enabled": false
Expand Down
Loading