feat: refresh claims after wait, locales

OriginProtocol · Jul 24, 2024 · 6892951 · 6892951
1 parent 15ad061
commit 6892951
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 18 deletions.
diff --git a/apps/defi/src/lang/en.json b/apps/defi/src/lang/en.json
@@ -577,12 +577,6 @@
       "value": "Amount to Stake"
     }
   ],
-  "7+beT+": [
-    {
-      "type": 0,
-      "value": "~30 min - few days"
-    }
-  ],
   "7CPiAt": [
     {
       "type": 0,
@@ -667,6 +661,20 @@
       "value": "Redeem for mix via Origin Vault"
     }
   ],
+  "8g703D": [
+    {
+      "type": 0,
+      "value": "~"
+    },
+    {
+      "type": 1,
+      "value": "WITHDRAW_DELAY"
+    },
+    {
+      "type": 0,
+      "value": " min - few days"
+    }
+  ],
   "8nvhZ9": [
     {
       "type": 0,

diff --git a/apps/defi/src/lang/extracts/en.json b/apps/defi/src/lang/extracts/en.json
@@ -227,9 +227,6 @@
   "6fzXU+": {
     "defaultMessage": "Amount to Stake"
   },
-  "7+beT+": {
-    "defaultMessage": "~30 min - few days"
-  },
   "7CPiAt": {
     "defaultMessage": "Redeemed"
   },
@@ -272,6 +269,9 @@
   "8cCxx8": {
     "defaultMessage": "Redeem for mix via Origin Vault"
   },
+  "8g703D": {
+    "defaultMessage": "~{WITHDRAW_DELAY} min - few days"
+  },
   "8nvhZ9": {
     "defaultMessage": "Last"
   },

diff --git a/libs/defi/oeth/src/redeem/components/ClaimHeader.tsx b/libs/defi/oeth/src/redeem/components/ClaimHeader.tsx
@@ -24,18 +24,12 @@ export const ClaimHeader = (props: StackProps) => {
   );
   const availableToClaim =
     claimable?.reduce(
-      (acc, curr) =>
-        curr.claimable
-          ? add([curr.amount, tokens.mainnet.WETH.decimals], acc)
-          : acc,
+      (acc, curr) => add([curr.amount, tokens.mainnet.WETH.decimals], acc),
       from(0),
     ) ?? from(0);
   const pendingAmount =
     pending?.reduce(
-      (acc, curr) =>
-        curr.claimable
-          ? add([curr.amount, tokens.mainnet.WETH.decimals], acc)
-          : acc,
+      (acc, curr) => add([curr.amount, tokens.mainnet.WETH.decimals], acc),
       from(0),
     ) ?? from(0);
 

diff --git a/libs/defi/oeth/src/redeem/components/WithdrawalRequestModal.tsx b/libs/defi/oeth/src/redeem/components/WithdrawalRequestModal.tsx
@@ -22,6 +22,7 @@ import {
 import { BlockExplorerLink } from '@origin/shared/providers';
 import { getFormatPrecision, ZERO_ADDRESS } from '@origin/shared/utils';
 import { useIntervalEffect, usePrevious } from '@react-hookz/web';
+import { useQueryClient } from '@tanstack/react-query';
 import { format } from 'dnum';
 import { useIntl } from 'react-intl';
 import { useAccount } from 'wagmi';
@@ -58,6 +59,7 @@ export const WithdrawalRequestModal = ({
   const theme = useTheme();
   const fullScreen = useMediaQuery(theme.breakpoints.down('md'));
   const { update } = useViewSelect();
+  const queryClient = useQueryClient();
   const { address } = useAccount();
   const [status, setStatus] = useState<Status>('processing');
   const [retries, setRetries] = useState(0);
@@ -207,6 +209,9 @@ export const WithdrawalRequestModal = ({
         fullWidth
         onClick={() => {
           update('claim');
+          queryClient.invalidateQueries({
+            queryKey: ['useClaimableRequests', address],
+          });
           onClose?.({}, 'backdropClick');
         }}
         size="large"

diff --git a/libs/defi/oeth/src/redeem/hooks.ts b/libs/defi/oeth/src/redeem/hooks.ts
@@ -88,7 +88,7 @@ export const useWithdrawalRequests = (
             new Date(r.timestamp),
             addMinutes(
               fromUnixTime(Number(block?.timestamp ?? 0)),
-              WITHDRAW_DELAY,
+              WITHDRAW_DELAY + 1,
             ),
           );