🎊 Consider all statues in checking WG lock state (Joystream#3823)

* Consider all statues in checking WG lock state * Correct on the logic when worker is not leaving role
traumschule · Nov 29, 2022 · e67eb63 · e67eb63
1 parent 2644a32
commit e67eb63
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/packages/ui/src/accounts/hooks/useGroupLocks/helpers.ts b/packages/ui/src/accounts/hooks/useGroupLocks/helpers.ts
@@ -17,21 +17,18 @@ export const useIsWGLockRecoverable = (hasWGLock: boolean, stakingAccount: strin
   })
   const workerId = workerData?.workers[0]?.id
   const { unstakingPeriodEnd } = useWorkerUnstakingPeriodEnd(workerId)
+  const status = applications[0]?.status
 
   if (!hasWGLock) return
 
-  if (applications[0]?.status === 'ApplicationStatusPending') {
-    return true
-  }
-
-  if (applications[0]?.status === 'ApplicationStatusAccepted') {
+  if (status === 'ApplicationStatusAccepted') {
     if (unstakingPeriodEnd) {
       return Date.parse(unstakingPeriodEnd) > Date.now()
     }
-    return true
+    return false
   }
 
-  return false
+  return !!(status && status !== 'ApplicationStatusWithdrawn')
 }
 
 export const useIsCandidateLockRecoverable = (hasCandidateLock: boolean, stakingAccount: string) => {