diff options
| -rw-r--r-- | app/components/Connect.js | 12 | ||||
| -rw-r--r-- | app/config.json | 14 |
2 files changed, 13 insertions, 13 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> diff --git a/app/config.json b/app/config.json index 688d4ee35f..ed984c0642 100644 --- a/app/config.json +++ b/app/config.json @@ -10,7 +10,7 @@ "guides": "https://mullvad.net/guides/", "supportEmail": "mailto:support@mullvad.net" }, - "defaultServer": "193.138.219.226", + "defaultServer": "193.138.218.135", "servers": { "168.1.6.5": { "address": "168.1.6.5", @@ -170,20 +170,20 @@ -3.7037902 ] }, - "185.65.132.108": { - "address": "185.65.132.108", + "185.213.152.132": { + "address": "185.213.152.132", "name": "Sweden - Helsingborg", "city": "Helsingborg", "country": "Sweden" }, - "193.138.219.226": { - "address": "193.138.219.226", + "193.138.218.135": { + "address": "193.138.218.135", "name": "Sweden - Malmö", "city": "Malmö", "country": "Sweden" }, - "185.65.135.73": { - "address": "185.65.135.73", + "185.65.135.143": { + "address": "185.65.135.143", "name": "Sweden - Stockholm", "city": "Stockholm", "country": "Sweden" |