@@ -118,28 +118,13 @@ class Send extends React.Component<SendProps, SendState> {
118118
119119 handleClose = ( ) => this . setState ( { openModal : false } ) ;
120120
121- handleSubmit = ( { address } : FormValues , formikHelpers : FormikHelpers < FormValues > ) => {
122- if ( ! AddressApi . isTextAddressValid ( address ! ) ) {
123- formikHelpers . setFieldError ( 'address' , this . props . t ( 'invalidAddress' ) ! ) ;
124- } else {
125- this . setState ( { openModal : true } ) ;
126- }
127- } ;
128-
129- onSubmit = async ( values : FormValues , password : string ) => {
121+ send = async ( { values, decryptedWif } : { values : FormValues , decryptedWif : string } ) => {
130122 const {
131123 sendTrxTrigger,
132124 sendTokenTrxTrigger,
133125 } = this . props ;
134126
135- const { address, wif, token } = this . props ;
136- let decryptedWif ;
137-
138- try {
139- decryptedWif = await CryptoApi . decryptWif ( wif , '' ) ;
140- } catch ( error ) {
141- decryptedWif = await CryptoApi . decryptWif ( wif , password ) ;
142- }
127+ const { address, token } = this . props ;
143128
144129 if ( ! token ) {
145130 sendTrxTrigger ( {
@@ -161,6 +146,29 @@ class Send extends React.Component<SendProps, SendState> {
161146 }
162147 } ;
163148
149+ handleSubmit = async ( values : FormValues , formikHelpers : FormikHelpers < FormValues > ) => {
150+ if ( ! AddressApi . isTextAddressValid ( values . address ! ) ) {
151+ formikHelpers . setFieldError ( 'address' , this . props . t ( 'invalidAddress' ) ! ) ;
152+ } else {
153+ try {
154+ const { wif } = this . props ;
155+ const decryptedWif = await CryptoApi . decryptWif ( wif , '' ) ;
156+
157+ await this . send ( { values, decryptedWif } ) ;
158+ } catch ( error ) {
159+ this . setState ( { openModal : true } ) ;
160+ }
161+ }
162+ } ;
163+
164+ onSubmit = async ( values : FormValues , password : string ) => {
165+ const { wif } = this . props ;
166+
167+ const decryptedWif = await CryptoApi . decryptWif ( wif , password ) ;
168+
169+ await this . send ( { values, decryptedWif } ) ;
170+ } ;
171+
164172 renderForm = ( formikProps : FormikProps < typeof initialValues > ) => {
165173 const {
166174 isNativeToken, props, onSubmit, handleClose,
@@ -174,7 +182,6 @@ class Send extends React.Component<SendProps, SendState> {
174182 onClose = { handleClose }
175183 token = { token }
176184 onSubmit = { onSubmit }
177-
178185 />
179186 < Form className = { styles . form } >
180187 < div className = { styles . fields } >
0 commit comments