Merge pull request #229 from Uniswap/ha-dev

Ha dev

package.json

@@ -26,7 +26,6 @@
     "react-redux": "^5.0.7",
     "react-responsive": "^5.0.0",
     "react-router-dom": "^4.3.1",
-    "react-router-transition": "^1.2.1",
     "react-scripts": "2.0.4",
     "react-scroll-to-component": "^1.0.2",
     "react-select": "^1.2.1",

src/pages/App.js

 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { BrowserRouter, Redirect, Route } from 'react-router-dom';
+import { BrowserRouter, Redirect, Route, Switch } from 'react-router-dom';
 import MediaQuery from 'react-responsive';
-import { AnimatedSwitch } from 'react-router-transition';
 import { Web3Connect, startWatching, initialize } from '../ducks/web3connect';
 import { setAddresses } from '../ducks/addresses';
 import Header from '../components/Header';
@@ -45,19 +44,16 @@ class App extends Component {
         </MediaQuery>
         <Web3Connect />
         <BrowserRouter>
-          <AnimatedSwitch
-            atEnter={{ opacity: 0 }}
-            atLeave={{ opacity: 0 }}
-            atActive={{ opacity: 1 }}
-            className="app__switch-wrapper"
-          >
-            <Route exact path="/swap" component={Swap} />
-            <Route exact path="/send" component={Send} />
-            <Route exact path="/add-liquidity" component={Pool} />
-            <Route exact path="/remove-liquidity" component={Pool} />
-            <Route exact path="/create-exchange/:tokenAddress?" component={Pool} />
-            <Redirect exact from="/" to="/swap" />
-          </AnimatedSwitch>
+          <Switch>
+            <div className="app__wrapper">
+              <Route exact path="/swap" component={Swap} />
+              <Route exact path="/send" component={Send} />
+              <Route exact path="/add-liquidity" component={Pool} />
+              <Route exact path="/remove-liquidity" component={Pool} />
+              <Route exact path="/create-exchange/:tokenAddress?" component={Pool} />
+              <Redirect exact from="/" to="/swap" />
+            </div>
+          </Switch>
         </BrowserRouter>
       </div>
     );

src/pages/App.scss

 @import "../variables.scss";
 
 .app {
-  &__switch-wrapper {
+  &__wrapper {
     height: 100%;
     position: relative;
     margin: auto;
@@ -23,4 +23,4 @@
   height: 100vh;
 
   @extend %col-nowrap;
-}
+}
\ No newline at end of file

src/pages/Pool/AddLiquidity.js

@@ -518,6 +518,7 @@ class AddLiquidity extends Component {
             'header--inactive': !isConnected,
           })}
         />
+
         {
           this.isNewExchange()
             ? (

src/pages/Send/index.js

@@ -735,6 +735,7 @@ class Send extends Component {
               'header--inactive': !this.props.isConnected,
             })}
           />
+
           <CurrencyInputPanel
             title={t("input")}
             description={lastEditedField === OUTPUT ? estimatedText : ''}

src/pages/Swap/index.js

@@ -703,7 +703,6 @@ class Swap extends Component {
     const { inputError, outputError, isValid } = this.validate();
 
 
-
     return (
       <div className="swap">
         <MediaQuery query="(max-width: 767px)">
@@ -719,6 +718,7 @@ class Swap extends Component {
               'header--inactive': !this.props.isConnected,
             })}
           />
+
           <CurrencyInputPanel
             title={t("input")}
             description={lastEditedField === OUTPUT ? estimatedText : ''}