oxen-io
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2112 from Bilb/fix-pin-item-crash 

fix crash of app on rendering pin item
This commit is contained in:
Audric Ackermann 2021-12-20 13:29:26 +11:00 committed by GitHub
parent cb33b6aaf6 7c42400aa2
commit 1424e13a68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ts/components/leftpane/conversation-list-item/HeaderItem.tsx
View File

@ -11,7 +11,8 @@ import { ContextConversationId } from './ConversationListItem';
import { UserItem } from './UserItem';
const NotificationSettingIcon = (props: { isMessagesSection: boolean }) => {
const convoSetting = useSelector(useConversationPropsById)?.currentNotificationSetting;
const convoId = useContext(ContextConversationId);
const convoSetting = useConversationPropsById(convoId)?.currentNotificationSetting;
if (!props.isMessagesSection) {
return null;

4
ts/components/menu/Menu.tsx
View File

@ -155,11 +155,11 @@ export const getPinConversationMenuItem = (conversationId: string): JSX.Element
if (isMessagesSection) {
const conversation = getConversationController().get(conversationId);
const isPinned = conversation.isPinned();
const isPinned = conversation?.isPinned() || false;
const togglePinConversation = async () => {
if ((!isPinned && nbOfAlreadyPinnedConvos < maxNumberOfPinnedConversations) || isPinned) {
await conversation.setIsPinned(!isPinned);
await conversation?.setIsPinned(!isPinned);
} else {
ToastUtils.pushToastWarning(
'pinConversationLimitToast',