diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-10-03 10:49:39 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-10-03 10:49:39 +0200 |
| commit | e73d32044663ae6256de5089eb227dc00b3ff9bc (patch) | |
| tree | c09def8110162de3c25830dc95b8d02457622b66 /app | |
| parent | daaa5524429e9f21f66aee6dac74169131421cef (diff) | |
| parent | b3393eb67de65683c0df77c922a52b0215e88034 (diff) | |
| download | mullvadvpn-e73d32044663ae6256de5089eb227dc00b3ff9bc.tar.xz mullvadvpn-e73d32044663ae6256de5089eb227dc00b3ff9bc.zip | |
Merge branch 'show-country-while-connecting'
Diffstat (limited to 'app')
| -rw-r--r-- | app/components/Connect.js | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/app/components/Connect.js b/app/components/Connect.js index 3625022634..5f5af30955 100644 --- a/app/components/Connect.js +++ b/app/components/Connect.js @@ -2,7 +2,7 @@ import moment from 'moment'; import React, { Component } from 'react'; -import { If, Then, Else } from 'react-if'; +import { If, Then } from 'react-if'; import { Layout, Container, Header } from './Layout'; import { BackendError } from '../lib/backend'; import ExternalLinkSVG from '../assets/images/icon-extLink.svg'; @@ -109,7 +109,7 @@ export default class Connect extends Component { case 'disconnected': isDisconnected = true; break; } - const { city, country } = isConnected + const { city, country } = isConnecting || isConnected ? serverInfo : { city: '\u2003', country: '\u2002' }; const ip = isConnected @@ -131,6 +131,14 @@ export default class Connect extends Component { : './assets/images/location-marker-unsecure.svg' } /> */ + let ipComponent = undefined; + if (isConnected || isDisconnected) { + if (this.state.showCopyIPMessage) { + ipComponent = <span>{ 'IP copied to clipboard!' }</span>; + } else { + ipComponent = <span>{ ip }</span>; + } + } return ( <div className="connect"> <div className="connect__map"> @@ -186,10 +194,7 @@ export default class Connect extends Component { */ } <div className={ this.ipAddressClass() } onClick={ this.onIPAddressClick.bind(this) }> - <If condition={ this.state.showCopyIPMessage }> - <Then><span>{ 'IP copied to clipboard!' }</span></Then> - <Else><span>{ ip }</span></Else> - </If> + { ipComponent } </div> </div> |