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

Show 'accept invite UI' for re-invite, calm progress spinner

Browse source
This commit is contained in:
Scott Nonnenberg 2020-10-26 07:39:45 -07:00
parent 5c0fcad6b1
commit fa2d300714
8 changed files with 40 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ts/components/CompositionArea.tsx
View file

@ -23,6 +23,7 @@ import { EmojiPickDataType } from './emoji/EmojiPicker';
export type OwnProps = {
readonly i18n: LocalizerType;
readonly areWePending?: boolean;
readonly groupVersion?: 1 | 2;
readonly isMissingMandatoryProfileSharing?: boolean;
readonly messageRequestsEnabled?: boolean;
@ -115,6 +116,7 @@ export const CompositionArea = ({
clearShowPickerHint,
// Message Requests
acceptedMessageRequest,
areWePending,
conversationType,
groupVersion,
isBlocked,
@ -331,7 +333,10 @@ export const CompositionArea = ({
};
}, [setLarge]);
if (messageRequestsEnabled && (!acceptedMessageRequest || isBlocked)) {
if (
messageRequestsEnabled &&
(!acceptedMessageRequest || isBlocked || areWePending)
) {
return (
<MessageRequestActions
i18n={i18n}