chore: resolve merge from main issues

curvefi · OnlyJousting · Feb 14, 2025 · Jan 8, 2025 · Jan 8, 2025 · Jan 9, 2025
commit fad34b3174781d75ec5fa46fd479a6bf88641ed8
diff --git a/...PageCrvUsdStaking/Statistics/BarChart.tsx → ...PageCrvUsdStaking/Statistics/BarChart.tsx b/...PageCrvUsdStaking/Statistics/BarChart.tsx → ...PageCrvUsdStaking/Statistics/BarChart.tsx
@@ -3,7 +3,7 @@ import { BarChart, Bar, Cell, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveCo
 import { formatNumber } from '@ui/utils/utilsFormat'
 import { useTheme } from '@mui/material/styles'
 import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
-import { toUTC } from '../utils'
+import { toUTC } from '@loan/components/PageCrvUsdStaking/utils'
 
 const { FontSize } = SizesAndSpaces
 

diff --git a/...CrvUsdStaking/Statistics/ChartTooltip.tsx → ...CrvUsdStaking/Statistics/ChartTooltip.tsx b/...CrvUsdStaking/Statistics/ChartTooltip.tsx → ...CrvUsdStaking/Statistics/ChartTooltip.tsx
diff --git a/...ageCrvUsdStaking/Statistics/LineChart.tsx → ...ageCrvUsdStaking/Statistics/LineChart.tsx b/...ageCrvUsdStaking/Statistics/LineChart.tsx → ...ageCrvUsdStaking/Statistics/LineChart.tsx
@@ -5,7 +5,7 @@ import { t } from '@lingui/macro'
 import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts'
 import CustomTooltip from './ChartTooltip'
 import { formatDateFromTimestamp } from '@ui/utils/utilsFormat'
-import { toUTC } from '../utils'
+import { toUTC } from '@loan/components/PageCrvUsdStaking/utils'
 
 const { FontSize } = SizesAndSpaces
 

diff --git a/...geCrvUsdStaking/Statistics/StatsStack.tsx → ...geCrvUsdStaking/Statistics/StatsStack.tsx b/...geCrvUsdStaking/Statistics/StatsStack.tsx → ...geCrvUsdStaking/Statistics/StatsStack.tsx
diff --git a/...ts/PageCrvUsdStaking/Statistics/index.tsx → ...ts/PageCrvUsdStaking/Statistics/index.tsx b/...ts/PageCrvUsdStaking/Statistics/index.tsx → ...ts/PageCrvUsdStaking/Statistics/index.tsx