summaryrefslogtreecommitdiffhomepage
path: root/app/components
diff options
context:
space:
mode:
authorErik Larkö <erik@mullvad.net>2017-09-29 14:37:09 +0200
committerErik Larkö <erik@mullvad.net>2017-10-02 08:20:41 +0200
commit5c499db133e292efec323340a2b9f37002638d1d (patch)
tree7958a5ef67a15651ee7d9bed4a200db5a3fc0aa5 /app/components
parent9547107bf5613eaa2cb430aafe24d1eff75f37c0 (diff)
downloadmullvadvpn-5c499db133e292efec323340a2b9f37002638d1d.tar.xz
mullvadvpn-5c499db133e292efec323340a2b9f37002638d1d.zip
Remove fastest and nearest servers
Diffstat (limited to 'app/components')
-rw-r--r--app/components/Connect.js39
-rw-r--r--app/components/SelectLocation.js3
2 files changed, 1 insertions, 41 deletions
diff --git a/app/components/Connect.js b/app/components/Connect.js
index 97e113a3fe..3625022634 100644
--- a/app/components/Connect.js
+++ b/app/components/Connect.js
@@ -156,32 +156,7 @@ export default class Connect extends Component {
<If condition={ isConnecting }>
<Then>
<div className="connect__status-location">
-
- <If condition={ preferredServer === 'fastest' }>
- <Then>
- <span>
- <img className="connect__status-location-icon" src="./assets/images/icon-fastest.svg" />
- { 'Fastest' }
- </span>
- </Then>
- </If>
-
- <If condition={ preferredServer === 'nearest' }>
- <Then>
- <span>
- <img className="connect__status-location-icon" src="./assets/images/icon-nearest.svg" />
- { 'Nearest' }
- </span>
- </Then>
- </If>
-
- { /* silly but react-if does not have ElseIf */ }
- <If condition={ preferredServer !== 'fastest' && preferredServer !== 'nearest' }>
- <Then>
- <span>{ country }</span>
- </Then>
- </If>
-
+ <span>{ country }</span>
</div>
</Then>
</If>
@@ -235,18 +210,6 @@ export default class Connect extends Component {
<div className="connect__server-label">Connect to</div>
<div className="connect__server-value">
- <If condition={ preferredServer === 'fastest' }>
- <Then>
- <img className="connect__server-icon" src="./assets/images/icon-fastest.svg" />
- </Then>
- </If>
-
- <If condition={ preferredServer === 'nearest' }>
- <Then>
- <img className="connect__server-icon" src="./assets/images/icon-nearest.svg" />
- </Then>
- </If>
-
<div className="connect__server-name">{ serverInfo.name }</div>
</div>
diff --git a/app/components/SelectLocation.js b/app/components/SelectLocation.js
index 4f2218d08c..5df5603f71 100644
--- a/app/components/SelectLocation.js
+++ b/app/components/SelectLocation.js
@@ -96,9 +96,6 @@ export default class SelectLocation extends Component {
While connected, your real location is masked with a private and secure location in the selected region
</div>
- { this.drawCell('fastest', 'Fastest', './assets/images/icon-fastest.svg', this.onSelect.bind(this, 'fastest')) }
- { this.drawCell('nearest', 'Nearest', './assets/images/icon-nearest.svg', this.onSelect.bind(this, 'nearest')) }
-
<div className="select-location__separator"></div>
{ Object.keys(servers).map((key) => this.drawCell(key, servers[key].name, null, this.onSelect.bind(this, key))) }