Rebase fixes

8 files changed, 81 insertions, 33 deletions

diff --git a/app/app.js b/app/app.js
index a5392a49c3..e84a577223 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,7 +1,6 @@
 // @flow
 
 import React from 'react';
-import ReactDOM from 'react-dom';
 import { Component} from 'reactxp';
 import { Provider } from 'react-redux';
 import { ConnectedRouter } from 'react-router-redux';
@@ -85,25 +84,6 @@ webFrame.setZoomLevelLimits(1, 1);
 
 ipcRenderer.send('on-browser-window-ready');
 
-function getRootElement() {
-  const currentScript = document.currentScript;
-  if (!currentScript) {
-    throw new Error('Missing document.currentScript');
-  }
-
-  const containerId = currentScript.getAttribute('data-container');
-  if(!containerId) {
-    throw new Error('Missing data-container attribute.');
-  }
-
-  const rootElement = document.querySelector(containerId);
-  if(!rootElement) {
-    throw new Error('Missing root element.');
-  }
-
-  return rootElement;
-}
-
 
 export default class App extends Component{
   render() {
diff --git a/app/components/HeaderBar.js b/app/components/HeaderBar.js
index 254c4e56c0..d22771420b 100644
--- a/app/components/HeaderBar.js
+++ b/app/components/HeaderBar.js
@@ -4,7 +4,6 @@ import {
   Component,
   Text,
   Button,
-  Image,
   View
 } from 'reactxp';
 
@@ -47,7 +46,7 @@ export default class HeaderBar extends Component {
             <Img style={ styles.headerbar__logo } source='logo-icon'/>
             <Text style={styles.headerbar__title}>MULLVAD VPN</Text>
           </View>
-        : null}
+          : null}
 
         {this.props.showSettings ?
           <View style={styles.headerbar__settings}>
@@ -55,7 +54,7 @@ export default class HeaderBar extends Component {
               <Img style={ styles.headerbar__settings } source='icon-settings'/>
             </Button>
           </View>
-        : null}
+          : null}
       </View>
     );
   }
diff --git a/app/components/HeaderBarStyles.js b/app/components/HeaderBarStyles.js
index 1e93f5d68e..2a2a0812bd 100644
--- a/app/components/HeaderBarStyles.js
+++ b/app/components/HeaderBarStyles.js
@@ -55,9 +55,9 @@ const styles = {
     width: 24,
     height: 24,
     backgroundColor: 'transparent',
-  marginLeft: -6, //Because of button.css, when removed remove this
-  marginTop: -1, //Because of button.css, when removed remove this
-})
+    marginLeft: -6, //Because of button.css, when removed remove this
+    marginTop: -1, //Because of button.css, when removed remove this
+  })
 };
 
 module.exports = styles;
\ No newline at end of file
diff --git a/app/components/Img.js b/app/components/Img.js
index 280d072a29..637f66f08b 100644
--- a/app/components/Img.js
+++ b/app/components/Img.js
@@ -5,7 +5,7 @@ import { View, Component } from 'reactxp';
 export default class Img extends Component {
   render(){
 
-    const url = "./assets/images/" + this.props.source + ".svg";
+    const url = './assets/images/' + this.props.source + '.svg';
 
     const style = this.props.style;
 
diff --git a/app/lib/backend.js b/app/lib/backend.js
index a68c2309e7..b76b3b3749 100644
--- a/app/lib/backend.js
+++ b/app/lib/backend.js
@@ -8,7 +8,6 @@ import accountActions from '../redux/account/actions';
 import connectionActions from '../redux/connection/actions';
 import settingsActions from '../redux/settings/actions';
 import { push } from 'react-router-redux';
-import { defaultServer } from '../config';
 
 import type { ReduxStore } from '../redux/store';
 import type { AccountToken, BackendState, RelayLocation, RelaySettingsUpdate } from './ipc-facade';
diff --git a/app/lib/platform.android.js b/app/lib/platform.android.js
index f1f286826b..d7bd39b867 100644
--- a/app/lib/platform.android.js
+++ b/app/lib/platform.android.js
@@ -6,8 +6,8 @@ const exit = () => {
   BackHandler.exitApp();
 };
 
-const open = (link) => {
+const open = (link: string) => {
   Linking.openURL(link);
 };
 
-export {exit, open};
\ No newline at end of file
+export {exit, open};
diff --git a/app/lib/platform.js b/app/lib/platform.js
index 868a24e588..74ae69e145 100644
--- a/app/lib/platform.js
+++ b/app/lib/platform.js
@@ -6,8 +6,9 @@ const exit = () => {
   remote.app.quit();
 };
 
-const open = (link) => {
+const open = (link: string) => {
+  // $FlowFixMe
   shell.openExternal(link);
 };
 
-export {exit, open};
\ No newline at end of file
+export {exit, open};
diff --git a/yarn.lock b/yarn.lock
index 2967bc46ae..5bacec412c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -56,10 +56,29 @@
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-4.5.2.tgz#8450fc442d2a59494251a5a52ae520017e2dcf0d"
 
+"@types/lodash@^4.14.64", "@types/lodash@^4.14.78":
+  version "4.14.85"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.85.tgz#a16fbf942422f6eca5622b6910492c496c35069b"
+
+"@types/node@*":
+  version "8.0.53"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
+
 "@types/node@^7.0.18":
   version "7.0.29"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.29.tgz#ccfcec5b7135c7caf6c4ffb8c7f33102340d99df"
 
+"@types/react-dom@^16.0.0":
+  version "16.0.3"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.3.tgz#8accad7eabdab4cca3e1a56f5ccb57de2da0ff64"
+  dependencies:
+    "@types/node" "*"
+    "@types/react" "*"
+
+"@types/react@*", "@types/react@^16.0.0":
+  version "16.0.25"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.25.tgz#bf696b83fe480c5e0eff4335ee39ebc95884a1ed"
+
 abbrev@1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
@@ -286,6 +305,12 @@ assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
+assert@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  dependencies:
+    util "0.10.3"
+
 assertion-error@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
@@ -3192,6 +3217,10 @@ ieee754@^1.1.6:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
+ifvisible.js@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/ifvisible.js/-/ifvisible.js-1.0.6.tgz#52eb151ce89c56f15316226462e892d1f8451261"
+
 ignore@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
@@ -3229,6 +3258,10 @@ inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, i
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
@@ -3768,7 +3801,7 @@ lodash@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.1, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -4821,6 +4854,21 @@ react@^15.6.1:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
+reactxp@^0.46.5:
+  version "0.46.5"
+  resolved "https://registry.yarnpkg.com/reactxp/-/reactxp-0.46.5.tgz#aab94c04cc51320f21889d6402cc2858603cc2df"
+  dependencies:
+    "@types/lodash" "^4.14.78"
+    "@types/react" "^16.0.0"
+    "@types/react-dom" "^16.0.0"
+    assert "^1.3.0"
+    ifvisible.js "^1.0.6"
+    lodash "^4.17.1"
+    prop-types "^15.5.9"
+    rebound "^0.0.13"
+    subscribableevent "^1.0.0"
+    synctasks "^0.2.9"
+
 read-config-file@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-1.2.0.tgz#1fd7dc8ccdad838cac9f686182625290fc94f456"
@@ -4916,6 +4964,10 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
+rebound@^0.0.13:
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/rebound/-/rebound-0.0.13.tgz#4a225254caf7da756797b19c5817bf7a7941fac1"
+
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -5573,6 +5625,13 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
+subscribableevent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/subscribableevent/-/subscribableevent-1.0.0.tgz#bde9500fa9009c7740c924109bac6119cd9898e6"
+  dependencies:
+    "@types/lodash" "^4.14.64"
+    lodash "^4.17.4"
+
 sumchecker@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-1.3.1.tgz#79bb3b4456dd04f18ebdbc0d703a1d1daec5105d"
@@ -5624,6 +5683,10 @@ symbol-observable@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
 
+synctasks@^0.2.9:
+  version "0.2.23"
+  resolved "https://registry.yarnpkg.com/synctasks/-/synctasks-0.2.23.tgz#2f3378adca9bd65f8784b500dce5aff18ef446f7"
+
 table@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"
@@ -5950,6 +6013,12 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  dependencies:
+    inherits "2.0.1"
+
 utils-merge@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"