merge master into sms-verification-modal

2016-11-09 19:04:31 +01:00
parent cde9f454eb 915766c7bf
commit 89c1d9c25c
9 changed files with 47 additions and 30 deletions
--- a/js/src/views/Connection/connection.js
+++ b/js/src/views/Connection/connection.js
@@ -128,7 +128,7 @@ class Connection extends Component {
    const { api } = this.context;
    const { token } = this.state;

-    api.updateToken(token);
+    api.updateToken(token, 0);
    this.setState({ token: '', validToken: false });
  }
 }