From c365481aee39bd40c337e25f7fd5b978ed23dbf5 Mon Sep 17 00:00:00 2001 From: Vincent Date: Fri, 21 Feb 2020 14:57:21 +1100 Subject: [PATCH] Started boilerplate getSessionConversationInfo --- ts/components/session/SessionConversation.tsx | 4 ++-- ts/state/selectors/conversations.ts | 3 +-- ts/state/smart/SessionConversation.tsx | 12 ++++++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ts/components/session/SessionConversation.tsx b/ts/components/session/SessionConversation.tsx index b73a43d06..77460fbfc 100644 --- a/ts/components/session/SessionConversation.tsx +++ b/ts/components/session/SessionConversation.tsx @@ -39,7 +39,7 @@ export class SessionConversation extends React.Component { // } render() { - // console.log(`[vince]`, this.props); + console.log(`[vince]`, this.props); // // const headerProps = this.props.getHeaderProps; // const { conversationKey } = this.props; @@ -195,4 +195,4 @@ export class SessionConversation extends React.Component { // public scrollToBottom() { // } -// } +} diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index ebb0225aa..958929e8a 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -22,8 +22,7 @@ export const getConversationLookup = createSelector( } ); -export const getSelectedConversation = createSelector( - getConversations, +export const getSelectedConversation = createSelector(getConversations, (state: ConversationsStateType): string | undefined => { return state.selectedConversation; } diff --git a/ts/state/smart/SessionConversation.tsx b/ts/state/smart/SessionConversation.tsx index be677436f..58f11e711 100644 --- a/ts/state/smart/SessionConversation.tsx +++ b/ts/state/smart/SessionConversation.tsx @@ -3,12 +3,16 @@ import { mapDispatchToProps } from '../actions'; import { SessionConversation } from '../../components/session/SessionConversation'; import { StateType } from '../reducer'; -import { getSessionConversationInfo } from '../selectors/conversations'; +import { getSessionConversationInfo, getSelectedConversation } from '../selectors/conversations'; const mapStateToProps = (state: StateType) => { - const lists = getSessionConversationList(state); - - return lists; + const lists = getSessionConversationInfo(state); + const selectedConversation = getSelectedConversation(state); + + return { + ...lists, + selectedConversation, + } }; const smart = connect(mapStateToProps, mapDispatchToProps);