2 files changed, 14 insertions, 10 deletions
diff --git a/webapp/components/common/comment_icon.jsx b/webapp/components/common/comment_icon.jsx
index e8be773e5..63218971f 100644
--- a/webapp/components/common/comment_icon.jsx
+++ b/webapp/components/common/comment_icon.jsx
@@ -1,3 +1,5 @@
+import PropTypes from 'prop-types';
+
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
@@ -41,11 +43,11 @@ export default function CommentIcon(props) {
 }
 
 CommentIcon.propTypes = {
-    idPrefix: React.PropTypes.string.isRequired,
-    idCount: React.PropTypes.number,
-    handleCommentClick: React.PropTypes.func.isRequired,
-    searchStyle: React.PropTypes.string,
-    commentCount: React.PropTypes.number
+    idPrefix: PropTypes.string.isRequired,
+    idCount: PropTypes.number,
+    handleCommentClick: PropTypes.func.isRequired,
+    searchStyle: PropTypes.string,
+    commentCount: PropTypes.number
 };
 
 CommentIcon.defaultProps = {
diff --git a/webapp/components/common/post_flag_icon.jsx b/webapp/components/common/post_flag_icon.jsx
index eb993d9f6..533b38bff 100644
--- a/webapp/components/common/post_flag_icon.jsx
+++ b/webapp/components/common/post_flag_icon.jsx
@@ -1,3 +1,5 @@
+import PropTypes from 'prop-types';
+
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
@@ -72,11 +74,11 @@ export default function PostFlagIcon(props) {
 }
 
 PostFlagIcon.propTypes = {
-    idPrefix: React.PropTypes.string.isRequired,
-    idCount: React.PropTypes.number,
-    postId: React.PropTypes.string.isRequired,
-    isFlagged: React.PropTypes.bool.isRequired,
-    isEphemeral: React.PropTypes.bool
+    idPrefix: PropTypes.string.isRequired,
+    idCount: PropTypes.number,
+    postId: PropTypes.string.isRequired,
+    isFlagged: PropTypes.bool.isRequired,
+    isEphemeral: PropTypes.bool
 };
 
 PostFlagIcon.defaultProps = {