adding back missing and changed dependencies

src/i18n/en.json

@@ -1,7 +1,7 @@
 {
   "contacts_not_found": "You have no chats<br />¯\\\\_(ツ)_/¯",
-  "email_prompt": "Email, e.g. jdoe@example.com",
   "full_name_prompt": "Full name, e.g. John Doe",
+  "email_prompt": "Email, e.g. jdoe@example.com",
   "sign_up_button": "Sign up",
   "login_prompt": "Login",
   "password_prompt": "Password",

src/i18n/ru.json

@@ -1,7 +1,7 @@
 {
   "contacts_not_found": "Чатов нет<br />¯\\\\_(ツ)_/¯",
-  "email_prompt": "Email, напр. ivan@example.com",
   "full_name_prompt": "Полное имя, напр. Иван Петров",
+  "email_prompt": "Email, напр. ivan@example.com",
   "sign_up_button": "Создать счет",
   "login_prompt": "Логин",
   "password_prompt": "Пароль",

src/views/create-account-view.jsx

@@ -1,23 +1,13 @@
 // Account registration.
 import React from 'react';
-import { FormattedMessage, defineMessages } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
 import AvatarUpload from '../widgets/avatar-upload.jsx';
 import CheckBox from '../widgets/checkbox.jsx';
 import VisiblePassword from '../widgets/visible-password.jsx';
 
-const messages = defineMessages({
+import LocalStorageUtil from '../lib/local-storage.js';
-  'email_prompt': {
+import vcard from '../lib/utils.js';
-    id: 'email_prompt',
-    description: 'Input placeholder for email entry',
-    defaultMessage: 'Email, e.g. jdoe@example.com'
-  },
-  'full_name_prompt': {
-    id: 'full_name_prompt',
-    description: 'Input placeholder for person\'s full name',
-    defaultMessage: 'Full name, e.g. John Doe'
-  }
-});
 
 export default class CreateAccountView extends React.PureComponent {
   constructor(props) {
@@ -30,7 +20,7 @@ export default class CreateAccountView extends React.PureComponent {
       fn: '', // full/formatted name
       imageDataUrl: null,
       errorCleared: false,
-      saveToken: localStorage.getObject('keep-logged-in')
+      saveToken: LocalStorageUtil.getObject('keep-logged-in')
     };
 
     this.handleLoginChange = this.handleLoginChange.bind(this);
@@ -63,7 +53,7 @@ export default class CreateAccountView extends React.PureComponent {
   }
 
   handleToggleSaveToken() {
-    localStorage.setObject('keep-logged-in', !this.state.saveToken);
+    LocalStorageUtil.setObject('keep-logged-in', !this.state.saveToken);
     this.setState({saveToken: !this.state.saveToken});
   }
 
@@ -83,33 +73,45 @@ export default class CreateAccountView extends React.PureComponent {
     if (this.props.disabled) {
       submitClasses += ' disabled';
     }
-    const {formatMessage} = this.props.intl;
+
     return (
       <form className="panel-form-column" onSubmit={this.handleSubmit}>
         <div className="panel-form-row">
           <div className="panel-form-column">
-            <input type="text" placeholder="{formatMessage({id: 'login_prompt'})}" autoComplete="user-name"
+            <FormattedMessage id="login_prompt">{
-              value={this.state.login} onChange={this.handleLoginChange} required autoFocus />
+              (login_prompt) => <input type="text" placeholder={login_prompt} autoComplete="user-name"
-            <VisiblePassword placeholder="{formatMessage({id: 'password_prompt'})}" autoComplete="new-password"
+                value={this.state.login} onChange={this.handleLoginChange} required autoFocus />
-              value={this.state.password} onFinished={this.handlePasswordChange}
+            }</FormattedMessage>
-              required={true} />
+            <FormattedMessage id="password_prompt">{
+              (password_prompt) => <VisiblePassword placeholder={password_prompt} autoComplete="new-password"
+                value={this.state.password} onFinished={this.handlePasswordChange}
+                required={true} />
+            }</FormattedMessage>
           </div>
           <AvatarUpload
             onImageChanged={this.handleImageChanged}
             onError={this.props.onError} />
         </div>
         <div  className="panel-form-row">
-          <input type="text" placeholder="{formatMessage(messages.full_name_prompt)}" autoComplete="name"
+          <FormattedMessage id="full_name_prompt" defaultMessage="Full name, e.g. John Doe"
-            value={this.state.fn} onChange={this.handleFnChange} required/>
+            description="Input placeholder for person's full name">{
+            <input type="text" placeholder={full_name_prompt} autoComplete="name"
+              value={this.state.fn} onChange={this.handleFnChange} required/>
+          }</FormattedMessage>
         </div>
         <div className="panel-form-row">
-          <input type="email" placeholder="{formatMessage(messages.email_prompt)}"
+          <FormattedMessage id="email_prompt" defaultMessage="Email, e.g. jdoe@example.com"
-            autoComplete="email" value={this.state.email} onChange={this.handleEmailChange} required/>
+            description="Input placeholder for email entry">{
+            <input type="email" placeholder={email_prompt} autoComplete="email"
+              value={this.state.email} onChange={this.handleEmailChange} required/>
+          }</FormattedMessage>
         </div>
         <div className="panel-form-row">
           <CheckBox id="save-token" name="save-token" checked={this.state.saveToken}
             onChange={this.handleToggleSaveToken} />
-          <label htmlFor="save-token">&nbsp;{formatMessage({id: 'stay_logged_in'})}</label>
+          <FormattedMessage id="stay_logged_in">
+            {(stay_logged_in) => <label htmlFor="save-token">&nbsp;{stay_logged_in}</label>}
+          </FormattedMessage>
         </div>
         <div className="dialog-buttons">
           <button className={submitClasses} type="submit">

src/views/login-view.jsx

@@ -49,7 +49,8 @@ export default class LoginView extends React.Component {
 
     return (
       <form id="login-form" onSubmit={this.handleSubmit}>
-        <FormattedMessage id="login_prompt" defaultMessage="Login">
+        <FormattedMessage id="login_prompt" defaultMessage="Login"
+          description="Login placeholder in LoginView">
         {
           (login_prompt) => <input type="text" id="inputLogin"
             placeholder={login_prompt}
@@ -59,7 +60,8 @@ export default class LoginView extends React.Component {
             required autoFocus />
         }
         </FormattedMessage>
-        <FormattedMessage id="password_prompt" defaultMessage="Password">
+        <FormattedMessage id="password_prompt" defaultMessage="Password"
+          description="Password placeholder in LoginView">
         {
           (password_prompt) => <VisiblePassword type="password" id="inputPassword"
             placeholder={password_prompt}
@@ -73,15 +75,18 @@ export default class LoginView extends React.Component {
           <CheckBox id="save-token" name="save-token" checked={this.state.saveToken}
             onChange={this.handleToggleSaveToken} />
           <label htmlFor="save-token">&nbsp;
-            <FormattedMessage id="stay_logged_in" defaultMessage="Stay logged in" />
+            <FormattedMessage id="stay_logged_in" defaultMessage="Stay logged in"
+              description="Label for a checkbox" />
           </label>
           <a href="#reset">
-            <FormattedMessage id="forgot_password_link" defaultMessage="Forgot password?" />
+            <FormattedMessage id="forgot_password_link" defaultMessage="Forgot password?"
+              description="Link to Reset password form" />
           </a>
         </div>
         <div className="dialog-buttons">
           <button className={submitClasses} type="submit">
-            <FormattedMessage id="sign_in_button" defaultMessage="Sign in" />
+            <FormattedMessage id="sign_in_button" defaultMessage="Sign in"
+              description="Button [Sign In]" />
           </button>
         </div>
       </form>

src/views/sidepanel-view.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { defineMessages } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import SideNavbar from '../widgets/side-navbar.jsx';
 import ErrorPanel from '../widgets/error-panel.jsx';
@@ -52,7 +52,7 @@ const messages = defineMessages({
   }
 });
 
-export default class SidepanelView extends React.Component {
+class SidepanelView extends React.Component {
   constructor(props) {
     super(props);
 
@@ -168,3 +168,5 @@ export default class SidepanelView extends React.Component {
     );
   }
 };
+
+export default injectIntl(SidepanelView);

src/views/tinode-web.jsx

@@ -20,8 +20,6 @@ import HashNavigation from '../lib/navigation.js';
 // Sound to play on message received.
 export const POP_SOUND = new Audio('audio/msg.mp3');
 
-console.log(FIREBASE_INIT);
-
 export default class TinodeWeb extends React.Component {
   constructor(props) {
     super(props);