summaryrefslogtreecommitdiffhomepage
path: root/app/components
diff options
context:
space:
mode:
authorErik Larkö <erik@mullvad.net>2017-11-10 08:58:50 +0100
committerErik Larkö <erik@mullvad.net>2017-11-10 13:54:49 +0100
commit91a0f3d93a4a327ad6ded2343de04a6ff950d5eb (patch)
tree03f5490d8e726e076cfaa4cdd78ec521f53fb184 /app/components
parent489579418d4135e3b720208153d493815ef0b9f7 (diff)
downloadmullvadvpn-91a0f3d93a4a327ad6ded2343de04a6ff950d5eb.tar.xz
mullvadvpn-91a0f3d93a4a327ad6ded2343de04a6ff950d5eb.zip
Update the hard coded server list
Diffstat (limited to 'app/components')
-rw-r--r--app/components/Connect.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/components/Connect.js b/app/components/Connect.js
index 3b4029fe76..1dc135c745 100644
--- a/app/components/Connect.js
+++ b/app/components/Connect.js
@@ -109,9 +109,6 @@ export default class Connect extends Component {
renderMap(): React.Element<*> {
const serverInfo = this._getServerInfo();
- if(!serverInfo) {
- throw new Error('Server info cannot be null.');
- }
let isConnecting = false;
let isConnected = false;
@@ -122,12 +119,15 @@ export default class Connect extends Component {
case 'disconnected': isDisconnected = true; break;
}
- const { city, country } = isConnecting || isConnected
+ const { city, country } = serverInfo && (isConnecting || isConnected)
? serverInfo
: { city: '\u2003', country: '\u2002' };
- const ip = isConnected
+ const ip = serverInfo && isConnected
? serverInfo.address
: '\u2003'; //this.props.connection.clientIp;
+ const serverName = serverInfo
+ ? serverInfo.name
+ : '\u2003';
// We decided to not include the map in the first beta release to customers
// but it MUST be included in the following releases. Therefore we choose
@@ -228,7 +228,7 @@ export default class Connect extends Component {
<div className="connect__server-label">Connect to</div>
<div className="connect__server-value">
- <div className="connect__server-name">{ serverInfo.name }</div>
+ <div className="connect__server-name">{ serverName }</div>
</div>
</div>