📥 Enable voting stake reuse (#2910)

* Exclude Voting from conflicting locks

* Refactor isConflictingWith function

* Fix test

packages/ui/src/accounts/model/lockTypes.ts

@@ -49,11 +49,21 @@ const isRivalrous = (lockType: LockType) => RIVALROUS.includes(lockType)
 const asLockTypes = (locks: BalanceLock[]): LockType[] => locks.flatMap((lock) => lock.type ?? [])
 const isConflictingWith = (lockTypeA: LockType): ((lockTypeB: LockType) => boolean) => {
   if (!lockTypeA) {
-    return () => false // Don't block transactions based on unknown locks
-  } else if (isRivalrous(lockTypeA)) {
+     // Don't block transactions based on unknown locks
+    return () => false
+  }
+
+  if (isRivalrous(lockTypeA)) {
     return isRivalrous
-  } else {
-    return (lockTypeB) => lockTypeA === lockTypeB
+  }
+
+  return (lockTypeB) => {
+    if (lockTypeA === 'Voting' && lockTypeB === 'Voting') {
+      // Vote stake should be reusable in next elections
+      return false
+    }
+
+    return lockTypeA === lockTypeB
   }
 }
 

packages/ui/test/accounts/hooks/useHasRequiredStake.test.tsx

@@ -129,12 +129,12 @@ describe('useHasRequiredStake', () => {
         locks: [
           {
             amount: new BN(100),
-            type: 'Voting',
+            type: 'Storage Worker',
           },
         ],
       },
     }
-    const { result } = renderUseTotalBalances(1000, 'Voting')
+    const { result } = renderUseTotalBalances(1000, 'Storage Worker')
     expect(result.current).toStrictEqual({
       hasRequiredStake: false,
       accountsWithTransferableBalance: null,