diff --git a/src/api/gramjs/apiBuilders/statistics.ts b/src/api/gramjs/apiBuilders/statistics.ts index 016ea55f1..78312bf5c 100644 --- a/src/api/gramjs/apiBuilders/statistics.ts +++ b/src/api/gramjs/apiBuilders/statistics.ts @@ -265,10 +265,12 @@ function buildChannelMonetizationBalances({ currentBalance, availableBalance, overallRevenue, + withdrawalEnabled, }: GramJs.BroadcastRevenueBalances): ChannelMonetizationBalances { return { currentBalance: Number(currentBalance) / DECIMALS, availableBalance: Number(availableBalance) / DECIMALS, overallRevenue: Number(overallRevenue) / DECIMALS, + isWithdrawalEnabled: withdrawalEnabled, }; } diff --git a/src/api/types/statistics.ts b/src/api/types/statistics.ts index 9fbbc8dd9..5f9bfabf2 100644 --- a/src/api/types/statistics.ts +++ b/src/api/types/statistics.ts @@ -139,4 +139,5 @@ export interface ChannelMonetizationBalances { currentBalance: number; availableBalance: number; overallRevenue: number; + isWithdrawalEnabled?: boolean; } diff --git a/src/components/right/statistics/MonetizationStatistics.module.scss b/src/components/right/statistics/MonetizationStatistics.module.scss index 1b5dc866d..1fe279298 100644 --- a/src/components/right/statistics/MonetizationStatistics.module.scss +++ b/src/components/right/statistics/MonetizationStatistics.module.scss @@ -71,6 +71,7 @@ } .textBottom { + margin-top: 0.5rem; font-size: 0.875rem; color: var(--color-text-secondary); } diff --git a/src/components/right/statistics/MonetizationStatistics.tsx b/src/components/right/statistics/MonetizationStatistics.tsx index ded4ae75c..611e987dd 100644 --- a/src/components/right/statistics/MonetizationStatistics.tsx +++ b/src/components/right/statistics/MonetizationStatistics.tsx @@ -84,7 +84,9 @@ const MonetizationStatistics = ({ ] = useFlag(false); const [isConfirmPasswordDialogOpen, openConfirmPasswordDialogOpen, closeConfirmPasswordDialogOpen] = useFlag(); const availableBalance = statistics?.balances?.availableBalance; - const canWithdraw = isCreator && isChannelRevenueWithdrawalEnabled && Boolean(availableBalance); + const isWithdrawalEnabled = statistics?.balances?.isWithdrawalEnabled; + const canWithdraw = isCreator && isChannelRevenueWithdrawalEnabled && Boolean(availableBalance) + && isWithdrawalEnabled; useEffect(() => { if (chatId) { @@ -144,12 +146,14 @@ const MonetizationStatistics = ({