Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks

 Conflicts:

	src/components/views/avatars/BaseAvatar.js

	test/components/views/messages/TextualBody-test.js

src/components/views/avatars/BaseAvatar.js

@@ -24,7 +24,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import {useEventEmitter} from "../../../hooks/useEventEmitter";
-import toRem from "../../../utils/rem";
+import {toPx} from "../../../utils/units";
 
 const useImageUrl = ({url, urls, idName, name, defaultToInitialLetter}) => {
     const [imageUrls, setUrls] = useState([]);
@@ -105,9 +105,9 @@ const BaseAvatar = (props) => {
                 className="mx_BaseAvatar_initial"
                 aria-hidden="true"
                 style={{
-                    fontSize: toRem(width * 0.65),
-                    width: toRem(width),
-                    lineHeight: toRem(height),
+                    fontSize: toPx(width * 0.65),
+                    width: toPx(width),
+                    lineHeight: toPx(height),
                 }}
             >
                 { initialLetter }
@@ -121,8 +121,8 @@ const BaseAvatar = (props) => {
                 title={title}
                 onError={onError}
                 style={{
-                    width: toRem(width),
-                    height: toRem(height),
+                    width: toPx(width),
+                    height: toPx(height),
                 }}
                 aria-hidden="true" />
         );
@@ -159,8 +159,8 @@ const BaseAvatar = (props) => {
                 onClick={onClick}
                 onError={onError}
                 style={{
-                    width: toRem(width),
-                    height: toRem(height),
+                    width: toPx(width),
+                    height: toPx(height),
                 }}
                 title={title} alt=""
                 inputRef={inputRef}
@@ -173,8 +173,8 @@ const BaseAvatar = (props) => {
                 src={imageUrl}
                 onError={onError}
                 style={{
-                    width: toRem(width),
-                    height: toRem(height),
+                    width: toPx(width),
+                    height: toPx(height),
                 }}
                 title={title} alt=""
                 ref={inputRef}

src/components/views/avatars/MemberAvatar.js

@@ -20,7 +20,8 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as Avatar from '../../../Avatar';
 import * as sdk from "../../../index";
-import dis from "../../../dispatcher";
+import dis from "../../../dispatcher/dispatcher";
+import {Action} from "../../../dispatcher/actions";
 
 export default createReactClass({
     displayName: 'MemberAvatar',
@@ -33,7 +34,7 @@ export default createReactClass({
         resizeMethod: PropTypes.string,
         // The onClick to give the avatar
         onClick: PropTypes.func,
-        // Whether the onClick of the avatar should be overriden to dispatch 'view_user'
+        // Whether the onClick of the avatar should be overriden to dispatch `Action.ViewUser`
         viewUserOnClick: PropTypes.bool,
         title: PropTypes.string,
     },
@@ -85,7 +86,7 @@ export default createReactClass({
         if (viewUserOnClick) {
             onClick = () => {
                 dis.dispatch({
-                    action: 'view_user',
+                    action: Action.ViewUser,
                     member: this.props.member,
                 });
             };