Merge branch 'develop' into initial-trezor-support

USER_AGREEMENT.md

@@ -138,7 +138,7 @@ Notwithstanding the parties' decision to resolve all disputes through arbitratio
 
 ### 13.6 30-Day Right to Opt Out ###
 
-You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: MetaMask ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at legal-opt@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, MetaMask also will not be bound by them.
+You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: MetaMask ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at support@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, MetaMask also will not be bound by them.
 
 ### 13.7 Changes to This Section ###
 

notices/archive/notice_0.md

@@ -138,7 +138,7 @@ Notwithstanding the parties' decision to resolve all disputes through arbitratio
 
 ### 13.6 30-Day Right to Opt Out ###
 
-You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: MetaMask ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at legal-opt@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, MetaMask also will not be bound by them.
+You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: MetaMask ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at support@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, MetaMask also will not be bound by them.
 
 ### 13.7 Changes to This Section ###
 
@@ -177,4 +177,3 @@ Users with questions, complaints or claims with respect to the Service may conta
 **[Privacy](https://metamask.io/privacy.html)**
 
 **[Attributions](https://metamask.io/attributions.html)**
-

ui/app/actions.js

@@ -6,7 +6,7 @@ const {
   calcGasTotal,
   calcTokenBalance,
   estimateGas,
-} = require('./components/send_/send.utils')
+} = require('./components/send/send.utils')
 const ethUtil = require('ethereumjs-util')
 const { fetchLocale } = require('../i18n-helper')
 const log = require('loglevel')

ui/app/app.js

@@ -11,7 +11,7 @@ const log = require('loglevel')
 // init
 const InitializeScreen = require('../../mascara/src/app/first-time').default
 // accounts
-const SendTransactionScreen = require('./components/send_/send.container')
+const SendTransactionScreen = require('./components/send/send.container')
 const ConfirmTransaction = require('./components/pages/confirm-transaction')
 
 // slideout menu

ui/app/components/customize-gas-modal/index.js

@@ -16,11 +16,11 @@ const {
   MIN_GAS_PRICE_DEC,
   MIN_GAS_LIMIT_DEC,
   MIN_GAS_PRICE_GWEI,
-} = require('../send_/send.constants')
+} = require('../send/send.constants')
 
 const {
   isBalanceSufficient,
-} = require('../send_/send.utils')
+} = require('../send/send.utils')
 
 const {
   conversionUtil,
@@ -45,7 +45,7 @@ const {
 const {
   getGasPrice,
   getGasLimit,
-} = require('../send_/send.selectors')
+} = require('../send/send.selectors')
 
 function mapStateToProps (state) {
   const selectedToken = getSelectedToken(state)

ui/app/components/dropdowns/account-dropdown-mini.js

@@ -1,7 +1,7 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const AccountListItem = require('../send_/account-list-item/account-list-item.component').default
+const AccountListItem = require('../send/account-list-item/account-list-item.component').default
 
 module.exports = AccountDropdownMini
 

ui/app/components/ens-input.js

@@ -10,7 +10,7 @@ const networkMap = require('ethjs-ens/lib/network-map.json')
 const ensRE = /.+\..+$/
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
 const connect = require('react-redux').connect
-const ToAutoComplete = require('./send/to-autocomplete')
+const ToAutoComplete = require('./send/to-autocomplete').default
 const log = require('loglevel')
 const { isValidENSAddress } = require('../util')
 

ui/app/components/modals/customize-gas/customize-gas.component.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import GasModalCard from '../../customize-gas-modal/gas-modal-card'
-import { MIN_GAS_PRICE_GWEI } from '../../send_/send.constants'
+import { MIN_GAS_PRICE_GWEI } from '../../send/send.constants'
 
 import {
   getDecimalGasLimit,

ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.component.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import ConfirmPageContainer, { ConfirmDetailRow } from '../../confirm-page-container'
 import { formatCurrency } from '../../../helpers/confirm-transaction/util'
-import { isBalanceSufficient } from '../../send_/send.utils'
+import { isBalanceSufficient } from '../../send/send.utils'
 import { DEFAULT_ROUTE } from '../../../routes'
 import {
   INSUFFICIENT_FUNDS_ERROR_KEY,

ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js

@@ -13,9 +13,9 @@ import {
   GAS_LIMIT_TOO_LOW_ERROR_KEY,
 } from '../../../constants/error-keys'
 import { getHexGasTotal } from '../../../helpers/confirm-transaction/util'
-import { isBalanceSufficient } from '../../send_/send.utils'
+import { isBalanceSufficient } from '../../send/send.utils'
 import { conversionGreaterThan } from '../../../conversion-util'
-import { MIN_GAS_LIMIT_DEC } from '../../send_/send.constants'
+import { MIN_GAS_LIMIT_DEC } from '../../send/send.constants'
 
 const mapStateToProps = (state, props) => {
   const { toAddress: propsToAddress } = props

ui/app/components/pending-tx/confirm-deploy-contract.js

@@ -11,7 +11,7 @@ const { conversionUtil } = require('../../conversion-util')
 const SenderToRecipient = require('../sender-to-recipient')
 const NetworkDisplay = require('../network-display')
 
-const { MIN_GAS_PRICE_HEX } = require('../send_/send.constants')
+const { MIN_GAS_PRICE_HEX } = require('../send/send.constants')
 
 class ConfirmDeployContract extends Component {
   constructor (props) {

ui/app/components/pending-tx/confirm-send-ether.js

@@ -19,14 +19,14 @@ const {
 const {
   calcGasTotal,
   isBalanceSufficient,
-} = require('../send_/send.utils')
+} = require('../send/send.utils')
-const GasFeeDisplay = require('../send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component').default
+const GasFeeDisplay = require('../send/send-content/send-gas-row/gas-fee-display/').default
 const SenderToRecipient = require('../sender-to-recipient')
 const NetworkDisplay = require('../network-display')
 const currencyFormatter = require('currency-formatter')
 const currencies = require('currency-formatter/currencies')
 
-const { MIN_GAS_PRICE_HEX } = require('../send_/send.constants')
+const { MIN_GAS_PRICE_HEX } = require('../send/send.constants')
 const { SEND_ROUTE, DEFAULT_ROUTE } = require('../../routes')
 const {
   ENVIRONMENT_TYPE_POPUP,

ui/app/components/pending-tx/confirm-send-token.js

@@ -11,7 +11,7 @@ abiDecoder.addABI(tokenAbi)
 const actions = require('../../actions')
 const clone = require('clone')
 const Identicon = require('../identicon')
-const GasFeeDisplay = require('../send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js').default
+const GasFeeDisplay = require('../send/send-content/send-gas-row/gas-fee-display/').default
 const NetworkDisplay = require('../network-display')
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
@@ -23,7 +23,7 @@ const {
 const {
   calcGasTotal,
   isBalanceSufficient,
-} = require('../send_/send.utils')
+} = require('../send/send.utils')
 const {
   calcTokenAmount,
 } = require('../../token-util')
@@ -31,7 +31,7 @@ const classnames = require('classnames')
 const currencyFormatter = require('currency-formatter')
 const currencies = require('currency-formatter/currencies')
 
-const { MIN_GAS_PRICE_HEX } = require('../send_/send.constants')
+const { MIN_GAS_PRICE_HEX } = require('../send/send.constants')
 
 const {
   getTokenExchangeRate,

ui/app/components/send/account-list-item/account-list-item.component.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import { checksumAddress } from '../../../util'
 import Identicon from '../../identicon'
-import CurrencyDisplay from '../../send/currency-display'
+import CurrencyDisplay from '../currency-display'
 
 export default class AccountListItem extends Component {
 
@@ -17,6 +17,10 @@ export default class AccountListItem extends Component {
     icon: PropTypes.node,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   render () {
     const {
       account,
@@ -67,8 +71,3 @@ export default class AccountListItem extends Component {
     </div>)
   }
 }
-
-AccountListItem.contextTypes = {
-  t: PropTypes.func,
-}
-

ui/app/components/send/account-list-item/tests/account-list-item-component.test.js

@@ -4,7 +4,7 @@ import { shallow } from 'enzyme'
 import sinon from 'sinon'
 import proxyquire from 'proxyquire'
 import Identicon from '../../../identicon'
-import CurrencyDisplay from '../../../send/currency-display'
+import CurrencyDisplay from '../../currency-display'
 
 const utilsMethodStubs = {
   checksumAddress: sinon.stub().returns('mockCheckSumAddress'),

ui/app/components/send/currency-display/currency-display.js

@@ -1,8 +1,8 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const { conversionUtil, multiplyCurrencies } = require('../../conversion-util')
+const { conversionUtil, multiplyCurrencies } = require('../../../conversion-util')
-const { removeLeadingZeroes } = require('../send_/send.utils')
+const { removeLeadingZeroes } = require('../send.utils')
 const currencyFormatter = require('currency-formatter')
 const currencies = require('currency-formatter/currencies')
 const ethUtil = require('ethereumjs-util')

ui/app/components/send/currency-display/index.js

@@ -0,0 +1 @@
+export { default } from './currency-display.js'

ui/app/components/send/send-content/send-amount-row/amount-max-button/amount-max-button.component.js

@@ -13,6 +13,10 @@ export default class AmountMaxButton extends Component {
     tokenBalance: PropTypes.string,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   setMaxAmount () {
     const {
       balance,
@@ -48,7 +52,3 @@ export default class AmountMaxButton extends Component {
   }
 
 }
-
-AmountMaxButton.contextTypes = {
-  t: PropTypes.func,
-}

ui/app/components/send/send-content/send-amount-row/send-amount-row.component.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import SendRowWrapper from '../send-row-wrapper/'
 import AmountMaxButton from './amount-max-button/'
-import CurrencyDisplay from '../../../send/currency-display'
+import CurrencyDisplay from '../../currency-display'
 
 export default class SendAmountRow extends Component {
 
@@ -25,7 +25,11 @@ export default class SendAmountRow extends Component {
     updateSendAmount: PropTypes.func,
     updateSendAmountError: PropTypes.func,
     updateGas: PropTypes.func,
-  }
+  };
+
+  static contextTypes = {
+    t: PropTypes.func,
+  };
 
   validateAmount (amount) {
     const {
@@ -117,8 +121,3 @@ export default class SendAmountRow extends Component {
   }
 
 }
-
-SendAmountRow.contextTypes = {
-  t: PropTypes.func,
-}
-

ui/app/components/send/send-content/send-amount-row/tests/send-amount-row-component.test.js

@@ -6,7 +6,7 @@ import SendAmountRow from '../send-amount-row.component.js'
 
 import SendRowWrapper from '../../send-row-wrapper/send-row-wrapper.component'
 import AmountMaxButton from '../amount-max-button/amount-max-button.container'
-import CurrencyDisplay from '../../../../send/currency-display'
+import CurrencyDisplay from '../../../currency-display'
 
 const propsMethodSpies = {
   setMaxModeTo: sinon.spy(),

ui/app/components/send/send-content/send-dropdown-list/send-dropdown-list.component.js

@@ -11,6 +11,10 @@ export default class SendDropdownList extends Component {
     activeAddress: PropTypes.string,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   getListItemIcon (accountAddress, activeAddress) {
     return accountAddress === activeAddress
       ? <i className={`fa fa-check fa-lg`} style={ { color: '#02c9b1' } }/>
@@ -46,7 +50,3 @@ export default class SendDropdownList extends Component {
   }
 
 }
-
-SendDropdownList.contextTypes = {
-  t: PropTypes.func,
-}

ui/app/components/send/send-content/send-from-row/from-dropdown/from-dropdown.component.js

@@ -14,6 +14,10 @@ export default class FromDropdown extends Component {
     selectedAccount: PropTypes.object,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   render () {
     const {
       accounts,
@@ -40,7 +44,3 @@ export default class FromDropdown extends Component {
   }
 
 }
-
-FromDropdown.contextTypes = {
-  t: PropTypes.func,
-}

ui/app/components/send/send-content/send-from-row/send-from-row.component.js

@@ -17,6 +17,10 @@ export default class SendFromRow extends Component {
     setSendTokenBalance: PropTypes.func,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   async handleFromChange (newFrom) {
     const {
       updateSendFrom,
@@ -57,7 +61,3 @@ export default class SendFromRow extends Component {
   }
 
 }
-
-SendFromRow.contextTypes = {
-  t: PropTypes.func,
-}

ui/app/components/send/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js

@@ -14,6 +14,10 @@ export default class GasFeeDisplay extends Component {
     onClick: PropTypes.func,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   render () {
     const {
       conversionRate,
@@ -55,7 +59,3 @@ export default class GasFeeDisplay extends Component {
     )
   }
 }
-
-GasFeeDisplay.contextTypes = {
-  t: PropTypes.func,
-}

ui/app/components/send/send-content/send-gas-row/send-gas-row.component.js

@@ -14,6 +14,10 @@ export default class SendGasRow extends Component {
     showCustomizeGasModal: PropTypes.func,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   render () {
     const {
       conversionRate,
@@ -42,7 +46,3 @@ export default class SendGasRow extends Component {
   }
 
 }
-
-SendGasRow.contextTypes = {
-  t: PropTypes.func,
-}

ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js

@@ -8,6 +8,10 @@ export default class SendRowErrorMessage extends Component {
     errorType: PropTypes.string,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   render () {
     const { errors, errorType } = this.props
 
@@ -21,7 +25,3 @@ export default class SendRowErrorMessage extends Component {
   }
 
 }
-
-SendRowErrorMessage.contextTypes = {
-  t: PropTypes.func,
-}

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

@@ -11,6 +11,10 @@ export default class SendRowWrapper extends Component {
     showError: PropTypes.bool,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   render () {
     const {
       children,
@@ -37,7 +41,3 @@ export default class SendRowWrapper extends Component {
   }
 
 }
-
-SendRowWrapper.contextTypes = {
-  t: PropTypes.func,
-}

ui/app/components/send/send-content/send-to-row/send-to-row.component.js

@@ -19,6 +19,10 @@ export default class SendToRow extends Component {
     updateSendToError: PropTypes.func,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   handleToChange (to, nickname = '', toError) {
     const { updateSendTo, updateSendToError, updateGas } = this.props
     const toErrorObject = getToErrorObject(to, toError)
@@ -63,8 +67,3 @@ export default class SendToRow extends Component {
   }
 
 }
-
-SendToRow.contextTypes = {
-  t: PropTypes.func,
-}
-