slippage without micro warnings on swap

src/components/Button/index.js

@@ -13,6 +13,7 @@ const Base = styled(RebassButton)`
   font-weight: 500;
   text-align: center;
   border-radius: 20px;
+  border-radius: ${({ borderRadius }) => borderRadius && borderRadius};
   outline: none;
   border: 1px solid transparent;
   color: white;
@@ -40,8 +41,6 @@ export const ButtonPrimary = styled(Base)`
     background-color: ${({ theme }) => theme.outlineGrey};
     color: ${({ theme }) => theme.darkGrey}
     cursor: auto;
-    outline: none;
-    border: none;
     box-shadow: none;
   }
 `
@@ -100,6 +99,27 @@ const ButtonConfirmedStyle = styled(Base)`
   }
 `
 
+const ButtonErrorStyle = styled(Base)`
+  background-color: ${({ theme }) => theme.salmonRed};
+  border: 1px solid ${({ theme }) => theme.salmonRed};
+
+  &:focus {
+    box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.05, theme.salmonRed)};
+    background-color: ${({ theme }) => darken(0.05, theme.salmonRed)};
+  }
+  &:hover {
+    background-color: ${({ theme }) => darken(0.05, theme.salmonRed)};
+  }
+  &:active {
+    box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.1, theme.salmonRed)};
+    background-color: ${({ theme }) => darken(0.1, theme.salmonRed)};
+  }
+  &:disabled {
+    opacity: 50%;
+    cursor: auto;
+  }
+`
+
 export function ButtonConfirmed({ children, confirmed, ...rest }) {
   if (confirmed) {
     return <ButtonConfirmedStyle {...rest}>{children}</ButtonConfirmedStyle>
@@ -108,6 +128,14 @@ export function ButtonConfirmed({ children, confirmed, ...rest }) {
   }
 }
 
+export function ButtonError({ children, error, ...rest }) {
+  if (error) {
+    return <ButtonErrorStyle {...rest}>{children}</ButtonErrorStyle>
+  } else {
+    return <ButtonPrimary {...rest}>{children}</ButtonPrimary>
+  }
+}
+
 export function ButtonDropwdown({ disabled, children, ...rest }) {
   return (
     <ButtonPrimary {...rest}>
@@ -129,3 +157,11 @@ export function ButtonDropwdownLight({ disabled, children, ...rest }) {
     </ButtonEmpty>
   )
 }
+
+export function ButtonRadio({ active, children, ...rest }) {
+  if (!active) {
+    return <ButtonEmpty {...rest}>{children}</ButtonEmpty>
+  } else {
+    return <ButtonPrimary {...rest}>{children}</ButtonPrimary>
+  }
+}

src/components/Card/index.js

@@ -3,7 +3,7 @@ import { Box } from 'rebass/styled-components'
 
 const Card = styled(Box)`
   width: 100%;
-  border-radius: 20px;
+  border-radius: 8px;
   padding: 1rem;
   padding: ${({ padding }) => padding};
   border: ${({ border }) => border};
@@ -16,5 +16,5 @@ export const LightCard = styled(Card)`
 `
 
 export const GreyCard = styled(Card)`
-  background-color: rgba(255, 255, 255, 0.6);
+  background-color: rgba(255, 255, 255, 0.9);
 `

src/components/CurrencyInputPanel/index.js

@@ -251,7 +251,12 @@ export default function CurrencyInputPanel({
           </LabelRow>
         )}
         <InputRow>
-          <NumericalInput field={field} value={value} onUserInput={onUserInput} />
+          <NumericalInput
+            value={value}
+            onUserInput={val => {
+              onUserInput(field, val)
+            }}
+          />
           {!!token?.address && !atMax && <StyledBalanceMax onClick={onMax}>MAX</StyledBalanceMax>}
           {renderUnlockButton()}
           <CurrencySelect

src/components/Header/index.js

@@ -17,6 +17,7 @@ import { isMobile } from 'react-device-detect'
 import { useWeb3React } from '../../hooks'
 import { useAddressBalance } from '../../contexts/Balances'
 import { useWalletModalToggle, usePopups } from '../../contexts/Application'
+import { AutoColumn } from '../Column'
 
 const HeaderFrame = styled.div`
   display: flex;
@@ -68,7 +69,7 @@ const AccountElement = styled.div`
   /* width: 100%; */
 `
 
-const FixedPopupColumn = styled.div`
+const FixedPopupColumn = styled(AutoColumn)`
   position: absolute;
   top: 80px;
   right: 20px
@@ -84,6 +85,15 @@ const StyledClose = styled(X)`
   }
 `
 
+const Popup = styled(Card)`
+  box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.04), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04),
+    0px 24px 32px rgba(0, 0, 0, 0.04);
+  z-index: 9999;
+  border-radius: 8px;
+  padding: 1rem;
+  background: ${theme => theme.white};
+`
+
 export default function Header() {
   const { account, chainId } = useWeb3React()
 
@@ -117,13 +127,13 @@ export default function Header() {
         </AccountElement>
         <Menu />
       </HeaderElement>
-      <FixedPopupColumn>
+      <FixedPopupColumn gap="20px">
         {activePopups.map(item => {
           return (
-            <Card bg="white" padding={'16px'} key={item.key} borderRadius={'8px'}>
+            <Popup key={item.key}>
               <StyledClose color="#888D9B" onClick={() => removePopup(item.key)} />
               {item.content}
-            </Card>
+            </Popup>
           )
         })}
       </FixedPopupColumn>

src/components/Menu/index.js

@@ -6,7 +6,6 @@ import { ReactComponent as MenuIcon } from '../../assets/images/menu.svg'
 
 import { Link } from '../../theme'
 import { darken, transparentize } from 'polished'
-import { useAdvancedManager } from '../../contexts/LocalStorage'
 
 import Toggle from 'react-switch'
 
@@ -140,7 +139,7 @@ const EmojiToggle = styled.span`
 
 export default function Menu() {
   const [isDark, toggleDarkMode] = useDarkModeManager()
-  const [isAdvanced, toggleAdvanced] = useState()
+  const [isAdvanced, toggleAdvanced] = useState(false)
 
   const node = useRef()
   const [open, toggle] = useToggle(false)

src/components/NumericalInput/index.tsx

@@ -11,6 +11,8 @@ const StyledInput = styled.input`
   flex: 1 1 auto;
   width: 0;
   background-color: ${({ theme }) => theme.inputBackground};
+  font-size: ${({ fontSize }) => fontSize && fontSize};
+  text-align: ${({ align }) => align && align};
 
   [type='number'] {
     -moz-appearance: textfield;
@@ -32,10 +34,10 @@ function escapeRegExp(string: string): string {
   return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
 }
 
-export const Input = React.memo(({ field, value, onUserInput, ...rest }: any) => {
+export const Input = React.memo(({ value, onUserInput, placeHolder = null, ...rest }: any) => {
   function enforcer(nextUserInput: string) {
     if (nextUserInput === '' || inputRegex.test(escapeRegExp(nextUserInput))) {
-      onUserInput(field, nextUserInput)
+      onUserInput(nextUserInput)
     }
   }
 
@@ -53,7 +55,7 @@ export const Input = React.memo(({ field, value, onUserInput, ...rest }: any) =>
       autoCorrect="off"
       // text-specific options
       type="text"
-      placeholder="0.0"
+      placeholder={placeHolder || '0.0'}
       minLength={1}
       maxLength={79}
       spellCheck="false"

src/components/PoolFinder/index.js

@@ -16,7 +16,7 @@ import { Link } from '../../theme'
 import { Text } from 'rebass'
 import { Plus } from 'react-feather'
 import { LightCard } from '../Card'
-import { AutoColumn, ColumnCenter } from '../Column'
+import Column, { AutoColumn, ColumnCenter } from '../Column'
 import { ButtonPrimary, ButtonDropwdown, ButtonDropwdownLight } from '../Button'
 import DoubleTokenLogo from '../DoubleLogo'
 
@@ -112,6 +112,13 @@ function PoolFinder({ history }) {
             </Row>
           </ButtonDropwdownLight>
         )}
+        {allowImport && (
+          <ColumnCenter justify="center" style={{ backgroundColor: '#EBF4FF', padding: '8px', borderRadius: '12px' }}>
+            <Text textAlign="center" fontWeight={500} color="#2172E5">
+              Liquidity Found!
+            </Text>
+          </ColumnCenter>
+        )}
         {position ? (
           !JSBI.equal(position.raw, JSBI.BigInt(0)) ? (
             <PositionCard
@@ -155,11 +162,7 @@ function PoolFinder({ history }) {
             </Text>
           </LightCard>
         )}
-        {allowImport && (
-          <Text textAlign="center" fontWeight={500}>
-            Liquidity Found!
-          </Text>
-        )}
+
         <ButtonPrimary disabled={!allowImport} onClick={endSearch}>
           <Text fontWeight={500} fontSize={20}>
             Import

src/components/PositionCard/index.js

@@ -61,11 +61,6 @@ function PositionCard({ exchangeAddress, token0, token1, history, minimal = fals
   return (
     <DynamicCard {...rest}>
       <AutoColumn gap="20px">
-        <FixedHeightRow>
-          <Text fontWeight={500} fontSize={16}>
-            Current Position
-          </Text>
-        </FixedHeightRow>
         <FixedHeightRow>
           <RowFixed>
             <DoubleLogo a0={token0?.address || ''} a1={token1?.address || ''} margin={true} size={24} />

src/components/Row/index.js

@@ -4,6 +4,7 @@ const Row = styled.div`
   width: 100%;
   display: flex;
   align-items: center;
+  align-items: ${({ align }) => align && align};
 `
 
 export const RowBetween = styled(Row)`

src/components/SearchModal/index.js

@@ -411,16 +411,18 @@ function SearchModal({ history, isOpen, onDismiss, onTokenSelect, urlAddedTokens
           />
           <RowBetween>
             <div>
-              <Text>
-                Don't see a pool?{' '}
-                <StyledLink
-                  onClick={() => {
-                    history.push('/find')
-                  }}
-                >
-                  Import it.
-                </StyledLink>
-              </Text>
+              {filterType !== 'tokens' && (
+                <Text>
+                  Don't see a pool?{' '}
+                  <StyledLink
+                    onClick={() => {
+                      history.push('/find')
+                    }}
+                  >
+                    Import it.
+                  </StyledLink>
+                </Text>
+              )}
             </div>
             <div />
             <Filter title="Your Balances" filter={FILTERS.BALANCES} />

src/constants/index.ts

@@ -19,13 +19,6 @@ export const SUPPORTED_THEMES = {
   LIGHT: 'LIGHT'
 }
 
-export enum TRANSACTION_TYPE {
-  SWAP,
-  SEND,
-  ADD,
-  REMOVE
-}
-
 const MAINNET_WALLETS = {
   INJECTED: {
     connector: injected,

src/contexts/Exchanges.tsx

@@ -9,14 +9,14 @@ import { ChainId, WETH, Token, TokenAmount, Exchange, JSBI } from '@uniswap/sdk'
 const UPDATE = 'UPDATE'
 
 const ALL_EXCHANGES: [Token, Token][] = [
-  // [
-  //   INITIAL_TOKENS_CONTEXT[ChainId.RINKEBY][WETH[ChainId.RINKEBY].address],
-  //   INITIAL_TOKENS_CONTEXT[ChainId.RINKEBY]['0xc7AD46e0b8a400Bb3C915120d284AafbA8fc4735']
-  // ]
-  // [
-  //   INITIAL_TOKENS_CONTEXT[ChainId.RINKEBY]['0xc7AD46e0b8a400Bb3C915120d284AafbA8fc4735'],
-  //   INITIAL_TOKENS_CONTEXT[ChainId.RINKEBY]['0x8ab15C890E5C03B5F240f2D146e3DF54bEf3Df44']
-  // ]
+  [
+    INITIAL_TOKENS_CONTEXT[ChainId.RINKEBY][WETH[ChainId.RINKEBY].address],
+    INITIAL_TOKENS_CONTEXT[ChainId.RINKEBY]['0xc7AD46e0b8a400Bb3C915120d284AafbA8fc4735']
+  ],
+  [
+    INITIAL_TOKENS_CONTEXT[ChainId.RINKEBY]['0xc7AD46e0b8a400Bb3C915120d284AafbA8fc4735'],
+    INITIAL_TOKENS_CONTEXT[ChainId.RINKEBY]['0x8ab15C890E5C03B5F240f2D146e3DF54bEf3Df44']
+  ]
 ]
 
 const EXCHANGE_MAP: {

src/pages/App.js

@@ -27,11 +27,6 @@ const HeaderWrapper = styled.div`
   width: 100%;
   justify-content: space-between;
 `
-const FooterWrapper = styled.div`
-  width: 100%;
-  min-height: 30px;
-  align-self: flex-end;
-`
 
 const BodyWrapper = styled.div`
   display: flex;
@@ -50,7 +45,7 @@ const Body = styled.div`
   box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04),
     0px 24px 32px rgba(0, 0, 0, 0.01);
   border-radius: 20px;
-  padding: 2rem 2rem;
+  padding: 2rem 2rem 1rem 2rem;
 `
 
 export default function App() {

src/pages/Supply/AddLiquidity.tsx

@@ -5,26 +5,27 @@ import { parseUnits, parseEther } from '@ethersproject/units'
 import { WETH, TokenAmount, JSBI, Percent, Route } from '@uniswap/sdk'
 
 import DoubleLogo from '../../components/DoubleLogo'
+import TokenLogo from '../../components/TokenLogo'
 import SearchModal from '../../components/SearchModal'
 import PositionCard from '../../components/PositionCard'
 import ConfirmationModal from '../../components/ConfirmationModal'
 import CurrencyInputPanel from '../../components/CurrencyInputPanel'
 import { Text } from 'rebass'
 import { Plus } from 'react-feather'
-import { RowBetween } from '../../components/Row'
-import { ChevronDown } from 'react-feather'
+import { ButtonPrimary } from '../../components/Button'
 import { AutoColumn, ColumnCenter } from '../../components/Column'
-import { ButtonPrimary, ButtonEmpty } from '../../components/Button'
+import Row, { RowBetween, RowFlat, RowFixed } from '../../components/Row'
 
 import { useToken } from '../../contexts/Tokens'
 import { useWeb3React } from '../../hooks'
+import { usePopups } from '../../contexts/Application'
 import { useAddressBalance } from '../../contexts/Balances'
 import { useAddressAllowance } from '../../contexts/Allowances'
 import { useTransactionAdder } from '../../contexts/Transactions'
 import { useExchange, useTotalSupply } from '../../contexts/Exchanges'
 
 import { BigNumber } from 'ethers/utils'
-import { TRANSACTION_TYPE, ROUTER_ADDRESSES } from '../../constants'
+import { ROUTER_ADDRESSES } from '../../constants'
 import { getRouterContract, calculateGasMargin } from '../../utils'
 
 // denominated in bips
@@ -41,7 +42,7 @@ const Wrapper = styled.div`
 
 const FixedBottom = styled.div`
   position: absolute;
-  bottom: -240px;
+  bottom: -200px;
   width: 100%;
 `
 
@@ -145,6 +146,7 @@ export default function AddLiquidity({ token0, token1 }) {
   // modal states
   const [showSearch, setShowSearch] = useState<boolean>(false)
   const [showConfirm, setShowConfirm] = useState<boolean>(false)
+  const [attemptingTxn, setAttemptingTxn] = useState<boolean>(false) // clicke confirm
   const [pendingConfirmation, setPendingConfirmation] = useState<boolean>(true)
 
   // input state
@@ -369,7 +371,10 @@ export default function AddLiquidity({ token0, token1 }) {
     return null
   }
 
+  const [, addPopup] = usePopups()
+
   async function onAdd() {
+    setAttemptingTxn(true)
     const router = getRouterContract(chainId, library, account)
 
     const minTokenInput = calculateSlippageAmount(parsedAmounts[Field.INPUT])[0]
@@ -428,26 +433,112 @@ export default function AddLiquidity({ token0, token1 }) {
       })
       .catch((e: Error) => {
         console.log(e)
+        addPopup(
+          <AutoColumn gap="10px">
+            <Text>Transaction Failed: try again.</Text>
+          </AutoColumn>
+        )
+        setPendingConfirmation(true)
+        setAttemptingTxn(false)
         setShowConfirm(false)
       })
   }
 
+  const modalHeader = () => {
+    return (
+      <AutoColumn gap="20px">
+        <RowFlat style={{ marginTop: '60px' }}>
+          <Text fontSize="48px" fontWeight={500} lineHeight="32px" marginRight={10}>
+            {liquidityMinted?.toFixed(6)}
+          </Text>
+          <DoubleLogo a0={tokens[Field.INPUT]?.symbol || ''} a1={tokens[Field.OUTPUT]?.symbol || ''} size={30} />
+        </RowFlat>
+        <Row>
+          <Text fontSize="24px">
+            {tokens[Field.INPUT]?.symbol + ':' + tokens[Field.OUTPUT]?.symbol + ' Pool Tokens'}
+          </Text>
+        </Row>
+      </AutoColumn>
+    )
+  }
+
+  const modalBottom = () => {
+    return (
+      <>
+        <RowBetween>
+          <Text color="#565A69" fontWeight={500} fontSize={16}>
+            {tokens[Field.INPUT]?.symbol} Deposited
+          </Text>
+          <RowFixed>
+            <TokenLogo address={tokens[Field.INPUT]?.address || ''} style={{ marginRight: '8px' }} />
+            <Text fontWeight={500} fontSize={16}>
+              {!!parsedAmounts[Field.INPUT] && parsedAmounts[Field.INPUT].toSignificant(6)}
+            </Text>
+          </RowFixed>
+        </RowBetween>
+        <RowBetween>
+          <Text color="#565A69" fontWeight={500} fontSize={16}>
+            {tokens[Field.OUTPUT]?.symbol} Deposited
+          </Text>
+          <RowFixed>
+            <TokenLogo address={tokens[Field.OUTPUT]?.address || ''} style={{ marginRight: '8px' }} />
+            <Text fontWeight={500} fontSize={16}>
+              {!!parsedAmounts[Field.OUTPUT] && parsedAmounts[Field.OUTPUT].toSignificant(6)}
+            </Text>
+          </RowFixed>
+        </RowBetween>
+        <RowBetween>
+          <Text color="#565A69" fontWeight={500} fontSize={16}>
+            Rate
+          </Text>
+          <Text fontWeight={500} fontSize={16}>
+            {`1 ${tokens[Field.INPUT]?.symbol} = ${route?.midPrice &&
+              route?.midPrice?.raw?.denominator &&
+              route.midPrice.adjusted.toFixed(8)} ${tokens[Field.OUTPUT]?.symbol}`}
+          </Text>
+        </RowBetween>
+        <RowBetween>
+          <Text color="#565A69" fontWeight={500} fontSize={16}>
+            Minted Pool Share:
+          </Text>
+          <Text fontWeight={500} fontSize={16}>
+            {poolTokenPercentage?.toFixed(6) + '%'}
+          </Text>
+        </RowBetween>
+        <ButtonPrimary style={{ margin: '20px 0' }} onClick={onAdd}>
+          <Text fontWeight={500} fontSize={20}>
+            Confirm Supply
+          </Text>
+        </ButtonPrimary>
+        <Text fontSize={12} color="#565A69" textAlign="center">
+          {`Output is estimated. You will receive at least ${liquidityMinted?.toFixed(6)} UNI ${
+            tokens[Field.INPUT]?.symbol
+          }/${tokens[Field.OUTPUT]?.symbol} or the transaction will revert.`}
+        </Text>
+      </>
+    )
+  }
+
+  const pendingText = `Supplied ${parsedAmounts[Field.INPUT]?.toSignificant(6)} ${
+    tokens[Field.INPUT]?.symbol
+  } ${'and'} ${parsedAmounts[Field.OUTPUT]?.toSignificant(6)} ${tokens[Field.OUTPUT]?.symbol}`
+
   return (
     <Wrapper>
       <ConfirmationModal
         isOpen={showConfirm}
         onDismiss={() => {
+          setPendingConfirmation(true)
+          setAttemptingTxn(false)
           setShowConfirm(false)
         }}
-        liquidityAmount={liquidityMinted}
-        amount0={parsedAmounts[Field.INPUT]}
-        amount1={parsedAmounts[Field.OUTPUT]}
-        poolTokenPercentage={poolTokenPercentage}
-        price={route?.midPrice && route?.midPrice?.raw?.denominator}
-        transactionType={TRANSACTION_TYPE.ADD}
-        contractCall={onAdd}
+        attemptingTxn={attemptingTxn}
         pendingConfirmation={pendingConfirmation}
         hash={txHash ? txHash : ''}
+        topContent={() => modalHeader()}
+        bottomContent={modalBottom}
+        pendingText={pendingText}
+        title="You will receive"
       />
       <SearchModal
         isOpen={showSearch}
@@ -456,22 +547,6 @@ export default function AddLiquidity({ token0, token1 }) {
         }}
       />
       <AutoColumn gap="20px">
-        <ButtonEmpty
-          padding={'1rem'}
-          onClick={() => {
-            setShowSearch(true)
-          }}
-        >
-          <RowBetween>
-            <DoubleLogo a0={exchange?.token0?.address || ''} a1={exchange?.token1?.address || ''} size={24} />
-            <Text fontSize={20}>
-              {exchange?.token0 && exchange?.token1
-                ? exchange.token0.symbol + ' / ' + exchange.token1.symbol + ' Pool'
-                : ''}
-            </Text>
-            <ChevronDown size={24} />
-          </RowBetween>
-        </ButtonEmpty>
         {noLiquidity && (
           <ColumnCenter>
             <Text fontWeight={500} style={{ textAlign: 'center' }}>

src/pages/Supply/RemoveLiquidity.tsx

@@ -6,15 +6,17 @@ import { TokenAmount, JSBI, Route, WETH, Percent } from '@uniswap/sdk'
 
 import Slider from '../../components/Slider'
 import TokenLogo from '../../components/TokenLogo'
+import DoubleLogo from '../../components/DoubleLogo'
 import PositionCard from '../../components/PositionCard'
 import ConfirmationModal from '../../components/ConfirmationModal'
 import CurrencyInputPanel from '../../components/CurrencyInputPanel'
 import { Text } from 'rebass'
 import { LightCard } from '../../components/Card'
 import { ButtonPrimary } from '../../components/Button'
+import { ButtonConfirmed } from '../../components/Button'
 import { ArrowDown, Plus } from 'react-feather'
-import { RowBetween, RowFixed } from '../../components/Row'
 import { AutoColumn, ColumnCenter } from '../../components/Column'
+import Row, { RowBetween, RowFixed } from '../../components/Row'
 
 import { useToken } from '../../contexts/Tokens'
 import { useWeb3React } from '../../hooks'
@@ -25,7 +27,6 @@ import { useExchange, useTotalSupply } from '../../contexts/Exchanges'
 
 import { BigNumber } from 'ethers/utils'
 import { splitSignature } from '@ethersproject/bytes'
-import { TRANSACTION_TYPE } from '../../constants'
 import { ROUTER_ADDRESSES } from '../../constants'
 import { getRouterContract, calculateGasMargin } from '../../utils'
 
@@ -138,6 +139,10 @@ function reducer(
   }
 }
 
+const ConfirmedText = styled(Text)`
+  color: ${({ theme, confirmed }) => (confirmed ? theme.connectedGreen : theme.white)};
+`
+
 export default function RemoveLiquidity({ token0, token1 }) {
   const { account, chainId, library } = useWeb3React()
   const routerAddress = ROUTER_ADDRESSES[chainId]
@@ -302,19 +307,19 @@ export default function RemoveLiquidity({ token0, token1 }) {
       : false
 
   // errors
-  const [generalError, setGeneralError] = useState()
-  const [inputError, setInputError] = useState()
-  const [outputError, setOutputError] = useState()
-  const [poolTokenError, setPoolTokenError] = useState()
+  const [generalError, setGeneralError] = useState('')
+  const [inputError, setInputError] = useState('')
+  const [outputError, setOutputError] = useState('')
+  const [poolTokenError, setPoolTokenError] = useState('')
   const [isValid, setIsValid] = useState(false)
 
   // update errors live
   useEffect(() => {
     // reset errors
-    setGeneralError(null)
-    setInputError(null)
-    setOutputError(null)
-    setPoolTokenError(null)
+    setGeneralError('')
+    setInputError('')
+    setOutputError('')
+    setPoolTokenError('')
     setIsValid(true)
 
     if (formattedAmounts[Field.TOKEN0] === '') {
@@ -480,28 +485,103 @@ export default function RemoveLiquidity({ token0, token1 }) {
     setPendingConfirmation(true)
   }
 
+  function modalHeader() {
+    return (
+      <AutoColumn gap="16px">
+        <Row style={{ marginTop: '40px' }}>
+          <TokenLogo address={tokens[Field.TOKEN0]?.symbol} size={'30px'} />
+          <Text fontSize="24px" marginLeft={10}>
+            {tokens[Field.TOKEN0]?.symbol}{' '}
+            {!!parsedAmounts[Field.TOKEN0] && parsedAmounts[Field.TOKEN0].toSignificant(8)}
+          </Text>
+        </Row>
+        <Row>
+          <TokenLogo address={tokens[Field.TOKEN1]?.symbol} size={'30px'} />
+          <Text fontSize="24px" marginLeft={10}>
+            {tokens[Field.TOKEN1]?.symbol}{' '}
+            {!!parsedAmounts[Field.TOKEN1] && parsedAmounts[Field.TOKEN1].toSignificant(8)}
+          </Text>
+        </Row>
+      </AutoColumn>
+    )
+  }
+
+  function modalBottom() {
+    return (
+      <>
+        <RowBetween>
+          <Text color="#565A69" fontWeight={500} fontSize={16}>
+            {'UNI ' + tokens[Field.TOKEN0]?.symbol + ':' + tokens[Field.TOKEN1]?.symbol} Burned
+          </Text>
+          <RowFixed>
+            <DoubleLogo
+              a0={tokens[Field.TOKEN0]?.address || ''}
+              a1={tokens[Field.TOKEN1]?.address || ''}
+              margin={true}
+            />
+            <Text fontWeight={500} fontSize={16}>
+              {parsedAmounts[Field.LIQUIDITY]?.toSignificant(6)}
+            </Text>
+          </RowFixed>
+        </RowBetween>
+        <RowBetween>
+          <Text color="#565A69" fontWeight={500} fontSize={16}>
+            Rate
+          </Text>
+          <Text fontWeight={500} fontSize={16}>
+            {`1 ${tokens[Field.TOKEN0]?.symbol} = ${route?.midPrice && route.midPrice.adjusted.toFixed(8)} ${
+              tokens[Field.TOKEN1]?.symbol
+            }`}
+          </Text>
+        </RowBetween>
+        <RowBetween gap="20px">
+          <ButtonConfirmed
+            style={{ margin: '20px 0' }}
+            width="48%"
+            onClick={onSign}
+            confirmed={signed}
+            disabled={signed}
+          >
+            <ConfirmedText fontWeight={500} fontSize={20} confirmed={signed}>
+              {signed ? 'Signed' : 'Sign'}
+            </ConfirmedText>
+          </ButtonConfirmed>
+          <ButtonPrimary width="48%" disabled={!signed} style={{ margin: '20px 0' }} onClick={onRemove}>
+            <Text fontWeight={500} fontSize={20}>
+              Confirm Remove
+            </Text>
+          </ButtonPrimary>
+        </RowBetween>
+        <Text fontSize={12} color="#565A69" textAlign="center">
+          {`Output is estimated. You will receive at least ${parsedAmounts[Field.TOKEN0]?.toFixed(6)} ${
+            tokens[Field.TOKEN0]?.symbol
+          } and at least ${parsedAmounts[Field.TOKEN1]?.toFixed(6)} ${
+            tokens[Field.TOKEN1]?.symbol
+          } or the transaction will revert.`}
+        </Text>
+      </>
+    )
+  }
+  const pendingText = `Removed ${parsedAmounts[Field.TOKEN0]?.toSignificant(6)} ${
+    tokens[Field.TOKEN0]?.symbol
+  } and ${parsedAmounts[Field.TOKEN1]?.toSignificant(6)} ${tokens[Field.TOKEN1]?.symbol}`
+
   return (
     <Wrapper>
-      {!!parsedAmounts[Field.TOKEN0] && !!parsedAmounts[Field.TOKEN1] && !!parsedAmounts[Field.LIQUIDITY] && (
-        <ConfirmationModal
-          isOpen={showConfirm}
-          onDismiss={() => {
-            resetModalState()
-            setShowConfirm(false)
-          }}
-          amount0={parsedAmounts[Field.TOKEN0]}
-          amount1={parsedAmounts[Field.TOKEN1]}
-          price={route?.midPrice}
-          liquidityAmount={parsedAmounts[Field.LIQUIDITY]}
-          transactionType={TRANSACTION_TYPE.REMOVE}
-          contractCall={onRemove}
-          extraCall={onSign}
-          signed={signed}
-          attemptedRemoval={attemptedRemoval}
-          pendingConfirmation={pendingConfirmation}
-          hash={txHash ? txHash : ''}
-        />
-      )}
+      <ConfirmationModal
+        isOpen={showConfirm}
+        onDismiss={() => {
+          resetModalState()
+          setShowConfirm(false)
+        }}
+        attemptingTxn={attemptedRemoval}
+        pendingConfirmation={pendingConfirmation}
+        hash={txHash ? txHash : ''}
+        topContent={modalHeader}
+        bottomContent={modalBottom}
+        pendingText={pendingText}
+        title="You will remove"
+      />
       <AutoColumn gap="20px">
         <LightCard>
           <AutoColumn gap="20px">

src/pages/Supply/index.js

@@ -3,22 +3,22 @@ import styled from 'styled-components'
 import { JSBI } from '@uniswap/sdk'
 import { withRouter } from 'react-router-dom'
 
-import { useWeb3React } from '@web3-react/core'
-import { useAllTokens } from '../../contexts/Tokens'
-import { useAllExchanges } from '../../contexts/Exchanges'
-import { useAllBalances, useAccountLPBalances } from '../../contexts/Balances'
-
+import Card from '../../components/Card'
 import Question from '../../components/Question'
 import SearchModal from '../../components/SearchModal'
 import PositionCard from '../../components/PositionCard'
 import Row, { RowBetween } from '../../components/Row'
-import Card, { LightCard } from '../../components/Card'
 import { Link } from '../../theme'
 import { Text } from 'rebass'
 import { AutoColumn } from '../../components/Column'
 import { ArrowRight } from 'react-feather'
 import { ButtonPrimary } from '../../components/Button'
 
+import { useWeb3React } from '@web3-react/core'
+import { useAllTokens } from '../../contexts/Tokens'
+import { useAllExchanges } from '../../contexts/Exchanges'
+import { useAllBalances, useAccountLPBalances } from '../../contexts/Balances'
+
 const Positions = styled.div`
   position: relative;
   margin-top: 38px;
@@ -71,19 +71,16 @@ function Supply({ history }) {
       </ButtonPrimary>
       <Positions>
         <AutoColumn gap="20px">
-          <RowBetween>
-            <Text fontWeight={500}>Your Pooled Liquidity</Text>
-            <Question text="filler text" />
-          </RowBetween>
-          {filteredExchangeList}
-          {filteredExchangeList?.length === 0 && (
-            <LightCard bg="rgba(255, 255, 255, 0.6)" padding={'45px'}>
-              <Text color="#C3C5CB">Add liquidity to see your positions</Text>
-            </LightCard>
+          {filteredExchangeList?.length !== 0 && (
+            <RowBetween>
+              <Text fontWeight={500}>Your Pooled Liquidity</Text>
+              <Question text="filler text" />
+            </RowBetween>
           )}
+          {filteredExchangeList}
           <AutoColumn justify="center">
             <Text color="#AEAEAE">
-              Already have liquidity?{' '}
+              {filteredExchangeList?.length !== 0 ? `Don't see your ` : 'Already have '} liquidity?{' '}
               <Link
                 onClick={() => {
                   history.push('/find')

src/theme/components.js

@@ -45,6 +45,7 @@ export const Link = styled.a.attrs({
   text-decoration: none;
   cursor: pointer;
   color: ${({ theme }) => theme.royalBlue};
+  font-weight: 500;
 
   :focus {
     outline: none;

src/theme/index.js

@@ -3,6 +3,7 @@ import { ThemeProvider as StyledComponentsThemeProvider, createGlobalStyle, css
 import { getQueryParam, checkSupportedTheme } from '../utils'
 import { SUPPORTED_THEMES } from '../constants'
 import { useDarkModeManager } from '../contexts/LocalStorage'
+import { Text } from 'rebass'
 
 export * from './components'
 
@@ -117,6 +118,19 @@ const theme = darkMode => ({
   `
 })
 
+export const TYPE = {
+  main: ({ children, ...rest }) => (
+    <Text fontWeight={500} color={theme().mineshaftGray} {...rest}>
+      {children}
+    </Text>
+  ),
+  blue: ({ children, ...rest }) => (
+    <Text fontWeight={500} color={theme().royalBlue} {...rest}>
+      {children}
+    </Text>
+  )
+}
+
 export const GlobalStyle = createGlobalStyle`
   @import url('https://rsms.me/inter/inter.css');
   html { font-family: 'Inter', sans-serif; }