Commit 6c9eeb46 authored by Ian Lapham's avatar Ian Lapham Committed by GitHub

fixes from bug hunting (#773)

* fix small bugs , token icons

* remove mainnet

* style changes

* fix nav pointer issues on desktop

* more style changes

* remove mainnet
parent a34dc73c
......@@ -1064,7 +1064,13 @@ function ExchangePage({ sendingInput = false, history, params }: ExchangePagePro
fontWeight={500}
fontSize={14}
color={theme.text2}
style={{ justifyContent: 'center', alignItems: 'center', display: 'flex' }}
style={{
justifyContent: 'center',
alignItems: 'center',
display: 'flex',
textAlign: 'right',
paddingLeft: '10px'
}}
>
{trade && showInverted
? (trade?.executionPrice?.invert()?.toSignificant(6) ?? '') +
......
......@@ -32,6 +32,8 @@ const HeaderFrame = styled.div`
top: 0;
position: absolute;
pointer-events: none;
${({ theme }) => theme.mediaWidth.upToExtraSmall`
padding: 12px 0 0 0;
width: calc(100%);
......@@ -48,6 +50,7 @@ const HeaderElement = styled.div`
const Title = styled.div`
display: flex;
align-items: center;
pointer-events: auto;
:hover {
cursor: pointer;
......@@ -108,6 +111,7 @@ const MigrateBanner = styled(AutoColumn)`
color: ${({ theme }) => theme.primaryText1};
font-weight: 400;
text-align: center;
pointer-events: auto;
a {
color: ${({ theme }) => theme.primaryText1};
}
......@@ -182,7 +186,7 @@ export default function Header() {
</TitleText>
)}
</Title>
<TestnetWrapper>
<TestnetWrapper style={{ pointerEvents: 'auto' }}>
{!isMobile && (
<VersionToggle target="_self" href="https://v1.uniswap.exchange">
<VersionLabel isV2={true}>V2</VersionLabel>
......@@ -198,7 +202,7 @@ export default function Header() {
{!isMobile && chainId === ChainId.GÖRLI && <NetworkCard>Görli</NetworkCard>}
{!isMobile && chainId === ChainId.KOVAN && <NetworkCard>Kovan</NetworkCard>}
</TestnetWrapper>
<AccountElement active={!!account}>
<AccountElement active={!!account} style={{ pointerEvents: 'auto' }}>
{account && userEthBalance ? (
<Text style={{ flexShrink: 0 }} px="0.5rem" fontWeight={500}>
{userEthBalance?.toSignificant(4)} ETH
......@@ -206,7 +210,9 @@ export default function Header() {
) : null}
<Web3Status />
</AccountElement>
<Menu />
<div style={{ pointerEvents: 'auto' }}>
<Menu />
</div>
</HeaderElement>
</RowBetween>
</HeaderFrame>
......
......@@ -47,7 +47,8 @@ const FixedPopupColumn = styled(AutoColumn)`
position: absolute;
top: 112px;
right: 1rem;
width: 220px;
max-width: 355px !important;
width: 100%;
${({ theme }) => theme.mediaWidth.upToSmall`
display: none;
......@@ -59,7 +60,7 @@ const Popup = styled.div`
width: 100%;
padding: 1em;
box-sizing: border-box;
background-color: ${({ theme }) => theme.advancedBG};
background-color: ${({ theme }) => theme.bg1};
position: relative;
border-radius: 10px;
padding: 20px;
......
......@@ -477,10 +477,10 @@ function SearchModal({
{otherSelectedTokenAddress === address && <GreySpan> ({otherSelectedText})</GreySpan>}
</Text>
<FadedSpan>
<TYPE.blue fontWeight={500}>
<TYPE.main fontWeight={500}>
{urlAdded && 'Added by URL'}
{customAdded && 'Added by user'}
</TYPE.blue>
</TYPE.main>
{customAdded && (
<div
onClick={event => {
......
......@@ -528,17 +528,17 @@ function AddLiquidity({ token0, token1 }: AddLiquidityProps) {
) : (
<AutoColumn gap="20px">
<RowFlat style={{ marginTop: '20px' }}>
<Text fontSize="48px" fontWeight={500} lineHeight="32px" marginRight={10}>
<Text fontSize="48px" fontWeight={500} lineHeight="42px" marginRight={10}>
{liquidityMinted?.toSignificant(6)}
</Text>
<DoubleLogo a0={tokens[Field.INPUT]?.symbol || ''} a1={tokens[Field.OUTPUT]?.symbol || ''} size={30} />
<DoubleLogo a0={tokens[Field.INPUT]?.address} a1={tokens[Field.OUTPUT]?.address} size={30} />
</RowFlat>
<Row>
<Text fontSize="24px">
{tokens[Field.INPUT]?.symbol + ':' + tokens[Field.OUTPUT]?.symbol + ' Pool Tokens'}
</Text>
</Row>
<TYPE.italic fontSize={12} textAlign="center" padding={'12px 0 0 0 '}>
<TYPE.italic fontSize={12} textAlign="left" padding={'8px 0 0 0 '}>
{`Output is estimated. You will receive at least ${liquidityMinted?.toSignificant(6)} UNI ${
tokens[Field.INPUT]?.symbol
}/${tokens[Field.OUTPUT]?.symbol} or the transaction will revert.`}
......@@ -578,7 +578,7 @@ function AddLiquidity({ token0, token1 }: AddLiquidityProps) {
<TYPE.body>Minted Pool Share:</TYPE.body>
<TYPE.body>{noLiquidity ? '100%' : poolTokenPercentage?.toSignificant(6) + '%'}</TYPE.body>
</RowBetween>
<ButtonPrimary style={{ margin: '20px 0' }} onClick={onAdd}>
<ButtonPrimary style={{ margin: '20px 0 0 0' }} onClick={onAdd}>
<Text fontWeight={500} fontSize={20}>
{noLiquidity ? 'Supply & Create Pool' : 'Confirm Supply'}
</Text>
......@@ -677,9 +677,15 @@ function AddLiquidity({ token0, token1 }: AddLiquidityProps) {
<ColumnCenter>
<BlueCard>
<AutoColumn gap="10px">
<TYPE.link fontWeight={600}>You are the first liquidity provider.</TYPE.link>
<TYPE.link fontWeight={400}>The ratio of tokens you add will set the price of this pool.</TYPE.link>
<TYPE.link fontWeight={400}>Once you are happy with the rate click supply to review.</TYPE.link>
<TYPE.link fontWeight={600} color={'primaryText1'}>
You are the first liquidity provider.
</TYPE.link>
<TYPE.link fontWeight={400} color={'primaryText1'}>
The ratio of tokens you add will set the price of this pool.
</TYPE.link>
<TYPE.link fontWeight={400} color={'primaryText1'}>
Once you are happy with the rate click supply to review.
</TYPE.link>
</AutoColumn>
</BlueCard>
</ColumnCenter>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment