@@ -52,18 +52,18 @@ const useOnTransactionChange = (
52
52
items : TransactionOutput [ ] ,
53
53
price : string ,
54
54
dispatch : StateDispatch ,
55
- setIsTransactionValid : Function ,
56
- setTotalAmount : Function
55
+ setTotalAmount : Function ,
56
+ setErrorMessage : Function
57
57
) => {
58
58
useEffect ( ( ) => {
59
59
clearTimeout ( generateTxTimer )
60
+ setErrorMessage ( '' )
60
61
generateTxTimer = setTimeout ( ( ) => {
61
62
dispatch ( {
62
63
type : AppActions . UpdateGeneratedTx ,
63
64
payload : null ,
64
65
} )
65
66
if ( verifyTransactionOutputs ( items ) ) {
66
- setIsTransactionValid ( true )
67
67
const totalAmount = outputsToTotalAmount ( items )
68
68
setTotalAmount ( totalAmount )
69
69
const realParams = {
@@ -81,16 +81,25 @@ const useOnTransactionChange = (
81
81
type : AppActions . UpdateGeneratedTx ,
82
82
payload : res . result ,
83
83
} )
84
+ } else {
85
+ throw new Error ( res . message . content )
84
86
}
85
87
} )
86
88
. catch ( ( err : Error ) => {
87
- console . error ( err )
89
+ dispatch ( {
90
+ type : AppActions . UpdateGeneratedTx ,
91
+ payload : '' ,
92
+ } )
93
+ setErrorMessage ( err . message )
88
94
} )
89
95
} else {
90
- setIsTransactionValid ( false )
96
+ dispatch ( {
97
+ type : AppActions . UpdateGeneratedTx ,
98
+ payload : '' ,
99
+ } )
91
100
}
92
101
} , 300 )
93
- } , [ walletID , items , price , dispatch , setIsTransactionValid , setTotalAmount ] )
102
+ } , [ walletID , items , price , dispatch , setTotalAmount ] )
94
103
}
95
104
96
105
const useOnSubmit = ( items : TransactionOutput [ ] , dispatch : StateDispatch ) =>
@@ -176,8 +185,8 @@ export const useInitialize = (
176
185
) => {
177
186
const fee = useMemo ( ( ) => calculateFee ( generatedTx ) , [ generatedTx ] )
178
187
179
- const [ isTransactionValid , setIsTransactionValid ] = useState ( false )
180
188
const [ totalAmount , setTotalAmount ] = useState ( '0' )
189
+ const [ errorMessage , setErrorMessage ] = useState ( '' )
181
190
182
191
const updateTransactionOutput = useUpdateTransactionOutput ( dispatch )
183
192
const onItemChange = useOnItemChange ( updateTransactionOutput )
@@ -235,8 +244,6 @@ export const useInitialize = (
235
244
fee,
236
245
totalAmount,
237
246
setTotalAmount,
238
- isTransactionValid,
239
- setIsTransactionValid,
240
247
useOnTransactionChange,
241
248
onItemChange,
242
249
addTransactionOutput,
@@ -247,6 +254,8 @@ export const useInitialize = (
247
254
onGetAmountErrorMessage,
248
255
onSubmit,
249
256
onClear,
257
+ errorMessage,
258
+ setErrorMessage,
250
259
}
251
260
}
252
261
0 commit comments