Skip to content

I
interface
Commit 495fb062 authored by ian-jh's avatar ian-jh
Browse files
Options

restore to beta

parent 59e3f34d
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 60 deletions
src/components/TransactionDetails/index.js
View file @ 495fb062
...@@ -91,9 +91,7 @@ const Popup = styled(Flex)` ...@@ -91,9 +91,7 @@ const Popup = styled(Flex)`
border-radius: 8px; border-radius: 8px;
line-height: 183.52%; animation: ${fadeIn} 0.15s linear;
background: #404040;
border-radius: 8px;
color: ${({ theme }) => theme.textColor}; color: ${({ theme }) => theme.textColor};
font-style: italic; font-style: italic;
...@@ -646,10 +644,10 @@ export default function TransactionDetails(props) { ...@@ -646,10 +644,10 @@ export default function TransactionDetails(props) {
<ValueWrapper> <ValueWrapper>
{b( {b(
`${amountFormatter( `${amountFormatter(
props.independentValueParsed, props.dependentValueMaximum,
props.independentDecimals, props.dependentDecimals,
Math.min(4, props.independentDecimals) Math.min(4, props.dependentDecimals)
)} ${props.outputSymbol}` )} ${props.inputSymbol}`
)} )}
</ValueWrapper>{' '} </ValueWrapper>{' '}
</div> </div>
......
src/pages/App.js
View file @ 495fb062
...@@ -51,59 +51,64 @@ export default function App() { ...@@ -51,59 +51,64 @@ export default function App() {
return ( return (
<> <>
<Suspense fallback={null}> <Suspense fallback={null}>
<HeaderWrapper> <AppWrapper>
<Header /> <HeaderWrapper>
</HeaderWrapper> <Header />
<BodyWrapper> </HeaderWrapper>
<Body> <BodyWrapper>
<Web3ReactManager> <Body>
<BrowserRouter> <Web3ReactManager>
<NavigationTabs /> <BrowserRouter>
{/* this Suspense is for route code-splitting */} <NavigationTabs />
<Suspense fallback={null}> {/* this Suspense is for route code-splitting */}
<Switch> <Suspense fallback={null}>
<Route exact strict path="/swap" component={Swap} /> <Switch>
<Route <Route exact strict path="/swap" component={Swap} />
exact <Route
strict exact
path="/swap/:tokenAddress?" strict
render={({ match }) => { path="/swap/:tokenAddress?"
if (isAddress(match.params.tokenAddress)) { render={({ match }) => {
return <Swap initialCurrency={isAddress(match.params.tokenAddress)} /> if (isAddress(match.params.tokenAddress)) {
} else { return <Swap initialCurrency={isAddress(match.params.tokenAddress)} />
return <Redirect to={{ pathname: '/swap' }} /> } else {
} return <Redirect to={{ pathname: '/swap' }} />
}} }
/> }}
<Route exact strict path="/send" component={Send} /> />
<Route <Route exact strict path="/send" component={Send} />
exact <Route
strict exact
path="/send/:tokenAddress?" strict
render={({ match }) => { path="/send/:tokenAddress?"
if (isAddress(match.params.tokenAddress)) { render={({ match }) => {
return <Send initialCurrency={isAddress(match.params.tokenAddress)} /> if (isAddress(match.params.tokenAddress)) {
} else { return <Send initialCurrency={isAddress(match.params.tokenAddress)} />
return <Redirect to={{ pathname: '/send' }} /> } else {
} return <Redirect to={{ pathname: '/send' }} />
}} }
/> }}
<Route />
path={[ <Route
'/add-liquidity', path={[
'/remove-liquidity', '/add-liquidity',
'/create-exchange', '/remove-liquidity',
'/create-exchange/:tokenAddress?' '/create-exchange',
]} '/create-exchange/:tokenAddress?'
component={Pool} ]}
/> component={Pool}
<Redirect to="/swap" /> />
</Switch> <Redirect to="/swap" />
</Suspense> </Switch>
</BrowserRouter> </Suspense>
</Web3ReactManager> </BrowserRouter>
</Body> </Web3ReactManager>
</BodyWrapper> </Body>
</BodyWrapper>
<FooterWrapper>
<Footer />
</FooterWrapper>
</AppWrapper>
</Suspense> </Suspense>
</> </>
) )
......
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