summaryrefslogtreecommitdiffhomepage
path: root/app/components/Connect.js
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@codeispoetry.ru>2017-02-21 14:12:39 +0000
committerAndrej Mihajlov <and@codeispoetry.ru>2017-02-21 14:12:39 +0000
commit0fd89cfc1c91d90ec625199ba0460bb5fb8c9ec6 (patch)
tree04b2f15f7f9aef83aa749b29757458486a11fee6 /app/components/Connect.js
parent191d72546accf308696f57ee14d27c1b221ad4b9 (diff)
downloadmullvadvpn-0fd89cfc1c91d90ec625199ba0460bb5fb8c9ec6.tar.xz
mullvadvpn-0fd89cfc1c91d90ec625199ba0460bb5fb8c9ec6.zip
State management via Backend events
Diffstat (limited to 'app/components/Connect.js')
-rw-r--r--app/components/Connect.js13
1 files changed, 12 insertions, 1 deletions
diff --git a/app/components/Connect.js b/app/components/Connect.js
index 9dda61c2ee..ec89dd897d 100644
--- a/app/components/Connect.js
+++ b/app/components/Connect.js
@@ -1,5 +1,6 @@
import React, { Component } from 'react';
import { Layout, Container, Header } from './Layout';
+import { servers } from '../constants';
export default class Connect extends Component {
@@ -12,6 +13,16 @@ export default class Connect extends Component {
}
render() {
+ let serverName;
+ const preferredServer = this.props.settings.preferredServer;
+
+ // special types of servers (Fastest, Nearest)
+ if(preferredServer === 'Fastest' || preferredServer === 'Nearest') {
+ serverName = preferredServer;
+ } else {
+ serverName = (servers[preferredServer] || {}).name;
+ }
+
return (
<Layout>
<Header showSettings={ true } onSettings={ ::this.onSettings } />
@@ -24,7 +35,7 @@ export default class Connect extends Component {
<div className="connect__row">
<div className="connect__server" onClick={ ::this.openLocationPicker }>
<div className="connect__server-label">Connect to</div>
- <div className="connect__server-country">{ this.props.settings.preferredServer }</div>
+ <div className="connect__server-country">{ serverName }</div>
</div>
</div>