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

nervosnetwork · Nov 11, 2019 · 21fd5b1 · 21fd5b1
1 parent 7bf6dbc
commit 21fd5b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
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' }}>