From 3fec09a293ddc20c17b8a8822bf27630b41b1e36 Mon Sep 17 00:00:00 2001 From: Vincent Date: Mon, 24 Feb 2020 10:07:51 +1100 Subject: [PATCH] Redux prep for refactor --- ts/components/LeftPane.tsx | 33 ++++++++++++++------------ ts/state/smart/SessionConversation.tsx | 7 +++--- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/ts/components/LeftPane.tsx b/ts/components/LeftPane.tsx index babd60a8e..f65cce3e4 100644 --- a/ts/components/LeftPane.tsx +++ b/ts/components/LeftPane.tsx @@ -28,23 +28,23 @@ interface State { } interface Props { - conversations: Array; - friends: Array; - sentFriendsRequest: Array; - receivedFriendsRequest: Array; - unreadMessageCount: number; - receivedFriendRequestCount: number; - searchResults?: SearchResultsProps; - searchTerm: string; - isSecondaryDevice: boolean; - - openConversationInternal: (id: string, messageId?: string) => void; - updateSearchTerm: (searchTerm: string) => void; - search: (query: string, options: SearchOptions) => void; - clearSearch: () => void; + // conversations: Array; + // friends: Array; + // sentFriendsRequest: Array; + // receivedFriendsRequest: Array; + // unreadMessageCount: number; + // receivedFriendRequestCount: number; + // searchResults?: SearchResultsProps; + // searchTerm: string; + // isSecondaryDevice: boolean; + + // openConversationInternal: (id: string, messageId?: string) => void; + // updateSearchTerm: (searchTerm: string) => void; + // search: (query: string, options: SearchOptions) => void; + // clearSearch: () => void; } -export class LeftPane extends React.Component { +export class LeftPane extends React.Component { public state = { selectedSection: SectionType.Message, }; @@ -52,6 +52,9 @@ export class LeftPane extends React.Component { public constructor(props: any) { super(props); this.handleSectionSelected = this.handleSectionSelected.bind(this); + + console.log(`[vince] These are my props:`, props); + } // this static function is set here to be used by all subsections (message, contacts,...) to render their headers diff --git a/ts/state/smart/SessionConversation.tsx b/ts/state/smart/SessionConversation.tsx index f3a0117d3..b578bc89d 100644 --- a/ts/state/smart/SessionConversation.tsx +++ b/ts/state/smart/SessionConversation.tsx @@ -6,12 +6,13 @@ import { StateType } from '../reducer'; import { getSessionConversationInfo } from '../selectors/conversations'; const mapStateToProps = (state: StateType) => { - const conversationInfo = getSessionConversationInfo(state); + //const conversationInfo = getSessionConversationInfo(state); - console.log(`[vince] stateToProps from SessionConversation:`, conversationInfo); + // console.log(`[vince] stateToProps from SessionConversation:`, conversationInfo); + console.log(`[vince] stateToProps from SessionConversation:`,state); return { - ...conversationInfo, + ...state, } };