From a90cae4ac406a0d2cf30e17a2c6d7ccd8635b009 Mon Sep 17 00:00:00 2001 From: Vincent Date: Fri, 21 Feb 2020 14:30:17 +1100 Subject: [PATCH] Started boilerplate getSessionConversationInfo --- js/views/inbox_view.js | 2 ++ ts/state/selectors/conversations.ts | 7 +++++++ ts/state/smart/SessionConversation.tsx | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js index b55f6e2f2..4f8b1dd3e 100644 --- a/js/views/inbox_view.js +++ b/js/views/inbox_view.js @@ -60,6 +60,8 @@ conversation => conversation.cachedProps ); + console.log(conversationId); + const initialState = { conversations: { conversationLookup: Signal.Util.makeLookup(conversations, 'id'), diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 90e175192..ebb0225aa 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -169,6 +169,13 @@ export const getLeftPaneLists = createSelector( _getLeftPaneLists ); +export const getSessionConversationInfo = createSelector( + getConversationLookup, + getConversationComparator, + getSelectedConversation, + _getLeftPaneLists +); + export const getMe = createSelector( [getConversationLookup, getUserNumber], (lookup: ConversationLookupType, ourNumber: string): ConversationType => { diff --git a/ts/state/smart/SessionConversation.tsx b/ts/state/smart/SessionConversation.tsx index af7231c46..be677436f 100644 --- a/ts/state/smart/SessionConversation.tsx +++ b/ts/state/smart/SessionConversation.tsx @@ -3,10 +3,10 @@ import { mapDispatchToProps } from '../actions'; import { SessionConversation } from '../../components/session/SessionConversation'; import { StateType } from '../reducer'; -import { getLeftPaneLists } from '../selectors/conversations'; +import { getSessionConversationInfo } from '../selectors/conversations'; const mapStateToProps = (state: StateType) => { - const lists = getLeftPaneLists(state); + const lists = getSessionConversationList(state); return lists; };