matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

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

Browse Source 
Fix PropTypes usage, sdk import path and GroupMemberTile letter-avatar
This commit is contained in:
David Baker
2019-10-01 11:49:32 +01:00
committed by GitHub
parent e457ef3679 37978e5ef5
commit a75fd1801c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/dialogs/AddressPickerDialog.js
View File

@@ -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,

4
src/components/views/groups/GroupMemberTile.js
View File

@@ -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}
/>

2
src/components/views/terms/InlineTermsAgreement.js
View File

@@ -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 = {