Commit b6ad0dbb authored by Kenny Tran's avatar Kenny Tran Committed by Chi Kei Chan

Redirect to /swap and add (estimated) to last edit (#40)

parent ae4c7391
import React, { Component } from 'react'; import React, { Component } from 'react';
import { drizzleConnect } from 'drizzle-react' import { drizzleConnect } from 'drizzle-react'
import { BrowserRouter, Switch, Route } from 'react-router-dom'; import { BrowserRouter, Switch, Redirect, Route } from 'react-router-dom';
import { AnimatedSwitch } from 'react-router-transition'; import { AnimatedSwitch } from 'react-router-transition';
import Swap from './Swap'; import Swap from './Swap';
import Send from './Send'; import Send from './Send';
...@@ -25,7 +25,7 @@ class App extends Component { ...@@ -25,7 +25,7 @@ class App extends Component {
<Route exact path="/swap" component={Swap} /> <Route exact path="/swap" component={Swap} />
<Route exact path="/send" component={Send} /> <Route exact path="/send" component={Send} />
<Route exact path="/pool" component={Pool} /> <Route exact path="/pool" component={Pool} />
<Route component={Swap} /> <Redirect exact from="/" to="/swap" />
</AnimatedSwitch> </AnimatedSwitch>
</BrowserRouter> </BrowserRouter>
); );
......
...@@ -143,10 +143,11 @@ class Swap extends Component { ...@@ -143,10 +143,11 @@ class Swap extends Component {
} }
render() { render() {
const { inputCurrency, outputCurrency, input, output } = this.props; const { lastEditedField, inputCurrency, outputCurrency, input, output } = this.props;
const { exchangeRate } = this.state; const { exchangeRate } = this.state;
const inputLabel = this.getTokenLabel(inputCurrency); const inputLabel = this.getTokenLabel(inputCurrency);
const outputLabel = this.getTokenLabel(outputCurrency); const outputLabel = this.getTokenLabel(outputCurrency);
const estimatedText = '(estimated)'
return ( return (
<div className="swap"> <div className="swap">
...@@ -158,6 +159,7 @@ class Swap extends Component { ...@@ -158,6 +159,7 @@ class Swap extends Component {
> >
<CurrencyInputPanel <CurrencyInputPanel
title="Input" title="Input"
description={lastEditedField === 'output' ? estimatedText : ''}
onCurrencySelected={d => this.props.updateField('inputCurrency', d)} onCurrencySelected={d => this.props.updateField('inputCurrency', d)}
onValueChange={d => this.updateInput(d)} onValueChange={d => this.updateInput(d)}
selectedTokens={[inputCurrency, outputCurrency]} selectedTokens={[inputCurrency, outputCurrency]}
...@@ -170,7 +172,7 @@ class Swap extends Component { ...@@ -170,7 +172,7 @@ class Swap extends Component {
</OversizedPanel> </OversizedPanel>
<CurrencyInputPanel <CurrencyInputPanel
title="Output" title="Output"
description="(estimated)" description={lastEditedField === 'input' ? estimatedText : ''}
onCurrencySelected={d => this.props.updateField('outputCurrency', d)} onCurrencySelected={d => this.props.updateField('outputCurrency', d)}
onValueChange={d => this.updateOutput(d)} onValueChange={d => this.updateOutput(d)}
selectedTokens={[inputCurrency, outputCurrency]} selectedTokens={[inputCurrency, outputCurrency]}
......
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