fix: fix conflict between disable and lock

subsquid · Dec 6, 2024 · 3c1aac1 · 3c1aac1
1 parent 6c3454e
commit 3c1aac1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/src/pages/DelegationsPage/DelegationsPage.tsx b/src/pages/DelegationsPage/DelegationsPage.tsx
@@ -105,7 +105,7 @@ export function MyDelegations() {
                           locked: d.locked || false,
                           unlockedAt: d.unlockedAt || '',
                         }))}
-                        disabled={!worker.delegations.some(d => !d.locked)}
+                        disabled={isLoading}
                       />
                     </Stack>
                   </TableCell>

diff --git a/src/pages/GatewaysPage/GatewayUnstake.tsx b/src/pages/GatewaysPage/GatewayUnstake.tsx
@@ -52,6 +52,7 @@ export function GatewayUnstakeButton({
         hidden={disabled}
         title={
           !disabled &&
+          source.locked &&
           (source.unlockedAt ? (
             <UnlocksTooltip timestamp={source.unlockedAt} />
           ) : (

diff --git a/src/pages/WorkersPage/Worker.tsx b/src/pages/WorkersPage/Worker.tsx
@@ -120,7 +120,7 @@ export const Worker = ({ backPath }: { backPath: string }) => {
                 // FIXME: some issue with types
                 unlockedAt: (d as any).unlockedAt,
               }))}
-              disabled={isLoading || !delegations?.some(d => !d.locked)}
+              disabled={isLoading}
             />
           </Stack>
         }

diff --git a/src/pages/WorkersPage/WorkerUndelegate.tsx b/src/pages/WorkersPage/WorkerUndelegate.tsx
@@ -83,7 +83,7 @@ export function WorkerUndelegate({
   return (
     <>
       <Tooltip
-        title={!disabled && unlockedAt && <UnlocksTooltip timestamp={unlockedAt} />}
+        title={!disabled && isLocked && unlockedAt && <UnlocksTooltip timestamp={unlockedAt} />}
         placement="top"
       >
         <Box sx={{ position: 'relative', display: 'inline-flex', alignItems: 'center' }}>

diff --git a/src/pages/WorkersPage/WorkerWithdraw.tsx b/src/pages/WorkersPage/WorkerWithdraw.tsx
@@ -43,7 +43,11 @@ export function WorkerWithdrawButton({
   return (
     <>
       <Tooltip
-        title={!disabled && source.unlockedAt && <UnlocksTooltip timestamp={source.unlockedAt} />}
+        title={
+          !disabled &&
+          source.locked &&
+          source.unlockedAt && <UnlocksTooltip timestamp={source.unlockedAt} />
+        }
         placement="top"
       >
         <Box sx={{ position: 'relative', display: 'inline-flex', alignItems: 'center' }}>