Remove unused components

ui/app/ducks/send/send-duck.test.js

@@ -6,7 +6,6 @@ import SendReducer, {
   updateSendErrors,
   showGasButtonGroup,
   hideGasButtonGroup,
-  updateSendWarnings,
 } from './send.duck.js'
 
 describe('Send Duck', () => {
@@ -20,14 +19,12 @@ describe('Send Duck', () => {
     toDropdownOpen: false,
     errors: {},
     gasButtonGroupShown: true,
-    warnings: {},
   }
   const OPEN_FROM_DROPDOWN = 'metamask/send/OPEN_FROM_DROPDOWN'
   const CLOSE_FROM_DROPDOWN = 'metamask/send/CLOSE_FROM_DROPDOWN'
   const OPEN_TO_DROPDOWN = 'metamask/send/OPEN_TO_DROPDOWN'
   const CLOSE_TO_DROPDOWN = 'metamask/send/CLOSE_TO_DROPDOWN'
   const UPDATE_SEND_ERRORS = 'metamask/send/UPDATE_SEND_ERRORS'
-  const UPDATE_SEND_WARNINGS = 'metamask/send/UPDATE_SEND_WARNINGS'
   const RESET_SEND_STATE = 'metamask/send/RESET_SEND_STATE'
   const SHOW_GAS_BUTTON_GROUP = 'metamask/send/SHOW_GAS_BUTTON_GROUP'
   const HIDE_GAS_BUTTON_GROUP = 'metamask/send/HIDE_GAS_BUTTON_GROUP'
@@ -176,11 +173,4 @@ describe('Send Duck', () => {
     )
   })
 
-  describe('updateSendWarnings', () => {
-    assert.deepEqual(
-      updateSendWarnings('mockWarningObject'),
-      { type: UPDATE_SEND_WARNINGS, value: 'mockWarningObject' }
-    )
-  })
-
 })

ui/app/ducks/send/send.duck.js

@@ -6,7 +6,6 @@ const CLOSE_FROM_DROPDOWN = 'metamask/send/CLOSE_FROM_DROPDOWN'
 const OPEN_TO_DROPDOWN = 'metamask/send/OPEN_TO_DROPDOWN'
 const CLOSE_TO_DROPDOWN = 'metamask/send/CLOSE_TO_DROPDOWN'
 const UPDATE_SEND_ERRORS = 'metamask/send/UPDATE_SEND_ERRORS'
-const UPDATE_SEND_WARNINGS = 'metamask/send/UPDATE_SEND_WARNINGS'
 const RESET_SEND_STATE = 'metamask/send/RESET_SEND_STATE'
 const SHOW_GAS_BUTTON_GROUP = 'metamask/send/SHOW_GAS_BUTTON_GROUP'
 const HIDE_GAS_BUTTON_GROUP = 'metamask/send/HIDE_GAS_BUTTON_GROUP'
@@ -17,7 +16,6 @@ const initState = {
   toDropdownOpen: false,
   gasButtonGroupShown: true,
   errors: {},
-  warnings: {},
 }
 
 // Reducer
@@ -48,13 +46,6 @@ export default function reducer ({ send: sendState = initState }, action = {}) {
           ...action.value,
         },
       })
-    case UPDATE_SEND_WARNINGS:
-      return extend(newState, {
-        warnings: {
-          ...newState.warnings,
-          ...action.value,
-        },
-      })
     case SHOW_GAS_BUTTON_GROUP:
       return extend(newState, {
         gasButtonGroupShown: true,
@@ -94,13 +85,6 @@ export function updateSendErrors (errorObject) {
   }
 }
 
-export function updateSendWarnings (warningObject) {
-  return {
-    type: UPDATE_SEND_WARNINGS,
-    value: warningObject,
-  }
-}
-
 export function resetSendState () {
   return { type: RESET_SEND_STATE }
 }

ui/app/pages/send/send-content/add-recipient/add-recipient.selectors.js

@@ -2,7 +2,6 @@ const selectors = {
   getToDropdownOpen,
   getTokens,
   sendToIsInError,
-  sendToIsInWarning,
 }
 
 module.exports = selectors
@@ -15,10 +14,6 @@ function sendToIsInError (state) {
   return Boolean(state.send.errors.to)
 }
 
-function sendToIsInWarning (state) {
-  return Boolean(state.send.warnings.to)
-}
-
 function getTokens (state) {
   return state.metamask.tokens
 }

ui/app/pages/send/send-content/send-row-wrapper/send-row-wrapper.component.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import SendRowErrorMessage from './send-row-error-message'
-import SendRowWarningMessage from './send-row-warning-message'
 
 export default class SendRowWrapper extends Component {
 
@@ -10,8 +9,6 @@ export default class SendRowWrapper extends Component {
     errorType: PropTypes.string,
     label: PropTypes.string,
     showError: PropTypes.bool,
-    showWarning: PropTypes.bool,
-    warningType: PropTypes.string,
   };
 
   static contextTypes = {
@@ -24,8 +21,6 @@ export default class SendRowWrapper extends Component {
       errorType = '',
       label,
       showError = false,
-      showWarning = false,
-      warningType = '',
     } = this.props
     const formField = Array.isArray(children) ? children[1] || children[0] : children
     const customLabelContent = children.length > 1 ? children[0] : null
@@ -42,7 +37,6 @@ export default class SendRowWrapper extends Component {
           </div>
           <div>
             {showError && <SendRowErrorMessage errorType={errorType} />}
-            {!showError && showWarning && <SendRowWarningMessage warningType={warningType} />}
           </div>
         </div>
       </div>
@@ -55,8 +49,6 @@ export default class SendRowWrapper extends Component {
       errorType = '',
       label,
       showError = false,
-      showWarning = false,
-      warningType = '',
     } = this.props
 
     const formField = Array.isArray(children) ? children[1] || children[0] : children
@@ -67,7 +59,6 @@ export default class SendRowWrapper extends Component {
         <div className="send-v2__form-label">
           {label}
           {showError && <SendRowErrorMessage errorType={errorType} />}
-          {!showError && showWarning && <SendRowWarningMessage warningType={warningType} />}
           {customLabelContent}
         </div>
         <div className="send-v2__form-field">

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

@@ -9,7 +9,6 @@ export default class SendHeader extends Component {
     clearSend: PropTypes.func,
     history: PropTypes.object,
     titleKey: PropTypes.string,
-    subtitleParams: PropTypes.array,
   };
 
   static contextTypes = {

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

@@ -1,14 +1,13 @@
 import { connect } from 'react-redux'
 import { clearSend } from '../../../store/actions'
 import SendHeader from './send-header.component'
-import { getSubtitleParams, getTitleKey } from './send-header.selectors'
+import { getTitleKey } from './send-header.selectors'
 
 export default connect(mapStateToProps, mapDispatchToProps)(SendHeader)
 
 function mapStateToProps (state) {
   return {
     titleKey: getTitleKey(state),
-    subtitleParams: getSubtitleParams(state),
   }
 }
 

ui/app/pages/send/send-header/send-header.selectors.js

@@ -6,7 +6,6 @@ const {
 
 const selectors = {
   getTitleKey,
-  getSubtitleParams,
 }
 
 module.exports = selectors
@@ -27,16 +26,3 @@ function getTitleKey (state) {
     return 'sendETH'
   }
 }
-
-function getSubtitleParams (state) {
-  const isEditing = Boolean(getSendEditingTransactionId(state))
-  const token = getSelectedToken(state)
-
-  if (isEditing) {
-    return [ 'editingTransaction' ]
-  } else if (token) {
-    return [ 'onlySendTokensToAccountAddress', [ token.symbol ] ]
-  } else {
-    return [ 'onlySendToEtherAddress' ]
-  }
-}

ui/app/pages/send/send-header/tests/send-header-component.test.js

@@ -24,7 +24,6 @@ describe('SendHeader Component', function () {
       clearSend={propsMethodSpies.clearSend}
       history={historySpies}
       titleKey={'mockTitleKey'}
-      subtitleParams={[ 'mockSubtitleKey', 'mockVal']}
     />, { context: { t: (str1, str2) => str2 ? str1 + str2 : str1 } })
   })
 

ui/app/pages/send/send-header/tests/send-header-container.test.js

@@ -20,7 +20,6 @@ proxyquire('../send-header.container.js', {
   '../../../store/actions': actionSpies,
   './send-header.selectors': {
     getTitleKey: (s) => `mockTitleKey:${s}`,
-    getSubtitleParams: (s) => `mockSubtitleParams:${s}`,
   },
 })
 
@@ -31,7 +30,6 @@ describe('send-header container', () => {
     it('should map the correct properties to props', () => {
       assert.deepEqual(mapStateToProps('mockState'), {
         titleKey: 'mockTitleKey:mockState',
-        subtitleParams: 'mockSubtitleParams:mockState',
       })
     })
 

ui/app/pages/send/send-header/tests/send-header-selectors.test.js

@@ -3,7 +3,6 @@ import proxyquire from 'proxyquire'
 
 const {
   getTitleKey,
-  getSubtitleParams,
 } = proxyquire('../send-header.selectors', {
   '../send.selectors': {
     getSelectedToken: (mockState) => mockState.t,
@@ -32,21 +31,4 @@ describe('send-header selectors', () => {
     })
   })
 
-  describe('getSubtitleParams()', () => {
-    it('should return the correct params when getSendEditingTransactionId is truthy', () => {
-      assert.deepEqual(getSubtitleParams({ e: 1, t: true, to: '0x123' }), [ 'editingTransaction' ])
-    })
-
-    it('should return the correct params when getSendEditingTransactionId is falsy and getSelectedToken is truthy', () => {
-      assert.deepEqual(
-        getSubtitleParams({ e: null, t: { symbol: 'ABC' }, to: '0x123' }),
-        [ 'onlySendTokensToAccountAddress', [ 'ABC' ] ]
-      )
-    })
-
-    it('should return the correct params when getSendEditingTransactionId is falsy and getSelectedToken is falsy', () => {
-      assert.deepEqual(getSubtitleParams({ e: null, to: '0x123' }), [ 'onlySendToEtherAddress' ])
-    })
-  })
-
 })

ui/app/pages/send/send.selectors.js

@@ -53,7 +53,6 @@ const selectors = {
   getSendTo,
   getSendToAccounts,
   getSendToNickname,
-  getSendWarnings,
   getTokenBalance,
   getTokenExchangeRate,
   getUnapprovedTxs,
@@ -244,11 +243,6 @@ function getSendToAccounts (state) {
   const addressBookAccounts = getAddressBook(state)
   return [...fromAccounts, ...addressBookAccounts]
 }
-
-function getSendWarnings (state) {
-  return state.send.warnings
-}
-
 function getTokenBalance (state) {
   return state.metamask.send.tokenBalance
 }