diff --git a/src/components/left/settings/SettingsMain.tsx b/src/components/left/settings/SettingsMain.tsx index c07ff408c..8b9f0cdac 100644 --- a/src/components/left/settings/SettingsMain.tsx +++ b/src/components/left/settings/SettingsMain.tsx @@ -35,7 +35,6 @@ type StateProps = { canBuyPremium?: boolean; isGiveawayAvailable?: boolean; starsBalance?: ApiStarsAmount; - shouldDisplayStars?: boolean; }; const SettingsMain: FC = ({ @@ -45,7 +44,6 @@ const SettingsMain: FC = ({ canBuyPremium, isGiveawayAvailable, starsBalance, - shouldDisplayStars, onScreenSelect, onReset, }) => { @@ -182,21 +180,19 @@ const SettingsMain: FC = ({ {lang('TelegramPremium')} )} - {shouldDisplayStars && ( - } - narrow - // eslint-disable-next-line react/jsx-no-bind - onClick={() => openStarsBalanceModal({})} - > - {lang('MenuStars')} - {Boolean(starsBalance) && ( - - {formatStarsAmount(lang, starsBalance)} - - )} - - )} + } + narrow + // eslint-disable-next-line react/jsx-no-bind + onClick={() => openStarsBalanceModal({})} + > + {lang('MenuStars')} + {Boolean(starsBalance) && ( + + {formatStarsAmount(lang, starsBalance)} + + )} + {isGiveawayAvailable && ( ( const { currentUserId } = global; const isGiveawayAvailable = selectIsGiveawayGiftsPurchaseAvailable(global); const starsBalance = global.stars?.balance; - const shouldDisplayStars = Boolean(global.stars?.history?.all?.transactions.length); return { sessionCount: global.activeSessions.orderedHashes.length, @@ -258,7 +253,6 @@ export default memo(withGlobal( canBuyPremium: !selectIsPremiumPurchaseBlocked(global), isGiveawayAvailable, starsBalance, - shouldDisplayStars, }; }, )(SettingsMain)); diff --git a/src/components/modals/stars/StarsBalanceModal.module.scss b/src/components/modals/stars/StarsBalanceModal.module.scss index 93b221898..1074a963e 100644 --- a/src/components/modals/stars/StarsBalanceModal.module.scss +++ b/src/components/modals/stars/StarsBalanceModal.module.scss @@ -13,6 +13,10 @@ max-width: 26.25rem; } +.minimal :global(.modal-dialog) { + height: auto; +} + .root :global(.modal-dialog), .root :global(.modal-content), .transition { diff --git a/src/components/modals/stars/StarsBalanceModal.tsx b/src/components/modals/stars/StarsBalanceModal.tsx index 45d27e476..9ecc66619 100644 --- a/src/components/modals/stars/StarsBalanceModal.tsx +++ b/src/components/modals/stars/StarsBalanceModal.tsx @@ -51,10 +51,11 @@ export type OwnProps = { type StateProps = { starsBalanceState?: GlobalState['stars']; canBuyPremium?: boolean; + shouldForceHeight?: boolean; }; const StarsBalanceModal = ({ - modal, starsBalanceState, canBuyPremium, + modal, starsBalanceState, canBuyPremium, shouldForceHeight, }: OwnProps & StateProps) => { const { closeStarsBalanceModal, loadStarsTransactions, loadStarsSubscriptions, openStarsGiftingPickerModal, openInvoice, @@ -179,7 +180,11 @@ const StarsBalanceModal = ({ }); return ( - +