Revert "refactor(components): implement memoized selectors for denormalized conversations"

src/apps/feed/components/sidekick/lib/selectors.ts

@@ -1,22 +1,29 @@
 import { createSelector } from '@reduxjs/toolkit';
+import { RootState } from '../../../../../store/reducer';
+import { denormalizeConversations } from '../../../../../store/channels-list';
 import { UnreadCount } from './useSidekick';
 import { DefaultRoomLabels } from '../../../../../store/channels';
-import { denormalizedConversationsSelector } from '../../../../../store/channels-list/selectors';
 
-export const selectSocialChannelsUnreadCounts = createSelector([denormalizedConversationsSelector], (conversations) => {
-  return conversations
-    .filter((c) => c.isSocialChannel && c.zid)
-    .reduce((acc, channel) => {
-      acc[channel.zid!] = { total: channel.unreadCount?.total || 0, highlight: channel.unreadCount?.highlight || 0 };
-      return acc;
-    }, {} as { [zid: string]: UnreadCount });
-});
+export const selectSocialChannelsUnreadCounts = createSelector(
+  [(state: RootState) => denormalizeConversations(state)],
+  (conversations) => {
+    return conversations
+      .filter((c) => c.isSocialChannel && c.zid)
+      .reduce((acc, channel) => {
+        acc[channel.zid!] = { total: channel.unreadCount?.total || 0, highlight: channel.unreadCount?.highlight || 0 };
+        return acc;
+      }, {} as { [zid: string]: UnreadCount });
+  }
+);
 
-export const selectMutedChannels = createSelector([denormalizedConversationsSelector], (conversations) => {
-  return conversations
-    .filter((c) => c.isSocialChannel && c.zid)
-    .reduce((acc, channel) => {
-      acc[channel.zid!] = channel.labels?.includes(DefaultRoomLabels.MUTE);
-      return acc;
-    }, {} as { [zid: string]: boolean });
-});
+export const selectMutedChannels = createSelector(
+  [(state: RootState) => denormalizeConversations(state)],
+  (conversations) => {
+    return conversations
+      .filter((c) => c.isSocialChannel && c.zid)
+      .reduce((acc, channel) => {
+        acc[channel.zid!] = channel.labels?.includes(DefaultRoomLabels.MUTE);
+        return acc;
+      }, {} as { [zid: string]: boolean });
+  }
+);

src/components/app-bar/container.tsx

@@ -1,9 +1,9 @@
 import { useRouteMatch } from 'react-router-dom';
 import { AppBar as AppBarComponent } from './';
+import { denormalizeConversations } from '../../store/channels-list';
 import { useSelector } from 'react-redux';
 import { RootState } from '../../store';
 import { DefaultRoomLabels } from '../../store/channels';
-import { denormalizedConversationsSelector } from '../../store/channels-list/selectors';
 
 export const AppBar = () => {
   const { activeApp, hasUnreadNotifications, hasUnreadHighlights } = useAppBar();
@@ -21,7 +21,7 @@ const useAppBar = () => {
   const match = useRouteMatch('/:app');
 
   const hasUnreadNotifications = useSelector((state: RootState) => {
-    const conversations = denormalizedConversationsSelector(state);
+    const conversations = denormalizeConversations(state);
     return conversations.some(
       (channel) =>
         channel.unreadCount?.total > 0 &&
@@ -31,7 +31,7 @@ const useAppBar = () => {
   });
 
   const hasUnreadHighlights = useSelector((state: RootState) => {
-    const conversations = denormalizedConversationsSelector(state);
+    const conversations = denormalizeConversations(state);
     return conversations.some(
       (channel) =>
         channel.unreadCount?.highlight > 0 &&

src/components/messenger/group-management/container.tsx

@@ -18,18 +18,17 @@ import { Option } from '../lib/types';
 import { GroupManagement } from '.';
 import { RootState } from '../../../store/reducer';
 import { GroupManagementErrors, EditConversationState } from '../../../store/group-management/types';
-import { User, openConversation, Channel } from '../../../store/channels';
+import { User, denormalize as denormalizeChannel, openConversation, Channel } from '../../../store/channels';
 import { currentUserSelector } from '../../../store/authentication/selectors';
 import { MemberManagementDialogContainer } from '../../group-management/member-management-dialog/container';
 import { getUserSubHandle } from '../../../lib/user';
 import { MemberNetworks } from '../../../store/users/types';
 import { searchMyNetworksByName } from '../../../platform-apps/channels/util/api';
 import { receiveSearchResults } from '../../../store/users';
+import { denormalizeConversations } from '../../../store/channels-list';
 import { CreateMessengerConversation } from '../../../store/channels-list/types';
 import { createConversation } from '../../../store/create-conversation';
 import { openUserProfile } from '../../../store/user-profile';
-import { denormalizedChannelSelector } from '../../../store/channels/selectors';
-import { denormalizedConversationsSelector } from '../../../store/channels-list/selectors';
 
 export interface PublicProperties {}
 
@@ -74,13 +73,13 @@ export class Container extends React.Component<Properties> {
       chat: { activeConversationId },
     } = state;
 
-    const conversation = denormalizedChannelSelector(state, activeConversationId);
+    const conversation = denormalizeChannel(activeConversationId, state);
     const currentUser = currentUserSelector(state);
     const conversationAdminIds = conversation?.adminMatrixIds;
     const conversationModeratorIds = conversation?.moderatorIds;
     const isCurrentUserRoomAdmin = conversationAdminIds?.includes(currentUser?.matrixId) ?? false;
     const isCurrentUserRoomModerator = conversationModeratorIds?.includes(currentUser?.id) ?? false;
-    const existingConversations = denormalizedConversationsSelector(state);
+    const existingConversations = denormalizeConversations(state);
 
     return {
       activeConversationId,

src/components/messenger/list/index.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { connectContainer } from '../../../store/redux-container';
 import { RootState } from '../../../store/reducer';
 import { Channel, onAddLabel, onRemoveLabel, openConversation, User } from '../../../store/channels';
+import { denormalizeConversations } from '../../../store/channels-list';
 import { compareDatesDesc } from '../../../lib/date';
 import { MemberNetworks } from '../../../store/users/types';
 import { searchMyNetworksByName } from '../../../platform-apps/channels/util/api';
@@ -39,7 +40,6 @@ import { IconPlus } from '@zero-tech/zui/icons';
 import { GroupTypeDialog } from './group-details-panel/group-type-dialog';
 import { AdminMessageType } from '../../../store/messages';
 import { Header } from '../../sidekick/components/header';
-import { denormalizedConversationsSelector } from '../../../store/channels-list/selectors';
 
 import { bemClassName } from '../../../lib/bem';
 import './styles.scss';
@@ -94,11 +94,10 @@ export class Container extends React.Component<Properties, State> {
       rewards,
     } = state;
 
-    const conversations = denormalizedConversationsSelector(state)
+    const conversations = denormalizeConversations(state)
       .filter((c) => !c.isSocialChannel)
       .map(addLastMessageMeta(state))
       .sort(byLastMessageOrCreation);
-
     const userHandle = getUserSubHandle(user?.data?.primaryZID, user?.data?.primaryWalletAddress);
     return {
       conversations,

src/components/messenger/user-profile/linked-accounts-panel/container.tsx

@@ -4,10 +4,10 @@ import { RootState } from '../../../../store/reducer';
 import { connectContainer } from '../../../../store/redux-container';
 import { openConversation } from '../../../../store/channels';
 import { createConversation } from '../../../../store/create-conversation';
+import { denormalizeConversations } from '../../../../store/channels-list';
 import { Channel } from '../../../../store/channels';
 import { config } from '../../../../config';
 import { LinkedAccountsPanel } from '.';
-import { denormalizedConversationsSelector } from '../../../../store/channels-list/selectors';
 
 export interface PublicProperties {
   onClose?: () => void;
@@ -24,7 +24,7 @@ export interface Properties extends PublicProperties {
 export class Container extends React.Component<Properties> {
   static mapState(state: RootState) {
     const telegramBotUserId = config.telegramBotUserId;
-    const existingConversations = denormalizedConversationsSelector(state);
+    const existingConversations = denormalizeConversations(state);
 
     return { telegramBotUserId, existingConversations };
   }

src/components/notifications-feed/index.tsx

@@ -2,13 +2,13 @@ import React from 'react';
 import { RootState } from '../../store/reducer';
 import { connectContainer } from '../../store/redux-container';
 import { Channel, DefaultRoomLabels } from '../../store/channels';
+import { denormalizeConversations } from '../../store/channels-list';
 import { IconBell1 } from '@zero-tech/zui/icons';
 import { NotificationItem } from './notification-item';
 import { Spinner } from '@zero-tech/zui/components/LoadingIndicator';
 import { openNotificationConversation } from '../../store/notifications';
 import { ToggleGroup } from '@zero-tech/zui/components/ToggleGroup';
 import { Panel, PanelBody, PanelHeader, PanelTitle } from '../layout/panel';
-import { denormalizedConversationsSelector } from '../../store/channels-list/selectors';
 
 import styles from './styles.module.scss';
 
@@ -53,7 +53,7 @@ export class Container extends React.Component<Properties, State> {
       chat: { isConversationsLoaded },
     } = state;
 
-    const conversations = denormalizedConversationsSelector(state).filter(
+    const conversations = denormalizeConversations(state).filter(
       (conversation) =>
         (conversation.unreadCount.total > 0 || conversation.unreadCount?.highlight > 0) &&
         !conversation.labels?.includes(DefaultRoomLabels.ARCHIVED)

src/store/channels-list/selectors.ts

@@ -2,9 +2,6 @@ import getDeepProperty from 'lodash.get';
 import { denormalize } from '../channels';
 import { compareDatesDesc } from '../../lib/date';
 import { AsyncListStatus } from '../normalized';
-import { createSelector } from 'reselect';
-import { denormalizeConversations } from '.';
-import { RootState } from '..';
 
 export function channelListStatus(state) {
   return getDeepProperty(state, 'channelsList.status', AsyncListStatus.Idle);
@@ -35,7 +32,3 @@ function byLastMessageOrCreation(a, b) {
   const bDate = b.lastMessage?.createdAt || b.createdAt;
   return compareDatesDesc(aDate, bDate);
 }
-
-export const denormalizedConversationsSelector = createSelector([(state: RootState) => state], (state) => {
-  return denormalizeConversations(state);
-});