Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab

src/components/views/elements/RoomAliasField.js

@@ -47,8 +47,8 @@ export default class RoomAliasField extends React.PureComponent {
                 <Field
                     label={_t("Room address")}
                     className="mx_RoomAliasField"
-                    prefix={poundSign}
-                    postfix={domain}
+                    prefixComponent={poundSign}
+                    postfixComponent={domain}
                     ref={ref => this._fieldRef = ref}
                     onValidate={this._onValidate}
                     placeholder={_t("e.g. my-room")}