Fix merge conflict

2017-10-02 17:57:22 +02:00 · 2017-10-02 17:57:22 +02:00 · a96169e80e
commit a96169e80e
parent 35cb52febc 8d189cc322
74 changed files with 506 additions and 438 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -40,6 +40,19 @@ module.exports = {
        }],
        "react/jsx-key": ["error"],

+        // Assert no spacing in JSX curly brackets
+        // <Element prop={ consideredError} prop={notConsideredError} />
+        //
+        // https://github.com/yannickcr/eslint-plugin-react/blob/HEAD/docs/rules/jsx-curly-spacing.md
+        "react/jsx-curly-spacing": ["error", {"when": "never", "children": {"when": "always"}}],
+
+        // Assert spacing before self-closing JSX tags, and no spacing before or
+        // after the closing slash, and no spacing after the opening bracket of
+        // the opening tag or closing tag.
+        //
+        // https://github.com/yannickcr/eslint-plugin-react/blob/HEAD/docs/rules/jsx-tag-spacing.md
+        "react/jsx-tag-spacing": ["error"],
+
        /** flowtype **/
        "flowtype/require-parameter-type": ["warn", {
            "excludeArrowFunctions": true,
--- a/jenkins.sh
+++ b/jenkins.sh
@ -21,9 +21,7 @@ npm run test -- --no-colors
 npm run lintall -- -f checkstyle -o eslint.xml || true

 # re-run the linter, excluding any files known to have errors or warnings.
-./node_modules/.bin/eslint --max-warnings 0 \
-    --ignore-path .eslintignore.errorfiles \
-    src test
+npm run lintwithexclusions

 # delete the old tarball, if it exists
 rm -f matrix-react-sdk-*.tgz
--- a/package.json
+++ b/package.json
@ -39,6 +39,7 @@
    "start": "parallelshell \"npm run build:watch\" \"npm run reskindex:watch\"",
    "lint": "eslint src/",
    "lintall": "eslint src/ test/",
+    "lintwithexclusions": "eslint --max-warnings 0 --ignore-path .eslintignore.errorfiles src test",
    "clean": "rimraf lib",
    "prepublish": "npm run clean && npm run build && git rev-parse HEAD > git-revision.txt",
    "test": "karma start --single-run=true --browsers ChromeHeadless",
@ -99,7 +100,7 @@
    "eslint-config-google": "^0.7.1",
    "eslint-plugin-babel": "^4.0.1",
    "eslint-plugin-flowtype": "^2.30.0",
-    "eslint-plugin-react": "^6.9.0",
+    "eslint-plugin-react": "^7.4.0",
    "expect": "^1.16.0",
    "json-loader": "^0.5.3",
    "karma": "^1.7.0",
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@ -6,6 +6,4 @@ npm run test
 ./.travis-test-riot.sh

 # run the linter, but exclude any files known to have errors or warnings.
-./node_modules/.bin/eslint --max-warnings 0 \
-    --ignore-path .eslintignore.errorfiles \
-    src test
+npm run lintwithexclusions
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@ -27,7 +27,7 @@ export function showGroupInviteDialog(groupId) {
        description: _t("Who would you like to add to this group?"),
        placeholder: _t("Name or matrix ID"),
        button: _t("Invite to Group"),
-        validAddressTypes: ['mx'],
+        validAddressTypes: ['mx-user-id'],
        onFinished: (success, addrs) => {
            if (!success) return;

@ -45,7 +45,7 @@ export function showGroupAddRoomDialog(groupId) {
            placeholder: _t("Room name or alias"),
            button: _t("Add to group"),
            pickerType: 'room',
-            validAddressTypes: ['mx'],
+            validAddressTypes: ['mx-room-id'],
            onFinished: (success, addrs) => {
                if (!success) return;

--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@ -28,7 +28,7 @@ export function inviteToRoom(roomId, addr) {

    if (addrType == 'email') {
        return MatrixClientPeg.get().inviteByEmail(roomId, addr);
-    } else if (addrType == 'mx') {
+    } else if (addrType == 'mx-user-id') {
        return MatrixClientPeg.get().invite(roomId, addr);
    } else {
        throw new Error('Unsupported address');
--- a/src/UserAddress.js
+++ b/src/UserAddress.js
@ -16,11 +16,12 @@ limitations under the License.

 const emailRegex = /^\S+@\S+\.\S+$/;

-const mxidRegex = /^@\S+:\S+$/;
+const mxUserIdRegex = /^@\S+:\S+$/;
+const mxRoomIdRegex = /^!\S+:\S+$/;

 import PropTypes from 'prop-types';
 export const addressTypes = [
-    'mx', 'email',
+    'mx-user-id', 'mx-room-id', 'email',
 ];

 // PropType definition for an object describing
@ -41,13 +42,16 @@ export const UserAddressType = PropTypes.shape({

 export function getAddressType(inputText) {
    const isEmailAddress = emailRegex.test(inputText);
-    const isMatrixId = mxidRegex.test(inputText);
+    const isUserId = mxUserIdRegex.test(inputText);
+    const isRoomId = mxRoomIdRegex.test(inputText);

    // sanity check the input for user IDs
    if (isEmailAddress) {
        return 'email';
-    } else if (isMatrixId) {
-        return 'mx';
+    } else if (isUserId) {
+        return 'mx-user-id';
+    } else if (isRoomId) {
+        return 'mx-room-id';
    } else {
        return null;
    }
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@ -35,7 +35,7 @@ export default {
        },
        {
            name: "-",
-            id: 'feature_flair',
+            id: 'feature_groups',
            default: false,
        },
    ],
@ -43,7 +43,7 @@ export default {
    // horrible but it works. The locality makes this somewhat more palatable.
    doTranslations: function() {
        this.LABS_FEATURES[0].name = _t("Matrix Apps");
-        this.LABS_FEATURES[1].name = _t("Flair");
+        this.LABS_FEATURES[1].name = _t("Groups");
    },

    loadProfileInfo: function() {
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@ -72,7 +72,7 @@ const CategoryRoomList = React.createClass({
            placeholder: _t("Room name or alias"),
            button: _t("Add to summary"),
            pickerType: 'room',
-            validAddressTypes: ['mx'],
+            validAddressTypes: ['mx-room-id'],
            groupId: this.props.groupId,
            onFinished: (success, addrs) => {
                if (!success) return;
@ -122,7 +122,9 @@ const CategoryRoomList = React.createClass({

        let catHeader = <div />;
        if (this.props.category && this.props.category.profile) {
-            catHeader = <div className="mx_GroupView_featuredThings_category">{this.props.category.profile.name}</div>;
+            catHeader = <div className="mx_GroupView_featuredThings_category">
+            { this.props.category.profile.name }
+        </div>;
        }
        return <div className="mx_GroupView_featuredThings_container">
            { catHeader }
@ -179,20 +181,26 @@ const FeaturedRoom = React.createClass({
    render: function() {
        const RoomAvatar = sdk.getComponent("avatars.RoomAvatar");

+        const roomName = this.props.summaryInfo.profile.name ||
+            this.props.summaryInfo.profile.canonical_alias ||
+            _t("Unnamed Room");
+
        const oobData = {
            roomId: this.props.summaryInfo.room_id,
            avatarUrl: this.props.summaryInfo.profile.avatar_url,
-            name: this.props.summaryInfo.profile.name,
+            name: roomName,
        };
+
        let permalink = null;
        if (this.props.summaryInfo.profile && this.props.summaryInfo.profile.canonical_alias) {
            permalink = 'https://matrix.to/#/' + this.props.summaryInfo.profile.canonical_alias;
        }
+
        let roomNameNode = null;
        if (permalink) {
-            roomNameNode = <a href={permalink} onClick={this.onClick} >{this.props.summaryInfo.profile.name}</a>;
+            roomNameNode = <a href={permalink} onClick={this.onClick} >{ roomName }</a>;
        } else {
-            roomNameNode = <span>{this.props.summaryInfo.profile.name}</span>;
+            roomNameNode = <span>{ roomName }</span>;
        }

        const deleteButton = this.props.editing ?
@ -237,8 +245,9 @@ const RoleUserList = React.createClass({
            description: _t("Who would you like to add to this summary?"),
            placeholder: _t("Name or matrix ID"),
            button: _t("Add to summary"),
-            validAddressTypes: ['mx'],
+            validAddressTypes: ['mx-user-id'],
            groupId: this.props.groupId,
+            shouldOmitSelf: false,
            onFinished: (success, addrs) => {
                if (!success) return;
                const errorList = [];
@ -843,8 +852,8 @@ export default React.createClass({
                    </AccessibleButton>,
                );
                rightButtons.push(
-                    <AccessibleButton className='mx_GroupView_textButton' onClick={this._onCancelClick} key="_cancelButton">
-                        <img src="img/cancel.svg" className='mx_filterFlipColor'
+                    <AccessibleButton className="mx_RoomHeader_cancelButton" onClick={this._onCancelClick} key="_cancelButton">
+                        <img src="img/cancel.svg" className="mx_filterFlipColor"
                            width="18" height="18" alt={_t("Cancel")} />
                    </AccessibleButton>,
                );
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@ -102,7 +102,7 @@ export default withMatrixClient(React.createClass({
        }

        return <div className="mx_MyGroups">
-            <SimpleRoomHeader title={ _t("Groups") } />
+            <SimpleRoomHeader title={_t("Groups")} icon="img/icons-groups.svg" />
            <div className='mx_MyGroups_joinCreateBox'>
                <div className="mx_MyGroups_createBox">
                    <div className="mx_MyGroups_joinCreateHeader">
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@ -13,11 +13,10 @@ 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.
 */
-var React = require('react');
-var ContentRepo = require("matrix-js-sdk").ContentRepo;
-var MatrixClientPeg = require('../../../MatrixClientPeg');
-var Avatar = require('../../../Avatar');
-var sdk = require("../../../index");
+import React from "react";
+import {ContentRepo} from "matrix-js-sdk";
+import MatrixClientPeg from "../../../MatrixClientPeg";
+import sdk from "../../../index";

 module.exports = React.createClass({
    displayName: 'RoomAvatar',
@ -30,7 +29,7 @@ module.exports = React.createClass({
        oobData: React.PropTypes.object,
        width: React.PropTypes.number,
        height: React.PropTypes.number,
-        resizeMethod: React.PropTypes.string
+        resizeMethod: React.PropTypes.string,
    },

    getDefaultProps: function() {
@ -44,13 +43,13 @@ module.exports = React.createClass({

    getInitialState: function() {
        return {
-            urls: this.getImageUrls(this.props)
+            urls: this.getImageUrls(this.props),
        };
    },

    componentWillReceiveProps: function(newProps) {
        this.setState({
-            urls: this.getImageUrls(newProps)
+            urls: this.getImageUrls(newProps),
        });
    },

@ -61,11 +60,10 @@ module.exports = React.createClass({
                props.oobData.avatarUrl,
                Math.floor(props.width * window.devicePixelRatio),
                Math.floor(props.height * window.devicePixelRatio),
-                props.resizeMethod
+                props.resizeMethod,
            ), // highest priority
            this.getRoomAvatarUrl(props),
-            this.getOneToOneAvatar(props),
-            this.getFallbackAvatar(props) // lowest priority
+            this.getOneToOneAvatar(props), // lowest priority
        ].filter(function(url) {
            return (url != null && url != "");
        });
@ -79,17 +77,17 @@ module.exports = React.createClass({
            Math.floor(props.width * window.devicePixelRatio),
            Math.floor(props.height * window.devicePixelRatio),
            props.resizeMethod,
-            false
+            false,
        );
    },

    getOneToOneAvatar: function(props) {
        if (!props.room) return null;

-        var mlist = props.room.currentState.members;
-        var userIds = [];
+        const mlist = props.room.currentState.members;
+        const userIds = [];
        // for .. in optimisation to return early if there are >2 keys
-        for (var uid in mlist) {
+        for (const uid in mlist) {
            if (mlist.hasOwnProperty(uid)) {
                userIds.push(uid);
            }
@ -99,7 +97,7 @@ module.exports = React.createClass({
        }

        if (userIds.length == 2) {
-            var theOtherGuy = null;
+            let theOtherGuy = null;
            if (mlist[userIds[0]].userId == MatrixClientPeg.get().credentials.userId) {
                theOtherGuy = mlist[userIds[1]];
            } else {
@ -110,7 +108,7 @@ module.exports = React.createClass({
                Math.floor(props.width * window.devicePixelRatio),
                Math.floor(props.height * window.devicePixelRatio),
                props.resizeMethod,
-                false
+                false,
            );
        } else if (userIds.length == 1) {
            return mlist[userIds[0]].getAvatarUrl(
@ -118,37 +116,24 @@ module.exports = React.createClass({
                Math.floor(props.width * window.devicePixelRatio),
                Math.floor(props.height * window.devicePixelRatio),
                props.resizeMethod,
-                false
+                false,
            );
        } else {
           return null;
        }
    },

-    getFallbackAvatar: function(props) {
-        let roomId = null;
-        if (props.oobData && props.oobData.roomId) {
-            roomId = this.props.oobData.roomId;
-        } else if (props.room) {
-            roomId = props.room.roomId;
-        } else {
-            return null;
-        }
-
-        return Avatar.defaultAvatarUrlForString(roomId);
-    },
-
    render: function() {
-        var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
+        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");

-        var {room, oobData, ...otherProps} = this.props;
+        const {room, oobData, ...otherProps} = this.props;

-        var roomName = room ? room.name : oobData.name;
+        const roomName = room ? room.name : oobData.name;

        return (
            <BaseAvatar {...otherProps} name={roomName}
                idName={room ? room.roomId : null}
                urls={this.state.urls} />
        );
-    }
+    },
 });
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@ -41,7 +41,11 @@ module.exports = React.createClass({
        validAddressTypes: PropTypes.arrayOf(PropTypes.oneOf(addressTypes)),
        onFinished: PropTypes.func.isRequired,
        groupId: PropTypes.string,
+        // The type of entity to search for. Default: 'user'.
        pickerType: PropTypes.oneOf(['user', 'room']),
+        // Whether the current user should be included in the addresses returned. Only
+        // applicable when pickerType is `user`. Default: false.
+        includeSelf: PropTypes.bool,
    },

    getDefaultProps: function() {
@ -50,6 +54,7 @@ module.exports = React.createClass({
            focus: true,
            validAddressTypes: addressTypes,
            pickerType: 'user',
+            includeSelf: false,
        };
    },

@ -358,7 +363,7 @@ module.exports = React.createClass({
        results.forEach((result) => {
            if (result.room_id) {
                queryList.push({
-                    addressType: 'mx',
+                    addressType: 'mx-room-id',
                    address: result.room_id,
                    displayName: result.name,
                    avatarMxc: result.avatar_url,
@ -366,14 +371,16 @@ module.exports = React.createClass({
                });
                return;
            }
-            if (result.user_id === MatrixClientPeg.get().credentials.userId) {
+            if (!this.props.includeSelf &&
+                result.user_id === MatrixClientPeg.get().credentials.userId
+            ) {
                return;
            }

            // Return objects, structure of which is defined
            // by UserAddressType
            queryList.push({
-                addressType: 'mx',
+                addressType: 'mx-user-id',
                address: result.user_id,
                displayName: result.display_name,
                avatarMxc: result.avatar_url,
@ -412,16 +419,23 @@ module.exports = React.createClass({
            address: addressText,
            isKnown: false,
        };
-        if (addrType == null) {
+        if (!this.props.validAddressTypes.includes(addrType)) {
            this.setState({ error: true });
            return null;
-        } else if (addrType == 'mx') {
+        } else if (addrType == 'mx-user-id') {
            const user = MatrixClientPeg.get().getUser(addrObj.address);
            if (user) {
                addrObj.displayName = user.displayName;
                addrObj.avatarMxc = user.avatarUrl;
                addrObj.isKnown = true;
            }
+        } else if (addrType == 'mx-room-id') {
+            const room = MatrixClientPeg.get().getRoom(addrObj.address);
+            if (room) {
+                addrObj.displayName = room.name;
+                addrObj.avatarMxc = room.avatarUrl;
+                addrObj.isKnown = true;
+            }
        }

        const userList = this.state.userList.slice();
@ -503,8 +517,21 @@ module.exports = React.createClass({
        let error;
        let addressSelector;
        if (this.state.error) {
+            let tryUsing = '';
+            const validTypeDescriptions = this.props.validAddressTypes.map((t) => {
+                return {
+                    'mx-user-id': _t("Matrix ID"),
+                    'mx-room-id': _t("Matrix Room ID"),
+                    'email': _t("email address"),
+                }[t];
+            });
+            tryUsing = _t("Try using one of the following valid address types: %(validTypesList)s.", {
+                validTypesList: validTypeDescriptions.join(", "),
+            });
            error = <div className="mx_ChatInviteDialog_error">
-                {_t("You have entered an invalid contact. Try using their Matrix ID or email address.")}
+                { _t("You have entered an invalid address.") }
+                <br />
+                { tryUsing }
            </div>;
        } else if (this.state.searchError) {
            error = <div className="mx_ChatInviteDialog_error">{ this.state.searchError }</div>;
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@ -45,11 +45,12 @@ export default React.createClass({
        const address = this.props.address;
        const name = address.displayName || address.address;

-        let imgUrls = [];
+        const imgUrls = [];
+        const isMatrixAddress = ['mx-user-id', 'mx-room-id'].includes(address.addressType);

-        if (address.addressType === "mx" && address.avatarMxc) {
+        if (isMatrixAddress && address.avatarMxc) {
            imgUrls.push(MatrixClientPeg.get().mxcUrlToHttp(
-                address.avatarMxc, 25, 25, 'crop'
+                address.avatarMxc, 25, 25, 'crop',
            ));
        } else if (address.addressType === 'email') {
            imgUrls.push('img/icon-email-user.svg');
@ -77,7 +78,7 @@ export default React.createClass({

        let info;
        let error = false;
-        if (address.addressType === "mx" && address.isKnown) {
+        if (isMatrixAddress && address.isKnown) {
            const idClasses = classNames({
                "mx_AddressTile_id": true,
                "mx_AddressTile_justified": this.props.justified,
@ -89,7 +90,7 @@ export default React.createClass({
                    <div className={idClasses}>{ address.address }</div>
                </div>
            );
-        } else if (address.addressType === "mx") {
+        } else if (isMatrixAddress) {
            const unknownMxClasses = classNames({
                "mx_AddressTile_unknownMx": true,
                "mx_AddressTile_justified": this.props.justified,
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@ -157,7 +157,12 @@ class FlairAvatar extends React.Component {
    render() {
        const httpUrl = this.context.matrixClient.mxcUrlToHttp(
            this.props.groupProfile.avatarUrl, 14, 14, 'scale', false);
-        return <img src={httpUrl} width="14px" height="14px" onClick={this.onClick}/>;
+        return <img
+            src={httpUrl}
+            width="14px"
+            height="14px"
+            onClick={this.onClick}
+            title={this.props.groupProfile.groupId} />;
    }
 }

@ -186,7 +191,7 @@ export default class Flair extends React.Component {

    componentWillMount() {
        this._unmounted = false;
-        if (UserSettingsStore.isFeatureEnabled('feature_flair') && groupSupport) {
+        if (UserSettingsStore.isFeatureEnabled('feature_groups') && groupSupport) {
            this._generateAvatars();
        }
    }
--- a/src/components/views/elements/GroupsButton.js
+++ b/src/components/views/elements/GroupsButton.js
@ -0,0 +1,38 @@
+/*
+Copyright 2017 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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+import { _t } from '../../../languageHandler';
+
+const GroupsButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="view_my_groups"
+            label={_t("Groups")}
+            iconPath="img/icons-groups.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+GroupsButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default GroupsButton;
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@ -124,7 +124,9 @@ export default withMatrixClient(React.createClass({
    render: function() {
        if (this.state.fetching) {
            const Spinner = sdk.getComponent("elements.Spinner");
-            return <Spinner />;
+            return (<div className="mx_MemberList">
+                <Spinner />
+            </div>);
        } else if (this.state.members === null) {
            return null;
        }
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@ -372,7 +372,7 @@ module.exports = React.createClass({
    },

    _getChildrenInvited: function(start, end) {
-        return this._makeMemberTiles(this.state.filteredInvitedMembers.slice(start, end));
+        return this._makeMemberTiles(this.state.filteredInvitedMembers.slice(start, end), 'invite');
    },

    _getChildCountInvited: function() {
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@ -734,7 +734,6 @@
    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNUNG: SCHLÜSSEL-VERIFIZIERUNG FEHLGESCHLAGEN! Der Signatur-Schlüssel für %(userId)s und das Gerät %(deviceId)s ist \"%(fprint)s\", welcher nicht mit dem bereitgestellten Schlüssel \"%(fingerprint)s\" übereinstimmt. Dies kann bedeuten, dass deine Kommunikation abgehört wird!",
    "You have <a>disabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>deaktiviert</a>.",
    "You have <a>enabled</a> URL previews by default.": "Du hast die URL-Vorschau standardmäßig <a>aktiviert</a>.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Du hast einen ungültigen Kontakt eingegeben. Versuche es mit der Matrix-Kennung oder der E-Mail-Adresse des Kontakts.",
    "$senderDisplayName changed the room avatar to <img/>": "$senderDisplayName hat das Raum-Bild geändert zu <img/>",
    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s hat das Raum-Bild für %(roomName)s geändert",
    "Hide removed messages": "Gelöschte Nachrichten verbergen",
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@ -685,7 +685,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Έχετε αποσυνδεθεί από όλες τις συσκευές και δεν θα λαμβάνετε πλέον ειδοποιήσεις push. Για να ενεργοποιήσετε τις ειδοποιήσεις, συνδεθείτε ξανά σε κάθε συσκευή",
    "You have <a>disabled</a> URL previews by default.": "Έχετε <a>απενεργοποιημένη</a> από προεπιλογή την προεπισκόπηση συνδέσμων.",
    "You have <a>enabled</a> URL previews by default.": "Έχετε <a>ενεργοποιημένη</a> από προεπιλογή την προεπισκόπηση συνδέσμων.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Έχετε πληκτρολογήσει μια άκυρη επαφή. Χρησιμοποιήστε το Matrix ID ή την ηλεκτρονική διεύθυνση αλληλογραφίας τους.",
    "You may wish to login with a different account, or add this email to this account.": "Μπορεί να θέλετε να συνδεθείτε με διαφορετικό λογαριασμό, ή να προσθέσετε αυτή τη διεύθυνση ηλεκτρονικής αλληλογραφίας σε αυτόν τον λογαριασμό.",
    "You need to be able to invite users to do that.": "Για να το κάνετε αυτό πρέπει να έχετε τη δυνατότητα να προσκαλέσετε χρήστες.",
    "You seem to be uploading files, are you sure you want to quit?": "Φαίνεται ότι αποστέλετε αρχεία, είστε βέβαιοι ότι θέλετε να αποχωρήσετε;",
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@ -554,7 +554,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device",
    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "You have entered an invalid contact. Try using their Matrix ID or email address.",
    "You have no visible notifications": "You have no visible notifications",
    "You may wish to login with a different account, or add this email to this account.": "You may wish to login with a different account, or add this email to this account.",
    "you must be a": "you must be a",
@ -894,5 +893,10 @@
    "Unpublish": "Unpublish",
    "This group is published on your profile": "This group is published on your profile",
    "Publish": "Publish",
-    "This group is not published on your profile": "This group is not published on your profile"
+    "This group is not published on your profile": "This group is not published on your profile",
+    "Matrix ID": "Matrix ID",
+    "Matrix Room ID": "Matrix Room ID",
+    "email address": "email address",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Try using one of the following valid address types: %(validTypesList)s.",
+    "You have entered an invalid address.": "You have entered an invalid address."
 }
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@ -478,7 +478,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device",
    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "You have entered an invalid contact. Try using their Matrix ID or email address.",
    "You have no visible notifications": "You have no visible notifications",
    "you must be a": "you must be a",
    "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@ -621,7 +621,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Ha sido desconectado de todos los dispositivos y no continuara recibiendo notificaciones. Para volver a habilitar las notificaciones, vuelva a conectarse en cada dispositivo",
    "You have <a>disabled</a> URL previews by default.": "Ha <a>deshabilitado</a> la vista previa de URL por defecto.",
    "You have <a>enabled</a> URL previews by default.": "Ha <a>habilitado</a> vista previa de URL por defecto.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Ha ingresado un contacto no valido. Intente usando la ID Matrix o e-mail del contacto.",
    "You have no visible notifications": "No tiene notificaciones visibles",
    "You may wish to login with a different account, or add this email to this account.": "Puede ingresar con una cuenta diferente, o agregar este e-mail a esta cuenta.",
    "you must be a": "usted debe ser un",
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@ -555,7 +555,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Saioa amaitu duzu eta ez dituzu jakinarazpenak jasoko. Jakinarazpenak jaso nahi badituzu hasi saioa berriro gailu bakoitzean",
    "You have <a>disabled</a> URL previews by default.": "Lehenetsita URLak aurreikustea <a>desgaitu</a> duzu.",
    "You have <a>enabled</a> URL previews by default.": "Lehenetsita URLak aurreikustea <a>gaitu</a> duzu.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Kontaktu baliogabea sartu duzu. Saiatu bere Matrix ID-a edo e-mail helbidea erabiltzen.",
    "You have no visible notifications": "Ez daukazu jakinarazpen ikusgairik",
    "You may wish to login with a different account, or add this email to this account.": "Agian beste kontu batekin hasi nahi duzu saioa, edo e-mail hau kontu honetara gehitu.",
    "you must be a": "hau izan behar duzu:",
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@ -679,7 +679,6 @@
    "Tagged as: ": "Étiquetter comme : ",
    "You have <a>disabled</a> URL previews by default.": "Vous avez <a>désactivé</a> les aperçus d’URL par défaut.",
    "You have <a>enabled</a> URL previews by default.": "Vous avez <a>activé</a> les aperçus d’URL par défaut.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Vous avez entré un contact invalide. Essayez d’utiliser leur identifiant Matrix ou leur adresse email.",
    "Hide removed messages": "Cacher les messages supprimés",
    "Add": "Ajouter",
    "%(count)s new messages|one": "%(count)s nouveau message",
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@ -529,7 +529,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Kijelentkeztél minden eszközről így nem fogsz \"push\" értesítéseket kapni. Az értesítések engedélyezéséhez jelentkezz vissza mindegyik eszközön",
    "You have <a>disabled</a> URL previews by default.": "Az URL előnézet alapból <a>tiltva</a> van.",
    "You have <a>enabled</a> URL previews by default.": "Az URL előnézet alapból <a>engedélyezve</a> van.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Érvénytelen kapcsolatot adtál meg. Próbáld meg a Matrix azonosítóját vagy e-mail címét használni.",
    "You have no visible notifications": "Nincsenek látható értesítéseid",
    "You may wish to login with a different account, or add this email to this account.": "Lehet, hogy más fiókba szeretnél belépni vagy ezt az e-mail címet szeretnéd ehhez a fiókhoz kötni.",
    "you must be a": "szükséges  szerep:",
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@ -535,7 +535,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "모든 장치에서 로그아웃되었고 더 이상 알림을 받지 않으실 거에요. 다시 알림을 받으시려면, 각 장치에 로그인해주세요",
    "You have <a>disabled</a> URL previews by default.": "URL 미리보기 <a>쓰지 않기</a>를 기본으로 하셨어요.",
    "You have <a>enabled</a> URL previews by default.": "URL 미리보기 <a>쓰기</a>를 기본으로 하셨어요.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "잘못된 연락처를 입력하셨어요. 매트릭스 ID나 이메일 주소를 써보세요.",
    "You have no visible notifications": "보여드릴 알림이 없어요",
    "You may wish to login with a different account, or add this email to this account.": "다른 계정으로 로그인하거나, 이 이메일을 이 계정에 추가할 수도 있어요.",
    "you must be a": "해야해요",
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@ -593,7 +593,6 @@
    "You cannot place VoIP calls in this browser.": "Tu nevari veikt VoIP zvanus šajā pārlūkā.",
    "You do not have permission to post to this room": "Tev nav vajadzīgās atļaujas pievienot ziņas šajā istabā",
    "You have <a>disabled</a> URL previews by default.": "URL priekšskatījums pēc noklusējuma Tev ir <a>atspējots</a>.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Tu ievadīji nepareizu kontaktu. Mēģini izmantot viņa Matrix ID vai epasta adresi.",
    "You may wish to login with a different account, or add this email to this account.": "Tu varētu, iespējams, vēlēties pierakstīties no cita konta vai piesaistīt šo epastu šim kontam.",
    "you must be a": "Tev ir jābūt",
    "You must <a>register</a> to use this functionality": "Lai izmantotu šo funkcionalitāti, Tev ir <a>jāreģistrējas</a>",
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@ -560,7 +560,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Je bent op alle apparaten uitgelegd en je zal niet langer notificaties ontvangen. Om notificaties weer aan te zetten, log op elk apparaat opnieuw in",
    "You have <a>disabled</a> URL previews by default.": "Je hebt URL-voorvertoningen standaard <a>uitgezet</a>.",
    "You have <a>enabled</a> URL previews by default.": "Je hebt URL-voorvertoningen standaard <a>aangezet</a>.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Je hebt een ongeldig contact ingevoerd. Probeer zijn of haar Matrix-ID of e-mailadres te gebruiken.",
    "You have no visible notifications": "Je hebt geen zichtbare notificaties",
    "You may wish to login with a different account, or add this email to this account.": "Je wilt misschien met een ander account inloggen of deze e-mail aan je account toevoegen.",
    "you must be a": "wat je moet zijn is een",
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@ -603,7 +603,6 @@
    "You have been kicked from %(roomName)s by %(userName)s.": "Zostałeś usunięty z %(roomName)s przez %(userName)s.",
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Wylogowałeś się ze wszystkich urządzeń i nie będziesz już otrzymywał powiadomień push. Aby ponownie aktywować powiadomienia zaloguj się ponownie na każdym urządzeniu",
    "You have <a>disabled</a> URL previews by default.": "Masz domyślnie <a>wyłączone</a> podglądy linków.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Wpisałeś niewłaściwy kontakt. Spróbuj używając Matrix ID lub adresu e-mail.",
    "You have no visible notifications": "Nie masz widocznych powiadomień",
    "You may wish to login with a different account, or add this email to this account.": "Możesz chcieć zalogować się z innego konta lub dodać e-mail do tego konta.",
    "you must be a": "musisz być",
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@ -733,7 +733,6 @@
    "Tagged as: ": "Marcado como: ",
    "You have <a>disabled</a> URL previews by default.": "Você <a>desabilitou</a> pré-visualizações de links por padrão.",
    "You have <a>enabled</a> URL previews by default.": "Você <a>habilitou</a> pré-visualizações de links por padrão.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Você inseriu um contato inválido. Tente usar o ID Matrix ou endereço de e-mail da pessoa que está buscando.",
    "You have been banned from %(roomName)s by %(userName)s.": "Você foi expulso(a) da sala %(roomName)s por %(userName)s.",
    "Send anyway": "Enviar de qualquer maneira",
    "This room": "Esta sala",
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@ -730,7 +730,6 @@
    "Tagged as: ": "Marcado como: ",
    "You have <a>disabled</a> URL previews by default.": "Você <a>desabilitou</a> pré-visualizações de links por padrão.",
    "You have <a>enabled</a> URL previews by default.": "Você <a>habilitou</a> pré-visualizações de links por padrão.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Você inseriu um contato inválido. Tente usar o ID Matrix ou endereço de e-mail da pessoa que está buscando.",
    "Hide removed messages": "Ocultar mensagens removidas",
    "Add": "Adicionar",
    "%(count)s new messages|one": "%(count)s nova mensagem",
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@ -618,7 +618,6 @@
    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ВНИМАНИЕ: ОШИБКА ПРОВЕРКИ КЛЮЧЕЙ! Ключ подписи пользователя %(userId)s на устройстве %(deviceId)s — \"%(fprint)s\", и он не соответствует предоставленному ключу \"%(fingerprint)s\". Это может означать, что ваше общение перехватывается!",
    "You have <a>disabled</a> URL previews by default.": "Предварительный просмотр ссылок <a>отключен</a> по-умолчанию.",
    "You have <a>enabled</a> URL previews by default.": "Предварительный просмотр ссылок <a>включен</a> по-умолчанию.",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Вы ввели недопустимый контакт. Попробуйте использовать Matrix ID или адрес электронной почты.",
    "You need to enter a user name.": "Необходимо ввести имя пользователя.",
    "You seem to be in a call, are you sure you want to quit?": "Звонок не завершен, вы уверены, что хотите выйти?",
    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Вы не сможете отменить это изменение, так как этот пользователь получит уровень доступа, аналогичный вашему.",
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@ -516,7 +516,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Tüm cihazlardan çıkış yaptınız ve artık bildirimler almayacaksınız . Bildirimleri yeniden etkinleştirmek için , her cihazda tekrar giriş yapın",
    "You have <a>disabled</a> URL previews by default.": "URL önizlemelerini varsayılan olarak <a> devre dışı </a> bıraktınız.",
    "You have <a>enabled</a> URL previews by default.": "URL önizlemelerini varsayılan olarak <a> etkinleştirdiniz </a> .",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "Geçersiz bir kişi girdiniz . Matrix ID veya e-posta adresini kullanarak tekrar deneyin.",
    "You have no visible notifications": "Hiçbir görünür bildiriminiz yok",
    "You may wish to login with a different account, or add this email to this account.": "Farklı bir hesap ile giriş yapmak veya bu e-postayı bu hesaba eklemek istemiş olabilirsiniz.",
    "you must be a": "olabilirsiniz",
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@ -630,7 +630,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "你已经登出了所有的设备并不再接收推送通知。要重新启用通知，请再在每个设备上登录",
    "You have <a>disabled</a> URL previews by default.": "你已经默认 <a>禁用</a> URL 预览。",
    "You have <a>enabled</a> URL previews by default.": "你已经默认 <a>启用</a> URL 预览。",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "你输入了一个非法的联系人。尝试使用他们的 Matrix ID 或者电子邮件地址。",
    "Your home server does not support device management.": "你的 home server 不支持设备管理。",
    "Set a display name:": "设置一个昵称：",
    "This server does not support authentication with a phone number.": "这个服务器不支持用电话号码认证。",
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@ -574,7 +574,6 @@
    "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "您已在所有裝置上登出，並且不會再收到推送通知。要重新啟用通知，再次於每個裝置上登入",
    "You have <a>disabled</a> URL previews by default.": "您已預設<a>停用</a> URL 預覽。",
    "You have <a>enabled</a> URL previews by default.": "您已預設<a>啟用</a> URL 預覽。",
-    "You have entered an invalid contact. Try using their Matrix ID or email address.": "您輸入了無效的聯絡人。嘗試使用他們的 Matrix ID 或電子郵件地址。",
    "You have no visible notifications": "您沒有可見的通知",
    "You may wish to login with a different account, or add this email to this account.": "您可能會想要以不同的帳號登入，或是把這個電子郵件加入到此帳號中。",
    "you must be a": "您一定是",