Commit 5bf978e4 authored by Ross's avatar Ross

tidy up, additional ani wrap

parent 10dc4e2d
...@@ -46,7 +46,7 @@ class App extends Component { ...@@ -46,7 +46,7 @@ class App extends Component {
<Web3Connect /> <Web3Connect />
<BrowserRouter> <BrowserRouter>
<Switch> <Switch>
<div className="app__switch-wrapper"> <div className="app__wrapper">
<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="/add-liquidity" component={Pool} /> <Route exact path="/add-liquidity" component={Pool} />
......
@import "../variables.scss"; @import "../variables.scss";
.app { .app {
&__switch-wrapper { &__wrapper {
height: 100%; height: 100%;
position: relative; position: relative;
......
...@@ -181,36 +181,39 @@ class CreateExchange extends Component { ...@@ -181,36 +181,39 @@ class CreateExchange extends Component {
'header--inactive': !isConnected, 'header--inactive': !isConnected,
})} })}
/> />
<ModeSelector title="Create Exchange" />
<AddressInputPanel <div className='ani_title_fade_in'>
title="Token Address" <ModeSelector title="Create Exchange" />
value={tokenAddress} <AddressInputPanel
onChange={this.onChange} title="Token Address"
errorMessage={errorMessage} value={tokenAddress}
/> onChange={this.onChange}
<OversizedPanel hideBottom> errorMessage={errorMessage}
<div className="pool__summary-panel"> />
<div className="pool__exchange-rate-wrapper"> <OversizedPanel hideBottom>
<span className="pool__exchange-rate">Label</span> <div className="pool__summary-panel">
<span>{label || ' - '}</span> <div className="pool__exchange-rate-wrapper">
</div> <span className="pool__exchange-rate">Label</span>
<div className="pool__exchange-rate-wrapper"> <span>{label || ' - '}</span>
<span className="swap__exchange-rate">Decimals</span> </div>
<span>{decimals || ' - '}</span> <div className="pool__exchange-rate-wrapper">
<span className="swap__exchange-rate">Decimals</span>
<span>{decimals || ' - '}</span>
</div>
</div> </div>
</OversizedPanel>
{ this.renderSummary() }
<div className="pool__cta-container">
<button
className={classnames('pool__cta-btn', {
'swap--inactive': !isConnected,
})}
disabled={!isValid}
onClick={this.onCreateExchange}
>
Create Exchange
</button>
</div> </div>
</OversizedPanel>
{ this.renderSummary() }
<div className="pool__cta-container">
<button
className={classnames('pool__cta-btn', {
'swap--inactive': !isConnected,
})}
disabled={!isValid}
onClick={this.onCreateExchange}
>
Create Exchange
</button>
</div> </div>
</div> </div>
); );
......
...@@ -359,35 +359,39 @@ class RemoveLiquidity extends Component { ...@@ -359,35 +359,39 @@ class RemoveLiquidity extends Component {
'header--inactive': !isConnected, 'header--inactive': !isConnected,
})} })}
/> />
<ModeSelector title="Remove Liquidity" />
<CurrencyInputPanel <div className='ani_title_fade_in'>
title="Pool Tokens"
extraText={this.getBalance(tokenAddress)} <ModeSelector title="Remove Liquidity" />
onValueChange={this.onInputChange} <CurrencyInputPanel
value={value} title="Pool Tokens"
errorMessage={errorMessage} extraText={this.getBalance(tokenAddress)}
selectedTokenAddress={tokenAddress} onValueChange={this.onInputChange}
onCurrencySelected={this.onTokenSelect} value={value}
filteredTokens={['ETH']} errorMessage={errorMessage}
/> selectedTokenAddress={tokenAddress}
<OversizedPanel> onCurrencySelected={this.onTokenSelect}
<div className="swap__down-arrow-background"> filteredTokens={['ETH']}
<img className="swap__down-arrow" src={isValid ? ArrowDownBlue : ArrowDownGrey} /> />
<OversizedPanel>
<div className="swap__down-arrow-background">
<img className="swap__down-arrow" src={isValid ? ArrowDownBlue : ArrowDownGrey} />
</div>
</OversizedPanel>
{ this.renderOutput() }
{ this.renderSummary(errorMessage) }
<div className="pool__cta-container">
<button
className={classnames('pool__cta-btn', {
'swap--inactive': !isConnected,
'pool__cta-btn--inactive': !isValid,
})}
disabled={!isValid}
onClick={this.onRemoveLiquidity}
>
Remove Liquidity
</button>
</div> </div>
</OversizedPanel>
{ this.renderOutput() }
{ this.renderSummary(errorMessage) }
<div className="pool__cta-container">
<button
className={classnames('pool__cta-btn', {
'swap--inactive': !isConnected,
'pool__cta-btn--inactive': !isValid,
})}
disabled={!isValid}
onClick={this.onRemoveLiquidity}
>
Remove Liquidity
</button>
</div> </div>
</div> </div>
]; ];
......
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