Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove unused and useless code #717

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,4 @@ const TooltipData = styled.p`
color: var(--chart-red);
}
`
const TooltipDataNotAvailable = styled.p`
font-size: var(--font-size-1);
font-weight: var(--semi-bold);
color: var(--page--text-color);
font-style: italic;
`

export default BarChartCustomTooltip
2 changes: 1 addition & 1 deletion apps/main/src/dao/components/Charts/LineChartComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const LineChartComponent = ({ data, height = 400 }: Props) => {
verticalAlign="top"
iconSize={0}
height={32}
formatter={(value) => 'Relative Gauge Weight'}
formatter={() => 'Relative Gauge Weight'}
wrapperStyle={{
fontWeight: 'bold',
fontSize: 'var(--font-size-1)',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,6 @@ const TooltipWrapper = styled.div`
gap: var(--spacing-2);
`

const TooltipTitle = styled.p`
font-size: var(--font-size-3);
color: var(--page--text-color);
font-weight: var(--bold);
`

const TooltipColumn = styled.div`
display: flex;
flex-direction: column;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const ComboBoxListItem = ({
const ItemButton = styled(Button)`
${focusVisible};

&.focus-visible,
&:focus-visible,
&.active {
color: var(--box--primary--color);
background-color: var(--table_detail_row--active--background-color);
Expand All @@ -56,11 +56,6 @@ const ItemButton = styled(Button)`
width: 100%;
`

const IconWrapper = styled.div`
min-width: 1.875rem; // 30px;
text-align: left;
`

const LabelText = styled.div`
overflow: hidden;

Expand Down
6 changes: 0 additions & 6 deletions apps/main/src/dao/components/MetricsComp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,4 @@ export const MetricsColumnData = styled.h3<{ noMargin?: boolean }>`
margin-top: ${({ noMargin }) => (noMargin ? '0' : 'var(--spacing-1)')};
font-size: var(--font-size-2);
`

export const MetricsRowData = styled.h3`
font-size: var(--font-size-2);
margin-left: var(--spacing-1);
`

export default MetricsComp
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,5 @@ const TooltipData = styled.p`
color: var(--chart-red);
}
`
const TooltipDataNotAvailable = styled.p`
font-size: var(--font-size-1);
font-weight: var(--semi-bold);
color: var(--page--text-color);
font-style: italic;
`

export default PositiveAndNegativeBarChartTooltip
2 changes: 1 addition & 1 deletion apps/main/src/dao/components/PageAnalytics/Page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const Page: NextPage = () => {
const params = useParams()
const location = useLocation()
const navigate = useNavigate()
const { routerParams } = usePageOnMount(params, location, navigate)
usePageOnMount(params, location, navigate)

useEffect(() => {
scrollToTop()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,5 @@ const TooltipData = styled.p`
color: var(--chart-red);
}
`
const TooltipDataNotAvailable = styled.p`
font-size: var(--font-size-1);
font-weight: var(--semi-bold);
color: var(--page--text-color);
font-style: italic;
`

export default FeesBarChartTooltip
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const GaugeDetails = ({ gaugeData, className }: { gaugeData: GaugeFormattedData;
: 'N/A'}
</h5>
<h5>
{gaugeData.pool?.tvl_usd && gaugeData.pool.tvl_usd !== undefined
{gaugeData.pool?.tvl_usd
? formatNumber(gaugeData.pool.tvl_usd, {
showDecimalIfSmallNumberOnly: true,
currency: 'USD',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const GaugeDetailsSm = ({ gaugeData, userGaugeWeightVoteData, className }: Gauge
<StatsRow>
<StatTitle>{t`TVL`}</StatTitle>
<StatData>
{gaugeData.pool?.tvl_usd && gaugeData.pool.tvl_usd !== undefined
{gaugeData.pool?.tvl_usd
? formatNumber(gaugeData.pool.tvl_usd, {
showDecimalIfSmallNumberOnly: true,
currency: 'USD',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,6 @@ const StyledTitleComp = styled(TitleComp)`
margin-right: auto;
`

const DataComp = styled.div`
display: grid;
grid-template-columns: 1fr 1fr;
`

const GaugeDataTitle = styled.p`
font-size: var(--font-size-1);
text-align: right;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ import { UserLock, UserLocksSortBy, veCrvLockType } from '@/dao/types/dao.types'

interface UserLocksTableProps {
userAddress: string
tableMinWidth: number
}

const UserLocksTable = ({ userAddress, tableMinWidth }: UserLocksTableProps) => {
const UserLocksTable = ({ userAddress }: UserLocksTableProps) => {
const { getUserLocks, userLocksMapper, userLocksSortBy, setUserLocksSortBy } = useStore((state) => state.user)

const gridTemplateColumns = '5.375rem 1fr 10rem 8rem'
Expand Down
2 changes: 1 addition & 1 deletion apps/main/src/dao/components/PageUser/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const UserPage = ({ routerParams: { rUserAddress } }: UserPageProps) => {
{activeNavKey === 'gauge_votes' && (
<UserGaugeVotesTable userAddress={userAddress} tableMinWidth={tableMinWidth} />
)}
{activeNavKey === 'locks' && <UserLocksTable userAddress={userAddress} tableMinWidth={tableMinWidth} />}
{activeNavKey === 'locks' && <UserLocksTable userAddress={userAddress} />}
</Container>
</Box>
</Wrapper>
Expand Down
3 changes: 1 addition & 2 deletions apps/main/src/dao/components/PaginatedTable/TableRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ interface TableRowProps {
holder: any
sortBy: { key: string; label: string; order: 'asc' | 'desc' }
labels: { key: string; label: string }[]
rank: number
gridTemplateColumns?: string
}

const TableRow = ({ holder, sortBy, labels, rank, gridTemplateColumns }: TableRowProps) => (
const TableRow = ({ holder, sortBy, labels, gridTemplateColumns }: TableRowProps) => (
<TableRowWrapper columns={labels.length} gridTemplateColumns={gridTemplateColumns}>
{labels.map((label, index) => (
<TableData key={index} className={sortBy.key === label.key ? 'active left-padding' : 'left-padding'}>
Expand Down
3 changes: 1 addition & 2 deletions apps/main/src/dao/components/ProposalVoteStatusBox/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ type ProposalVoteStatusBoxProps = {
}

const ProposalVoteStatusBox = ({ proposalData, className }: ProposalVoteStatusBoxProps) => {
const { votesFor, votesAgainst, quorumVeCrv, minAcceptQuorumPercent, minSupport, currentQuorumPercentage } =
proposalData
const { votesFor, votesAgainst, minAcceptQuorumPercent, minSupport, currentQuorumPercentage } = proposalData

const totalVotes = votesFor + votesAgainst
const support = totalVotes > 0 ? (votesFor / totalVotes) * 100 : 0
Expand Down
3 changes: 1 addition & 2 deletions apps/main/src/dao/components/UserBox/VoteDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ import { ProposalType, SnapshotVotingPower, ActiveProposal } from '@/dao/types/d
type Props = {
userAddress: string
activeProposal?: ActiveProposal
testId?: string
proposalId?: string
votingPower: SnapshotVotingPower
snapshotVotingPower: boolean
className?: string
}

const VoteDialog = ({ userAddress, activeProposal, testId, className, votingPower, proposalId }: Props) => {
const VoteDialog = ({ userAddress, activeProposal, className, votingPower, proposalId }: Props) => {
const { castVote, voteTxMapper, executeProposal, executeTxMapper } = useStore((state) => state.proposals)
const userProposalVote = useStore((state) => state.proposals.userProposalVoteMapper[proposalId ?? '']) ?? null
const pricesProposal = useStore((state) => state.proposals.proposalMapper[proposalId ?? ''])
Expand Down
3 changes: 1 addition & 2 deletions apps/main/src/dao/components/UserBox/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ type Props = {
votingPower?: SnapshotVotingPower
activeProposal?: ActiveProposal
snapshotVotingPower: boolean
row?: boolean
}

const UserBox = ({ className, children, votingPower, snapshotVotingPower, activeProposal, row }: Props) => {
const UserBox = ({ className, children, votingPower, snapshotVotingPower, activeProposal }: Props) => {
const { wallet, connect } = useWallet()
return (
<Wrapper className={className}>
Expand Down
17 changes: 0 additions & 17 deletions apps/main/src/dao/store/createLayoutSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ const DEFAULT_LAYOUT_HEIGHT: LayoutHeight = {
secondaryNav: 0,
footer: 0,
}
export const layoutHeightKeys = ['globalAlert', 'mainNav', 'secondaryNav', 'footer'] as const

const DEFAULT_STATE: SliceState = {
height: DEFAULT_LAYOUT_HEIGHT,
Expand Down Expand Up @@ -112,19 +111,3 @@ const createLayoutSlice = (set: SetState<State>, get: GetState<State>) => ({
})

export default createLayoutSlice

export function getPageWidthClassName(pageWidth: number) {
if (pageWidth > 1920) {
return 'page-wide'
} else if (pageWidth > 1280 && pageWidth <= 1920) {
return 'page-large'
} else if (pageWidth > 960 && pageWidth <= 1280) {
return 'page-medium'
} else if (pageWidth > 450 && pageWidth <= 960) {
return 'page-small'
} else if (pageWidth > 321 && pageWidth <= 450) {
return 'page-small-x'
} else {
return 'page-small-xx'
}
}
6 changes: 2 additions & 4 deletions apps/main/src/dao/store/createProposalsSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
TransactionState,
UserProposalVoteResData,
} from '@/dao/types/dao.types'
import { useWallet, notify } from '@ui-kit/features/connect-wallet'
import { notify, useWallet } from '@ui-kit/features/connect-wallet'

type StateKey = keyof typeof DEFAULT_STATE

Expand Down Expand Up @@ -297,9 +297,7 @@ const createProposalsSlice = (set: SetState<State>, get: GetState<State>): Propo
const proposals = Object.values(proposalsData)

const filteredProposals = filterProposals(proposals, activeFilter)
const sortedProposals = sortProposals(filteredProposals, activeSortBy, activeSortDirection)

return sortedProposals
return sortProposals(filteredProposals, activeSortBy, activeSortDirection)
},
setProposals: (searchValue: string) => {
const { selectFilteredSortedProposals, activeSortBy, activeSortDirection } = get()[sliceKey]
Expand Down
11 changes: 3 additions & 8 deletions apps/main/src/dao/store/createUserSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,7 @@ const createUserSlice = (set: SetState<State>, get: GetState<State>): UserSlice

set(
produce((state) => {
const reversedEntries = [...locks].reverse()
state[sliceKey].userLocksMapper[address].locks = reversedEntries
state[sliceKey].userLocksMapper[address].locks = [...locks].reverse()
state[sliceKey].userLocksSortBy.order = order
}),
)
Expand Down Expand Up @@ -590,8 +589,7 @@ const createUserSlice = (set: SetState<State>, get: GetState<State>): UserSlice

set(
produce((state) => {
const reversedEntries = [...votes].reverse()
state[sliceKey].userGaugeVotesMapper[address].votes = reversedEntries
state[sliceKey].userGaugeVotesMapper[address].votes = [...votes].reverse()
state[sliceKey].userGaugeVotesSortBy.order = order
}),
)
Expand Down Expand Up @@ -623,8 +621,7 @@ const createUserSlice = (set: SetState<State>, get: GetState<State>): UserSlice

set(
produce((state) => {
const reversedEntries = [...data.gauges].reverse()
state[sliceKey].userGaugeVoteWeightsMapper[address].data.gauges = reversedEntries
state[sliceKey].userGaugeVoteWeightsMapper[address].data.gauges = [...data.gauges].reverse()
state[sliceKey].userGaugeVoteWeightsSortBy.order = order
}),
)
Expand Down Expand Up @@ -680,6 +677,4 @@ const createUserSlice = (set: SetState<State>, get: GetState<State>): UserSlice
},
})

const calculateGaugeVoteStale = (usedVeCrv: number, futureVeCrv: number) => usedVeCrv < futureVeCrv

export default createUserSlice
5 changes: 2 additions & 3 deletions apps/main/src/dao/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export function copyToClipboard(text: string) {
// IE specific code path to prevent textarea being shown while dialog is visible.
return window.clipboardData.setData('Text', text)
} else if (document.queryCommandSupported && document.queryCommandSupported('copy')) {
var textarea = document.createElement('textarea')
const textarea = document.createElement('textarea')
textarea.textContent = text
textarea.style.position = 'fixed' // Prevent scrolling to bottom of page in MS Edge.
document.body.appendChild(textarea)
Expand Down Expand Up @@ -65,6 +65,5 @@ export const httpFetcher = (uri: string) => fetch(uri).then((res) => res.json())
export function getChainIdFromGaugeData(gaugeData: GaugeFormattedData | undefined) {
if (!gaugeData) return 1
const gaugeNetwork = gaugeData?.pool?.chain ?? gaugeData?.market?.chain ?? 'ethereum'
const chainId = Chain[upperFirst(gaugeNetwork) as keyof typeof Chain] ?? 1
return chainId
return Chain[upperFirst(gaugeNetwork) as keyof typeof Chain] ?? 1
}
10 changes: 1 addition & 9 deletions apps/main/src/dao/utils/utilsDates.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
import type { Dayjs } from 'dayjs'

import { parseDate } from '@internationalized/date'
import dayjs from '@ui-kit/lib/dayjs'

export function todayInMilliseconds() {
const parsedToday = dayjs().format('YYYY-MM-DD')
return dayjs(parsedToday).valueOf()
}

export function toCalendarDate(date: Dayjs) {
return parseDate(date.format('YYYY-MM-DD'))
}
export const toCalendarDate = (date: Dayjs) => parseDate(date.format('YYYY-MM-DD'))

export function formatDisplayDate(date: Dayjs | string) {
const parsedDate = typeof date === 'string' ? dayjs(date) : date
Expand Down
40 changes: 3 additions & 37 deletions apps/main/src/dex/components/PageCreatePool/ConfirmModal/index.tsx
Original file line number Diff line number Diff line change
@@ -1,34 +1,28 @@
import { useRef, useMemo, useCallback } from 'react'
import { useCallback, useMemo, useRef } from 'react'
import { useOverlayTriggerState } from '@react-stately/overlays'
import { useButton } from '@react-aria/button'
import styled from 'styled-components'
import { t } from '@ui-kit/lib/i18n'
import { useNavigate } from 'react-router-dom'
import { useParams } from 'react-router-dom'
import { useNavigate, useParams } from 'react-router-dom'
import { getPath } from '@/dex/utils/utilsRouter'

import useStore from '@/dex/store/useStore'

import { breakpoints } from '@ui/utils/responsive'
import { checkFormReady } from '@/dex/components/PageCreatePool/utils'

import Icon from '@ui/Icon'
import Box from '@ui/Box'
import Button from '@ui/Button'
import InternalLinkButton from '@ui/InternalLinkButton'
import ExternalLink from '@ui/Link/ExternalLink'
import { ROUTE } from '@/dex/constants'
import Spinner from 'ui/src/Spinner/Spinner'
import ModalPendingTx from 'ui/src/ModalPendingTx'

import ModalDialog from '@/dex/components/PageCreatePool/ConfirmModal/ModalDialog'
import CreatePoolButton from '@/dex/components/PageCreatePool/ConfirmModal/CreatePoolButton'
import InfoLinkBar from '@/dex/components/PageCreatePool/ConfirmModal/CreateInfoLinkBar'
import PoolTypeSummary from '@/dex/components/PageCreatePool/Summary/PoolTypeSummary'
import TokensInPoolSummary from '@/dex/components/PageCreatePool/Summary/TokensInPoolSummary'
import ParametersSummary from '@/dex/components/PageCreatePool/Summary/ParametersSummary'
import PoolInfoSummary from '@/dex/components/PageCreatePool/Summary/PoolInfoSummary'
import { CurveApi, ChainId } from '@/dex/types/main.types'
import { ChainId, CurveApi } from '@/dex/types/main.types'

type Props = {
disabled?: boolean
Expand Down Expand Up @@ -377,34 +371,6 @@ const StyledButtonSpinner = styled(Spinner)`
}
`

const StyledPendingSpinner = styled(Spinner)`
margin: var(--spacing-4) auto;
> div {
border-color: var(--page--text-color) transparent transparent transparent;
}
`

const Transaction = styled(ExternalLink)`
display: flex;
align-items: center;
font-size: var(--font-size-2);
font-weight: var(--semi-bold);
color: var(--page--text-color);
text-transform: none;
text-decoration: none;
background-color: var(--page--background-color);
padding: var(--spacing-2);
p {
font-weight: var(--bold);
margin-right: var(--spacing-1);
}
`

const StyledIcon = styled(Icon)`
margin: auto 0 auto var(--spacing-1);
color: var(--page--text-color);
`

const ButtonWrapper = styled.div`
margin: 0 var(--spacing-normal);
`
Expand Down
Loading