Merge pull request #606 from curvefi/refactor/imports

refactor: ambiguous imports
curvefi · Jan 17, 2025 · 5e46b3f · 5e46b3f
2 parents a56b6d9 + be82bca
commit 5e46b3f
Show file tree

Hide file tree

Showing 843 changed files with 5,135 additions and 5,271 deletions.
diff --git a/apps/dao/src/components/AlertFormError.tsx b/apps/dao/src/components/AlertFormError.tsx
@@ -1,10 +1,10 @@
-import type { AlertBoxProps } from '@/ui/AlertBox/types'
+import type { AlertBoxProps } from '@ui/AlertBox/types'
 
 import { t } from '@lingui/macro'
 import React, { useMemo } from 'react'
 import styled from 'styled-components'
 
-import AlertBox from '@/ui/AlertBox'
+import AlertBox from '@ui/AlertBox'
 
 export enum AlertFormErrorKey {
   USER_REJECTED_ACTION = 'error-user-rejected-action',

diff --git a/apps/dao/src/components/BackButton/index.tsx b/apps/dao/src/components/BackButton/index.tsx
@@ -1,9 +1,9 @@
 import styled from 'styled-components'
 import { useNavigate } from 'react-router-dom'
 
-import Box from '@/ui/Box'
-import Button from '@/ui/Button'
-import Icon from '@/ui/Icon'
+import Box from '@ui/Box'
+import Button from '@ui/Button'
+import Icon from '@ui/Icon'
 
 type BackButtonProps = {
   path: string

diff --git a/apps/dao/src/components/Charts/GaugeVotingBarChartCustomTooltip.tsx b/apps/dao/src/components/Charts/GaugeVotingBarChartCustomTooltip.tsx
@@ -4,9 +4,9 @@ import { TooltipProps } from 'recharts'
 import styled from 'styled-components'
 import { t } from '@lingui/macro'
 
-import { formatNumber } from '@/ui/utils'
+import { formatNumber } from '@ui/utils'
 
-import Box from '@/ui/Box'
+import Box from '@ui/Box'
 
 const BarChartCustomTooltip = ({ active, payload }: TooltipProps<ValueType, NameType>) => {
   if (active && payload && payload.length) {

diff --git a/apps/dao/src/components/Charts/GaugeWeightHistoryChart/index.tsx b/apps/dao/src/components/Charts/GaugeWeightHistoryChart/index.tsx
@@ -2,11 +2,11 @@ import { useEffect } from 'react'
 import styled from 'styled-components'
 import { t } from '@lingui/macro'
 
-import useStore from '@/store/useStore'
+import useStore from '@dao/store/useStore'
 
-import Spinner, { SpinnerWrapper } from '@/ui/Spinner'
-import LineChartComponent from '@/components/Charts/LineChartComponent'
-import ErrorMessage from '@/components/ErrorMessage'
+import Spinner, { SpinnerWrapper } from '@ui/Spinner'
+import LineChartComponent from '@dao/components/Charts/LineChartComponent'
+import ErrorMessage from '@dao/components/ErrorMessage'
 
 interface GaugeWeightHistoryChartProps {
   gaugeAddress: string

diff --git a/apps/dao/src/components/Charts/GaugesBarChartCustomTooltip.tsx b/apps/dao/src/components/Charts/GaugesBarChartCustomTooltip.tsx
@@ -4,9 +4,9 @@ import { TooltipProps } from 'recharts'
 import styled from 'styled-components'
 import { t } from '@lingui/macro'
 
-import { formatNumber } from '@/ui/utils'
+import { formatNumber } from '@ui/utils'
 
-import Box from '@/ui/Box'
+import Box from '@ui/Box'
 
 const BarChartCustomTooltip = ({ active, payload }: TooltipProps<ValueType, NameType>) => {
   if (active && payload && payload.length) {

diff --git a/apps/dao/src/components/Charts/LineChartComponent.tsx b/apps/dao/src/components/Charts/LineChartComponent.tsx
@@ -1,9 +1,9 @@
 import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts'
 
-import { formatDateFromTimestamp } from '@/ui/utils/utilsFormat'
+import { formatDateFromTimestamp } from '@ui/utils/utilsFormat'
 
 import LineChartCustomTooltip from './LineChartCustomTooltip'
-import { GaugeWeightHistoryData } from '@/types/dao.types'
+import { GaugeWeightHistoryData } from '@dao/types/dao.types'
 
 type Props = {
   data: GaugeWeightHistoryData[]

diff --git a/apps/dao/src/components/Charts/LineChartCustomTooltip.tsx b/apps/dao/src/components/Charts/LineChartCustomTooltip.tsx
@@ -4,9 +4,9 @@ import { TooltipProps } from 'recharts'
 import styled from 'styled-components'
 import { t } from '@lingui/macro'
 
-import { formatDateFromTimestamp, formatNumber } from '@/ui/utils/utilsFormat'
+import { formatDateFromTimestamp, formatNumber } from '@ui/utils/utilsFormat'
 
-import Box from '@/ui/Box'
+import Box from '@ui/Box'
 
 const CustomTooltip = ({ active, payload }: TooltipProps<ValueType, NameType>) => {
   if (active && payload && payload.length) {

diff --git a/apps/dao/src/components/ComboBoxSelectGauge/ComboBox.tsx b/apps/dao/src/components/ComboBoxSelectGauge/ComboBox.tsx
@@ -1,24 +1,24 @@
-import type { ComboBoxSelectGaugeProps } from '@/components/ComboBoxSelectGauge/types'
+import type { ComboBoxSelectGaugeProps } from '@dao/components/ComboBoxSelectGauge/types'
 
 import React, { useEffect, useRef, useState } from 'react'
 import { t } from '@lingui/macro'
 import chunk from 'lodash/chunk'
 import styled from 'styled-components'
 
-import { breakpoints } from '@/ui/utils/responsive'
-import useStore from '@/store/useStore'
-
-import { RCEditClear } from '@/ui/images'
-import { StyledInput } from '@/ui/InputComp/styles'
-import Box from '@/ui/Box/Box'
-import ComboBoxListChunk from '@/components/ComboBoxSelectGauge/ComboBoxListChunk'
-import Icon from '@/ui/Icon'
-import IconButton from '@/ui/IconButton/IconButton'
-import InputProvider from '@/ui/InputComp/InputProvider'
-import Popover from '@/ui/Popover/Popover'
-import Spinner from '@/ui/Spinner'
-import SpinnerWrapper from '@/ui/Spinner/SpinnerWrapper'
-import { GaugeFormattedData } from '@/types/dao.types'
+import { breakpoints } from '@ui/utils/responsive'
+import useStore from '@dao/store/useStore'
+
+import { RCEditClear } from '@ui/images'
+import { StyledInput } from '@ui/InputComp/styles'
+import Box from '@ui/Box/Box'
+import ComboBoxListChunk from '@dao/components/ComboBoxSelectGauge/ComboBoxListChunk'
+import Icon from '@ui/Icon'
+import IconButton from '@ui/IconButton/IconButton'
+import InputProvider from '@ui/InputComp/InputProvider'
+import Popover from '@ui/Popover/Popover'
+import Spinner from '@ui/Spinner'
+import SpinnerWrapper from '@ui/Spinner/SpinnerWrapper'
+import { GaugeFormattedData } from '@dao/types/dao.types'
 
 const ComboBox = ({
   testId,

diff --git a/apps/dao/src/components/ComboBoxSelectGauge/ComboBoxListChunk.tsx b/apps/dao/src/components/ComboBoxSelectGauge/ComboBoxListChunk.tsx
@@ -1,12 +1,12 @@
-import type { ComboBoxSelectGaugeProps } from '@/components/ComboBoxSelectGauge/types'
+import type { ComboBoxSelectGaugeProps } from '@dao/components/ComboBoxSelectGauge/types'
 
 import React, { useRef } from 'react'
 import styled from 'styled-components'
 
 import useIntersectionObserver from 'ui/src/hooks/useIntersectionObserver'
 
-import SelectGaugeListItem from '@/components/ComboBoxSelectGauge/ComboBoxListItem'
-import { GaugeFormattedData } from '@/types/dao.types'
+import SelectGaugeListItem from '@dao/components/ComboBoxSelectGauge/ComboBoxListItem'
+import { GaugeFormattedData } from '@dao/types/dao.types'
 
 const SelectGaugeListChunk = ({
   testId,

diff --git a/apps/dao/src/components/ComboBoxSelectGauge/ComboBoxListItem.tsx b/apps/dao/src/components/ComboBoxSelectGauge/ComboBoxListItem.tsx
@@ -1,15 +1,15 @@
-import type { ComboBoxSelectGaugeProps } from '@/components/ComboBoxSelectGauge/types'
+import type { ComboBoxSelectGaugeProps } from '@dao/components/ComboBoxSelectGauge/types'
 
 import React from 'react'
 import styled from 'styled-components'
 
-import { focusVisible } from '@/ui/utils'
-import { shortenTokenAddress } from '@/ui/utils'
+import { focusVisible } from '@ui/utils'
+import { shortenTokenAddress } from '@ui/utils'
 
-import Box from '@/ui/Box'
-import Button from '@/ui/Button'
-import Chip from '@/ui/Typography/Chip'
-import { GaugeFormattedData } from '@/types/dao.types'
+import Box from '@ui/Box'
+import Button from '@ui/Button'
+import Chip from '@ui/Typography/Chip'
+import { GaugeFormattedData } from '@dao/types/dao.types'
 
 const ComboBoxListItem = ({
   imageBaseUrl,

diff --git a/apps/dao/src/components/ComboBoxSelectGauge/ComboBoxSelectedGaugeButton.tsx b/apps/dao/src/components/ComboBoxSelectGauge/ComboBoxSelectedGaugeButton.tsx
@@ -1,11 +1,11 @@
 import type { AriaButtonProps } from 'react-aria'
-import type { ButtonProps } from '@/ui/Button/types'
+import type { ButtonProps } from '@ui/Button/types'
 
 import { useButton } from 'react-aria'
 import React, { useRef } from 'react'
 import styled from 'styled-components'
 
-import ButtonComp from '@/ui/Button'
+import ButtonComp from '@ui/Button'
 
 const ComboBoxSelectedGaugeButton = (props: React.PropsWithChildren<AriaButtonProps<'button'> & ButtonProps>) => {
   const ref = useRef<HTMLButtonElement>(null)

diff --git a/apps/dao/src/components/ComboBoxSelectGauge/index.tsx b/apps/dao/src/components/ComboBoxSelectGauge/index.tsx
@@ -1,19 +1,19 @@
-import type { EndsWith } from '@/components/ComboBoxSelectGauge/types'
+import type { EndsWith } from '@dao/components/ComboBoxSelectGauge/types'
 
 import Fuse from 'fuse.js'
 import React, { useCallback, useState } from 'react'
 import { useFilter } from 'react-aria'
 import { useOverlayTriggerState } from 'react-stately'
 import { t } from '@lingui/macro'
 
-import { delayAction } from '@/utils'
-import useStore from '@/store/useStore'
-import networks from '@/networks'
+import { delayAction } from '@dao/utils'
+import useStore from '@dao/store/useStore'
+import networks from '@dao/networks'
 
-import ComboBox from '@/components/ComboBoxSelectGauge/ComboBox'
-import ComboBoxSelectedGaugeButton from '@/components/ComboBoxSelectGauge/ComboBoxSelectedGaugeButton'
-import ModalDialog from '@/ui/Dialog'
-import { GaugeFormattedData } from '@/types/dao.types'
+import ComboBox from '@dao/components/ComboBoxSelectGauge/ComboBox'
+import ComboBoxSelectedGaugeButton from '@dao/components/ComboBoxSelectGauge/ComboBoxSelectedGaugeButton'
+import ModalDialog from '@ui/Dialog'
+import { GaugeFormattedData } from '@dao/types/dao.types'
 
 const ComboBoxGauges = ({
   disabled,

diff --git a/apps/dao/src/components/ComboBoxSelectGauge/types.ts b/apps/dao/src/components/ComboBoxSelectGauge/types.ts
@@ -1,4 +1,4 @@
-import { GaugeFormattedData } from '@/types/dao.types'
+import { GaugeFormattedData } from '@dao/types/dao.types'
 
 export type EndsWith = (string: string, substring: string) => boolean
 

diff --git a/apps/dao/src/components/ConnectWallet.tsx b/apps/dao/src/components/ConnectWallet.tsx
@@ -1,8 +1,8 @@
-import { isLoading } from '@/ui/utils'
-import useStore from '@/store/useStore'
+import { isLoading } from '@ui/utils'
+import useStore from '@dao/store/useStore'
 import { useUserProfileStore } from '@ui-kit/features/user-profile'
 
-import ConnectWalletPrompt from '@/ui/ConnectWalletPrompt'
+import ConnectWalletPrompt from '@ui/ConnectWalletPrompt'
 
 type ConnectWalletProps = {
   description: string

diff --git a/apps/dao/src/components/CopyIconButton.tsx b/apps/dao/src/components/CopyIconButton.tsx
@@ -1,7 +1,7 @@
-import { copyToClipboard } from '@/utils'
+import { copyToClipboard } from '@dao/utils'
 
-import TooltipButton from '@/ui/Tooltip'
-import Icon from '@/ui/Icon'
+import TooltipButton from '@ui/Tooltip'
+import Icon from '@ui/Icon'
 
 type CopyIconButtonProps = {
   copyContent: string

diff --git a/apps/dao/src/components/DetailInfoEstGas.tsx b/apps/dao/src/components/DetailInfoEstGas.tsx
@@ -4,15 +4,15 @@ import isNaN from 'lodash/isNaN'
 import isUndefined from 'lodash/isUndefined'
 import styled from 'styled-components'
 
-import { NETWORK_TOKEN } from '@/constants'
-import { FORMAT_OPTIONS, formatNumber } from '@/ui/utils'
+import { NETWORK_TOKEN } from '@dao/constants'
+import { FORMAT_OPTIONS, formatNumber } from '@ui/utils'
 import { gweiToEther, weiToGwei } from '@ui-kit/utils'
-import networks from '@/networks'
-import useStore from '@/store/useStore'
+import networks from '@dao/networks'
+import useStore from '@dao/store/useStore'
 
-import DetailInfo from '@/ui/DetailInfo'
-import IconTooltip from '@/ui/Tooltip/TooltipIcon'
-import { CurveApi, ChainId, EstimatedGas } from '@/types/dao.types'
+import DetailInfo from '@ui/DetailInfo'
+import IconTooltip from '@ui/Tooltip/TooltipIcon'
+import { CurveApi, ChainId, EstimatedGas } from '@dao/types/dao.types'
 
 export type StepProgress = {
   active: number

diff --git a/apps/dao/src/components/ErrorMessage/index.tsx b/apps/dao/src/components/ErrorMessage/index.tsx
@@ -1,7 +1,7 @@
 import styled from 'styled-components'
 
-import IconButton from '@/ui/IconButton'
-import Icon from '@/ui/Icon'
+import IconButton from '@ui/IconButton'
+import Icon from '@ui/Icon'
 
 type Props = {
   message: string

diff --git a/apps/dao/src/components/ExternalLinkButton.tsx b/apps/dao/src/components/ExternalLinkButton.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components'
-import Icon from '@/ui/Icon'
-import Button from '@/ui/Button'
+import Icon from '@ui/Icon'
+import Button from '@ui/Button'
 
 type ExternalLinkIconButtonProps = {
   href: string

diff --git a/apps/dao/src/components/ExternalLinkIconButton.tsx b/apps/dao/src/components/ExternalLinkIconButton.tsx
@@ -1,8 +1,8 @@
 import styled from 'styled-components'
 
-import TooltipButton from '@/ui/Tooltip'
-import { ExternalLink } from '@/ui/Link'
-import Icon from '@/ui/Icon'
+import TooltipButton from '@ui/Tooltip'
+import { ExternalLink } from '@ui/Link'
+import Icon from '@ui/Icon'
 
 type ExternalLinkIconButtonProps = {
   href: string

diff --git a/apps/dao/src/components/InternalLinkButton.tsx b/apps/dao/src/components/InternalLinkButton.tsx
@@ -1,10 +1,10 @@
 import styled from 'styled-components'
 import { useNavigate, useParams } from 'react-router-dom'
 
-import { getPath } from '@/utils/utilsRouter'
+import { getPath } from '@dao/utils/utilsRouter'
 
-import { InternalLink } from '@/ui/Link'
-import Icon from '@/ui/Icon'
+import { InternalLink } from '@ui/Link'
+import Icon from '@ui/Icon'
 
 type InternalLinkButtonProps = {
   to: string

diff --git a/apps/dao/src/components/Page404/Page.tsx b/apps/dao/src/components/Page404/Page.tsx
@@ -1,7 +1,7 @@
 import type { NextPage } from 'next'
 
-import DocumentHead from '@/layout/DocumentHead'
-import Error404 from '@/ui/Error404'
+import DocumentHead from '@dao/layout/DocumentHead'
+import Error404 from '@ui/Error404'
 
 const Page: NextPage = () => (
   <>

diff --git a/apps/dao/src/components/PageAnalytics/CrvStats/index.tsx b/apps/dao/src/components/PageAnalytics/CrvStats/index.tsx
@@ -1,13 +1,13 @@
 import { useEffect } from 'react'
 import styled from 'styled-components'
 
-import useStore from '@/store/useStore'
-import { formatNumber } from '@/ui/utils'
+import useStore from '@dao/store/useStore'
+import { formatNumber } from '@ui/utils'
 import { t } from '@lingui/macro'
 
-import Box from '@/ui/Box'
-import MetricsComp, { MetricsColumnData } from '@/components/MetricsComp'
-import Tooltip from '@/ui/Tooltip'
+import Box from '@ui/Box'
+import MetricsComp, { MetricsColumnData } from '@dao/components/MetricsComp'
+import Tooltip from '@ui/Tooltip'
 
 const CrvStats: React.FC = () => {
   const provider = useStore((state) => state.wallet.getProvider(''))

diff --git a/apps/dao/src/components/PageAnalytics/DailyLocksChart/PositiveAndNegativeBarChart.tsx b/apps/dao/src/components/PageAnalytics/DailyLocksChart/PositiveAndNegativeBarChart.tsx
@@ -4,7 +4,7 @@ import { BarChart, Bar, Cell, XAxis, YAxis, CartesianGrid, Tooltip, ReferenceLin
 import { formatNumber } from 'ui/src/utils'
 
 import PositiveAndNegativeBarChartTooltip from './PositiveAndNegativeBarChartTooltip'
-import { VeCrvDailyLock } from '@/types/dao.types'
+import { VeCrvDailyLock } from '@dao/types/dao.types'
 
 type PositiveAndNegativeBarChartProps = {
   data: VeCrvDailyLock[]

diff --git a/apps/dao/src/components/PageAnalytics/DailyLocksChart/PositiveAndNegativeBarChartTooltip.tsx b/apps/dao/src/components/PageAnalytics/DailyLocksChart/PositiveAndNegativeBarChartTooltip.tsx
@@ -4,9 +4,9 @@ import { TooltipProps } from 'recharts'
 import styled from 'styled-components'
 import { t } from '@lingui/macro'
 
-import { formatNumber } from '@/ui/utils/utilsFormat'
+import { formatNumber } from '@ui/utils/utilsFormat'
 
-import Box from '@/ui/Box'
+import Box from '@ui/Box'
 
 const PositiveAndNegativeBarChartTooltip: React.FC<TooltipProps<ValueType, NameType>> = ({ active, payload }) => {
   if (active && payload && payload.length) {

diff --git a/apps/dao/src/components/PageAnalytics/DailyLocksChart/index.tsx b/apps/dao/src/components/PageAnalytics/DailyLocksChart/index.tsx
@@ -2,11 +2,11 @@ import styled from 'styled-components'
 import { useEffect } from 'react'
 import { t } from '@lingui/macro'
 
-import useStore from '@/store/useStore'
+import useStore from '@dao/store/useStore'
 
-import Box from '@/ui/Box'
+import Box from '@ui/Box'
 import Spinner from '../../Spinner'
-import ErrorMessage from '@/components/ErrorMessage'
+import ErrorMessage from '@dao/components/ErrorMessage'
 import PositiveAndNegativeBarChart from './PositiveAndNegativeBarChart'
 
 const DailyLocks: React.FC = () => {

diff --git a/apps/dao/src/components/PageAnalytics/HoldersTable/index.tsx b/apps/dao/src/components/PageAnalytics/HoldersTable/index.tsx
@@ -1,15 +1,15 @@
 import styled from 'styled-components'
 import { t } from '@lingui/macro'
 
-import useStore from '@/store/useStore'
+import useStore from '@dao/store/useStore'
 
-import { shortenTokenAddress, formatNumber, formatDateFromTimestamp, convertToLocaleTimestamp } from '@/ui/utils'
-import { TOP_HOLDERS } from '@/constants'
+import { shortenTokenAddress, formatNumber, formatDateFromTimestamp, convertToLocaleTimestamp } from '@ui/utils'
+import { TOP_HOLDERS } from '@dao/constants'
 
-import PaginatedTable, { Column } from '@/components/PaginatedTable'
-import { TableRowWrapper, TableData, TableDataLink } from '@/components/PaginatedTable/TableRow'
-import Box from '@/ui/Box'
-import { VeCrvHolder, AllHoldersSortBy } from '@/types/dao.types'
+import PaginatedTable, { Column } from '@dao/components/PaginatedTable'
+import { TableRowWrapper, TableData, TableDataLink } from '@dao/components/PaginatedTable/TableRow'
+import Box from '@ui/Box'
+import { VeCrvHolder, AllHoldersSortBy } from '@dao/types/dao.types'
 
 const TopHoldersTable: React.FC = () => {
   const { veCrvHolders, allHoldersSortBy, setAllHoldersSortBy, getVeCrvHolders } = useStore((state) => state.analytics)