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

Fix PropTypes usage, sdk import path and GroupMemberTile letter-avatar
2019-10-01 11:49:32 +01:00
parent e457ef3679 37978e5ef5
commit a75fd1801c
3 changed files with 5 additions and 3 deletions
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/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,