Merge pull request #3486 from matrix-org/t3chguy/fixes

Fix PropTypes usage, sdk import path and GroupMemberTile letter-avatar

src/components/views/dialogs/AddressPickerDialog.js

@@ -52,7 +52,7 @@ module.exports = createReactClass({
         // Extra node inserted after picker input, dropdown and errors
         extraNode: PropTypes.node,
         value: PropTypes.string,
-        placeholder: PropTypes.oneOfType(PropTypes.string, PropTypes.func),
+        placeholder: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
         roomId: PropTypes.string,
         button: PropTypes.string,
         focus: PropTypes.bool,

src/components/views/groups/GroupMemberTile.js

@@ -59,7 +59,9 @@ export default createReactClass({
         );
 
         const av = (
-            <BaseAvatar name={this.props.member.userId}
+            <BaseAvatar
+                name={this.props.member.displayname || this.props.member.userId}
+                idName={this.props.member.userId}
                 width={36} height={36}
                 url={avatarUrl}
             />

src/components/views/terms/InlineTermsAgreement.js

@@ -17,7 +17,7 @@ limitations under the License.
 import React from "react";
 import PropTypes from "prop-types";
 import {_t, pickBestLanguage} from "../../../languageHandler";
-import sdk from "../../../..";
+import sdk from "../../..";
 
 export default class InlineTermsAgreement extends React.Component {
     static propTypes = {