mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions 1

Use UUIDs in group database schema

Browse source
This commit is contained in:
Fedor Indutny 2021-10-26 15:59:08 -07:00 • committed by GitHub
parent 74fde10ff5
commit 63fcdbe787
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
79 changed files with 4530 additions and 3664 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ts/state/smart/PendingInvites.tsx
View file

@ -8,7 +8,10 @@ import { PendingInvites } from '../../components/conversation/conversation-detai
import type { StateType } from '../reducer';
import { getIntl } from '../selectors/user';
import { getConversationByIdSelector } from '../selectors/conversations';
import {
getConversationByIdSelector,
getConversationByUuidSelector,
} from '../selectors/conversations';
import { getGroupMemberships } from '../../util/getGroupMemberships';
import { assert } from '../../util/assert';
@ -24,6 +27,7 @@ const mapStateToProps = (
props: SmartPendingInvitesProps
): PropsType => {
const conversationSelector = getConversationByIdSelector(state);
const conversationByUuidSelector = getConversationByUuidSelector(state);
const conversation = conversationSelector(props.conversationId);
assert(
@ -33,7 +37,7 @@ const mapStateToProps = (
return {
...props,
...getGroupMemberships(conversation, conversationSelector),
...getGroupMemberships(conversation, conversationByUuidSelector),
conversation,
i18n: getIntl(state),
};