feat: update logic for showing the empty convo text

pull/3056/head
William Grant 1 year ago
parent 2245494781
commit 1d5f6b404e

@ -1,6 +1,8 @@
import { useState } from 'react'; import { useState } from 'react';
import { useSelector } from 'react-redux';
import { useMount } from 'react-use'; import { useMount } from 'react-use';
import styled from 'styled-components'; import styled from 'styled-components';
import { getLeftPaneConversationIdsCount } from '../state/selectors/conversations';
import { Flex } from './basic/Flex'; import { Flex } from './basic/Flex';
import { Spacer2XL, SpacerXS } from './basic/Text'; import { Spacer2XL, SpacerXS } from './basic/Text';
@ -65,12 +67,12 @@ const StyledNoConversations = styled(StyledP)`
`; `;
export const EmptyMessageView = () => { export const EmptyMessageView = () => {
const [newAccountCreated, setNewAccountCreated] = useState(true); const conversationCount = useSelector(getLeftPaneConversationIdsCount);
const [newAccountCreated, setNewAccountCreated] = useState(false);
useMount(() => { useMount(() => {
const launchCount = window.getSettingValue('launch-count'); const launchCount = window.getSettingValue('launch-count');
window.log.debug(`WIP: [launch-count] ${launchCount}`);
if (!launchCount || launchCount < 1) { if (!launchCount || launchCount < 1) {
setNewAccountCreated(true); setNewAccountCreated(true);
} }
@ -101,16 +103,20 @@ export const EmptyMessageView = () => {
flexDirection="column" flexDirection="column"
justifyContent="center" justifyContent="center"
alignItems="center" alignItems="center"
margin="auto" margin="0 auto"
> >
<img src="images/session/brand.svg" alt="full-brand-logo" /> <img src="images/session/brand.svg" alt="full-brand-logo" />
<img src="images/session/session-text.svg" alt="full-brand-text" /> <img src="images/session/session-text.svg" alt="full-brand-text" />
</StyledSessionFullLogo> </StyledSessionFullLogo>
)} )}
<StyledHR /> {!conversationCount ? (
<StyledNoConversations>{window.i18n('conversationsNone')}</StyledNoConversations> <>
<SpacerXS /> <StyledHR />
<StyledP style={{ width: '360px' }}>{window.i18n('onboardingHitThePlusButton')}</StyledP> <StyledNoConversations>{window.i18n('conversationsNone')}</StyledNoConversations>
<SpacerXS />
<StyledP style={{ width: '360px' }}>{window.i18n('onboardingHitThePlusButton')}</StyledP>
</>
) : null}
</StyledPlaceholder> </StyledPlaceholder>
); );
}; };

@ -445,6 +445,13 @@ export const getLeftPaneConversationIds = createSelector(
_getLeftPaneConversationIds _getLeftPaneConversationIds
); );
export const getLeftPaneConversationIdsCount = createSelector(
getLeftPaneConversationIds,
(convoIds: Array<string>) => {
return convoIds.length;
}
);
const getDirectContacts = createSelector(getSortedConversations, _getPrivateFriendsConversations); const getDirectContacts = createSelector(getSortedConversations, _getPrivateFriendsConversations);
export const getPrivateContactsPubkeys = createSelector(getDirectContacts, state => export const getPrivateContactsPubkeys = createSelector(getDirectContacts, state =>

Loading…
Cancel
Save