diff --git a/src/pages/DelegationsPage/DelegationsPage.tsx b/src/pages/DelegationsPage/DelegationsPage.tsx
index 3eb83cb..dd5cb09 100644
--- 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}
/>
diff --git a/src/pages/GatewaysPage/GatewayUnstake.tsx b/src/pages/GatewaysPage/GatewayUnstake.tsx
index 58babbe..feacc85 100644
--- a/src/pages/GatewaysPage/GatewayUnstake.tsx
+++ b/src/pages/GatewaysPage/GatewayUnstake.tsx
@@ -52,7 +52,7 @@ export function GatewayUnstakeButton({
hidden={disabled}
title={
!disabled &&
- (source.unlockedAt ? (
+ (source.locked && source.unlockedAt ? (
) : (
'Auto-extension is enabled'
diff --git a/src/pages/WorkersPage/Worker.tsx b/src/pages/WorkersPage/Worker.tsx
index 2c86131..f9e6c17 100644
--- 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}
/>
}
diff --git a/src/pages/WorkersPage/WorkerUndelegate.tsx b/src/pages/WorkersPage/WorkerUndelegate.tsx
index 39cd8a6..4eebd65 100644
--- a/src/pages/WorkersPage/WorkerUndelegate.tsx
+++ b/src/pages/WorkersPage/WorkerUndelegate.tsx
@@ -83,7 +83,7 @@ export function WorkerUndelegate({
return (
<>
}
+ title={!disabled && isLocked && unlockedAt && }
placement="top"
>
diff --git a/src/pages/WorkersPage/WorkerWithdraw.tsx b/src/pages/WorkersPage/WorkerWithdraw.tsx
index c48e9c3..9d32439 100644
--- a/src/pages/WorkersPage/WorkerWithdraw.tsx
+++ b/src/pages/WorkersPage/WorkerWithdraw.tsx
@@ -43,7 +43,11 @@ export function WorkerWithdrawButton({
return (
<>
}
+ title={
+ !disabled &&
+ source.locked &&
+ source.unlockedAt &&
+ }
placement="top"
>