Fix for incorrect expiry time

AudiusProject · Oct 31, 2020 · 843a0d8 · 843a0d8
1 parent 3949900
commit 843a0d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/TransactionStatus/TransactionStatus.tsx b/src/components/TransactionStatus/TransactionStatus.tsx
@@ -85,7 +85,7 @@ const WaitingTransaction: React.FC<WaitingTransactionProps> = props => {
   }, [status, onClose])
 
   // @ts-ignore
-  const { name, target, lockupDuration } = props
+  const { name, target } = props
   const onCancelSubmit = useCallback(() => {
     if (name === PendingTransactionName.RemoveDelegator) {
       cancelTransaction(target)
@@ -95,7 +95,7 @@ const WaitingTransaction: React.FC<WaitingTransactionProps> = props => {
   }, [name, target, cancelTransaction])
   const { timeRemaining } = useTimeRemaining(
     props.lockupExpiryBlock,
-    lockupDuration
+    0 /* period - 0 because lockupExpiry has time period baked in */
   )
 
   return (

diff --git a/src/store/cache/protocol/hooks.ts b/src/store/cache/protocol/hooks.ts
@@ -199,7 +199,7 @@ export const useTimeRemaining = (block: number, period: number | null) => {
       if (currentBlock > targetBlock) {
         setTimeRemaining(0)
       } else {
-        setTimeRemaining((targetBlock - currentBlock) * averageBlockTime)
+        setTimeRemaining((targetBlock - currentBlock) * averageBlockTime * 1000)
       }
     }
   }, [averageBlockTime, currentBlock, block, period, targetBlock])