Migrate schema to service ids

This commit is contained in:
Fedor Indutny 2023-08-16 22:54:39 +02:00 committed by Jamie Kyle
parent 71958f8a01
commit 8b0da36caa
258 changed files with 4795 additions and 2613 deletions

View file

@ -11,7 +11,7 @@ import type { StateProps } from '../../components/conversation/conversation-deta
import { ConversationDetails } from '../../components/conversation/conversation-details/ConversationDetails';
import {
getConversationByIdSelector,
getConversationByUuidSelector,
getConversationByServiceIdSelector,
getAllComposableConversations,
} from '../selectors/conversations';
import { getGroupMemberships } from '../../util/getGroupMemberships';
@ -74,10 +74,11 @@ const mapStateToProps = (
Boolean(conversation.groupLink) &&
conversation.accessControlAddFromInviteLink !== ACCESS_ENUM.UNSATISFIABLE;
const conversationByUuidSelector = getConversationByUuidSelector(state);
const conversationByServiceIdSelector =
getConversationByServiceIdSelector(state);
const groupMemberships = getGroupMemberships(
conversation,
conversationByUuidSelector
conversationByServiceIdSelector
);
const badges = getBadgesSelector(state)(conversation.badges);
@ -88,7 +89,7 @@ const mapStateToProps = (
c =>
c.type === 'group' &&
(c.memberships ?? []).some(
member => member.uuid === conversation.uuid
member => member.aci === conversation.serviceId
)
)
: [];