Merge branch 'cleanup' into swap
This commit is contained in:
commit
00e5962ae0
|
@ -11,7 +11,8 @@ const tabs = [
|
||||||
name: 'NAV_SendEther'
|
name: 'NAV_SendEther'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'NAV_Swap'
|
name: 'NAV_Swap',
|
||||||
|
link: 'swap'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'NAV_Offline'
|
name: 'NAV_Offline'
|
||||||
|
@ -62,7 +63,7 @@ export default class TabsOptions extends Component {
|
||||||
{
|
{
|
||||||
tabs.map((object, i) => {
|
tabs.map((object, i) => {
|
||||||
// if the window pathname is the same or similar to the tab objects name, set the active toggle
|
// if the window pathname is the same or similar to the tab objects name, set the active toggle
|
||||||
const activeOrNot = (window.location.pathname === object.name || window.location.pathname.substring(1) === object.name) ? 'active' : '';
|
const activeOrNot = (window.location.pathname === object.link || window.location.pathname.substring(1) === object.link) ? 'active' : '';
|
||||||
return (
|
return (
|
||||||
<li className={`nav-item ${activeOrNot}`}
|
<li className={`nav-item ${activeOrNot}`}
|
||||||
key={i} onClick={this.tabClick(i)}>
|
key={i} onClick={this.tabClick(i)}>
|
||||||
|
|
|
@ -41,9 +41,7 @@ class App extends Component {
|
||||||
changeNode,
|
changeNode,
|
||||||
nodeSelection
|
nodeSelection
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
// let title = children.props.route.name;
|
|
||||||
|
|
||||||
let headerProps = {
|
let headerProps = {
|
||||||
changeLanguage,
|
changeLanguage,
|
||||||
languageSelection,
|
languageSelection,
|
||||||
|
|
|
@ -33,14 +33,6 @@ export default class GenerateWalletPasswordInputComponent extends Component {
|
||||||
className="input-group-addon eye"/>
|
className="input-group-addon eye"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/*TODO - if we want descriptive errors we could re-enable this*/}
|
|
||||||
{/*{this.props.meta.touched && this.props.meta.error &&*/}
|
|
||||||
{/*<div>*/}
|
|
||||||
{/*<p className="error">{this.props.meta.error}</p>*/}
|
|
||||||
{/*</div>*/}
|
|
||||||
{/*}*/}
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue