summaryrefslogtreecommitdiffhomepage
path: root/app/components
diff options
context:
space:
mode:
authorErik Larkö <erik@mullvad.net>2017-06-26 16:30:54 +0200
committerErik Larkö <erik@mullvad.net>2017-07-07 13:49:29 +0200
commit16ee9a212560f0a1989dc278cb9281152307275d (patch)
tree3033099f2a3081618e05531a5e828b910b25c244 /app/components
parent5da649c239443431fe492fdf57fbdaee0099ca79 (diff)
downloadmullvadvpn-16ee9a212560f0a1989dc278cb9281152307275d.tar.xz
mullvadvpn-16ee9a212560f0a1989dc278cb9281152307275d.zip
Move geoIP from account to connection
Diffstat (limited to 'app/components')
-rw-r--r--app/components/Connect.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/components/Connect.js b/app/components/Connect.js
index 173628646d..eb93d97432 100644
--- a/app/components/Connect.js
+++ b/app/components/Connect.js
@@ -129,7 +129,7 @@ export default class Connect extends Component {
const displayLocation = this.displayLocation();
const mapBounds = this.calculateMapBounds(displayLocation.location, altitude);
const mapBoundsOptions = { offset: [0, -113], animate: !this.state.isFirstPass };
- const accountLocation = this.convertToMapCoordinate(this.props.account.location || [0, 0]);
+ const accountLocation = this.convertToMapCoordinate(this.props.connection.location || [0, 0]);
const serverLocation = this.convertToMapCoordinate(serverInfo.location);
const map = process.platform === 'darwin'
@@ -397,7 +397,7 @@ export default class Connect extends Component {
displayLocation(): DisplayLocation {
// return user location when disconnected
if(this.props.connection.status === 'disconnected') {
- let { location, country, city } = this.props.account;
+ let { location, country, city } = this.props.connection;
return {
location: location || [0, 0],
country, city