Merge pull request #6419 from MetaMask/develop

Merge develop into master

16 files changed, 12 insertions, 1252 deletions

diff --git a/ui/app/components/app/account-dropdowns.js b/ui/app/components/app/account-dropdowns.js
deleted file mode 100644
index e02d17e54..000000000
--- a/ui/app/components/app/account-dropdowns.js
+++ /dev/null
@@ -1,338 +0,0 @@
-const Component = require('react').Component
-const PropTypes = require('prop-types')
-const h = require('react-hyperscript')
-const actions = require('../../store/actions')
-const genAccountLink = require('etherscan-link').createAccountLink
-const connect = require('react-redux').connect
-const Dropdown = require('./dropdown').Dropdown
-const DropdownMenuItem = require('./dropdown').DropdownMenuItem
-const copyToClipboard = require('copy-to-clipboard')
-const { checksumAddress } = require('../../helpers/utils/util')
-
-import Identicon from '../ui/identicon'
-
-class AccountDropdowns extends Component {
-  constructor (props) {
-    super(props)
-    this.state = {
-      accountSelectorActive: false,
-      optionsMenuActive: false,
-    }
-    this.accountSelectorToggleClassName = 'accounts-selector'
-    this.optionsMenuToggleClassName = 'fa-ellipsis-h'
-  }
-
-  renderAccounts () {
-    const { identities, selected, keyrings } = this.props
-
-    return Object.keys(identities).map((key, index) => {
-      const identity = identities[key]
-      const isSelected = identity.address === selected
-
-      const simpleAddress = identity.address.substring(2).toLowerCase()
-
-      const keyring = keyrings.find((kr) => {
-        return kr.accounts.includes(simpleAddress) ||
-          kr.accounts.includes(identity.address)
-      })
-
-      return h(
-        DropdownMenuItem,
-        {
-          closeMenu: () => {},
-          onClick: () => {
-            this.props.actions.showAccountDetail(identity.address)
-          },
-          style: {
-            marginTop: index === 0 ? '5px' : '',
-            fontSize: '24px',
-          },
-        },
-        [
-          h(
-            Identicon,
-            {
-              address: identity.address,
-              diameter: 32,
-              style: {
-                marginLeft: '10px',
-              },
-            },
-          ),
-          this.indicateIfLoose(keyring),
-          h('span', {
-            style: {
-              marginLeft: '20px',
-              fontSize: '24px',
-              maxWidth: '145px',
-              whiteSpace: 'nowrap',
-              overflow: 'hidden',
-              textOverflow: 'ellipsis',
-            },
-          }, identity.name || ''),
-          h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, isSelected ? h('.check', '✓') : null),
-        ]
-      )
-    })
-  }
-
-  indicateIfLoose (keyring) {
-    try { // Sometimes keyrings aren't loaded yet:
-      const type = keyring.type
-      const isLoose = type !== 'HD Key Tree'
-      return isLoose ? h('.keyring-label.allcaps', this.context.t('loose')) : null
-    } catch (e) { return }
-  }
-
-  renderAccountSelector () {
-    const { actions } = this.props
-    const { accountSelectorActive } = this.state
-
-    return h(
-      Dropdown,
-      {
-        useCssTransition: true, // Hardcoded because account selector is temporarily in app-header
-        style: {
-          marginLeft: '-238px',
-          marginTop: '38px',
-          minWidth: '180px',
-          overflowY: 'auto',
-          maxHeight: '300px',
-          width: '300px',
-        },
-        innerStyle: {
-          padding: '8px 25px',
-        },
-        isOpen: accountSelectorActive,
-        onClickOutside: (event) => {
-          const { classList } = event.target
-          const isNotToggleElement = !classList.contains(this.accountSelectorToggleClassName)
-          if (accountSelectorActive && isNotToggleElement) {
-            this.setState({ accountSelectorActive: false })
-          }
-        },
-      },
-      [
-        ...this.renderAccounts(),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => actions.addNewAccount(),
-          },
-          [
-            h(
-              Identicon,
-              {
-                style: {
-                  marginLeft: '10px',
-                },
-                diameter: 32,
-              },
-            ),
-            h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, this.context.t('createAccount')),
-          ],
-        ),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => actions.showImportPage(),
-          },
-          [
-            h(
-              Identicon,
-              {
-                style: {
-                  marginLeft: '10px',
-                },
-                diameter: 32,
-              },
-            ),
-            h('span', {
-              style: {
-                marginLeft: '20px',
-                fontSize: '24px',
-                marginBottom: '5px',
-              },
-            }, this.context.t('importAccount')),
-          ]
-        ),
-      ]
-    )
-  }
-
-  renderAccountOptions () {
-    const { actions } = this.props
-    const { optionsMenuActive } = this.state
-
-    return h(
-      Dropdown,
-      {
-        style: {
-          marginLeft: '-215px',
-          minWidth: '180px',
-        },
-        isOpen: optionsMenuActive,
-        onClickOutside: (event) => {
-          const { classList } = event.target
-          const isNotToggleElement = !classList.contains(this.optionsMenuToggleClassName)
-          if (optionsMenuActive && isNotToggleElement) {
-            this.setState({ optionsMenuActive: false })
-          }
-        },
-      },
-      [
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => {
-              const { selected, network } = this.props
-              const url = genAccountLink(selected, network)
-              global.platform.openWindow({ url })
-            },
-          },
-          this.context.t('etherscanView'),
-        ),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => {
-              const { selected, identities } = this.props
-              var identity = identities[selected]
-              actions.showQrView(selected, identity ? identity.name : '')
-            },
-          },
-          this.context.t('showQRCode'),
-        ),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => {
-              const { selected } = this.props
-              copyToClipboard(checksumAddress(selected))
-            },
-          },
-          this.context.t('copyAddress'),
-        ),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => {
-              actions.requestAccountExport()
-            },
-          },
-          this.context.t('exportPrivateKey'),
-        ),
-      ]
-    )
-  }
-
-  render () {
-    const { metricsEvent } = this.context
-    const { style, enableAccountsSelector, enableAccountOptions } = this.props
-    const { optionsMenuActive, accountSelectorActive } = this.state
-
-    return h(
-      'span',
-      {
-        style: style,
-      },
-      [
-        enableAccountsSelector && h(
-          // 'i.fa.fa-angle-down',
-          'div.cursor-pointer.color-orange.accounts-selector',
-          {
-            style: {
-              // fontSize: '1.8em',
-              background: 'url(images/switch_acc.svg) white center center no-repeat',
-              height: '25px',
-              width: '25px',
-              transform: 'scale(0.75)',
-              marginRight: '3px',
-            },
-            onClick: (event) => {
-              event.stopPropagation()
-              this.setState({
-                accountSelectorActive: !accountSelectorActive,
-                optionsMenuActive: false,
-              })
-            },
-          },
-          this.renderAccountSelector(),
-        ),
-        enableAccountOptions && h(
-          'i.fa.fa-ellipsis-h',
-          {
-            style: {
-              marginRight: '0.5em',
-              fontSize: '1.8em',
-            },
-            onClick: (event) => {
-              metricsEvent({
-                eventOpts: {
-                  category: 'Accounts',
-                  action: 'userClick',
-                  name: 'accountsOpenedMenu',
-                },
-                pageOpts: {
-                  section: 'header',
-                  component: 'accountDropdownIcon',
-                },
-              })
-              event.stopPropagation()
-              this.setState({
-                accountSelectorActive: false,
-                optionsMenuActive: !optionsMenuActive,
-              })
-            },
-          },
-          this.renderAccountOptions()
-        ),
-      ]
-    )
-  }
-}
-
-AccountDropdowns.defaultProps = {
-  enableAccountsSelector: false,
-  enableAccountOptions: false,
-}
-
-AccountDropdowns.propTypes = {
-  identities: PropTypes.objectOf(PropTypes.object),
-  selected: PropTypes.string,
-  keyrings: PropTypes.array,
-  actions: PropTypes.objectOf(PropTypes.func),
-  network: PropTypes.string,
-  style: PropTypes.object,
-  enableAccountOptions: PropTypes.bool,
-  enableAccountsSelector: PropTypes.bool,
-    t: PropTypes.func,
-}
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    actions: {
-      showConfigPage: () => dispatch(actions.showConfigPage()),
-      requestAccountExport: () => dispatch(actions.requestExportAccount()),
-      showAccountDetail: (address) => dispatch(actions.showAccountDetail(address)),
-      addNewAccount: () => dispatch(actions.addNewAccount()),
-      showImportPage: () => dispatch(actions.showImportPage()),
-      showQrView: (selected, identity) => dispatch(actions.showQrView(selected, identity)),
-    },
-  }
-}
-
-AccountDropdowns.contextTypes = {
-  t: PropTypes.func,
-  metricsEvent: PropTypes.func,
-}
-
-module.exports = {
-  AccountDropdowns: connect(null, mapDispatchToProps)(AccountDropdowns),
-}
diff --git a/ui/app/components/app/dropdowns/components/account-dropdowns.js b/ui/app/components/app/dropdowns/components/account-dropdowns.js
deleted file mode 100644
index c603a9a9f..000000000
--- a/ui/app/components/app/dropdowns/components/account-dropdowns.js
+++ /dev/null
@@ -1,473 +0,0 @@
-const Component = require('react').Component
-const PropTypes = require('prop-types')
-const h = require('react-hyperscript')
-const actions = require('../../../../store/actions')
-const genAccountLink = require('../../../../../lib/account-link.js')
-const connect = require('react-redux').connect
-const Dropdown = require('./dropdown').Dropdown
-const DropdownMenuItem = require('./dropdown').DropdownMenuItem
-import Identicon from '../../../ui/identicon'
-const { checksumAddress } = require('../../../../helpers/utils/util')
-const copyToClipboard = require('copy-to-clipboard')
-const { formatBalance } = require('../../../../helpers/utils/util')
-
-
-class AccountDropdowns extends Component {
-  constructor (props) {
-    super(props)
-    this.state = {
-      accountSelectorActive: false,
-      optionsMenuActive: false,
-    }
-    // Used for orangeaccount selector icon
-    // this.accountSelectorToggleClassName = 'accounts-selector'
-    this.accountSelectorToggleClassName = 'fa-angle-down'
-    this.optionsMenuToggleClassName = 'fa-ellipsis-h'
-  }
-
-  renderAccounts () {
-    const { identities, accounts, selected, menuItemStyles, actions, keyrings, ticker } = this.props
-
-    return Object.keys(identities).map((key, index) => {
-      const identity = identities[key]
-      const isSelected = identity.address === selected
-
-      const balanceValue = accounts[key].balance
-      const formattedBalance = balanceValue ? formatBalance(balanceValue, 6, true, ticker) : '...'
-      const simpleAddress = identity.address.substring(2).toLowerCase()
-
-      const keyring = keyrings.find((kr) => {
-        return kr.accounts.includes(simpleAddress) ||
-          kr.accounts.includes(identity.address)
-      })
-
-      return h(
-        DropdownMenuItem,
-        {
-          closeMenu: () => {},
-          onClick: () => {
-            this.props.actions.showAccountDetail(identity.address)
-          },
-          style: Object.assign(
-            {
-              marginTop: index === 0 ? '5px' : '',
-              fontSize: '24px',
-              width: '260px',
-            },
-            menuItemStyles,
-          ),
-        },
-        [
-          h('div.flex-row.flex-center', {}, [
-
-            h('span', {
-              style: {
-                flex: '1 1 0',
-                minWidth: '20px',
-                minHeight: '30px',
-              },
-            }, [
-              h('span', {
-                style: {
-                  flex: '1 1 auto',
-                  fontSize: '14px',
-                },
-              }, isSelected ? h('i.fa.fa-check') : null),
-            ]),
-
-            h(
-              Identicon,
-              {
-                address: identity.address,
-                diameter: 24,
-                style: {
-                  flex: '1 1 auto',
-                  marginLeft: '10px',
-                },
-              },
-            ),
-
-            h('span.flex-column', {
-              style: {
-                flex: '10 10 auto',
-                width: '175px',
-                alignItems: 'flex-start',
-                justifyContent: 'center',
-                marginLeft: '10px',
-                position: 'relative',
-              },
-            }, [
-              this.indicateIfLoose(keyring),
-              h('span.account-dropdown-name', {
-                style: {
-                  fontSize: '18px',
-                  maxWidth: '145px',
-                  whiteSpace: 'nowrap',
-                  overflow: 'hidden',
-                  textOverflow: 'ellipsis',
-                },
-              }, identity.name || ''),
-
-              h('span.account-dropdown-balance', {
-                style: {
-                  fontSize: '14px',
-                  fontFamily: 'Avenir',
-                  fontWeight: 500,
-                },
-              }, formattedBalance),
-            ]),
-
-            h('span', {
-              style: {
-                flex: '3 3 auto',
-              },
-            }, [
-              h('span.account-dropdown-edit-button.allcaps', {
-                style: {
-                  fontSize: '16px',
-                },
-                onClick: () => {
-                  actions.showEditAccountModal(identity)
-                },
-              }, [
-                this.context.t('edit'),
-              ]),
-            ]),
-
-          ]),
-        ]
-      )
-    })
-  }
-
-  indicateIfLoose (keyring) {
-    try { // Sometimes keyrings aren't loaded yet:
-      const type = keyring.type
-      const isLoose = type !== 'HD Key Tree'
-      return isLoose ? h('.keyring-label.allcaps', this.context.t('loose')) : null
-    } catch (e) { return }
-  }
-
-  renderAccountSelector () {
-    const { actions, useCssTransition, innerStyle, sidebarOpen } = this.props
-    const { accountSelectorActive, menuItemStyles } = this.state
-
-    return h(
-      Dropdown,
-      {
-        useCssTransition,
-        style: {
-          marginLeft: '-185px',
-          marginTop: '50px',
-          minWidth: '180px',
-          overflowY: 'auto',
-          maxHeight: '300px',
-          width: '300px',
-        },
-        innerStyle,
-        isOpen: accountSelectorActive,
-        onClickOutside: (event) => {
-          const { classList } = event.target
-          const isNotToggleElement = !classList.contains(this.accountSelectorToggleClassName)
-          if (accountSelectorActive && isNotToggleElement) {
-            this.setState({ accountSelectorActive: false })
-          }
-        },
-      },
-      [
-        ...this.renderAccounts(),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            style: Object.assign(
-              {},
-              menuItemStyles,
-            ),
-            onClick: () => actions.showNewAccountPageCreateForm(),
-          },
-          [
-            h(
-              'i.fa.fa-plus.fa-lg',
-              {
-                style: {
-                  marginLeft: '8px',
-                },
-              }
-            ),
-            h('span', {
-              style: {
-                marginLeft: '14px',
-                fontFamily: 'DIN OT',
-                fontSize: '16px',
-                lineHeight: '23px',
-              },
-            }, this.context.t('createAccount')),
-          ],
-        ),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {
-              if (sidebarOpen) {
-                actions.hideSidebar()
-              }
-            },
-            onClick: () => actions.showNewAccountPageImportForm(),
-            style: Object.assign(
-              {},
-              menuItemStyles,
-            ),
-          },
-          [
-            h(
-              'i.fa.fa-download.fa-lg',
-              {
-                style: {
-                  marginLeft: '8px',
-                },
-              }
-            ),
-            h('span', {
-              style: {
-                marginLeft: '20px',
-                marginBottom: '5px',
-                fontFamily: 'DIN OT',
-                fontSize: '16px',
-                lineHeight: '23px',
-              },
-            }, this.context.t('importAccount')),
-          ]
-        ),
-      ]
-    )
-  }
-
-  renderAccountOptions () {
-    const { actions, dropdownWrapperStyle, useCssTransition } = this.props
-    const { optionsMenuActive, menuItemStyles } = this.state
-    const dropdownMenuItemStyle = {
-      fontFamily: 'DIN OT',
-      fontSize: 16,
-      lineHeight: '24px',
-      padding: '8px',
-    }
-
-    return h(
-      Dropdown,
-      {
-        useCssTransition,
-        style: Object.assign(
-          {
-            marginLeft: '-10px',
-            position: 'absolute',
-            width: '29vh', // affects both mobile and laptop views
-          },
-          dropdownWrapperStyle,
-        ),
-        isOpen: optionsMenuActive,
-        onClickOutside: (event) => {
-          const { classList } = event.target
-          const isNotToggleElement = !classList.contains(this.optionsMenuToggleClassName)
-          if (optionsMenuActive && isNotToggleElement) {
-            this.setState({ optionsMenuActive: false })
-          }
-        },
-      },
-      [
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => {
-              this.props.actions.showAccountDetailModal()
-            },
-            style: Object.assign(
-              dropdownMenuItemStyle,
-              menuItemStyles,
-            ),
-          },
-          this.context.t('accountDetails'),
-        ),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => {
-              const { selected, network } = this.props
-              const url = genAccountLink(selected, network)
-              global.platform.openWindow({ url })
-            },
-            style: Object.assign(
-              dropdownMenuItemStyle,
-              menuItemStyles,
-            ),
-          },
-          this.context.t('etherscanView'),
-        ),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => {
-              const { selected } = this.props
-              copyToClipboard(checksumAddress(selected))
-            },
-            style: Object.assign(
-              dropdownMenuItemStyle,
-              menuItemStyles,
-            ),
-          },
-          this.context.t('copyAddress'),
-        ),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => this.props.actions.showExportPrivateKeyModal(),
-            style: Object.assign(
-              dropdownMenuItemStyle,
-              menuItemStyles,
-            ),
-          },
-          this.context.t('exportPrivateKey'),
-        ),
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => {
-              actions.hideSidebar()
-              actions.showAddTokenPage()
-            },
-            style: Object.assign(
-              dropdownMenuItemStyle,
-              menuItemStyles,
-            ),
-          },
-          this.context.t('addToken'),
-        ),
-
-      ]
-    )
-  }
-
-  render () {
-    const { style, enableAccountsSelector, enableAccountOptions } = this.props
-    const { optionsMenuActive, accountSelectorActive } = this.state
-
-    return h(
-      'span',
-      {
-        style: style,
-      },
-      [
-        enableAccountsSelector && h(
-          'i.fa.fa-angle-down',
-          {
-            style: {
-              cursor: 'pointer',
-            },
-            onClick: (event) => {
-              event.stopPropagation()
-              this.setState({
-                accountSelectorActive: !accountSelectorActive,
-                optionsMenuActive: false,
-              })
-            },
-          },
-          this.renderAccountSelector(),
-        ),
-        enableAccountOptions && h(
-          'i.fa.fa-ellipsis-h',
-          {
-            style: {
-              fontSize: '135%',
-              cursor: 'pointer',
-            },
-            onClick: (event) => {
-              event.stopPropagation()
-              this.setState({
-                accountSelectorActive: false,
-                optionsMenuActive: !optionsMenuActive,
-              })
-            },
-          },
-          this.renderAccountOptions()
-        ),
-      ]
-    )
-  }
-}
-
-AccountDropdowns.defaultProps = {
-  enableAccountsSelector: false,
-  enableAccountOptions: false,
-}
-
-AccountDropdowns.propTypes = {
-  identities: PropTypes.objectOf(PropTypes.object),
-  selected: PropTypes.string,
-  keyrings: PropTypes.array,
-  accounts: PropTypes.object,
-  menuItemStyles: PropTypes.object,
-  actions: PropTypes.object,
-  // actions.showAccountDetail: ,
-  useCssTransition: PropTypes.bool,
-  innerStyle: PropTypes.object,
-  sidebarOpen: PropTypes.bool,
-  dropdownWrapperStyle: PropTypes.string,
-  // actions.showAccountDetailModal: ,
-  network: PropTypes.number,
-  // actions.showExportPrivateKeyModal: ,
-  style: PropTypes.object,
-  ticker: PropTypes.string,
-  enableAccountsSelector: PropTypes.bool,
-  enableAccountOption: PropTypes.bool,
-  enableAccountOptions: PropTypes.bool,
-    t: PropTypes.func,
-}
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    actions: {
-      hideSidebar: () => dispatch(actions.hideSidebar()),
-      showConfigPage: () => dispatch(actions.showConfigPage()),
-      showAccountDetail: (address) => dispatch(actions.showAccountDetail(address)),
-      showAccountDetailModal: () => {
-        dispatch(actions.showModal({ name: 'ACCOUNT_DETAILS' }))
-      },
-      showEditAccountModal: (identity) => {
-        dispatch(actions.showModal({
-          name: 'EDIT_ACCOUNT_NAME',
-          identity,
-        }))
-      },
-      showNewAccountPageCreateForm: () => dispatch(actions.showNewAccountPage({ form: 'CREATE' })),
-      showExportPrivateKeyModal: () => {
-        dispatch(actions.showModal({ name: 'EXPORT_PRIVATE_KEY' }))
-      },
-      showAddTokenPage: () => {
-        dispatch(actions.showAddTokenPage())
-      },
-      addNewAccount: () => dispatch(actions.addNewAccount()),
-      showNewAccountPageImportForm: () => dispatch(actions.showNewAccountPage({ form: 'IMPORT' })),
-      showQrView: (selected, identity) => dispatch(actions.showQrView(selected, identity)),
-    },
-  }
-}
-
-function mapStateToProps (state) {
-  return {
-    ticker: state.metamask.ticker,
-    keyrings: state.metamask.keyrings,
-    sidebarOpen: state.appState.sidebar.isOpen,
-  }
-}
-
-AccountDropdowns.contextTypes = {
-  t: PropTypes.func,
-}
-
-module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDropdowns)
-
diff --git a/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js b/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js
index d242f59f5..8aaccafd5 100644
--- a/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js
+++ b/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js
@@ -38,6 +38,7 @@ export default class GasModalPageContainer extends Component {
     customPriceIsSafe: PropTypes.bool,
     isSpeedUp: PropTypes.bool,
     disableSave: PropTypes.bool,
+    isEthereumNetwork: PropTypes.bool,
   }
 
   state = {}
@@ -75,6 +76,7 @@ export default class GasModalPageContainer extends Component {
     customPriceIsSafe,
     isSpeedUp,
     transactionFee,
+    isEthereumNetwork,
   }) {
     return (
       <AdvancedTabContent
@@ -90,6 +92,7 @@ export default class GasModalPageContainer extends Component {
         gasEstimatesLoading={gasEstimatesLoading}
         customPriceIsSafe={customPriceIsSafe}
         isSpeedUp={isSpeedUp}
+        isEthereumNetwork={isEthereumNetwork}
       />
     )
   }
diff --git a/ui/app/components/app/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js b/ui/app/components/app/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js
index b9eb67d2b..ab24b9c0e 100644
--- a/ui/app/components/app/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js
+++ b/ui/app/components/app/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js
@@ -140,7 +140,7 @@ describe('gas-modal-page-container container', () => {
         insufficientBalance: true,
         isSpeedUp: false,
         txId: 34,
-        isEthereumNetwork: false,
+        isEthereumNetwork: true,
         isMainnet: true,
       }
       const baseMockOwnProps = { transaction: { id: 34 } }
diff --git a/ui/app/components/app/modals/deposit-ether-modal.js b/ui/app/components/app/modals/deposit-ether-modal.js
index def88f085..6f622a17c 100644
--- a/ui/app/components/app/modals/deposit-ether-modal.js
+++ b/ui/app/components/app/modals/deposit-ether-modal.js
@@ -28,8 +28,8 @@ function mapStateToProps (state) {
 
 function mapDispatchToProps (dispatch) {
   return {
-    toCoinbase: (address) => {
-      dispatch(actions.buyEth({ service: 'coinbase', address, amount: 0 }))
+    toWyre: (address) => {
+      dispatch(actions.buyEth({ service: 'wyre', address, amount: 0 }))
     },
     toCoinSwitch: (address) => {
       dispatch(actions.buyEth({ service: 'coinswitch', address }))
@@ -130,7 +130,7 @@ DepositEtherModal.prototype.renderRow = function ({
 }
 
 DepositEtherModal.prototype.render = function () {
-  const { network, toCoinbase, toCoinSwitch, address, toFaucet } = this.props
+  const { network, toWyre, toCoinSwitch, address, toFaucet } = this.props
   const { buyingWithShapeshift } = this.state
 
   const isTestNetwork = ['3', '4', '42'].find(n => n === network)
@@ -190,7 +190,7 @@ DepositEtherModal.prototype.render = function () {
           title: WYRE_ROW_TITLE,
           text: WYRE_ROW_TEXT,
           buttonLabel: this.context.t('continueToWyre'),
-          onButtonClick: () => toCoinbase(address),
+          onButtonClick: () => toWyre(address),
           hide: isTestNetwork || buyingWithShapeshift,
         }),
 
diff --git a/ui/app/components/app/notice.js b/ui/app/components/app/notice.js
deleted file mode 100644
index bb7e0814c..000000000
--- a/ui/app/components/app/notice.js
+++ /dev/null
@@ -1,138 +0,0 @@
-const inherits = require('util').inherits
-const Component = require('react').Component
-const PropTypes = require('prop-types')
-const h = require('react-hyperscript')
-const ReactMarkdown = require('react-markdown')
-const linker = require('extension-link-enabler')
-const findDOMNode = require('react-dom').findDOMNode
-const connect = require('react-redux').connect
-
-Notice.contextTypes = {
-  t: PropTypes.func,
-}
-
-module.exports = connect()(Notice)
-
-
-inherits(Notice, Component)
-function Notice () {
-  Component.call(this)
-}
-
-Notice.prototype.render = function () {
-  const { notice, onConfirm } = this.props
-  const { title, date, body } = notice
-  const state = this.state || { disclaimerDisabled: true }
-  const disabled = state.disclaimerDisabled
-
-  return (
-    h('.flex-column.flex-center.flex-grow', {
-      style: {
-        width: '100%',
-      },
-    }, [
-      h('h3.flex-center.text-transform-uppercase.terms-header', {
-        style: {
-          background: '#EBEBEB',
-          color: '#AEAEAE',
-          width: '100%',
-          fontSize: '20px',
-          textAlign: 'center',
-          padding: 6,
-        },
-      }, [
-        title,
-      ]),
-
-      h('h5.flex-center.text-transform-uppercase.terms-header', {
-        style: {
-          background: '#EBEBEB',
-          color: '#AEAEAE',
-          marginBottom: 24,
-          width: '100%',
-          fontSize: '20px',
-          textAlign: 'center',
-          padding: 6,
-        },
-      }, [
-        date,
-      ]),
-
-      h('style', `
-
-        .markdown {
-          overflow-x: hidden;
-        }
-
-        .markdown h1, .markdown h2, .markdown h3 {
-          margin: 10px 0;
-          font-weight: bold;
-        }
-
-        .markdown strong {
-          font-weight: bold;
-        }
-        .markdown em {
-          font-style: italic;
-        }
-
-        .markdown p {
-          margin: 10px 0;
-        }
-
-        .markdown a {
-          color: #df6b0e;
-        }
-
-      `),
-
-      h('div.markdown', {
-        onScroll: (e) => {
-          var object = e.currentTarget
-          if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) {
-            this.setState({disclaimerDisabled: false})
-          }
-        },
-        style: {
-          background: 'rgb(235, 235, 235)',
-          height: '310px',
-          padding: '6px',
-          width: '90%',
-          overflowY: 'scroll',
-          scroll: 'auto',
-        },
-      }, [
-        h(ReactMarkdown, {
-          className: 'notice-box',
-          source: body,
-          skipHtml: true,
-        }),
-      ]),
-
-      h('button.primary', {
-        disabled,
-        onClick: () => {
-          this.setState({disclaimerDisabled: true}, () => onConfirm())
-        },
-        style: {
-          marginTop: '18px',
-        },
-      }, this.context.t('accept')),
-    ])
-  )
-}
-
-Notice.prototype.componentDidMount = function () {
-  // eslint-disable-next-line react/no-find-dom-node
-  var node = findDOMNode(this)
-  linker.setupListener(node)
-  if (document.getElementsByClassName('notice-box')[0].clientHeight < 310) {
-    this.setState({disclaimerDisabled: false})
-  }
-}
-
-Notice.prototype.componentWillUnmount = function () {
-  // eslint-disable-next-line react/no-find-dom-node
-  var node = findDOMNode(this)
-  linker.teardownListener(node)
-}
diff --git a/ui/app/components/app/send/tests/send-selectors-test-data.js b/ui/app/components/app/send/tests/send-selectors-test-data.js
index d43d7c650..cff26a191 100644
--- a/ui/app/components/app/send/tests/send-selectors-test-data.js
+++ b/ui/app/components/app/send/tests/send-selectors-test-data.js
@@ -28,7 +28,6 @@ module.exports = {
     'conversionRate': 1200.88200327,
     'conversionDate': 1489013762,
     'nativeCurrency': 'ETH',
-    'noActiveNotices': true,
     'frequentRpcList': [],
     'network': '3',
     'accounts': {
diff --git a/ui/app/ducks/app/app.js b/ui/app/ducks/app/app.js
index acbb5c989..295507d70 100644
--- a/ui/app/ducks/app/app.js
+++ b/ui/app/ducks/app/app.js
@@ -435,12 +435,6 @@ function reduceApp (state, action) {
         forgottenPassword: false,
       })
 
-    case actions.SHOW_NOTICE:
-      return extend(appState, {
-        transForward: true,
-        isLoading: false,
-      })
-
     case actions.REVEAL_ACCOUNT:
       return extend(appState, {
         scrollToBottom: true,
diff --git a/ui/app/ducks/gas/gas.duck.js b/ui/app/ducks/gas/gas.duck.js
index 8eb68f846..5a0a236e6 100644
--- a/ui/app/ducks/gas/gas.duck.js
+++ b/ui/app/ducks/gas/gas.duck.js
@@ -361,7 +361,7 @@ export function fetchGasEstimates (blockTime) {
   return (dispatch, getState) => {
     const state = getState()
 
-    if (isEthereumNetwork(state)) {
+    if (!isEthereumNetwork(state)) {
       return Promise.resolve(null)
     }
 
diff --git a/ui/app/ducks/metamask/metamask.js b/ui/app/ducks/metamask/metamask.js
index 864229e83..47c767d68 100644
--- a/ui/app/ducks/metamask/metamask.js
+++ b/ui/app/ducks/metamask/metamask.js
@@ -18,8 +18,6 @@ function reduceMetamask (state, action) {
     rpcTarget: 'https://rawtestrpc.metamask.io/',
     identities: {},
     unapprovedTxs: {},
-    noActiveNotices: true,
-    nextUnreadNotice: undefined,
     frequentRpcList: [],
     addressBook: [],
     selectedTokenAddress: null,
@@ -69,18 +67,6 @@ function reduceMetamask (state, action) {
       delete newState.seedWords
       return newState
 
-    case actions.SHOW_NOTICE:
-      return extend(metamaskState, {
-        noActiveNotices: false,
-        nextUnreadNotice: action.value,
-      })
-
-    case actions.CLEAR_NOTICES:
-      return extend(metamaskState, {
-        noActiveNotices: true,
-        nextUnreadNotice: undefined,
-      })
-
     case actions.UPDATE_METAMASK_STATE:
       return extend(metamaskState, action.value)
 
diff --git a/ui/app/helpers/constants/routes.js b/ui/app/helpers/constants/routes.js
index c15027ff4..df35112d1 100644
--- a/ui/app/helpers/constants/routes.js
+++ b/ui/app/helpers/constants/routes.js
@@ -19,7 +19,6 @@ const NEW_ACCOUNT_ROUTE = '/new-account'
 const IMPORT_ACCOUNT_ROUTE = '/new-account/import'
 const CONNECT_HARDWARE_ROUTE = '/new-account/connect'
 const SEND_ROUTE = '/send'
-const NOTICE_ROUTE = '/notice'
 const WELCOME_ROUTE = '/welcome'
 
 const INITIALIZE_ROUTE = '/initialize'
@@ -29,7 +28,6 @@ const INITIALIZE_CREATE_PASSWORD_ROUTE = '/initialize/create-password'
 const INITIALIZE_IMPORT_ACCOUNT_ROUTE = '/initialize/create-password/import-account'
 const INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE = '/initialize/create-password/import-with-seed-phrase'
 const INITIALIZE_UNIQUE_IMAGE_ROUTE = '/initialize/create-password/unique-image'
-const INITIALIZE_NOTICE_ROUTE = '/initialize/notice'
 const INITIALIZE_SELECT_ACTION_ROUTE = '/initialize/select-action'
 const INITIALIZE_SEED_PHRASE_ROUTE = '/initialize/seed-phrase'
 const INITIALIZE_END_OF_FLOW_ROUTE = '/initialize/end-of-flow'
@@ -62,7 +60,6 @@ module.exports = {
   IMPORT_ACCOUNT_ROUTE,
   CONNECT_HARDWARE_ROUTE,
   SEND_ROUTE,
-  NOTICE_ROUTE,
   WELCOME_ROUTE,
   INITIALIZE_ROUTE,
   INITIALIZE_WELCOME_ROUTE,
@@ -71,7 +68,6 @@ module.exports = {
   INITIALIZE_IMPORT_ACCOUNT_ROUTE,
   INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE,
   INITIALIZE_UNIQUE_IMAGE_ROUTE,
-  INITIALIZE_NOTICE_ROUTE,
   INITIALIZE_SELECT_ACTION_ROUTE,
   INITIALIZE_SEED_PHRASE_ROUTE,
   INITIALIZE_CONFIRM_SEED_PHRASE_ROUTE,
diff --git a/ui/app/pages/home/home.container.js b/ui/app/pages/home/home.container.js
index 02ec4b9c6..7508654dc 100644
--- a/ui/app/pages/home/home.container.js
+++ b/ui/app/pages/home/home.container.js
@@ -7,7 +7,6 @@ import { unconfirmedTransactionsCountSelector } from '../../selectors/confirm-tr
 const mapStateToProps = state => {
   const { metamask, appState } = state
   const {
-    noActiveNotices,
     lostAccounts,
     seedWords,
     suggestedTokens,
@@ -16,7 +15,6 @@ const mapStateToProps = state => {
   const { forgottenPassword } = appState
 
   return {
-    noActiveNotices,
     lostAccounts,
     forgottenPassword,
     seedWords,
diff --git a/ui/app/pages/notice/notice.js b/ui/app/pages/notice/notice.js
deleted file mode 100644
index d8274dfcb..000000000
--- a/ui/app/pages/notice/notice.js
+++ /dev/null
@@ -1,203 +0,0 @@
-const { Component } = require('react')
-const h = require('react-hyperscript')
-const { connect } = require('react-redux')
-const PropTypes = require('prop-types')
-const ReactMarkdown = require('react-markdown')
-const linker = require('extension-link-enabler')
-const generateLostAccountsNotice = require('../../../lib/lost-accounts-notice')
-const findDOMNode = require('react-dom').findDOMNode
-const actions = require('../../store/actions')
-const { DEFAULT_ROUTE } = require('../../helpers/constants/routes')
-
-class Notice extends Component {
-  constructor (props) {
-    super(props)
-
-    this.state = {
-      disclaimerDisabled: true,
-    }
-  }
-
-  componentWillMount () {
-    if (!this.props.notice) {
-      this.props.history.push(DEFAULT_ROUTE)
-    }
-  }
-
-  componentDidMount () {
-    // eslint-disable-next-line react/no-find-dom-node
-    var node = findDOMNode(this)
-    linker.setupListener(node)
-    if (document.getElementsByClassName('notice-box')[0].clientHeight < 310) {
-      this.setState({ disclaimerDisabled: false })
-    }
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (!nextProps.notice) {
-      this.props.history.push(DEFAULT_ROUTE)
-    }
-  }
-
-  componentWillUnmount () {
-    // eslint-disable-next-line react/no-find-dom-node
-    var node = findDOMNode(this)
-    linker.teardownListener(node)
-  }
-
-  handleAccept () {
-    this.setState({ disclaimerDisabled: true })
-    this.props.onConfirm()
-  }
-
-  render () {
-    const { notice = {} } = this.props
-    const { title, date, body } = notice
-    const { disclaimerDisabled } = this.state
-
-    return (
-      h('.flex-column.flex-center.flex-grow', {
-        style: {
-          width: '100%',
-        },
-      }, [
-        h('h3.flex-center.text-transform-uppercase.terms-header', {
-          style: {
-            background: '#EBEBEB',
-            color: '#AEAEAE',
-            width: '100%',
-            fontSize: '20px',
-            textAlign: 'center',
-            padding: 6,
-          },
-        }, [
-          title,
-        ]),
-
-        h('h5.flex-center.text-transform-uppercase.terms-header', {
-          style: {
-            background: '#EBEBEB',
-            color: '#AEAEAE',
-            marginBottom: 24,
-            width: '100%',
-            fontSize: '20px',
-            textAlign: 'center',
-            padding: 6,
-          },
-        }, [
-          date,
-        ]),
-
-        h('style', `
-
-          .markdown {
-            overflow-x: hidden;
-          }
-
-          .markdown h1, .markdown h2, .markdown h3 {
-            margin: 10px 0;
-            font-weight: bold;
-          }
-
-          .markdown strong {
-            font-weight: bold;
-          }
-          .markdown em {
-            font-style: italic;
-          }
-
-          .markdown p {
-            margin: 10px 0;
-          }
-
-          .markdown a {
-            color: #df6b0e;
-          }
-
-        `),
-
-        h('div.markdown', {
-          onScroll: (e) => {
-            var object = e.currentTarget
-            if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) {
-              this.setState({ disclaimerDisabled: false })
-            }
-          },
-          style: {
-            background: 'rgb(235, 235, 235)',
-            height: '310px',
-            padding: '6px',
-            width: '90%',
-            overflowY: 'scroll',
-            scroll: 'auto',
-          },
-        }, [
-          h(ReactMarkdown, {
-            className: 'notice-box',
-            source: body,
-            skipHtml: true,
-          }),
-        ]),
-
-        h('button.primary', {
-          disabled: disclaimerDisabled,
-          onClick: () => this.handleAccept(),
-          style: {
-            marginTop: '18px',
-          },
-        }, 'Accept'),
-      ])
-    )
-  }
-
-}
-
-const mapStateToProps = state => {
-  const { metamask } = state
-  const { noActiveNotices, nextUnreadNotice, lostAccounts } = metamask
-
-  return {
-    noActiveNotices,
-    nextUnreadNotice,
-    lostAccounts,
-  }
-}
-
-Notice.propTypes = {
-  notice: PropTypes.object,
-  onConfirm: PropTypes.func,
-  history: PropTypes.object,
-}
-
-const mapDispatchToProps = dispatch => {
-  return {
-    markNoticeRead: nextUnreadNotice => dispatch(actions.markNoticeRead(nextUnreadNotice)),
-    markAccountsFound: () => dispatch(actions.markAccountsFound()),
-  }
-}
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => {
-  const { noActiveNotices, nextUnreadNotice, lostAccounts } = stateProps
-  const { markNoticeRead, markAccountsFound } = dispatchProps
-
-  let notice
-  let onConfirm
-
-  if (!noActiveNotices) {
-    notice = nextUnreadNotice
-    onConfirm = () => markNoticeRead(nextUnreadNotice)
-  } else if (lostAccounts && lostAccounts.length > 0) {
-    notice = generateLostAccountsNotice(lostAccounts)
-    onConfirm = () => markAccountsFound()
-  }
-
-  return {
-    ...stateProps,
-    ...dispatchProps,
-    ...ownProps,
-    notice,
-    onConfirm,
-  }
-}
-
-module.exports = connect(mapStateToProps, mapDispatchToProps, mergeProps)(Notice)
diff --git a/ui/app/pages/routes/index.js b/ui/app/pages/routes/index.js
index 460cec958..e06d88c90 100644
--- a/ui/app/pages/routes/index.js
+++ b/ui/app/pages/routes/index.js
@@ -31,7 +31,6 @@ const AddTokenPage = require('../add-token')
 const ConfirmAddTokenPage = require('../confirm-add-token')
 const ConfirmAddSuggestedTokenPage = require('../confirm-add-suggested-token')
 const CreateAccountPage = require('../create-account')
-const NoticeScreen = require('../notice/notice')
 
 const Loading = require('../../components/ui/loading-screen')
 const LoadingNetwork = require('../../components/app/loading-network-screen').default
@@ -67,7 +66,6 @@ import {
   CONFIRM_TRANSACTION_ROUTE,
   INITIALIZE_ROUTE,
   INITIALIZE_UNLOCK_ROUTE,
-  NOTICE_ROUTE,
 } from '../../helpers/constants/routes'
 
 // enums
@@ -109,7 +107,6 @@ class Routes extends Component {
         <Authenticated path={REVEAL_SEED_ROUTE} component={RevealSeedConfirmation} exact />
         <Authenticated path={MOBILE_SYNC_ROUTE} component={MobileSyncPage} exact />
         <Authenticated path={SETTINGS_ROUTE} component={Settings} />
-        <Authenticated path={NOTICE_ROUTE} component={NoticeScreen} exact />
         <Authenticated path={`${CONFIRM_TRANSACTION_ROUTE}/:id?`} component={ConfirmTransaction} />
         <Authenticated path={SEND_ROUTE} component={SendTransactionScreen} exact />
         <Authenticated path={ADD_TOKEN_ROUTE} component={AddTokenPage} exact />
@@ -322,7 +319,6 @@ Routes.propTypes = {
   dispatch: PropTypes.func,
   toggleAccountMenu: PropTypes.func,
   selectedAddress: PropTypes.string,
-  noActiveNotices: PropTypes.bool,
   lostAccounts: PropTypes.array,
   isInitialized: PropTypes.bool,
   forgottenPassword: PropTypes.bool,
@@ -360,10 +356,8 @@ function mapStateToProps (state) {
     address,
     keyrings,
     isInitialized,
-    noActiveNotices,
     seedWords,
     unapprovedTxs,
-    nextUnreadNotice,
     lostAccounts,
     unapprovedMsgCount,
     unapprovedPersonalMsgCount,
@@ -380,14 +374,13 @@ function mapStateToProps (state) {
     alertMessage,
     isLoading,
     loadingMessage,
-    noActiveNotices,
     isInitialized,
     isUnlocked: state.metamask.isUnlocked,
     selectedAddress: state.metamask.selectedAddress,
     currentView: state.appState.currentView,
     activeAddress: state.appState.activeAddress,
     transForward: state.appState.transForward,
-    isOnboarding: Boolean(!noActiveNotices || seedWords || !isInitialized),
+    isOnboarding: Boolean(seedWords || !isInitialized),
     isPopup: state.metamask.isPopup,
     seedWords: state.metamask.seedWords,
     submittedPendingTransactions: submittedPendingTransactionsSelector(state),
@@ -400,7 +393,6 @@ function mapStateToProps (state) {
     network: state.metamask.network,
     provider: state.metamask.provider,
     forgottenPassword: state.appState.forgottenPassword,
-    nextUnreadNotice,
     lostAccounts,
     frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
     currentCurrency: state.metamask.currentCurrency,
diff --git a/ui/app/selectors/selectors.js b/ui/app/selectors/selectors.js
index bea2cea33..554232f7b 100644
--- a/ui/app/selectors/selectors.js
+++ b/ui/app/selectors/selectors.js
@@ -301,7 +301,8 @@ function isEthereumNetwork (state) {
     RINKEBY,
     ROPSTEN,
   } = NETWORK_TYPES
-  return [ KOVAN, MAINNET, RINKEBY, ROPSTEN].includes(type => type === networkType)
+
+  return [ KOVAN, MAINNET, RINKEBY, ROPSTEN].includes(networkType)
 }
 
 function preferencesSelector ({ metamask }) {
diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
index e5825b5f6..7d369fdb9 100644
--- a/ui/app/store/actions.js
+++ b/ui/app/store/actions.js
@@ -51,13 +51,6 @@ var actions = {
   // remote state
   UPDATE_METAMASK_STATE: 'UPDATE_METAMASK_STATE',
   updateMetamaskState: updateMetamaskState,
-  // notices
-  MARK_NOTICE_READ: 'MARK_NOTICE_READ',
-  markNoticeRead: markNoticeRead,
-  SHOW_NOTICE: 'SHOW_NOTICE',
-  showNotice: showNotice,
-  CLEAR_NOTICES: 'CLEAR_NOTICES',
-  clearNotices: clearNotices,
   markAccountsFound,
   // intialize screen
   CREATE_NEW_VAULT_IN_PROGRESS: 'CREATE_NEW_VAULT_IN_PROGRESS',
@@ -1857,47 +1850,6 @@ function goBackToInitView () {
   }
 }
 
-//
-// notice
-//
-
-function markNoticeRead (notice) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    log.debug(`background.markNoticeRead`)
-    return new Promise((resolve, reject) => {
-      background.markNoticeRead(notice, (err, notice) => {
-        dispatch(actions.hideLoadingIndication())
-        if (err) {
-          dispatch(actions.displayWarning(err.message))
-          return reject(err)
-        }
-
-        if (notice) {
-          dispatch(actions.showNotice(notice))
-          resolve(true)
-        } else {
-          dispatch(actions.clearNotices())
-          resolve(false)
-        }
-      })
-    })
-  }
-}
-
-function showNotice (notice) {
-  return {
-    type: actions.SHOW_NOTICE,
-    value: notice,
-  }
-}
-
-function clearNotices () {
-  return {
-    type: actions.CLEAR_NOTICES,
-  }
-}
-
 function markAccountsFound () {
   log.debug(`background.markAccountsFound`)
   return callBackgroundThenUpdate(background.markAccountsFound)
@@ -2492,15 +2444,6 @@ function setCompletedOnboarding () {
     dispatch(actions.showLoadingIndication())
 
     try {
-      await pify(background.markAllNoticesRead).call(background)
-    } catch (err) {
-      dispatch(actions.displayWarning(err.message))
-      throw err
-    }
-
-    dispatch(actions.clearNotices())
-
-    try {
       await pify(background.completeOnboarding).call(background)
     } catch (err) {
       dispatch(actions.displayWarning(err.message))