feat(neuron-ui): show local error message ahead of remote error message

Keith-CY · Keith-CY · commit 21fd5b1631ce · 2019-11-11T09:35:07.000+08:00
diff --git a/packages/neuron-ui/src/components/Send/hooks.ts b/packages/neuron-ui/src/components/Send/hooks.ts
@@ -99,7 +99,7 @@ const useOnTransactionChange = (
         })
       }
     }, 300)
-  }, [walletID, items, price, dispatch, setTotalAmount])
+  }, [walletID, items, price, dispatch, setTotalAmount, setErrorMessage])
 }
 
 const useOnSubmit = (items: TransactionOutput[], dispatch: StateDispatch) =>
diff --git a/packages/neuron-ui/src/components/Send/index.tsx b/packages/neuron-ui/src/components/Send/index.tsx
@@ -62,10 +62,9 @@ const Send = ({
   const leftStackWidth = '70%'
   const labelWidth = '140px'
 
-  let errorMessageUnderTotal = errorMessage
-  if (!errorMessageUnderTotal && !verifyTotalAmount(totalAmount, fee, balance)) {
-    errorMessageUnderTotal = t(`messages.codes.${ErrorCode.AmountNotEnough}`)
-  }
+  const errorMessageUnderTotal = verifyTotalAmount(totalAmount, fee, balance)
+    ? errorMessage
+    : t(`messages.codes.${ErrorCode.AmountNotEnough}`)
 
   return (
     <Stack verticalFill tokens={{ childrenGap: 15, padding: '20px 0 0 0' }}>

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ const useOnTransactionChange = (`
`99`	`99`	`})`
`100`	`100`	`}`
`101`	`101`	`}, 300)`
`102`		`- }, [walletID, items, price, dispatch, setTotalAmount])`
	`102`	`+ }, [walletID, items, price, dispatch, setTotalAmount, setErrorMessage])`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`const useOnSubmit = (items: TransactionOutput[], dispatch: StateDispatch) =>`