ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gifts: Hotfix (#5545)

Browse Source
This commit is contained in:
zubiden 2025-01-28 01:07:02 +01:00 committed by Alexander Zinchuk
parent 4c1e8b52ba
commit a323496937
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/modals/gift/GiftModal.tsx
View File

@ -17,6 +17,7 @@ import { getPeerTitle, getUserFullName } from '../../../global/helpers';
import { isApiPeerChat, isApiPeerUser } from '../../../global/helpers/peers'; import { isApiPeerChat, isApiPeerUser } from '../../../global/helpers/peers';
import { selectPeer } from '../../../global/selectors'; import { selectPeer } from '../../../global/selectors';
import buildClassName from '../../../util/buildClassName'; import buildClassName from '../../../util/buildClassName';
import { throttle } from '../../../util/schedulers';
import useCurrentOrPrev from '../../../hooks/useCurrentOrPrev'; import useCurrentOrPrev from '../../../hooks/useCurrentOrPrev';
import { useIntersectionObserver } from '../../../hooks/useIntersectionObserver'; import { useIntersectionObserver } from '../../../hooks/useIntersectionObserver';
@ -56,6 +57,9 @@ type StateProps = {
const AVATAR_SIZE = 100; const AVATAR_SIZE = 100;
const INTERSECTION_THROTTLE = 200; const INTERSECTION_THROTTLE = 200;
const SCROLL_THROTTLE = 200;
const runThrottledForScroll = throttle((cb) => cb(), SCROLL_THROTTLE, true);
const PremiumGiftModal: FC<OwnProps & StateProps> = ({ const PremiumGiftModal: FC<OwnProps & StateProps> = ({
modal, modal,
@ -133,21 +137,25 @@ const PremiumGiftModal: FC<OwnProps & StateProps> = ({
if (!isOpen) { if (!isOpen) {
setIsHeaderHidden(true); setIsHeaderHidden(true);
setSelectedGift(undefined); setSelectedGift(undefined);
setSelectedCategory('all');
} }
}, [isOpen]); }, [isOpen]);
const handleScroll = useLastCallback((e: React.UIEvent<HTMLDivElement>) => { const handleScroll = useLastCallback((e: React.UIEvent<HTMLDivElement>) => {
if (selectedGift) return; if (selectedGift) return;
const currentTarget = e.currentTarget;
const { scrollTop } = e.currentTarget; runThrottledForScroll(() => {
const { scrollTop } = currentTarget;
setIsHeaderHidden(scrollTop <= 150); setIsHeaderHidden(scrollTop <= 150);
if (transitionRef.current && giftHeaderRef.current) { if (transitionRef.current && giftHeaderRef.current) {
const { top: headerTop } = giftHeaderRef.current.getBoundingClientRect(); const { top: headerTop } = giftHeaderRef.current.getBoundingClientRect();
const { top: transitionTop } = transitionRef.current.getBoundingClientRect(); const { top: transitionTop } = transitionRef.current.getBoundingClientRect();
setIsHeaderForStarGifts(headerTop - transitionTop <= 0); setIsHeaderForStarGifts(headerTop - transitionTop <= 0);
} }
});
}); });
const giftPremiumDescription = lang('GiftPremiumDescription', { const giftPremiumDescription = lang('GiftPremiumDescription', {

3
src/global/selectors/peers.ts
View File

@ -16,9 +16,8 @@ export function selectPeerPhotos<T extends GlobalState>(global: T, peerId: strin
export function selectCanGift<T extends GlobalState>(global: T, peerId: string) { export function selectCanGift<T extends GlobalState>(global: T, peerId: string) {
const bot = selectBot(global, peerId); const bot = selectBot(global, peerId);
const user = selectUser(global, peerId); const user = selectUser(global, peerId);
const chat = selectChat(global, peerId);
const areStarGiftsAvailable = chat ? selectChatFullInfo(global, peerId)?.areStarGiftsAvailable : user; const areStarGiftsAvailable = selectChatFullInfo(global, peerId)?.areStarGiftsAvailable || user;
return Boolean(!selectIsPremiumPurchaseBlocked(global) && !bot && peerId !== SERVICE_NOTIFICATIONS_USER_ID return Boolean(!selectIsPremiumPurchaseBlocked(global) && !bot && peerId !== SERVICE_NOTIFICATIONS_USER_ID
&& areStarGiftsAvailable); && areStarGiftsAvailable);