Remove unnecessary imports, and account-detail.js

ui/app/account-detail.js

@@ -1,280 +0,0 @@
-const inherits = require('util').inherits
-const extend = require('xtend')
-const Component = require('react').Component
-const h = require('react-hyperscript')
-const connect = require('react-redux').connect
-const actions = require('./actions')
-const valuesFor = require('./util').valuesFor
-const Identicon = require('./components/identicon')
-const EthBalance = require('./components/eth-balance')
-const TransactionList = require('./components/transaction-list')
-const ExportAccountView = require('./components/account-export')
-const ethUtil = require('ethereumjs-util')
-const EditableLabel = require('./components/editable-label')
-const TabBar = require('./components/tab-bar')
-const TokenList = require('./components/token-list')
-const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns
-
-module.exports = connect(mapStateToProps)(AccountDetailScreen)
-
-function mapStateToProps (state) {
-  return {
-    metamask: state.metamask,
-    identities: state.metamask.identities,
-    accounts: state.metamask.accounts,
-    address: state.metamask.selectedAddress,
-    accountDetail: state.appState.accountDetail,
-    network: state.metamask.network,
-    unapprovedMsgs: valuesFor(state.metamask.unapprovedMsgs),
-    shapeShiftTxList: state.metamask.shapeShiftTxList,
-    transactions: state.metamask.selectedAddressTxList || [],
-    conversionRate: state.metamask.conversionRate,
-    currentCurrency: state.metamask.currentCurrency,
-    currentAccountTab: state.metamask.currentAccountTab,
-    tokens: state.metamask.tokens,
-  }
-}
-
-inherits(AccountDetailScreen, Component)
-function AccountDetailScreen () {
-  Component.call(this)
-}
-
-AccountDetailScreen.prototype.render = function () {
-  var props = this.props
-  var selected = props.address || Object.keys(props.accounts)[0]
-  var checksumAddress = selected && ethUtil.toChecksumAddress(selected)
-  var identity = props.identities[selected]
-  var account = props.accounts[selected]
-  const { network, conversionRate, currentCurrency } = props
-
-  return (
-
-    h('.account-detail-section.full-flex-height', [
-
-    // identicon, label, balance, etc
-      h('.account-data-subsection', {
-        style: {
-          margin: '0 20px',
-          flex: '1 0 auto',
-        },
-      }, [
-
-        // header - identicon + nav
-        h('div', {
-          style: {
-            paddingTop: '20px',
-            display: 'flex',
-            justifyContent: 'flex-start',
-            alignItems: 'flex-start',
-          },
-        }, [
-
-          // large identicon and addresses
-          h('.identicon-wrapper.select-none', [
-            h(Identicon, {
-              diameter: 62,
-              address: selected,
-            }),
-          ]),
-          h('flex-column', {
-            style: {
-              lineHeight: '10px',
-              marginLeft: '15px',
-              width: '100%',
-            },
-          }, [
-            h(EditableLabel, {
-              textValue: identity ? identity.name : '',
-              state: {
-                isEditingLabel: false,
-              },
-              saveText: (text) => {
-                props.dispatch(actions.saveAccountLabel(selected, text))
-              },
-            }, [
-
-              // What is shown when not editing + edit text:
-              h('label.editing-label', [h('.edit-text', 'edit')]),
-              h(
-                'div',
-                {
-                  style: {
-                    display: 'flex',
-                    justifyContent: 'flex-start',
-                    alignItems: 'center',
-                  },
-                },
-                [
-                  h(
-                    'h2.font-medium.color-forest',
-                    {
-                      name: 'edit',
-                      style: {
-                      },
-                    },
-                    [
-                      identity && identity.name,
-                    ]
-                  ),
-                  h(
-                    AccountDropdowns,
-                    {
-                      style: {
-                        marginRight: '8px',
-                        marginLeft: 'auto',
-                        cursor: 'pointer',
-                      },
-                      selected,
-                      network,
-                      identities: props.identities,
-                      enableAccountOptions: true,
-                    },
-                  ),
-                ]
-              ),
-            ]),
-            h('.flex-row', {
-              style: {
-                width: '15em',
-                justifyContent: 'space-between',
-                alignItems: 'baseline',
-              },
-            }, [
-
-              // address
-
-              h('div', {
-                style: {
-                  overflow: 'hidden',
-                  textOverflow: 'ellipsis',
-                  paddingTop: '3px',
-                  width: '5em',
-                  fontSize: '13px',
-                  fontFamily: 'Montserrat Light',
-                  textRendering: 'geometricPrecision',
-                  marginBottom: '15px',
-                  color: '#AEAEAE',
-                },
-              }, checksumAddress),
-            ]),
-
-            // account ballence
-
-          ]),
-        ]),
-        h('.flex-row', {
-          style: {
-            justifyContent: 'space-between',
-            alignItems: 'flex-start',
-          },
-        }, [
-
-          h(EthBalance, {
-            value: account && account.balance,
-            conversionRate,
-            currentCurrency,
-            style: {
-              lineHeight: '7px',
-              marginTop: '10px',
-            },
-          }),
-
-          h('.flex-grow'),
-
-          h('button', {
-            onClick: () => props.dispatch(actions.buyEthView(selected)),
-            style: { marginRight: '10px' },
-          }, 'BUY'),
-
-          h('button', {
-            onClick: () => props.dispatch(actions.showSendPage()),
-            style: {
-              marginBottom: '20px',
-              marginRight: '8px',
-            },
-          }, 'SEND'),
-
-        ]),
-      ]),
-
-      // subview (tx history, pk export confirm, buy eth warning)
-      this.subview(),
-
-    ])
-  )
-}
-
-AccountDetailScreen.prototype.subview = function () {
-  var subview
-  try {
-    subview = this.props.accountDetail.subview
-  } catch (e) {
-    subview = null
-  }
-
-  switch (subview) {
-    case 'transactions':
-      return this.tabSections()
-    case 'export':
-      var state = extend({key: 'export'}, this.props)
-      return h(ExportAccountView, state)
-    default:
-      return this.tabSections()
-  }
-}
-
-AccountDetailScreen.prototype.tabSections = function () {
-  const { currentAccountTab } = this.props
-
-  return h('section.tabSection.full-flex-height.grow-tenx', [
-
-    h(TabBar, {
-      tabs: [
-        { content: 'Sent', key: 'history' },
-        { content: 'Tokens', key: 'tokens' },
-      ],
-      defaultTab: currentAccountTab || 'history',
-      tabSelected: (key) => {
-        this.props.dispatch(actions.setCurrentAccountTab(key))
-      },
-    }),
-
-    this.tabSwitchView(),
-  ])
-}
-
-AccountDetailScreen.prototype.tabSwitchView = function () {
-  const props = this.props
-  const { address, network } = props
-  const { currentAccountTab, tokens } = this.props
-
-  switch (currentAccountTab) {
-    case 'tokens':
-      return h(TokenList, {
-        userAddress: address,
-        network,
-        tokens,
-        addToken: () => this.props.dispatch(actions.showAddTokenPage()),
-      })
-    default:
-      return this.transactionList()
-  }
-}
-
-AccountDetailScreen.prototype.transactionList = function () {
-  const {transactions, unapprovedMsgs, address,
-    network, shapeShiftTxList, conversionRate } = this.props
-
-  return h(TransactionList, {
-    transactions: transactions.sort((a, b) => b.time - a.time),
-    network,
-    unapprovedMsgs,
-    conversionRate,
-    address,
-    shapeShiftTxList,
-    viewPendingTx: (txId) => {
-      this.props.dispatch(actions.viewPendingTx(txId))
-    },
-  })
-}

ui/app/app.js

@@ -26,8 +26,6 @@ const Import = require('./accounts/import')
 const InfoScreen = require('./info')
 const Loading = require('./components/loading')
 const SandwichExpando = require('sandwich-expando')
-const Dropdown = require('./components/dropdown').Dropdown
-const DropdownMenuItem = require('./components/dropdown').DropdownMenuItem
 const NetworkIndicator = require('./components/network')
 const BuyView = require('./components/buy-button-subview')
 const QrView = require('./components/qr-code')
@@ -35,7 +33,6 @@ const HDCreateVaultComplete = require('./keychains/hd/create-vault-complete')
 const HDRestoreVaultScreen = require('./keychains/hd/restore-vault')
 const RevealSeedConfirmation = require('./keychains/hd/recover-seed/confirmation')
 const ReactCSSTransitionGroup = require('react-addons-css-transition-group')
-const AccountDropdowns = require('./components/account-dropdowns').AccountDropdowns
 const NetworkDropdown = require('./components/dropdowns/network-dropdown')
 
 // Global Modals