oct-2263: final sablier ui update

golemfoundation · Jan 16, 2025 · beb5f26 · beb5f26
1 parent 54597ee
commit beb5f26
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/client/src/components/Home/HomeGridCurrentGlmLock/HomeGridCurrentGlmLock.tsx b/client/src/components/Home/HomeGridCurrentGlmLock/HomeGridCurrentGlmLock.tsx
@@ -42,7 +42,11 @@ const HomeGridCurrentGlmLock: FC<HomeGridCurrentGlmLockProps> = ({ className })
     useUserSablierStreams();
 
   const isPreLaunch = getIsPreLaunch(currentEpoch);
-  const didUserWinAnyRaffles = !!userSablierStreams && userSablierStreams.sum > 0;
+  const didUserWinAnyRaffles =
+    !!userSablierStreams &&
+    (userSablierStreams.sum > 0 ||
+      (userSablierStreams.sablierStreams.some(({ isCancelled }) => isCancelled) &&
+        userSablierStreams.sumAvailable > 0));
 
   const buttonText = useMemo(() => {
     if (userSablierStreams && userSablierStreams.sumAvailable > 0n) {
@@ -75,7 +79,12 @@ const HomeGridCurrentGlmLock: FC<HomeGridCurrentGlmLockProps> = ({ className })
                 _first(transactionsPending)?.type !== 'withdrawal')
             }
             showCryptoSuffix
-            valueCrypto={(depositsValue || 0n) + (userSablierStreams?.sumAvailable || 0n)}
+            valueCrypto={
+              (depositsValue || 0n) +
+              ((!userSablierStreams?.sablierStreams.some(({ isCancelled }) => isCancelled) &&
+                userSablierStreams?.sumAvailable) ||
+                0n)
+            }
             variant={isMobile ? 'large' : 'extra-large'}
           />
           <div className={styles.divider} />

diff --git a/...components/Home/HomeGridCurrentGlmLock/ModalLockGlm/LockGlmBudgetBox/LockGlmBudgetBox.tsx b/...components/Home/HomeGridCurrentGlmLock/ModalLockGlm/LockGlmBudgetBox/LockGlmBudgetBox.tsx
@@ -41,7 +41,10 @@ const LockGlmBudgetBox: FC<LockGlmBudgetBoxProps> = ({
   );
 
   const shouldRaffleWinningsBeDisplayed =
-    currentMode === 'unlock' && userSablierStreams && userSablierStreams.sumAvailable > 0;
+    currentMode === 'unlock' &&
+    userSablierStreams &&
+    userSablierStreams.sumAvailable > 0 &&
+    !userSablierStreams.sablierStreams.some(({ isCancelled }) => isCancelled);
   const areFundsFetching = isFetchingAvailableFundsGlm || isFetchinguserSablierStreams;
 
   const secondRowValue = getFormattedGlmValue({
@@ -54,7 +57,9 @@ const LockGlmBudgetBox: FC<LockGlmBudgetBoxProps> = ({
     if (shouldRaffleWinningsBeDisplayed) {
       return (
         <div className={styles.timeLockedInSablier}>
-          {t('timeLockedInSablier')}
+          {userSablierStreams.sum === userSablierStreams.sumAvailable
+            ? t('timeLockedInSablier')
+            : t('lockedInSablier')}
           <Button
             className={styles.unlockInSablierButton}
             href={SABLIER_APP_LINK}

diff --git a/client/src/components/Home/HomeGridCurrentGlmLock/RaffleWinnerBadge/RaffleWinnerBadge.tsx b/client/src/components/Home/HomeGridCurrentGlmLock/RaffleWinnerBadge/RaffleWinnerBadge.tsx
@@ -28,7 +28,7 @@ const RaffleWinnerBadge: FC<RaffleWinnerBadgeProps> = ({ isVisible }) => {
     ? getValuesToDisplay({
         cryptoCurrency: 'golem',
         showFiatPrefix: false,
-        valueCrypto: userSablierStreams.sum,
+        valueCrypto: userSablierStreams.sumAvailable,
       })
     : undefined;
 
@@ -49,7 +49,7 @@ const RaffleWinnerBadge: FC<RaffleWinnerBadgeProps> = ({ isVisible }) => {
     const amountFormatted = getValuesToDisplay({
       cryptoCurrency: 'golem',
       showCryptoSuffix: true,
-      valueCrypto: parseUnitsBigInt(curr.amount, 'wei'),
+      valueCrypto: parseUnitsBigInt(curr.remainingAmount, 'wei'),
     });
     const newRow = t('tooltipWinningRow', {
       date: format(parseInt(curr.dateAvailableForWithdrawal, 10) * 1000, 'd LLL y'),

diff --git a/client/src/hooks/queries/useUserSablierStreams.ts b/client/src/hooks/queries/useUserSablierStreams.ts
@@ -24,9 +24,6 @@ export default function useUserSablierStreams(): UseQueryResult<ReturnType, unkn
         return acc + parseUnitsBigInt(curr.amount, 'wei');
       }, BigInt(0)),
       sumAvailable: response.sablierStreams.reduce((acc, curr) => {
-        if (curr.isCancelled) {
-          return acc;
-        }
         return acc + parseUnitsBigInt(curr.remainingAmount, 'wei');
       }, BigInt(0)),
     }),

diff --git a/client/src/locales/en/translation.json b/client/src/locales/en/translation.json
@@ -119,6 +119,7 @@
             "currentlyLocked": "Currently Locked",
             "walletBalance": "Wallet balance",
             "timeLockedInSablier": "Time locked in Sablier",
+            "lockedInSablier": "Locked in Sablier",
             "unlockInSablier": "Unlock in Sablier"
           }
         },