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

Fix action propagation to timeline items

Browse source
This commit is contained in:
Fedor Indutny 2021-09-12 19:36:41 -07:00 • committed by GitHub
parent 9ffa29ca0d
commit 5a57e2b704
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 71 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ts/state/smart/CompositionArea.tsx
View file

@ -7,6 +7,7 @@ import { mapDispatchToProps } from '../actions';
import { CompositionArea } from '../../components/CompositionArea';
import { StateType } from '../reducer';
import { isConversationSMSOnly } from '../../util/isConversationSMSOnly';
import { dropNull } from '../../util/dropNull';
import { selectRecentEmojis } from '../selectors/emojis';
import { getIntl, getUserConversationId } from '../selectors/user';
@ -60,9 +61,10 @@ const mapStateToProps = (state: StateType, props: ExternalProps) => {
['showStickersIntroduction'],
false
);
const showPickerHint =
const showPickerHint = Boolean(
get(state.items, ['showStickerPickerHint'], false) &&
receivedPacks.length > 0;
receivedPacks.length > 0
);
const {
attachments: draftAttachments,
@ -77,8 +79,6 @@ const mapStateToProps = (state: StateType, props: ExternalProps) => {
return {
// Base
i18n: getIntl(state),
draftText,
draftBodyRanges,
// AttachmentsList
draftAttachments,
// MediaQualitySelector
@ -123,6 +123,9 @@ const mapStateToProps = (state: StateType, props: ExternalProps) => {
announcementsOnly,
areWeAdmin,
groupAdmins: getGroupAdminsSelector(state)(conversation.id),
draftText: dropNull(draftText),
draftBodyRanges,
};
};
@ -138,5 +141,4 @@ const dispatchPropsMap = {
const smart = connect(mapStateToProps, dispatchPropsMap);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export const SmartCompositionArea = smart(CompositionArea as any);
export const SmartCompositionArea = smart(CompositionArea);