Merge remote-tracking branch 'origin/experimental' into dbkr/sas

src/components/views/dialogs/LogoutDialog.js

@@ -138,7 +138,9 @@ export default class LogoutDialog extends React.Component {
                     // once you can restorew a backup by verifying a device
                     description={_t(
                         "When signing in again, you can access encrypted chat history by " +
-                        "restoring your key backup. You'll need your recovery key.",
+                        "restoring your key backup. You'll need your recovery passphrase " +
+                        "or, if you didn't set a recovery passphrase, your recovery key " +
+                        "(that you downloaded).",
                     )}
                     button={_t("Sign out")}
                     onFinished={this._onFinished}

src/components/views/dialogs/RoomSettingsDialog.js

@@ -0,0 +1,90 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {Tab, TabbedView} from "../../structures/TabbedView";
+import {_t, _td} from "../../../languageHandler";
+import AccessibleButton from "../elements/AccessibleButton";
+import dis from '../../../dispatcher';
+
+// TODO: Ditch this whole component
+export class TempTab extends React.Component {
+    static propTypes = {
+        onClose: PropTypes.func.isRequired,
+    };
+
+    componentDidMount(): void {
+        dis.dispatch({action: "open_old_room_settings"});
+        this.props.onClose();
+    }
+
+    render() {
+        return <div>Hello World</div>;
+    }
+}
+
+export default class UserSettingsDialog extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    _getTabs() {
+        const tabs = [];
+
+        tabs.push(new Tab(
+            _td("General"),
+            "mx_RoomSettingsDialog_settingsIcon",
+            <div>General Test</div>,
+        ));
+        tabs.push(new Tab(
+            _td("Security & Privacy"),
+            "mx_RoomSettingsDialog_securityIcon",
+            <div>Security Test</div>,
+        ));
+        tabs.push(new Tab(
+            _td("Roles & Permissions"),
+            "mx_RoomSettingsDialog_rolesIcon",
+            <div>Roles Test</div>,
+        ));
+        tabs.push(new Tab(
+            _td("Advanced"),
+            "mx_RoomSettingsDialog_warningIcon",
+            <div>Advanced Test</div>,
+        ));
+        tabs.push(new Tab(
+            _td("Visit old settings"),
+            "mx_RoomSettingsDialog_warningIcon",
+            <TempTab onClose={this.props.onFinished} />,
+        ));
+
+        return tabs;
+    }
+
+    render() {
+        return (
+            <div className="mx_RoomSettingsDialog">
+                <div className="mx_SettingsDialog_header">
+                    {_t("Settings")}
+                    <span className="mx_SettingsDialog_close">
+                        <AccessibleButton className="mx_SettingsDialog_closeIcon" onClick={this.props.onFinished} />
+                    </span>
+                </div>
+                <TabbedView tabs={this._getTabs()} />
+            </div>
+        );
+    }
+}

src/components/views/dialogs/SetMxIdDialog.js

@@ -193,9 +193,6 @@ export default React.createClass({
             return;
         }
 
-        // XXX Implement RTS /register here
-        const teamToken = null;
-
         this.props.onFinished(true, {
             userId: response.user_id,
             deviceId: response.device_id,
@@ -203,7 +200,6 @@ export default React.createClass({
             identityServerUrl: this._matrixClient.getIdentityServerUrl(),
             accessToken: response.access_token,
             password: this._generatedPassword,
-            teamToken: teamToken,
         });
     },
 

src/components/views/dialogs/SetPasswordDialog.js

@@ -116,9 +116,8 @@ export default React.createClass({
                     <ChangePassword
                         className="mx_SetPasswordDialog_change_password"
                         rowClassName=""
-                        rowLabelClassName=""
-                        rowInputClassName=""
-                        buttonClassName="mx_Dialog_primary mx_SetPasswordDialog_change_password_button"
+                        buttonClassNames="mx_Dialog_primary mx_SetPasswordDialog_change_password_button"
+                        buttonKind="primary"
                         confirm={false}
                         autoFocusNewPasswordInput={true}
                         shouldAskForEmail={true}

src/components/views/dialogs/UserSettingsDialog.js

@@ -21,6 +21,13 @@ import {_t, _td} from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 import GeneralSettingsTab from "../settings/tabs/GeneralSettingsTab";
 import dis from '../../../dispatcher';
+import SettingsStore from "../../../settings/SettingsStore";
+import LabsSettingsTab from "../settings/tabs/LabsSettingsTab";
+import SecuritySettingsTab from "../settings/tabs/SecuritySettingsTab";
+import NotificationSettingsTab from "../settings/tabs/NotificationSettingsTab";
+import PreferencesSettingsTab from "../settings/tabs/PreferencesSettingsTab";
+import VoiceSettingsTab from "../settings/tabs/VoiceSettingsTab";
+import HelpSettingsTab from "../settings/tabs/HelpSettingsTab";
 
 // TODO: Ditch this whole component
 export class TempTab extends React.Component {
@@ -44,52 +51,61 @@ export default class UserSettingsDialog extends React.Component {
     };
 
     _getTabs() {
-        return [
-            new Tab(
-                _td("General"),
-                "mx_UserSettingsDialog_settingsIcon",
-                <GeneralSettingsTab />,
-            ),
-            new Tab(
-                _td("Notifications"),
-                "mx_UserSettingsDialog_bellIcon",
-                <div>Notifications Test</div>,
-            ),
-            new Tab(
-                _td("Preferences"),
-                "mx_UserSettingsDialog_preferencesIcon",
-                <div>Preferences Test</div>,
-            ),
-            new Tab(
-                _td("Voice & Video"),
-                "mx_UserSettingsDialog_voiceIcon",
-                <div>Voice Test</div>,
-            ),
-            new Tab(
-                _td("Security & Privacy"),
-                "mx_UserSettingsDialog_securityIcon",
-                <div>Security Test</div>,
-            ),
-            new Tab(
-                _td("Help & About"),
-                "mx_UserSettingsDialog_helpIcon",
-                <div>Help Test</div>,
-            ),
-            new Tab(
-                _td("Visit old settings"),
-                "mx_UserSettingsDialog_helpIcon",
-                <TempTab onClose={this.props.onFinished} />,
-            ),
-        ];
+        const tabs = [];
+
+        tabs.push(new Tab(
+            _td("General"),
+            "mx_UserSettingsDialog_settingsIcon",
+            <GeneralSettingsTab />,
+        ));
+        tabs.push(new Tab(
+            _td("Notifications"),
+            "mx_UserSettingsDialog_bellIcon",
+            <NotificationSettingsTab />,
+        ));
+        tabs.push(new Tab(
+            _td("Preferences"),
+            "mx_UserSettingsDialog_preferencesIcon",
+            <PreferencesSettingsTab />,
+        ));
+        tabs.push(new Tab(
+            _td("Voice & Video"),
+            "mx_UserSettingsDialog_voiceIcon",
+            <VoiceSettingsTab />,
+        ));
+        tabs.push(new Tab(
+            _td("Security & Privacy"),
+            "mx_UserSettingsDialog_securityIcon",
+            <SecuritySettingsTab />,
+        ));
+        if (SettingsStore.getLabsFeatures().length > 0) {
+            tabs.push(new Tab(
+                _td("Labs"),
+                "mx_UserSettingsDialog_labsIcon",
+                <LabsSettingsTab />,
+            ));
+        }
+        tabs.push(new Tab(
+            _td("Help & About"),
+            "mx_UserSettingsDialog_helpIcon",
+            <HelpSettingsTab closeSettingsFn={this.props.onFinished} />,
+        ));
+        tabs.push(new Tab(
+            _td("Visit old settings"),
+            "mx_UserSettingsDialog_helpIcon",
+            <TempTab onClose={this.props.onFinished} />,
+        ));
+
+        return tabs;
     }
 
     render() {
         return (
             <div className="mx_UserSettingsDialog">
-                <div className="mx_UserSettingsDialog_header">
+                <div className="mx_SettingsDialog_header">
                     {_t("Settings")}
-                    <span className="mx_UserSettingsDialog_close">
-                        <AccessibleButton className="mx_UserSettingsDialog_closeIcon" onClick={this.props.onFinished} />
+                    <span className="mx_SettingsDialog_close">
+                        <AccessibleButton className="mx_SettingsDialog_closeIcon" onClick={this.props.onFinished} />
                     </span>
                 </div>
                 <TabbedView tabs={this._getTabs()} />