fix for #90

src/i18n/de.json

@@ -1353,5 +1353,12 @@
     "description": "Contact search prompt when forwarding a message.",
     "missing": false,
     "obsolete": false
+  },
+  "label_new_password": {
+    "translation": "Neues Kennwort",
+    "defaultMessage": "New password",
+    "description": "Label for entering a new password",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/en.json

@@ -34,13 +34,6 @@
     "missing": false,
     "obsolete": false
   },
-  "action_more": {
-    "translation": "More",
-    "defaultMessage": "More",
-    "description": "Action for showing more content",
-    "missing": false,
-    "obsolete": true
-  },
   "action_report_chat": {
     "translation": "Report Conversation",
     "defaultMessage": "Report Conversation",
@@ -461,13 +454,6 @@
     "missing": false,
     "obsolete": false
   },
-  "label_default_access": {
-    "translation": "Default access mode:",
-    "defaultMessage": "Default access mode:",
-    "description": "Section title",
-    "missing": false,
-    "obsolete": true
-  },
   "label_default_access_mode": {
     "translation": "Default access mode:",
     "defaultMessage": "Default access mode:",
@@ -1033,13 +1019,6 @@
     "missing": false,
     "obsolete": false
   },
-  "sidepanel_title_acc_general": {
-    "translation": "General",
-    "defaultMessage": "General",
-    "description": "Sidepanel title for TopicCommonView.",
-    "missing": false,
-    "obsolete": true
-  },
   "sidepanel_title_acc_notifications": {
     "translation": "Notifications",
     "defaultMessage": "Notifications",
@@ -1047,13 +1026,6 @@
     "missing": false,
     "obsolete": false
   },
-  "sidepanel_title_acc_security": {
-    "translation": "Security",
-    "defaultMessage": "Security",
-    "description": "Sidepanel title for AccSecurityView.",
-    "missing": false,
-    "obsolete": true
-  },
   "sidepanel_title_acc_support": {
     "translation": "Support",
     "defaultMessage": "Support",
@@ -1089,13 +1061,6 @@
     "missing": false,
     "obsolete": false
   },
-  "sidepanel_title_crop": {
-    "translation": "Drag to Adjust",
-    "defaultMessage": "Drag to Adjust",
-    "description": "Sidepanel title for AvatarCropView.",
-    "missing": false,
-    "obsolete": true
-  },
   "sidepanel_title_login": {
     "translation": "Sign In",
     "defaultMessage": "Sign In",
@@ -1187,13 +1152,6 @@
     "missing": false,
     "obsolete": false
   },
-  "title_info": {
-    "translation": "Info",
-    "defaultMessage": "Info",
-    "description": "Title for InfoView",
-    "missing": false,
-    "obsolete": true
-  },
   "title_manage_tags": {
     "translation": "Manage",
     "defaultMessage": "Manage",
@@ -1299,20 +1257,6 @@
     "missing": false,
     "obsolete": false
   },
-  "panel_title_acc_general": {
-    "translation": "General",
-    "defaultMessage": "General",
-    "description": "Title for TopicCommonView.",
-    "missing": false,
-    "obsolete": true
-  },
-  "panel_title_acc_security": {
-    "translation": "Security",
-    "defaultMessage": "Security",
-    "description": "Title for TopicSecirityView and AccSecurityView.",
-    "missing": false,
-    "obsolete": true
-  },
   "panel_title_crop": {
     "translation": "Drag to Adjust",
     "defaultMessage": "Drag to Adjust",
@@ -1409,5 +1353,12 @@
     "description": "Contact search prompt when forwarding a message.",
     "missing": false,
     "obsolete": false
+  },
+  "label_new_password": {
+    "translation": "New password",
+    "defaultMessage": "New password",
+    "description": "Label for entering a new password",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/es.json

@@ -1353,5 +1353,12 @@
     "description": "Contact search prompt when forwarding a message.",
     "missing": false,
     "obsolete": false
+  },
+  "label_new_password": {
+    "translation": "Nueva contraseña",
+    "defaultMessage": "New password",
+    "description": "Label for entering a new password",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/ex/base-en.json

@@ -302,6 +302,10 @@
     "defaultMessage": "Muted:",
     "description": "Label for Muting/unmuting the topic"
   },
+  "label_new_password": {
+    "defaultMessage": "New password",
+    "description": "Label for entering a new password"
+  },
   "label_other_user": {
     "defaultMessage": "Other",
     "description": "Label for the other user when the user is unnamed"

src/i18n/ko.json

@@ -1353,5 +1353,12 @@
     "description": "Contact search prompt when forwarding a message.",
     "missing": false,
     "obsolete": false
+  },
+  "label_new_password": {
+    "translation": "새 비밀번호",
+    "defaultMessage": "New password",
+    "description": "Label for entering a new password",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/ro.json

@@ -1353,5 +1353,12 @@
     "description": "Contact search prompt when forwarding a message.",
     "missing": false,
     "obsolete": false
+  },
+  "label_new_password": {
+    "translation": "Parolă Nouă",
+    "defaultMessage": "New password",
+    "description": "Label for entering a new password",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/ru.json

@@ -1353,5 +1353,12 @@
     "description": "Contact search prompt when forwarding a message.",
     "missing": false,
     "obsolete": false
+  },
+  "label_new_password": {
+    "translation": "Новый пароль",
+    "defaultMessage": "New password",
+    "description": "Label for entering a new password",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/zh-TW.json

@@ -1353,5 +1353,12 @@
     "description": "Contact search prompt when forwarding a message.",
     "missing": false,
     "obsolete": false
+  },
+  "label_new_password": {
+    "translation": "新密碼",
+    "defaultMessage": "New password",
+    "description": "Label for entering a new password",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/zh.json

@@ -1353,5 +1353,12 @@
     "description": "Contact search prompt when forwarding a message.",
     "missing": false,
     "obsolete": false
+  },
+  "label_new_password": {
+    "translation": "新密码",
+    "defaultMessage": "New password",
+    "description": "Label for entering a new password",
+    "missing": false,
+    "obsolete": false
   }
 }

src/views/password-reset-view.jsx

@@ -53,15 +53,21 @@ export default class PasswordResetView extends React.PureComponent {
     return (
       <form id="password-reset-form" onSubmit={this.handleSubmit}>
         {(this.state.token && this.state.scheme) ?
+          <><label htmlFor="new-password">
+            <FormattedMessage id="label_new_password"
+              defaultMessage="New password"
+              description="Label for entering a new password" />
+          </label>
           <FormattedMessage id="new_password_placeholder" defaultMessage="Enter new password"
             description="Placeholder for entering new password">{
             (placeholder) => <VisiblePassword
+              id="new-password"
               placeholder={placeholder}
               autoComplete="new-password"
               value={this.state.password}
               required={true} autoFocus={true}
               onChange={this.handlePasswordChange} />
-          }</FormattedMessage>
+          }</FormattedMessage></>
         : this.state.sent ?
           <>
             <br/>

src/views/tinode-web.jsx

@@ -288,9 +288,12 @@ class TinodeWeb extends React.Component {
         });
       }
 
-      // Save possible topic name and navigate to blank state.
+      // Maybe navigate to home screen.
-      this.setState({requestedTopic: parsedNav.path[1]});
+      if (!['cred', 'reset', 'register'].includes(parsedNav.path[0])) {
-      HashNavigation.navigateTo('');
+        // Save possible topic name.
+        this.setState({requestedTopic: parsedNav.path[1]});
+        HashNavigation.navigateTo('');
+      }
 
       this.readTimer = null;
       this.readTimerCallback = null;
@@ -1199,6 +1202,8 @@ class TinodeWeb extends React.Component {
       delete parsed.params.code;
       delete parsed.params.method;
       delete parsed.params.tab;
+      delete parsed.params.scheme;
+      delete parsed.params.token;
     }
     HashNavigation.navigateTo(HashNavigation.composeUrlHash(parsed.path, parsed.params));
     this.setState({errorText: '', errorLevel: null});
@@ -1611,6 +1616,9 @@ class TinodeWeb extends React.Component {
         .then(() => {
           return this.tinode.updateAccountBasic(null, null, newPassword, {token: token});
         })
+        .then(() => {
+          HashNavigation.navigateTo('');
+        })
         .catch((err) => {
           // Socket error
           this.handleError(err.message, 'err');