Message: Fix appearance order (#6835)
This commit is contained in:
parent
43b6ddd426
commit
ac07a2242b
@ -309,10 +309,8 @@ const ActionMessage = ({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const timeout = setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
|
// Keep as is for now to avoid breaking appearance order
|
||||||
return () => {
|
setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
|
||||||
clearTimeout(timeout);
|
|
||||||
};
|
|
||||||
}, [appearanceOrder, noAppearanceAnimation]);
|
}, [appearanceOrder, noAppearanceAnimation]);
|
||||||
|
|
||||||
const { ref: refWithTransition } = useShowTransition({
|
const { ref: refWithTransition } = useShowTransition({
|
||||||
|
|||||||
@ -530,10 +530,8 @@ const Message = ({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const timeout = setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
|
// Keep as is for now to avoid breaking appearance order
|
||||||
return () => {
|
setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
|
||||||
clearTimeout(timeout);
|
|
||||||
};
|
|
||||||
}, [appearanceOrder, noAppearanceAnimation]);
|
}, [appearanceOrder, noAppearanceAnimation]);
|
||||||
|
|
||||||
useShowTransition({
|
useShowTransition({
|
||||||
|
|||||||
@ -92,8 +92,9 @@ const SenderGroupContainer: FC<OwnProps & StateProps> = ({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Keep as is for now to avoid breaking appearance order
|
||||||
setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
|
setTimeout(markShown, appearanceOrder * MESSAGE_APPEARANCE_DELAY);
|
||||||
}, [appearanceOrder, markShown, noAppearanceAnimation]);
|
}, [appearanceOrder, noAppearanceAnimation]);
|
||||||
|
|
||||||
const shouldPreferOriginSender = forwardInfo
|
const shouldPreferOriginSender = forwardInfo
|
||||||
&& (isChatWithSelf || isRepliesChat || isAnonymousForwards || !messageSender);
|
&& (isChatWithSelf || isRepliesChat || isAnonymousForwards || !messageSender);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user