From e9746338fee5bca5022bc6ffcd9e8ead14e4118f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Miko=C5=82ajczyk?= Date: Fri, 14 Feb 2025 09:28:09 +0100 Subject: [PATCH] [FIX]: Sablier stream -- cancelled --- .../HomeGridCurrentGlmLock.tsx | 2 +- .../RaffleWinnerBadge/RaffleWinnerBadge.tsx | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/client/src/components/Home/HomeGridCurrentGlmLock/HomeGridCurrentGlmLock.tsx b/client/src/components/Home/HomeGridCurrentGlmLock/HomeGridCurrentGlmLock.tsx index c25447993a..ce46e7c2fb 100644 --- a/client/src/components/Home/HomeGridCurrentGlmLock/HomeGridCurrentGlmLock.tsx +++ b/client/src/components/Home/HomeGridCurrentGlmLock/HomeGridCurrentGlmLock.tsx @@ -46,7 +46,7 @@ const HomeGridCurrentGlmLock: FC = ({ className }) !!userSablierStreams && (userSablierStreams.sumAvailable > 0 || (userSablierStreams.sablierStreams.some(({ isCancelled }) => isCancelled) && - userSablierStreams.sumAvailable > 0)); + userSablierStreams.sum > 0)); const buttonText = useMemo(() => { if (userSablierStreams && userSablierStreams.sumAvailable > 0n) { diff --git a/client/src/components/Home/HomeGridCurrentGlmLock/RaffleWinnerBadge/RaffleWinnerBadge.tsx b/client/src/components/Home/HomeGridCurrentGlmLock/RaffleWinnerBadge/RaffleWinnerBadge.tsx index 626a2ef6c8..a6070bcc51 100644 --- a/client/src/components/Home/HomeGridCurrentGlmLock/RaffleWinnerBadge/RaffleWinnerBadge.tsx +++ b/client/src/components/Home/HomeGridCurrentGlmLock/RaffleWinnerBadge/RaffleWinnerBadge.tsx @@ -24,18 +24,20 @@ const RaffleWinnerBadge: FC = ({ isVisible }) => { const { data: depositsValue } = useDepositValue(); const { data: userSablierStreams } = useUserSablierStreams(); + const isSablierStreamCancelled = userSablierStreams?.sablierStreams.some( + ({ isCancelled }) => isCancelled, + ); + const userSablierStreamsSumFormatted = userSablierStreams ? getValuesToDisplay({ cryptoCurrency: 'golem', showFiatPrefix: false, - valueCrypto: userSablierStreams.sumAvailable, + valueCrypto: isSablierStreamCancelled + ? userSablierStreams.sum + : userSablierStreams.sumAvailable, }) : undefined; - const isSablierStreamCancelled = userSablierStreams?.sablierStreams.some( - ({ isCancelled }) => isCancelled, - ); - const userSablierStreamsSumFloat = userSablierStreamsSumFormatted ? parseFloat(userSablierStreamsSumFormatted.primary.replace(/\s/g, '')) : 0;