diff --git a/src/api/gramjs/apiBuilders/chats.ts b/src/api/gramjs/apiBuilders/chats.ts index fc4189f00..5baef8453 100644 --- a/src/api/gramjs/apiBuilders/chats.ts +++ b/src/api/gramjs/apiBuilders/chats.ts @@ -464,7 +464,7 @@ export function buildApiChatReactions(availableReactions?: GramJs.TypeChatReacti if (availableReactions instanceof GramJs.ChatReactionsAll) { // TODO Hack before custom reactions are implemented // eslint-disable-next-line max-len - return ['๐Ÿ‘', '๐Ÿ‘Ž', 'โค', '๐Ÿ”ฅ', '๐Ÿฅฐ', '๐Ÿ‘', '๐Ÿ˜', '๐Ÿค”', '๐Ÿคฏ', '๐Ÿ˜ฑ', '๐Ÿคฌ', '๐Ÿ˜ข', '๐ŸŽ‰', '๐Ÿคฉ', '๐Ÿคฎ', '๐Ÿ’ฉ', '๐Ÿ™', '๐Ÿ‘Œ', '๐Ÿ•Š', '๐Ÿคก', '๐Ÿฅฑ', '๐Ÿฅด', '๐Ÿ˜', '๐Ÿณ', 'โคโ€๐Ÿ”ฅ', '๐ŸŒš', '๐ŸŒญ', '๐Ÿ’ฏ', '๐Ÿคฃ', 'โšก', '๐ŸŒ', '๐Ÿ†', '๐Ÿ’”', '๐Ÿคจ', '๐Ÿ˜', '๐Ÿ“', '๐Ÿพ', '๐Ÿ’‹', '๐Ÿ–•', '๐Ÿ˜ˆ', '๐Ÿ˜ด', '๐Ÿ˜ญ', '๐Ÿค“', '๐Ÿ‘ป', '๐Ÿ‘จโ€๐Ÿ’ป', '๐Ÿ‘€', '๐ŸŽƒ']; + return ['๐Ÿ‘', '๐Ÿ‘Ž', 'โค', '๐Ÿ”ฅ', '๐Ÿฅฐ', '๐Ÿ‘', '๐Ÿ˜', '๐Ÿค”', '๐Ÿคฏ', '๐Ÿ˜ฑ', '๐Ÿคฌ', '๐Ÿ˜ข', '๐ŸŽ‰', '๐Ÿคฉ', '๐Ÿคฎ', '๐Ÿ’ฉ', '๐Ÿ™', '๐Ÿ‘Œ', '๐Ÿ•Š', '๐Ÿคก', '๐Ÿฅฑ', '๐Ÿฅด', '๐Ÿ˜', '๐Ÿณ', 'โคโ€๐Ÿ”ฅ', '๐ŸŒš', '๐ŸŒญ', '๐Ÿ’ฏ', '๐Ÿคฃ', 'โšก', '๐ŸŒ', '๐Ÿ†', '๐Ÿ’”', '๐Ÿคจ', '๐Ÿ˜', '๐Ÿ“', '๐Ÿพ', '๐Ÿ’‹', '๐Ÿ–•', '๐Ÿ˜ˆ', '๐Ÿ˜ด', '๐Ÿ˜ญ', '๐Ÿค“', '๐Ÿ‘ป', '๐Ÿ‘จโ€๐Ÿ’ป', '๐Ÿ‘€', '๐ŸŽƒ', '๐Ÿ™ˆ', '๐Ÿ˜‡', '๐Ÿ˜จ', '๐Ÿค', 'โœ๏ธ', '๐Ÿค—', '๐Ÿซก']; } if (availableReactions instanceof GramJs.ChatReactionsSome) { return availableReactions.reactions.map(buildApiReaction).filter(Boolean); diff --git a/src/assets/reaction-thumbs-premium.png b/src/assets/reaction-thumbs-premium.png deleted file mode 100644 index ee3ab3bcc..000000000 Binary files a/src/assets/reaction-thumbs-premium.png and /dev/null differ diff --git a/src/assets/reaction-thumbs.png b/src/assets/reaction-thumbs.png index 7f12d288b..ff307f7a4 100644 Binary files a/src/assets/reaction-thumbs.png and b/src/assets/reaction-thumbs.png differ diff --git a/src/components/common/UiLoader.tsx b/src/components/common/UiLoader.tsx index 1cea77eb8..55d63dc9f 100644 --- a/src/components/common/UiLoader.tsx +++ b/src/components/common/UiLoader.tsx @@ -7,7 +7,7 @@ import type { ThemeKey } from '../../types'; import type { FC } from '../../lib/teact/teact'; import { getChatAvatarHash } from '../../global/helpers/chats'; // Direct import for better module splitting -import { selectIsRightColumnShown, selectTheme, selectIsCurrentUserPremium } from '../../global/selectors'; +import { selectIsRightColumnShown, selectTheme } from '../../global/selectors'; import { DARK_THEME_BG_COLOR, LIGHT_THEME_BG_COLOR } from '../../config'; import useFlag from '../../hooks/useFlag'; import useShowTransition from '../../hooks/useShowTransition'; @@ -22,7 +22,6 @@ import styles from './UiLoader.module.scss'; import telegramLogoPath from '../../assets/telegram-logo.svg'; import reactionThumbsPath from '../../assets/reaction-thumbs.png'; -import premiumReactionThumbsPath from '../../assets/reaction-thumbs-premium.png'; import lockPreviewPath from '../../assets/lock.png'; import monkeyPath from '../../assets/monkey.svg'; @@ -44,7 +43,6 @@ type StateProps = Pick Promise.all([ + main: () => Promise.all([ loadModule(Bundles.Main, 'Main') .then(preloadFonts), preloadAvatars(), - preloadImage(isCurrentUserPremium ? premiumReactionThumbsPath : reactionThumbsPath), + preloadImage(reactionThumbsPath), ]), authPhoneNumber: () => Promise.all([ preloadFonts(), @@ -101,7 +99,6 @@ const UiLoader: FC = ({ shouldSkipHistoryAnimations, leftColumnWidth, theme, - isCurrentUserPremium, }) => { const { setIsUiReady } = getActions(); @@ -115,7 +112,7 @@ const UiLoader: FC = ({ const safePreload = async () => { try { - await preloadTasks[page!](isCurrentUserPremium!); + await preloadTasks[page!](); } catch (err) { // Do nothing } @@ -183,7 +180,6 @@ export default withGlobal( isRightColumnShown: selectIsRightColumnShown(global), leftColumnWidth: global.leftColumnWidth, theme, - isCurrentUserPremium: selectIsCurrentUserPremium(global), }; }, )(UiLoader); diff --git a/src/components/middle/message/ReactionSelector.tsx b/src/components/middle/message/ReactionSelector.tsx index ac977c0ed..09334cc6b 100644 --- a/src/components/middle/message/ReactionSelector.tsx +++ b/src/components/middle/message/ReactionSelector.tsx @@ -73,7 +73,6 @@ const ReactionSelector: FC = ({ isReady={isReady} onSendReaction={onSendReaction} reaction={reaction} - isCurrentUserPremium={isCurrentUserPremium} /> ); })} diff --git a/src/components/middle/message/ReactionSelectorReaction.scss b/src/components/middle/message/ReactionSelectorReaction.scss index 010f23b0c..4e17d81bf 100644 --- a/src/components/middle/message/ReactionSelectorReaction.scss +++ b/src/components/middle/message/ReactionSelectorReaction.scss @@ -17,10 +17,6 @@ background-image: url('../../../assets/reaction-thumbs.png'); background-repeat: no-repeat; background-size: auto 100%; - - &--premium { - background-image: url('../../../assets/reaction-thumbs-premium.png'); - } } .AnimatedSticker { diff --git a/src/components/middle/message/ReactionSelectorReaction.tsx b/src/components/middle/message/ReactionSelectorReaction.tsx index 04ec83fe6..a2d6ccde9 100644 --- a/src/components/middle/message/ReactionSelectorReaction.tsx +++ b/src/components/middle/message/ReactionSelectorReaction.tsx @@ -19,13 +19,12 @@ type OwnProps = { previewIndex: number; isReady?: boolean; onSendReaction: (reaction: string, x: number, y: number) => void; - isCurrentUserPremium?: boolean; }; const cn = createClassNameBuilder('ReactionSelectorReaction'); const ReactionSelectorReaction: FC = ({ - reaction, previewIndex, onSendReaction, isReady, isCurrentUserPremium, + reaction, previewIndex, onSendReaction, isReady, }) => { // eslint-disable-next-line no-null/no-null const containerRef = useRef(null); @@ -54,10 +53,7 @@ const ReactionSelectorReaction: FC = ({ > {shouldRenderStatic && (
)}