From 19ce7c7a4db9593dbe50dd56ea2dd1a6954ad75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Fri, 5 Apr 2019 21:56:13 +0200 Subject: [PATCH] Moved state variable. --- app/src/components/MeetingDrawer/Chat/MessageList.js | 4 ++-- app/src/components/Room.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/components/MeetingDrawer/Chat/MessageList.js b/app/src/components/MeetingDrawer/Chat/MessageList.js index 3e8b2d8..8e174cc 100644 --- a/app/src/components/MeetingDrawer/Chat/MessageList.js +++ b/app/src/components/MeetingDrawer/Chat/MessageList.js @@ -97,7 +97,7 @@ MessageList.propTypes = const mapStateToProps = (state) => ({ chatmessages : state.chatmessages, - myPicture : state.me.picture + myPicture : state.settings.picture }); export default connect( @@ -109,7 +109,7 @@ export default connect( { return ( prev.chatmessages === next.chatmessages && - prev.me.picture === next.me.picture + prev.settings.picture === next.settings.picture ); } } diff --git a/app/src/components/Room.js b/app/src/components/Room.js index 339fdb9..8a503b7 100644 --- a/app/src/components/Room.js +++ b/app/src/components/Room.js @@ -416,7 +416,7 @@ const mapStateToProps = (state) => advancedMode : state.settings.advancedMode, loggedIn : state.me.loggedIn, loginEnabled : state.me.loginEnabled, - myPicture : state.me.picture, + myPicture : state.settings.picture, toolAreaOpen : state.toolarea.toolAreaOpen, unread : state.toolarea.unreadMessages + state.toolarea.unreadFiles @@ -449,7 +449,7 @@ export default withRoomContext(connect( prev.room === next.room && prev.me.loggedIn === next.me.loggedIn && prev.me.loginEnabled === next.me.loginEnabled && - prev.me.picture === next.me.picture && + prev.settings.picture === next.settings.picture && prev.toolarea.toolAreaOpen === next.toolarea.toolAreaOpen && prev.toolarea.unreadMessages === next.toolarea.unreadMessages && prev.toolarea.unreadFiles === next.toolarea.unreadFiles &&