ButterflyEffect/uniswap-interface-uncensored
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no more borderRadius errors! (#1968)

Browse Source
This commit is contained in:
Noah Zinsmeister 2021-07-06 17:05:19 -04:00 committed by GitHub
parent ae86fefe8b
commit 43cefbdc6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 88 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -92,6 +92,7 @@
"react-dom": "^17.0.1", "react-dom": "^17.0.1",
"react-feather": "^2.0.8", "react-feather": "^2.0.8",
"react-ga": "^2.5.7", "react-ga": "^2.5.7",
"react-is": "^17.0.2",
"react-markdown": "^4.3.1", "react-markdown": "^4.3.1",
"react-popper": "^2.2.3", "react-popper": "^2.2.3",
"react-redux": "^7.2.2", "react-redux": "^7.2.2",
@ -106,7 +107,7 @@
"redux-localstorage-simple": "^2.3.1", "redux-localstorage-simple": "^2.3.1",
"serve": "^11.3.2", "serve": "^11.3.2",
"start-server-and-test": "^1.11.0", "start-server-and-test": "^1.11.0",
"styled-components": "^4.2.0", "styled-components": "^5.3.0",
"styled-system": "^5.1.5", "styled-system": "^5.1.5",
"typechain": "^5.0.0", "typechain": "^5.0.0",
"typescript": "^4.2.3", "typescript": "^4.2.3",

32
src/components/Button/index.tsx
View File

@ -12,16 +12,15 @@ const Base = styled(RebassButton)<
{ {
padding?: string padding?: string
width?: string width?: string
borderRadius?: string $borderRadius?: string
altDisabledStyle?: boolean altDisabledStyle?: boolean
} & ButtonProps } & ButtonProps
>` >`
padding: ${({ padding }) => (padding ? padding : '16px')}; padding: ${({ padding }) => padding ?? '16px'};
width: ${({ width }) => (width ? width : '100%')}; width: ${({ width }) => width ?? '100%'};
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
border-radius: 20px; border-radius: ${({ $borderRadius }) => $borderRadius ?? '20px'};
border-radius: ${({ borderRadius }) => borderRadius && borderRadius};
outline: none; outline: none;
border: 1px solid transparent; border: 1px solid transparent;
color: white; color: white;
@ -345,17 +344,6 @@ export function ButtonDropdown({ disabled = false, children, ...rest }: { disabl
) )
} }
export function ButtonDropdownGrey({ disabled = false, children, ...rest }: { disabled?: boolean } & ButtonProps) {
return (
<ButtonGray {...rest} disabled={disabled} style={{ borderRadius: '20px' }}>
<RowBetween>
<div style={{ display: 'flex', alignItems: 'center' }}>{children}</div>
<ChevronDown size={24} />
</RowBetween>
</ButtonGray>
)
}
export function ButtonDropdownLight({ disabled = false, children, ...rest }: { disabled?: boolean } & ButtonProps) { export function ButtonDropdownLight({ disabled = false, children, ...rest }: { disabled?: boolean } & ButtonProps) {
return ( return (
<ButtonOutlined {...rest} disabled={disabled}> <ButtonOutlined {...rest} disabled={disabled}>
@ -367,14 +355,6 @@ export function ButtonDropdownLight({ disabled = false, children, ...rest }: { d
) )
} }
export function ButtonRadio({ active, ...rest }: { active?: boolean } & ButtonProps) {
if (!active) {
return <ButtonWhite {...rest} />
} else {
return <ButtonPrimary {...rest} />
}
}
const ActiveOutlined = styled(ButtonOutlined)` const ActiveOutlined = styled(ButtonOutlined)`
border: 1px solid; border: 1px solid;
border-color: ${({ theme }) => theme.primary1}; border-color: ${({ theme }) => theme.primary1};
@ -407,13 +387,13 @@ export function ButtonRadioChecked({ active = false, children, ...rest }: { acti
if (!active) { if (!active) {
return ( return (
<ButtonOutlined borderRadius="12px" padding="12px 8px" {...rest}> <ButtonOutlined $borderRadius="12px" padding="12px 8px" {...rest}>
{<RowBetween>{children}</RowBetween>} {<RowBetween>{children}</RowBetween>}
</ButtonOutlined> </ButtonOutlined>
) )
} else { } else {
return ( return (
<ActiveOutlined {...rest} padding="12px 8px" borderRadius="12px"> <ActiveOutlined {...rest} padding="12px 8px" $borderRadius="12px">
{ {
<RowBetween> <RowBetween>
{children} {children}

8
src/components/Card/index.tsx
View File

@ -1,13 +1,11 @@
import styled from 'styled-components/macro' import styled from 'styled-components/macro'
import { Box } from 'rebass/styled-components' import { Box } from 'rebass/styled-components'
const Card = styled(Box)<{ width?: string; padding?: string; border?: string; borderRadius?: string }>` const Card = styled(Box)<{ width?: string; padding?: string; border?: string; $borderRadius?: string }>`
width: ${({ width }) => width ?? '100%'}; width: ${({ width }) => width ?? '100%'};
border-radius: 16px; padding: ${({ padding }) => padding ?? '1rem'};
padding: 1rem; border-radius: ${({ $borderRadius }) => $borderRadius ?? '16px'};
padding: ${({ padding }) => padding};
border: ${({ border }) => border}; border: ${({ border }) => border};
border-radius: ${({ borderRadius }) => borderRadius};
` `
export default Card export default Card

2
src/components/FeeSelector/index.tsx
View File

@ -159,7 +159,7 @@ export default function FeeSelector({
)} )}
</AutoColumn> </AutoColumn>
<ButtonGray onClick={() => setShowOptions(!showOptions)} width="auto" padding="4px" borderRadius="6px"> <ButtonGray onClick={() => setShowOptions(!showOptions)} width="auto" padding="4px" $borderRadius="6px">
{showOptions ? <Trans>Hide</Trans> : <Trans>Edit</Trans>} {showOptions ? <Trans>Hide</Trans> : <Trans>Edit</Trans>}
</ButtonGray> </ButtonGray>
</RowBetween> </RowBetween>

2
src/components/Menu/index.tsx
View File

@ -172,7 +172,7 @@ export default function Menu() {
</div> </div>
</MenuItem> </MenuItem>
{account && ( {account && (
<UNIbutton onClick={openClaimModal} padding="8px 16px" width="100%" borderRadius="12px" mt="0.5rem"> <UNIbutton onClick={openClaimModal} padding="8px 16px" width="100%" $borderRadius="12px" mt="0.5rem">
<Trans>Claim UNI</Trans> <Trans>Claim UNI</Trans>
</UNIbutton> </UNIbutton>
)} )}

2
src/components/Popups/ClaimPopup.tsx
View File

@ -117,7 +117,7 @@ export default function ClaimPopup() {
</TYPE.subHeader> </TYPE.subHeader>
</AutoColumn> </AutoColumn>
<AutoColumn style={{ zIndex: 10 }} justify="center"> <AutoColumn style={{ zIndex: 10 }} justify="center">
<ButtonPrimary padding="8px" borderRadius="8px" width={'fit-content'} onClick={handleToggleSelfClaimModal}> <ButtonPrimary padding="8px" $borderRadius="8px" width={'fit-content'} onClick={handleToggleSelfClaimModal}>
<Trans>Claim your UNI tokens</Trans> <Trans>Claim your UNI tokens</Trans>
</ButtonPrimary> </ButtonPrimary>
</AutoColumn> </AutoColumn>

2
src/components/PositionCard/Sushi.tsx
View File

@ -62,7 +62,7 @@ export default function SushiPositionCard({ tokenA, tokenB, liquidityToken, bord
<RowFixed gap="8px"> <RowFixed gap="8px">
<ButtonEmpty <ButtonEmpty
padding="0px 35px 0px 0px" padding="0px 35px 0px 0px"
borderRadius="12px" $borderRadius="12px"
width="fit-content" width="fit-content"
as={Link} as={Link}
to={`/migrate/v2/${liquidityToken.address}`} to={`/migrate/v2/${liquidityToken.address}`}

6
src/components/PositionCard/V2.tsx
View File

@ -98,7 +98,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
<RowFixed gap="8px"> <RowFixed gap="8px">
<ButtonEmpty <ButtonEmpty
padding="6px 8px" padding="6px 8px"
borderRadius="12px" $borderRadius="12px"
width="fit-content" width="fit-content"
onClick={() => setShowMore(!showMore)} onClick={() => setShowMore(!showMore)}
> >
@ -188,7 +188,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
<RowBetween marginTop="10px"> <RowBetween marginTop="10px">
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
as={Link} as={Link}
to={`/migrate/v2/${pair.liquidityToken.address}`} to={`/migrate/v2/${pair.liquidityToken.address}`}
width="64%" width="64%"
@ -197,7 +197,7 @@ export default function V2PositionCard({ pair, border, stakedBalance }: Position
</ButtonPrimary> </ButtonPrimary>
<ButtonSecondary <ButtonSecondary
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
as={Link} as={Link}
width="32%" width="32%"
to={`/remove/v2/${currencyId(currency0)}/${currencyId(currency1)}`} to={`/remove/v2/${currencyId(currency0)}/${currencyId(currency1)}`}

12
src/components/PositionCard/index.tsx
View File

@ -219,7 +219,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
</Text> </Text>
</AutoRow> </AutoRow>
<RowFixed gap="8px" style={{ marginRight: '4px' }}> <RowFixed gap="8px" style={{ marginRight: '4px' }}>
<ButtonEmpty padding="6px 8px" borderRadius="12px" width="100%" onClick={() => setShowMore(!showMore)}> <ButtonEmpty padding="6px 8px" $borderRadius="12px" width="100%" onClick={() => setShowMore(!showMore)}>
{showMore ? ( {showMore ? (
<> <>
<Trans>Manage</Trans> <Trans>Manage</Trans>
@ -306,7 +306,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
</Text> </Text>
</FixedHeightRow> </FixedHeightRow>
<ButtonSecondary padding="8px" borderRadius="8px"> <ButtonSecondary padding="8px" $borderRadius="8px">
<ExternalLink <ExternalLink
style={{ width: '100%', textAlign: 'center' }} style={{ width: '100%', textAlign: 'center' }}
href={`https://v2.info.uniswap.org/account/${account}`} href={`https://v2.info.uniswap.org/account/${account}`}
@ -320,7 +320,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
<RowBetween marginTop="10px"> <RowBetween marginTop="10px">
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
as={Link} as={Link}
to={`/migrate/v2/${pair.liquidityToken.address}`} to={`/migrate/v2/${pair.liquidityToken.address}`}
width="32%" width="32%"
@ -329,7 +329,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
</ButtonPrimary> </ButtonPrimary>
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
as={Link} as={Link}
to={`/add/v2/${currencyId(currency0)}/${currencyId(currency1)}`} to={`/add/v2/${currencyId(currency0)}/${currencyId(currency1)}`}
width="32%" width="32%"
@ -338,7 +338,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
</ButtonPrimary> </ButtonPrimary>
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
as={Link} as={Link}
width="32%" width="32%"
to={`/remove/v2/${currencyId(currency0)}/${currencyId(currency1)}`} to={`/remove/v2/${currencyId(currency0)}/${currencyId(currency1)}`}
@ -350,7 +350,7 @@ export default function FullPositionCard({ pair, border, stakedBalance }: Positi
{stakedBalance && JSBI.greaterThan(stakedBalance.quotient, BIG_INT_ZERO) && ( {stakedBalance && JSBI.greaterThan(stakedBalance.quotient, BIG_INT_ZERO) && (
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
as={Link} as={Link}
to={`/uni/${currencyId(currency0)}/${currencyId(currency1)}`} to={`/uni/${currencyId(currency0)}/${currencyId(currency1)}`}
width="100%" width="100%"

2
src/components/SearchModal/CurrencyList.tsx
View File

@ -162,7 +162,7 @@ function BreakLineComponent({ style }: { style: CSSProperties }) {
const theme = useTheme() const theme = useTheme()
return ( return (
<FixedContentRow style={style}> <FixedContentRow style={style}>
<LightGreyCard padding="8px 12px" borderRadius="8px"> <LightGreyCard padding="8px 12px" $borderRadius="8px">
<RowBetween> <RowBetween>
<RowFixed> <RowFixed>
<TokenListLogoWrapper src={TokenListLogo} /> <TokenListLogoWrapper src={TokenListLogo} />

2
src/components/SearchModal/ImportList.tsx
View File

@ -149,7 +149,7 @@ export function ImportList({ listURL, list, setModalView, onDismiss }: ImportPro
<ButtonPrimary <ButtonPrimary
disabled={!confirmed} disabled={!confirmed}
altDisabledStyle={true} altDisabledStyle={true}
borderRadius="20px" $borderRadius="20px"
padding="10px 1rem" padding="10px 1rem"
onClick={handleAddList} onClick={handleAddList}
> >

4
src/components/SearchModal/ImportToken.tsx
View File

@ -108,7 +108,7 @@ export function ImportToken({ tokens, list, onBack, onDismiss, handleCurrencySel
</TYPE.small> </TYPE.small>
</RowFixed> </RowFixed>
) : ( ) : (
<WarningWrapper borderRadius="4px" padding="4px" highWarning={true}> <WarningWrapper $borderRadius="4px" padding="4px" highWarning={true}>
<RowFixed> <RowFixed>
<AlertCircle stroke={theme.red1} size="10px" /> <AlertCircle stroke={theme.red1} size="10px" />
<TYPE.body color={theme.red1} ml="4px" fontSize="10px" fontWeight={500}> <TYPE.body color={theme.red1} ml="4px" fontSize="10px" fontWeight={500}>
@ -124,7 +124,7 @@ export function ImportToken({ tokens, list, onBack, onDismiss, handleCurrencySel
<ButtonPrimary <ButtonPrimary
altDisabledStyle={true} altDisabledStyle={true}
borderRadius="20px" $borderRadius="20px"
padding="10px 1rem" padding="10px 1rem"
onClick={() => { onClick={() => {
tokens.map((token) => addToken(token)) tokens.map((token) => addToken(token))

2
src/components/claim/AddressClaimModal.tsx
View File

@ -132,7 +132,7 @@ export default function AddressClaimModal({ isOpen, onDismiss }: { isOpen: boole
disabled={!isAddress(parsedAddress ?? '') || !hasAvailableClaim} disabled={!isAddress(parsedAddress ?? '') || !hasAvailableClaim}
padding="16px 16px" padding="16px 16px"
width="100%" width="100%"
borderRadius="12px" $borderRadius="12px"
mt="1rem" mt="1rem"
onClick={onClaim} onClick={onClaim}
> >

2
src/components/claim/ClaimModal.tsx
View File

@ -161,7 +161,7 @@ export default function ClaimModal() {
disabled={!isAddress(account ?? '')} disabled={!isAddress(account ?? '')}
padding="16px 16px" padding="16px 16px"
width="100%" width="100%"
borderRadius="12px" $borderRadius="12px"
mt="1rem" mt="1rem"
onClick={onClaim} onClick={onClaim}
> >

2
src/components/earn/PoolCard.tsx
View File

@ -119,7 +119,7 @@ export default function PoolCard({ stakingInfo }: { stakingInfo: StakingInfo })
</TYPE.white> </TYPE.white>
<StyledInternalLink to={`/uni/${currencyId(currency0)}/${currencyId(currency1)}`} style={{ width: '100%' }}> <StyledInternalLink to={`/uni/${currencyId(currency0)}/${currencyId(currency1)}`} style={{ width: '100%' }}>
<ButtonPrimary padding="8px" borderRadius="8px"> <ButtonPrimary padding="8px" $borderRadius="8px">
{isStaking ? <Trans>Manage</Trans> : <Trans>Deposit</Trans>} {isStaking ? <Trans>Manage</Trans> : <Trans>Deposit</Trans>}
</ButtonPrimary> </ButtonPrimary>
</StyledInternalLink> </StyledInternalLink>

8
src/pages/AddLiquidity/index.tsx
View File

@ -639,7 +639,7 @@ export default function AddLiquidity({
)} )}
{outOfRange ? ( {outOfRange ? (
<YellowCard padding="8px 12px" borderRadius="12px"> <YellowCard padding="8px 12px" $borderRadius="12px">
<RowBetween> <RowBetween>
<AlertTriangle stroke={theme.yellow3} size="16px" /> <AlertTriangle stroke={theme.yellow3} size="16px" />
<TYPE.yellow ml="12px" fontSize="12px"> <TYPE.yellow ml="12px" fontSize="12px">
@ -653,7 +653,7 @@ export default function AddLiquidity({
) : null} ) : null}
{invalidRange ? ( {invalidRange ? (
<YellowCard padding="8px 12px" borderRadius="12px"> <YellowCard padding="8px 12px" $borderRadius="12px">
<RowBetween> <RowBetween>
<AlertTriangle stroke={theme.yellow3} size="16px" /> <AlertTriangle stroke={theme.yellow3} size="16px" />
<TYPE.yellow ml="12px" fontSize="12px"> <TYPE.yellow ml="12px" fontSize="12px">
@ -703,13 +703,13 @@ export default function AddLiquidity({
</DynamicSection> </DynamicSection>
<div> <div>
{addIsUnsupported ? ( {addIsUnsupported ? (
<ButtonPrimary disabled={true} borderRadius="12px" padding={'12px'}> <ButtonPrimary disabled={true} $borderRadius="12px" padding={'12px'}>
<TYPE.main mb="4px"> <TYPE.main mb="4px">
<Trans>Unsupported Asset</Trans> <Trans>Unsupported Asset</Trans>
</TYPE.main> </TYPE.main>
</ButtonPrimary> </ButtonPrimary>
) : !account ? ( ) : !account ? (
<ButtonLight onClick={toggleWalletModal} borderRadius="12px" padding={'12px'}> <ButtonLight onClick={toggleWalletModal} $borderRadius="12px" padding={'12px'}>
<Trans>Connect wallet</Trans> <Trans>Connect wallet</Trans>
</ButtonLight> </ButtonLight>
) : ( ) : (

6
src/pages/AddLiquidityV2/index.tsx
View File

@ -215,7 +215,7 @@ export default function AddLiquidity({
const modalHeader = () => { const modalHeader = () => {
return noLiquidity ? ( return noLiquidity ? (
<AutoColumn gap="20px"> <AutoColumn gap="20px">
<LightCard mt="20px" borderRadius="20px"> <LightCard mt="20px" $borderRadius="20px">
<RowFlat> <RowFlat>
<Text fontSize="48px" fontWeight={500} lineHeight="42px" marginRight={10}> <Text fontSize="48px" fontWeight={500} lineHeight="42px" marginRight={10}>
{currencies[Field.CURRENCY_A]?.symbol + '/' + currencies[Field.CURRENCY_B]?.symbol} {currencies[Field.CURRENCY_A]?.symbol + '/' + currencies[Field.CURRENCY_B]?.symbol}
@ -398,7 +398,7 @@ export default function AddLiquidity({
/> />
{currencies[Field.CURRENCY_A] && currencies[Field.CURRENCY_B] && pairState !== PairState.INVALID && ( {currencies[Field.CURRENCY_A] && currencies[Field.CURRENCY_B] && pairState !== PairState.INVALID && (
<> <>
<LightCard padding="0px" borderRadius={'20px'}> <LightCard padding="0px" $borderRadius={'20px'}>
<RowBetween padding="1rem"> <RowBetween padding="1rem">
<TYPE.subHeader fontWeight={500} fontSize={14}> <TYPE.subHeader fontWeight={500} fontSize={14}>
{noLiquidity ? ( {noLiquidity ? (
@ -408,7 +408,7 @@ export default function AddLiquidity({
)} )}
</TYPE.subHeader> </TYPE.subHeader>
</RowBetween>{' '} </RowBetween>{' '}
<LightCard padding="1rem" borderRadius={'20px'}> <LightCard padding="1rem" $borderRadius={'20px'}>
<PoolPriceBar <PoolPriceBar
currencies={currencies} currencies={currencies}
poolTokenPercentage={poolTokenPercentage} poolTokenPercentage={poolTokenPercentage}

8
src/pages/Earn/Manage.tsx
View File

@ -217,7 +217,7 @@ export default function Manage({
</RowBetween> </RowBetween>
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
width={'fit-content'} width={'fit-content'}
as={Link} as={Link}
to={`/add/${currencyA && currencyId(currencyA)}/${currencyB && currencyId(currencyB)}`} to={`/add/${currencyA && currencyId(currencyA)}/${currencyB && currencyId(currencyB)}`}
@ -292,7 +292,7 @@ export default function Manage({
{stakingInfo?.earnedAmount && JSBI.notEqual(BIG_INT_ZERO, stakingInfo?.earnedAmount?.quotient) && ( {stakingInfo?.earnedAmount && JSBI.notEqual(BIG_INT_ZERO, stakingInfo?.earnedAmount?.quotient) && (
<ButtonEmpty <ButtonEmpty
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
width="fit-content" width="fit-content"
onClick={() => setShowClaimRewardModal(true)} onClick={() => setShowClaimRewardModal(true)}
> >
@ -340,7 +340,7 @@ export default function Manage({
{!showAddLiquidityButton && ( {!showAddLiquidityButton && (
<DataRow style={{ marginBottom: '1rem' }}> <DataRow style={{ marginBottom: '1rem' }}>
{stakingInfo && stakingInfo.active && ( {stakingInfo && stakingInfo.active && (
<ButtonPrimary padding="8px" borderRadius="8px" width="160px" onClick={handleDepositClick}> <ButtonPrimary padding="8px" $borderRadius="8px" width="160px" onClick={handleDepositClick}>
{stakingInfo?.stakedAmount?.greaterThan(JSBI.BigInt(0)) ? ( {stakingInfo?.stakedAmount?.greaterThan(JSBI.BigInt(0)) ? (
<Trans>Deposit</Trans> <Trans>Deposit</Trans>
) : ( ) : (
@ -353,7 +353,7 @@ export default function Manage({
<> <>
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
width="160px" width="160px"
onClick={() => setShowUnstakingModal(true)} onClick={() => setShowUnstakingModal(true)}
> >

4
src/pages/MigrateV2/MigrateV2Pair.tsx
View File

@ -544,7 +544,7 @@ function V2PairMigration({
/> />
{outOfRange ? ( {outOfRange ? (
<YellowCard padding="8px 12px" borderRadius="12px"> <YellowCard padding="8px 12px" $borderRadius="12px">
<RowBetween> <RowBetween>
<AlertTriangle stroke={theme.yellow3} size="16px" /> <AlertTriangle stroke={theme.yellow3} size="16px" />
<TYPE.yellow ml="12px" fontSize="12px"> <TYPE.yellow ml="12px" fontSize="12px">
@ -557,7 +557,7 @@ function V2PairMigration({
) : null} ) : null}
{invalidRange ? ( {invalidRange ? (
<YellowCard padding="8px 12px" borderRadius="12px"> <YellowCard padding="8px 12px" $borderRadius="12px">
<RowBetween> <RowBetween>
<AlertTriangle stroke={theme.yellow3} size="16px" /> <AlertTriangle stroke={theme.yellow3} size="16px" />
<TYPE.yellow ml="12px" fontSize="12px"> <TYPE.yellow ml="12px" fontSize="12px">

4
src/pages/Pool/PositionPage.tsx
View File

@ -540,7 +540,7 @@ export function PositionPage({
to={`/increase/${currencyId(currency0)}/${currencyId(currency1)}/${feeAmount}/${tokenId}`} to={`/increase/${currencyId(currency0)}/${currencyId(currency1)}/${feeAmount}/${tokenId}`}
width="fit-content" width="fit-content"
padding="6px 8px" padding="6px 8px"
borderRadius="12px" $borderRadius="12px"
style={{ marginRight: '8px' }} style={{ marginRight: '8px' }}
> >
<Trans>Increase Liquidity</Trans> <Trans>Increase Liquidity</Trans>
@ -552,7 +552,7 @@ export function PositionPage({
to={`/remove/${tokenId}`} to={`/remove/${tokenId}`}
width="fit-content" width="fit-content"
padding="6px 8px" padding="6px 8px"
borderRadius="12px" $borderRadius="12px"
> >
<Trans>Remove Liquidity</Trans> <Trans>Remove Liquidity</Trans>
</ResponsiveButtonPrimary> </ResponsiveButtonPrimary>

4
src/pages/Vote/VotePage.tsx
View File

@ -250,7 +250,7 @@ export default function VotePage({
<RowFixed style={{ width: '100%', gap: '12px' }}> <RowFixed style={{ width: '100%', gap: '12px' }}>
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
onClick={() => { onClick={() => {
setSupport(true) setSupport(true)
toggleVoteModal() toggleVoteModal()
@ -260,7 +260,7 @@ export default function VotePage({
</ButtonPrimary> </ButtonPrimary>
<ButtonPrimary <ButtonPrimary
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
onClick={() => { onClick={() => {
setSupport(false) setSupport(false)
toggleVoteModal() toggleVoteModal()

2
src/pages/Vote/index.tsx
View File

@ -181,7 +181,7 @@ export default function Vote() {
<ButtonPrimary <ButtonPrimary
style={{ width: 'fit-content' }} style={{ width: 'fit-content' }}
padding="8px" padding="8px"
borderRadius="8px" $borderRadius="8px"
onClick={toggleDelegateModal} onClick={toggleDelegateModal}
> >
<Trans>Unlock Voting</Trans> <Trans>Unlock Voting</Trans>

93
yarn.lock
View File

@ -1631,7 +1631,7 @@
debug "^4.1.0" debug "^4.1.0"
globals "^11.1.0" globals "^11.1.0"
"@babel/traverse@^7.14.5": "@babel/traverse@^7.14.5", "@babel/traverse@^7.4.5":
version "7.14.7" version "7.14.7"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753"
integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ== integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==
@ -1774,7 +1774,7 @@
resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz" resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
"@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.1": "@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.1", "@emotion/is-prop-valid@^0.8.8":
version "0.8.8" version "0.8.8"
resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz" resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"
integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
@ -1825,12 +1825,12 @@
"@emotion/styled-base" "^10.0.27" "@emotion/styled-base" "^10.0.27"
babel-plugin-emotion "^10.0.27" babel-plugin-emotion "^10.0.27"
"@emotion/stylis@0.8.5": "@emotion/stylis@0.8.5", "@emotion/stylis@^0.8.4":
version "0.8.5" version "0.8.5"
resolved "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz" resolved "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz"
integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==
"@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.0": "@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.4":
version "0.7.5" version "0.7.5"
resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz" resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz"
integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
@ -5432,10 +5432,10 @@ babel-plugin-polyfill-regenerator@^0.2.0:
dependencies: dependencies:
"@babel/helper-define-polyfill-provider" "^0.2.0" "@babel/helper-define-polyfill-provider" "^0.2.0"
"babel-plugin-styled-components@>= 1": "babel-plugin-styled-components@>= 1.12.0":
version "1.12.0" version "1.13.1"
resolved "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz" resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.1.tgz#5ecd28b207627c2a26ef8d5da401e9644065095a"
integrity sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA== integrity sha512-iY11g5orsdBnvWtXKCFBzDyTxZ9jvmkcYCCs5ONlvASYltDRhieCVzeDC7Do0fSW7psAL0zfVoXB3FHz2CkUSg==
dependencies: dependencies:
"@babel/helper-annotate-as-pure" "^7.0.0" "@babel/helper-annotate-as-pure" "^7.0.0"
"@babel/helper-module-imports" "^7.0.0" "@babel/helper-module-imports" "^7.0.0"
@ -7476,14 +7476,14 @@ css-select@^2.0.0, css-select@^2.0.2:
domutils "^1.7.0" domutils "^1.7.0"
nth-check "^1.0.2" nth-check "^1.0.2"
css-to-react-native@^2.2.2: css-to-react-native@^3.0.0:
version "2.3.2" version "3.0.0"
resolved "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.2.tgz" resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756"
integrity sha512-VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw== integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==
dependencies: dependencies:
camelize "^1.0.0" camelize "^1.0.0"
css-color-keywords "^1.0.0" css-color-keywords "^1.0.0"
postcss-value-parser "^3.3.0" postcss-value-parser "^4.0.2"
css-tree@1.0.0-alpha.37: css-tree@1.0.0-alpha.37:
version "1.0.0-alpha.37" version "1.0.0-alpha.37"
@ -10340,7 +10340,7 @@ hmac-drbg@^1.0.1:
minimalistic-assert "^1.0.0" minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.1" minimalistic-crypto-utils "^1.0.1"
hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
version "3.3.2" version "3.3.2"
resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz" resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@ -11293,11 +11293,6 @@ is-upper-case@^2.0.2:
dependencies: dependencies:
tslib "^2.0.3" tslib "^2.0.3"
is-what@^3.3.1:
version "3.14.1"
resolved "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz"
integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
is-whitespace-character@^1.0.0: is-whitespace-character@^1.0.0:
version "1.0.4" version "1.0.4"
resolved "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz" resolved "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz"
@ -12785,7 +12780,7 @@ memdown@^1.0.0:
ltgt "~2.2.0" ltgt "~2.2.0"
safe-buffer "~5.1.1" safe-buffer "~5.1.1"
"memoize-one@>=3.1.1 <6", memoize-one@^5.0.0: "memoize-one@>=3.1.1 <6":
version "5.2.1" version "5.2.1"
resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz" resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz"
integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
@ -12806,13 +12801,6 @@ memory-fs@^0.5.0:
errno "^0.1.3" errno "^0.1.3"
readable-stream "^2.0.1" readable-stream "^2.0.1"
merge-anything@^2.2.4:
version "2.4.4"
resolved "https://registry.npmjs.org/merge-anything/-/merge-anything-2.4.4.tgz"
integrity sha512-l5XlriUDJKQT12bH+rVhAHjwIuXWdAIecGwsYjv2LJo+dA1AeRTmeQS+3QBpO6lEthBMDi2IUMpLC1yyRvGlwQ==
dependencies:
is-what "^3.3.1"
merge-descriptors@1.0.1: merge-descriptors@1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
@ -14813,7 +14801,7 @@ postcss-unique-selectors@^4.0.1:
postcss "^7.0.0" postcss "^7.0.0"
uniqs "^2.0.0" uniqs "^2.0.0"
postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0: postcss-value-parser@^3.0.0:
version "3.3.1" version "3.3.1"
resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz" resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"
integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
@ -15002,7 +14990,7 @@ prompts@^2.0.1:
kleur "^3.0.3" kleur "^3.0.3"
sisteransi "^1.0.5" sisteransi "^1.0.5"
prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2: prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2:
version "15.7.2" version "15.7.2"
resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz" resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@ -15355,6 +15343,11 @@ react-is@^17.0.1:
resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
react-is@^17.0.2:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
react-markdown@^4.3.1: react-markdown@^4.3.1:
version "4.3.1" version "4.3.1"
resolved "https://registry.npmjs.org/react-markdown/-/react-markdown-4.3.1.tgz" resolved "https://registry.npmjs.org/react-markdown/-/react-markdown-4.3.1.tgz"
@ -16627,6 +16620,11 @@ sha.js@^2.4.0, sha.js@^2.4.8:
inherits "^2.0.1" inherits "^2.0.1"
safe-buffer "^5.0.1" safe-buffer "^5.0.1"
shallowequal@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
shebang-command@^1.2.0: shebang-command@^1.2.0:
version "1.2.0" version "1.2.0"
resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz" resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"
@ -17249,23 +17247,20 @@ style-loader@1.3.0:
loader-utils "^2.0.0" loader-utils "^2.0.0"
schema-utils "^2.7.0" schema-utils "^2.7.0"
styled-components@^4.2.0: styled-components@^5.3.0:
version "4.4.1" version "5.3.0"
resolved "https://registry.npmjs.org/styled-components/-/styled-components-4.4.1.tgz" resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.0.tgz#e47c3d3e9ddfff539f118a3dd0fd4f8f4fb25727"
integrity sha512-RNqj14kYzw++6Sr38n7197xG33ipEOktGElty4I70IKzQF1jzaD1U4xQ+Ny/i03UUhHlC5NWEO+d8olRCDji6g== integrity sha512-bPJKwZCHjJPf/hwTJl6TbkSZg/3evha+XPEizrZUGb535jLImwDUdjTNxXqjjaASt2M4qO4AVfoHJNe3XB/tpQ==
dependencies: dependencies:
"@babel/helper-module-imports" "^7.0.0" "@babel/helper-module-imports" "^7.0.0"
"@babel/traverse" "^7.0.0" "@babel/traverse" "^7.4.5"
"@emotion/is-prop-valid" "^0.8.1" "@emotion/is-prop-valid" "^0.8.8"
"@emotion/unitless" "^0.7.0" "@emotion/stylis" "^0.8.4"
babel-plugin-styled-components ">= 1" "@emotion/unitless" "^0.7.4"
css-to-react-native "^2.2.2" babel-plugin-styled-components ">= 1.12.0"
memoize-one "^5.0.0" css-to-react-native "^3.0.0"
merge-anything "^2.2.4" hoist-non-react-statics "^3.0.0"
prop-types "^15.5.4" shallowequal "^1.1.0"
react-is "^16.6.0"
stylis "^3.5.0"
stylis-rule-sheet "^0.0.10"
supports-color "^5.5.0" supports-color "^5.5.0"
styled-system@^5.0.0, styled-system@^5.1.5: styled-system@^5.0.0, styled-system@^5.1.5:
@ -17296,16 +17291,6 @@ stylehacks@^4.0.0:
postcss "^7.0.0" postcss "^7.0.0"
postcss-selector-parser "^3.0.0" postcss-selector-parser "^3.0.0"
stylis-rule-sheet@^0.0.10:
version "0.0.10"
resolved "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz"
integrity sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==
stylis@^3.5.0:
version "3.5.4"
resolved "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz"
integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==
subscriptions-transport-ws@^0.9.18: subscriptions-transport-ws@^0.9.18:
version "0.9.19" version "0.9.19"
resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz#10ca32f7e291d5ee8eb728b9c02e43c52606cdcf" resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz#10ca32f7e291d5ee8eb728b9c02e43c52606cdcf"