Decouple ens-input.component from send context

test/unit/ui/app/reducers/metamask.spec.js

@@ -533,7 +533,7 @@ describe('MetaMask Reducers', () => {
 
   it('update ensResolution', () => {
     const state = reduceMetamask({}, {
-      type: actions.UPDATE_ENS_RESOLUTION,
+      type: actions.UPDATE_SEND_ENS_RESOLUTION,
       payload: '0x1337',
     })
 
@@ -543,7 +543,7 @@ describe('MetaMask Reducers', () => {
 
   it('update ensResolutionError', () => {
     const state = reduceMetamask({}, {
-      type: actions.UPDATE_ENS_RESOLUTION_ERROR,
+      type: actions.UPDATE_SEND_ENS_RESOLUTION_ERROR,
       payload: 'ens name not found',
     })
 

ui/app/ducks/metamask/metamask.js

@@ -292,7 +292,7 @@ function reduceMetamask (state, action) {
         },
       })
 
-    case actions.UPDATE_ENS_RESOLUTION:
+      case actions.UPDATE_SEND_ENS_RESOLUTION:
       return extend(metamaskState, {
         send: {
           ...metamaskState.send,
@@ -301,7 +301,7 @@ function reduceMetamask (state, action) {
         },
       })
 
-    case actions.UPDATE_ENS_RESOLUTION_ERROR:
+    case actions.UPDATE_SEND_ENS_RESOLUTION_ERROR:
       return extend(metamaskState, {
         send: {
           ...metamaskState.send,

ui/app/pages/send/send-content/add-recipient/ens-input.component.js

@@ -30,6 +30,8 @@ export default class EnsInput extends Component {
     scanQrCode: PropTypes.func,
     updateEnsResolutionError: PropTypes.func,
     addressBook: PropTypes.array,
+    onPaste: PropTypes.func,
+    onReset: PropTypes.func,
   }
 
   state = {
@@ -69,9 +71,9 @@ export default class EnsInput extends Component {
   }
 
   resetInput = () => {
-    const { updateSendTo, updateEnsResolution, updateEnsResolutionError } = this.props
+    const { updateEnsResolution, updateEnsResolutionError, onReset } = this.props
     this.onChange({ target: { value: '' } })
-    updateSendTo('', '')
+    onReset()
     updateEnsResolution('')
     updateEnsResolutionError('')
   }
@@ -98,13 +100,12 @@ export default class EnsInput extends Component {
   onPaste = event => {
     event.clipboardData.items[0].getAsString(text => {
       if (isValidAddress(text)) {
-        this.props.updateSendTo(text)
+        this.props.onPaste(text)
       }
     })
   }
 
   onChange = e => {
-    console.log('onchange', e.target.value)
     const { network, onChange, updateEnsResolution, updateEnsResolutionError } = this.props
     const input = e.target.value
     const networkHasEnsSupport = getNetworkEnsSupport(network)

ui/app/pages/send/send-content/add-recipient/ens-input.container.js

@@ -7,11 +7,6 @@ import {
 import {
   getAddressBook,
 } from '../../../../selectors/selectors'
-import {
-  updateSendTo,
-  updateEnsResolution,
-  updateEnsResolutionError,
-} from '../../../../store/actions'
 const connect = require('react-redux').connect
 
 
@@ -21,10 +16,5 @@ export default connect(
     selectedAddress: getSendTo(state),
     selectedName: getSendToNickname(state),
     addressBook: getAddressBook(state),
-  }),
-  dispatch => ({
-    updateSendTo: (to, nickname) => dispatch(updateSendTo(to, nickname)),
-    updateEnsResolution: (ensResolution) => dispatch(updateEnsResolution(ensResolution)),
-    updateEnsResolutionError: (message) => dispatch(updateEnsResolutionError(message)),
   })
 )(EnsInput)

ui/app/pages/send/send.component.js

@@ -298,6 +298,10 @@ export default class SendTransactionScreen extends PersistentForm {
           this.props.scanQrCode()
         }}
         onChange={this.onRecipientInputChange}
+        onPaste={text => this.props.updateSendTo(text)}
+        onReset={() => this.props.updateSendTo('', '')}
+        updateEnsResolution={this.props.updateSendEnsResolution}
+        updateEnsResolutionError={this.props.updateSendEnsResolutionError}
       />
     )
   }

ui/app/pages/send/send.container.js

@@ -38,6 +38,8 @@ import {
   setGasTotal,
   showQrScanner,
   qrCodeDetected,
+  updateSendEnsResolution,
+  updateSendEnsResolutionError,
 } from '../../store/actions'
 import {
   resetSendState,
@@ -119,5 +121,7 @@ function mapDispatchToProps (dispatch) {
     qrCodeDetected: (data) => dispatch(qrCodeDetected(data)),
     updateSendTo: (to, nickname) => dispatch(updateSendTo(to, nickname)),
     fetchBasicGasEstimates: () => dispatch(fetchBasicGasEstimates()),
+    updateSendEnsResolution: (ensResolution) => dispatch(updateSendEnsResolution(ensResolution)),
+    updateSendEnsResolutionError: (message) => dispatch(updateSendEnsResolutionError(message)),
   }
 }

ui/app/store/actions.js

@@ -200,10 +200,10 @@ var actions = {
   CLOSE_FROM_DROPDOWN: 'CLOSE_FROM_DROPDOWN',
   GAS_LOADING_STARTED: 'GAS_LOADING_STARTED',
   GAS_LOADING_FINISHED: 'GAS_LOADING_FINISHED',
-  UPDATE_ENS_RESOLUTION: 'UPDATE_ENS_RESOLUTION',
-  UPDATE_ENS_RESOLUTION_ERROR: 'UPDATE_ENS_RESOLUTION_ERROR',
-  updateEnsResolution,
-  updateEnsResolutionError,
+  UPDATE_SEND_ENS_RESOLUTION: 'UPDATE_SEND_ENS_RESOLUTION',
+  UPDATE_SEND_ENS_RESOLUTION_ERROR: 'UPDATE_SEND_ENS_RESOLUTION_ERROR',
+  updateSendEnsResolution,
+  updateSendEnsResolutionError,
   setGasLimit,
   setGasPrice,
   updateGasData,
@@ -1173,16 +1173,16 @@ function clearSend () {
   }
 }
 
-function updateEnsResolution (ensResolution) {
+function updateSendEnsResolution (ensResolution) {
   return {
-    type: actions.UPDATE_ENS_RESOLUTION,
+    type: actions.UPDATE_SEND_ENS_RESOLUTION,
     payload: ensResolution,
   }
 }
 
-function updateEnsResolutionError (errorMessage) {
+function updateSendEnsResolutionError (errorMessage) {
   return {
-    type: actions.UPDATE_ENS_RESOLUTION_ERROR,
+    type: actions.UPDATE_SEND_ENS_RESOLUTION_ERROR,
     payload: errorMessage,
   }
 }