dependencies updated

package.json

@@ -3,17 +3,17 @@
   "description": "Tinode messenger for the web",
   "version": "0.16.0-rc1",
   "devDependencies": {
-    "@babel/core": "^7.3.4",
+    "@babel/core": "^7.4.5",
-    "@babel/preset-env": "^7.3.4",
+    "@babel/preset-env": "^7.4.5",
     "@babel/preset-react": "^7.0.0",
-    "babel-loader": "^8.0.5",
+    "babel-loader": "^8.0.6",
-    "babel-plugin-react-intl": "^3.0.1",
+    "babel-plugin-react-intl": "^3.2.0",
-    "browserslist": "^4.4.1",
+    "browserslist": "^4.6.2",
     "cssnano": "^4.1.10",
     "postcss": "^7.0.17",
-    "uglifyjs-webpack-plugin": "^2.1.2",
+    "uglifyjs-webpack-plugin": "^2.1.3",
-    "webpack": "^4.29.6",
+    "webpack": "^4.33.0",
-    "webpack-cli": "^3.2.3"
+    "webpack-cli": "^3.3.4"
   },
   "repository": {
     "type": "git",
@@ -80,7 +80,7 @@
     "firebase": "^5.8.6",
     "react": "^16.8.4",
     "react-dom": "^16.8.4",
-    "react-intl": "^2.8.0",
+    "react-intl": "^2.9.0",
     "tinode-sdk": "^0.15.14"
   }
 }

src/i18n/en.json

@@ -4,6 +4,7 @@
   "full_name_prompt": "Full name, e.g. John Doe",
   "email_prompt": "Email, e.g. jdoe@example.com",
   "button_sign_up": "Sign up",
+  "validate_credential_action": "confirm",
   "label_your_name": "Your name",
   "label_password": "Password",
   "password_unchanged_prompt": "Unchanged",

src/i18n/ru.json

@@ -133,5 +133,6 @@
   "peers_messaging_disabled": "Чат заблокирован у корреспондента.",
   "enable_peers_messaging": "Разблокировать.",
   "more_online_members": "+еще {overflow}",
-  "label_user_contacts": "Конакты:"
+  "label_user_contacts": "Конакты:",
+  "validate_credential_action": ":!![MISSING]!!:confirm"
 }

src/i18n/zh-CN.json

@@ -133,5 +133,6 @@
   "tags_editor_no_tags": "添加一些标签",
   "title_manage_tags": "管理标签",
   "more_online_members": "还有{overflow}个",
-  "label_user_contacts": "往来："
+  "label_user_contacts": "往来：",
+  "validate_credential_action": ":!![MISSING]!!:confirm"
 }

src/messages.json

@@ -5,6 +5,7 @@
     "full_name_prompt": "Full name, e.g. John Doe",
     "email_prompt": "Email, e.g. jdoe@example.com",
     "button_sign_up": "Sign up",
+    "validate_credential_action": "confirm",
     "label_your_name": "Your name",
     "label_password": "Password",
     "password_unchanged_prompt": "Unchanged",

src/views/edit-account-view.jsx

@@ -164,21 +164,15 @@ export default class EditAccountView extends React.Component {
   }
 
   render() {
-    /*
-    let tags = [];
-    this.state.tags.map((tag) => {
-      tags.push(<span className="badge" key={tags.length}>{tag}</span>);
-    });
-    if (tags.length == 0) {
-      tags = <i><FormattedMessage id="tags_not_found" /></i>;
-    }
-    */
     let credentials = [];
     this.state.credentials.map((cred) => {
       credentials.push(<div key={cred.meth + ":" + cred.val}>{cred.meth}: <tt>{cred.val}</tt>
         <span > {!cred.done ?
-          <a href="javascript:;"
+          <a href="javascript:;" className="clickable"
-            onClick={this.props.onCredConfirm.bind(this, cred.meth, cred.val)}>confirm</a>
+            onClick={this.props.onCredConfirm.bind(this, cred.meth, cred.val)}>
+              <FormattedMessage id="validate_credential_action" defaultMessage="confirm"
+                description="Validate credentail call to action" />
+            </a>
           : null} <a href="javascript:;" onClick={this.props.onCredDelete.bind(this, cred.meth, cred.val)}><i
             className="material-icons gray">delete_outline</i></a></span></div>);
     });

src/views/tinode-web.jsx

@@ -954,8 +954,7 @@ class TinodeWeb extends React.Component {
   }
 
   handleCredConfirm(method, response) {
-    // TODO: implement
+    handleCredentialsRequest({cred: [method]});
-    console.log("confirm credential", method, response);
   }
 
   // User clicked Cancel button in Setting or Sign Up panel.

src/views/validation-view.jsx

@@ -26,6 +26,7 @@ class ValidationView extends React.PureComponent {
     this.handleChange = this.handleChange.bind(this);
     this.handleKeyPress = this.handleKeyPress.bind(this);
     this.handleSubmit = this.handleSubmit.bind(this);
+    this.handleCancel = this.handleCancel.bind(this);
   }
 
   handleChange(e) {
@@ -35,6 +36,8 @@ class ValidationView extends React.PureComponent {
   handleKeyPress(e) {
     if (e.key === 'Enter') {
       this.handleSubmit(e);
+    } else if (e.key == 'Escape') {
+      this.handleCancel(e);
     }
   }
 
@@ -45,6 +48,12 @@ class ValidationView extends React.PureComponent {
     }
   }
 
+  handleCancel(e) {
+    e.preventDefault();
+    this.props.onCancel();
+  }
+
+
   render() {
     const { formatMessage } = this.props.intl;
     const methods = {'email': formatMessage(messages.email), 'tel': formatMessage(messages.phone)};
@@ -72,6 +81,9 @@ class ValidationView extends React.PureComponent {
           <button className="blue" onClick={this.handleSubmit}>
             <FormattedMessage id="button_confirm" defaultMessage="Confirm" description="Button [Confirm]" />
           </button>
+          <button className="white" onClick={this.handleCancel}>
+            <FormattedMessage id="button_cancel" />
+          </button>
         </div>
       </div>
     );