Delete uneeded files from old-ui.

9 files changed, 0 insertions, 2106 deletions

diff --git a/old-ui/app/actions.js b/old-ui/app/actions.js
deleted file mode 100644
index d070548fc..000000000
--- a/old-ui/app/actions.js
+++ /dev/null
@@ -1,1128 +0,0 @@
-const getBuyEthUrl = require('../../app/scripts/lib/buy-eth-url')
-
-var actions = {
-  _setBackgroundConnection: _setBackgroundConnection,
-
-  GO_HOME: 'GO_HOME',
-  goHome: goHome,
-  // menu state
-  getNetworkStatus: 'getNetworkStatus',
-  // transition state
-  TRANSITION_FORWARD: 'TRANSITION_FORWARD',
-  TRANSITION_BACKWARD: 'TRANSITION_BACKWARD',
-  transitionForward,
-  transitionBackward,
-  // 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',
-  SHOW_CREATE_VAULT: 'SHOW_CREATE_VAULT',
-  SHOW_RESTORE_VAULT: 'SHOW_RESTORE_VAULT',
-  FORGOT_PASSWORD: 'FORGOT_PASSWORD',
-  forgotPassword: forgotPassword,
-  SHOW_INIT_MENU: 'SHOW_INIT_MENU',
-  SHOW_NEW_VAULT_SEED: 'SHOW_NEW_VAULT_SEED',
-  SHOW_INFO_PAGE: 'SHOW_INFO_PAGE',
-  SHOW_IMPORT_PAGE: 'SHOW_IMPORT_PAGE',
-  unlockMetamask: unlockMetamask,
-  unlockFailed: unlockFailed,
-  showCreateVault: showCreateVault,
-  showRestoreVault: showRestoreVault,
-  showInitializeMenu: showInitializeMenu,
-  showImportPage,
-  createNewVaultAndKeychain: createNewVaultAndKeychain,
-  createNewVaultAndRestore: createNewVaultAndRestore,
-  createNewVaultInProgress: createNewVaultInProgress,
-  addNewKeyring,
-  importNewAccount,
-  addNewAccount,
-  NEW_ACCOUNT_SCREEN: 'NEW_ACCOUNT_SCREEN',
-  navigateToNewAccountScreen,
-  showNewVaultSeed: showNewVaultSeed,
-  showInfoPage: showInfoPage,
-  // seed recovery actions
-  REVEAL_SEED_CONFIRMATION: 'REVEAL_SEED_CONFIRMATION',
-  revealSeedConfirmation: revealSeedConfirmation,
-  requestRevealSeed: requestRevealSeed,
-  // unlock screen
-  UNLOCK_IN_PROGRESS: 'UNLOCK_IN_PROGRESS',
-  UNLOCK_FAILED: 'UNLOCK_FAILED',
-  UNLOCK_METAMASK: 'UNLOCK_METAMASK',
-  LOCK_METAMASK: 'LOCK_METAMASK',
-  tryUnlockMetamask: tryUnlockMetamask,
-  lockMetamask: lockMetamask,
-  unlockInProgress: unlockInProgress,
-  // error handling
-  displayWarning: displayWarning,
-  DISPLAY_WARNING: 'DISPLAY_WARNING',
-  HIDE_WARNING: 'HIDE_WARNING',
-  hideWarning: hideWarning,
-  // accounts screen
-  SET_SELECTED_ACCOUNT: 'SET_SELECTED_ACCOUNT',
-  SHOW_ACCOUNT_DETAIL: 'SHOW_ACCOUNT_DETAIL',
-  SHOW_ACCOUNTS_PAGE: 'SHOW_ACCOUNTS_PAGE',
-  SHOW_CONF_TX_PAGE: 'SHOW_CONF_TX_PAGE',
-  SHOW_CONF_MSG_PAGE: 'SHOW_CONF_MSG_PAGE',
-  SET_CURRENT_FIAT: 'SET_CURRENT_FIAT',
-  setCurrentCurrency: setCurrentCurrency,
-  setCurrentAccountTab,
-  // account detail screen
-  SHOW_SEND_PAGE: 'SHOW_SEND_PAGE',
-  showSendPage: showSendPage,
-  ADD_TO_ADDRESS_BOOK: 'ADD_TO_ADDRESS_BOOK',
-  addToAddressBook: addToAddressBook,
-  REQUEST_ACCOUNT_EXPORT: 'REQUEST_ACCOUNT_EXPORT',
-  requestExportAccount: requestExportAccount,
-  EXPORT_ACCOUNT: 'EXPORT_ACCOUNT',
-  exportAccount: exportAccount,
-  SHOW_PRIVATE_KEY: 'SHOW_PRIVATE_KEY',
-  showPrivateKey: showPrivateKey,
-  SAVE_ACCOUNT_LABEL: 'SAVE_ACCOUNT_LABEL',
-  saveAccountLabel: saveAccountLabel,
-  // tx conf screen
-  COMPLETED_TX: 'COMPLETED_TX',
-  TRANSACTION_ERROR: 'TRANSACTION_ERROR',
-  NEXT_TX: 'NEXT_TX',
-  PREVIOUS_TX: 'PREV_TX',
-  signMsg: signMsg,
-  cancelMsg: cancelMsg,
-  signPersonalMsg,
-  cancelPersonalMsg,
-  signTypedMsg,
-  cancelTypedMsg,
-  signTx: signTx,
-  updateAndApproveTx,
-  cancelTx: cancelTx,
-  completedTx: completedTx,
-  txError: txError,
-  nextTx: nextTx,
-  previousTx: previousTx,
-  cancelAllTx: cancelAllTx,
-  viewPendingTx: viewPendingTx,
-  VIEW_PENDING_TX: 'VIEW_PENDING_TX',
-  // app messages
-  confirmSeedWords: confirmSeedWords,
-  showAccountDetail: showAccountDetail,
-  BACK_TO_ACCOUNT_DETAIL: 'BACK_TO_ACCOUNT_DETAIL',
-  backToAccountDetail: backToAccountDetail,
-  showAccountsPage: showAccountsPage,
-  showConfTxPage: showConfTxPage,
-  // config screen
-  SHOW_CONFIG_PAGE: 'SHOW_CONFIG_PAGE',
-  SET_RPC_TARGET: 'SET_RPC_TARGET',
-  SET_DEFAULT_RPC_TARGET: 'SET_DEFAULT_RPC_TARGET',
-  SET_PROVIDER_TYPE: 'SET_PROVIDER_TYPE',
-  showConfigPage,
-  SHOW_ADD_TOKEN_PAGE: 'SHOW_ADD_TOKEN_PAGE',
-  showAddTokenPage,
-  addToken,
-  setRpcTarget: setRpcTarget,
-  setProviderType: setProviderType,
-  // loading overlay
-  SHOW_LOADING: 'SHOW_LOADING_INDICATION',
-  HIDE_LOADING: 'HIDE_LOADING_INDICATION',
-  showLoadingIndication: showLoadingIndication,
-  hideLoadingIndication: hideLoadingIndication,
-  // buy Eth with coinbase
-  onboardingBuyEthView,
-  ONBOARDING_BUY_ETH_VIEW: 'ONBOARDING_BUY_ETH_VIEW',
-  BUY_ETH: 'BUY_ETH',
-  buyEth: buyEth,
-  buyEthView: buyEthView,
-  buyWithShapeShift,
-  BUY_ETH_VIEW: 'BUY_ETH_VIEW',
-  COINBASE_SUBVIEW: 'COINBASE_SUBVIEW',
-  coinBaseSubview: coinBaseSubview,
-  SHAPESHIFT_SUBVIEW: 'SHAPESHIFT_SUBVIEW',
-  shapeShiftSubview: shapeShiftSubview,
-  PAIR_UPDATE: 'PAIR_UPDATE',
-  pairUpdate: pairUpdate,
-  coinShiftRquest: coinShiftRquest,
-  SHOW_SUB_LOADING_INDICATION: 'SHOW_SUB_LOADING_INDICATION',
-  showSubLoadingIndication: showSubLoadingIndication,
-  HIDE_SUB_LOADING_INDICATION: 'HIDE_SUB_LOADING_INDICATION',
-  hideSubLoadingIndication: hideSubLoadingIndication,
-// QR STUFF:
-  SHOW_QR: 'SHOW_QR',
-  showQrView: showQrView,
-  reshowQrCode: reshowQrCode,
-  SHOW_QR_VIEW: 'SHOW_QR_VIEW',
-// FORGOT PASSWORD:
-  BACK_TO_INIT_MENU: 'BACK_TO_INIT_MENU',
-  goBackToInitView: goBackToInitView,
-  RECOVERY_IN_PROGRESS: 'RECOVERY_IN_PROGRESS',
-  BACK_TO_UNLOCK_VIEW: 'BACK_TO_UNLOCK_VIEW',
-  backToUnlockView: backToUnlockView,
-  // SHOWING KEYCHAIN
-  SHOW_NEW_KEYCHAIN: 'SHOW_NEW_KEYCHAIN',
-  showNewKeychain: showNewKeychain,
-
-  callBackgroundThenUpdate,
-  forceUpdateMetamaskState,
-
-  // Feature Flags
-  setFeatureFlag,
-  updateFeatureFlags,
-  UPDATE_FEATURE_FLAGS: 'UPDATE_FEATURE_FLAGS',
-}
-
-module.exports = actions
-
-var background = null
-function _setBackgroundConnection (backgroundConnection) {
-  background = backgroundConnection
-}
-
-function goHome () {
-  return {
-    type: actions.GO_HOME,
-  }
-}
-
-// async actions
-
-function tryUnlockMetamask (password) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    dispatch(actions.unlockInProgress())
-    log.debug(`background.submitPassword`)
-    background.submitPassword(password, (err) => {
-      dispatch(actions.hideLoadingIndication())
-      if (err) {
-        dispatch(actions.unlockFailed(err.message))
-      } else {
-        dispatch(actions.transitionForward())
-        forceUpdateMetamaskState(dispatch)
-      }
-    })
-  }
-}
-
-function transitionForward () {
-  return {
-    type: this.TRANSITION_FORWARD,
-  }
-}
-
-function transitionBackward () {
-  return {
-    type: this.TRANSITION_BACKWARD,
-  }
-}
-
-function confirmSeedWords () {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    log.debug(`background.clearSeedWordCache`)
-    return new Promise((resolve, reject) => {
-      background.clearSeedWordCache((err, account) => {
-        dispatch(actions.hideLoadingIndication())
-        if (err) {
-          dispatch(actions.displayWarning(err.message))
-          reject(err)
-        }
-
-        log.info('Seed word cache cleared. ' + account)
-        dispatch(actions.showAccountsPage())
-        resolve(account)
-      })
-    })
-  }
-}
-
-function createNewVaultAndRestore (password, seed) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    log.debug(`background.createNewVaultAndRestore`)
-
-    return new Promise((resolve, reject) => {
-      background.createNewVaultAndRestore(password, seed, (err) => {
-
-        dispatch(actions.hideLoadingIndication())
-
-        if (err) {
-          dispatch(actions.displayWarning(err.message))
-          return reject(err)
-        }
-
-        dispatch(actions.showAccountsPage())
-        resolve()
-      })
-    })
-  }
-}
-
-function createNewVaultAndKeychain (password) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    log.debug(`background.createNewVaultAndKeychain`)
-
-    return new Promise((resolve, reject) => {
-      background.createNewVaultAndKeychain(password, (err) => {
-        if (err) {
-          dispatch(actions.displayWarning(err.message))
-          return reject(err)
-        }
-        log.debug(`background.placeSeedWords`)
-        background.placeSeedWords((err) => {
-          if (err) {
-            dispatch(actions.displayWarning(err.message))
-            return reject(err)
-          }
-          dispatch(actions.hideLoadingIndication())
-          forceUpdateMetamaskState(dispatch)
-          resolve()
-        })
-      })
-    })
-
-  }
-}
-
-function revealSeedConfirmation () {
-  return {
-    type: this.REVEAL_SEED_CONFIRMATION,
-  }
-}
-
-function requestRevealSeed (password) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    log.debug(`background.submitPassword`)
-    background.submitPassword(password, (err) => {
-      if (err) {
-        return dispatch(actions.displayWarning(err.message))
-      }
-      log.debug(`background.placeSeedWords`)
-      background.placeSeedWords((err, result) => {
-        if (err) return dispatch(actions.displayWarning(err.message))
-        dispatch(actions.hideLoadingIndication())
-        dispatch(actions.showNewVaultSeed(result))
-      })
-    })
-  }
-}
-
-function addNewKeyring (type, opts) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    log.debug(`background.addNewKeyring`)
-    background.addNewKeyring(type, opts, (err) => {
-      dispatch(actions.hideLoadingIndication())
-      if (err) return dispatch(actions.displayWarning(err.message))
-      dispatch(actions.showAccountsPage())
-    })
-  }
-}
-
-function importNewAccount (strategy, args) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication('This may take a while, be patient.'))
-    log.debug(`background.importAccountWithStrategy`)
-    return new Promise((resolve, reject) => {
-      background.importAccountWithStrategy(strategy, args, (err) => {
-        if (err) {
-          dispatch(actions.displayWarning(err.message))
-          return reject(err)
-        }
-        log.debug(`background.getState`)
-        background.getState((err, newState) => {
-          dispatch(actions.hideLoadingIndication())
-          if (err) {
-            dispatch(actions.displayWarning(err.message))
-            return reject(err)
-          }
-          dispatch(actions.updateMetamaskState(newState))
-          dispatch({
-            type: actions.SHOW_ACCOUNT_DETAIL,
-            value: newState.selectedAddress,
-          })
-          resolve(newState)
-        })
-      })
-    })
-  }
-}
-
-function navigateToNewAccountScreen () {
-  return {
-    type: this.NEW_ACCOUNT_SCREEN,
-  }
-}
-
-function addNewAccount () {
-  log.debug(`background.addNewAccount`)
-  return callBackgroundThenUpdate(background.addNewAccount)
-}
-
-function showInfoPage () {
-  return {
-    type: actions.SHOW_INFO_PAGE,
-  }
-}
-
-function setCurrentCurrency (currencyCode) {
-  return (dispatch) => {
-    dispatch(this.showLoadingIndication())
-    log.debug(`background.setCurrentCurrency`)
-    background.setCurrentCurrency(currencyCode, (err, data) => {
-      dispatch(this.hideLoadingIndication())
-      if (err) {
-        log.error(err.stack)
-        return dispatch(actions.displayWarning(err.message))
-      }
-      dispatch({
-        type: this.SET_CURRENT_FIAT,
-        value: {
-          currentCurrency: data.currentCurrency,
-          conversionRate: data.conversionRate,
-          conversionDate: data.conversionDate,
-        },
-      })
-    })
-  }
-}
-
-function signMsg (msgData) {
-  log.debug('action - signMsg')
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-
-    log.debug(`actions calling background.signMessage`)
-    background.signMessage(msgData, (err, newState) => {
-      log.debug('signMessage called back')
-      dispatch(actions.updateMetamaskState(newState))
-      dispatch(actions.hideLoadingIndication())
-
-      if (err) log.error(err)
-      if (err) return dispatch(actions.displayWarning(err.message))
-
-      dispatch(actions.completedTx(msgData.metamaskId))
-    })
-  }
-}
-
-function signPersonalMsg (msgData) {
-  log.debug('action - signPersonalMsg')
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-
-    log.debug(`actions calling background.signPersonalMessage`)
-    background.signPersonalMessage(msgData, (err, newState) => {
-      log.debug('signPersonalMessage called back')
-      dispatch(actions.updateMetamaskState(newState))
-      dispatch(actions.hideLoadingIndication())
-
-      if (err) log.error(err)
-      if (err) return dispatch(actions.displayWarning(err.message))
-
-      dispatch(actions.completedTx(msgData.metamaskId))
-    })
-  }
-}
-
-function signTypedMsg (msgData) {
-  log.debug('action - signTypedMsg')
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-
-    log.debug(`actions calling background.signTypedMessage`)
-    background.signTypedMessage(msgData, (err, newState) => {
-      log.debug('signTypedMessage called back')
-      dispatch(actions.updateMetamaskState(newState))
-      dispatch(actions.hideLoadingIndication())
-
-      if (err) log.error(err)
-      if (err) return dispatch(actions.displayWarning(err.message))
-
-      dispatch(actions.completedTx(msgData.metamaskId))
-    })
-  }
-}
-
-function signTx (txData) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    global.ethQuery.sendTransaction(txData, (err, data) => {
-      dispatch(actions.hideLoadingIndication())
-      if (err) dispatch(actions.displayWarning(err.message))
-      dispatch(this.goHome())
-    })
-    dispatch(actions.showConfTxPage())
-  }
-}
-
-function updateAndApproveTx (txData) {
-  log.info('actions: updateAndApproveTx: ' + JSON.stringify(txData))
-  return (dispatch) => {
-    log.debug(`actions calling background.updateAndApproveTx`)
-    background.updateAndApproveTransaction(txData, (err) => {
-      dispatch(actions.hideLoadingIndication())
-      if (err) {
-        dispatch(actions.txError(err))
-        dispatch(actions.goHome())
-        return log.error(err.message)
-      }
-      dispatch(actions.completedTx(txData.id))
-    })
-  }
-}
-
-function completedTx (id) {
-  return {
-    type: actions.COMPLETED_TX,
-    value: id,
-  }
-}
-
-function txError (err) {
-  return {
-    type: actions.TRANSACTION_ERROR,
-    message: err.message,
-  }
-}
-
-function cancelMsg (msgData) {
-  log.debug(`background.cancelMessage`)
-  background.cancelMessage(msgData.id)
-  return actions.completedTx(msgData.id)
-}
-
-function cancelPersonalMsg (msgData) {
-  const id = msgData.id
-  background.cancelPersonalMessage(id)
-  return actions.completedTx(id)
-}
-
-function cancelTypedMsg (msgData) {
-  const id = msgData.id
-  background.cancelTypedMessage(id)
-  return actions.completedTx(id)
-}
-
-function cancelTx (txData) {
-  return (dispatch) => {
-    log.debug(`background.cancelTransaction`)
-    background.cancelTransaction(txData.id, () => {
-      dispatch(actions.completedTx(txData.id))
-    })
-  }
-}
-
-function cancelAllTx (txsData) {
-  return (dispatch) => {
-    txsData.forEach((txData, i) => {
-      background.cancelTransaction(txData.id, () => {
-        dispatch(actions.completedTx(txData.id))
-        i === txsData.length - 1 ? dispatch(actions.goHome()) : null
-      })
-    })
-  }
-}
-//
-// initialize screen
-//
-
-function showCreateVault () {
-  return {
-    type: actions.SHOW_CREATE_VAULT,
-  }
-}
-
-function showRestoreVault () {
-  return {
-    type: actions.SHOW_RESTORE_VAULT,
-  }
-}
-
-function forgotPassword () {
-  return {
-    type: actions.FORGOT_PASSWORD,
-  }
-}
-
-function showInitializeMenu () {
-  return {
-    type: actions.SHOW_INIT_MENU,
-  }
-}
-
-function showImportPage () {
-  return {
-    type: actions.SHOW_IMPORT_PAGE,
-  }
-}
-
-function createNewVaultInProgress () {
-  return {
-    type: actions.CREATE_NEW_VAULT_IN_PROGRESS,
-  }
-}
-
-function showNewVaultSeed (seed) {
-  return {
-    type: actions.SHOW_NEW_VAULT_SEED,
-    value: seed,
-  }
-}
-
-function backToUnlockView () {
-  return {
-    type: actions.BACK_TO_UNLOCK_VIEW,
-  }
-}
-
-function showNewKeychain () {
-  return {
-    type: actions.SHOW_NEW_KEYCHAIN,
-  }
-}
-
-//
-// unlock screen
-//
-
-function unlockInProgress () {
-  return {
-    type: actions.UNLOCK_IN_PROGRESS,
-  }
-}
-
-function unlockFailed (message) {
-  return {
-    type: actions.UNLOCK_FAILED,
-    value: message,
-  }
-}
-
-function unlockMetamask (account) {
-  return {
-    type: actions.UNLOCK_METAMASK,
-    value: account,
-  }
-}
-
-function updateMetamaskState (newState) {
-  return {
-    type: actions.UPDATE_METAMASK_STATE,
-    value: newState,
-  }
-}
-
-function lockMetamask () {
-  log.debug(`background.setLocked`)
-  return callBackgroundThenUpdate(background.setLocked)
-}
-
-function setCurrentAccountTab (newTabName) {
-  log.debug(`background.setCurrentAccountTab: ${newTabName}`)
-  return callBackgroundThenUpdateNoSpinner(background.setCurrentAccountTab, newTabName)
-}
-
-function showAccountDetail (address) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    log.debug(`background.setSelectedAddress`)
-    background.setSelectedAddress(address, (err) => {
-      dispatch(actions.hideLoadingIndication())
-      if (err) {
-        return dispatch(actions.displayWarning(err.message))
-      }
-      dispatch({
-        type: actions.SHOW_ACCOUNT_DETAIL,
-        value: address,
-      })
-    })
-  }
-}
-
-function backToAccountDetail (address) {
-  return {
-    type: actions.BACK_TO_ACCOUNT_DETAIL,
-    value: address,
-  }
-}
-
-function showAccountsPage () {
-  return {
-    type: actions.SHOW_ACCOUNTS_PAGE,
-  }
-}
-
-function showConfTxPage (transForward = true) {
-  return {
-    type: actions.SHOW_CONF_TX_PAGE,
-    transForward: transForward,
-  }
-}
-
-function nextTx () {
-  return {
-    type: actions.NEXT_TX,
-  }
-}
-
-function viewPendingTx (txId) {
-  return {
-    type: actions.VIEW_PENDING_TX,
-    value: txId,
-  }
-}
-
-function previousTx () {
-  return {
-    type: actions.PREVIOUS_TX,
-  }
-}
-
-function showConfigPage (transitionForward = true) {
-  return {
-    type: actions.SHOW_CONFIG_PAGE,
-    value: transitionForward,
-  }
-}
-
-function showAddTokenPage (transitionForward = true) {
-  return {
-    type: actions.SHOW_ADD_TOKEN_PAGE,
-    value: transitionForward,
-  }
-}
-
-function addToken (address, symbol, decimals) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    background.addToken(address, symbol, decimals, (err) => {
-      dispatch(actions.hideLoadingIndication())
-      if (err) {
-        return dispatch(actions.displayWarning(err.message))
-      }
-      setTimeout(() => {
-        dispatch(actions.goHome())
-      }, 250)
-    })
-  }
-}
-
-function goBackToInitView () {
-  return {
-    type: actions.BACK_TO_INIT_MENU,
-  }
-}
-
-//
-// 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))
-          return reject(err)
-        }
-        if (notice) {
-          dispatch(actions.showNotice(notice))
-          resolve()
-        } else {
-          dispatch(actions.clearNotices())
-          resolve()
-        }
-      })
-    })
-  }
-}
-
-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)
-}
-
-//
-// config
-//
-
-function setProviderType (type) {
-  return (dispatch) => {
-    log.debug(`background.setProviderType`)
-    background.setProviderType(type, (err, result) => {
-      if (err) {
-        log.error(err)
-        return dispatch(self.displayWarning('Had a problem changing networks!'))
-      }
-    })
-    return {
-      type: actions.SET_PROVIDER_TYPE,
-      value: type,
-    }
-  }
-}
-
-function setRpcTarget (newRpc) {
-  log.debug(`background.setRpcTarget: ${newRpc}`)
-  return (dispatch) => {
-    background.setCustomRpc(newRpc, (err, result) => {
-      if (err) {
-        log.error(err)
-        return dispatch(self.displayWarning('Had a problem changing networks!'))
-      }
-    })
-  }
-}
-
-// Calls the addressBookController to add a new address.
-function addToAddressBook (recipient, nickname) {
-  log.debug(`background.addToAddressBook`)
-  return (dispatch) => {
-    background.setAddressBook(recipient, nickname, (err, result) => {
-      if (err) {
-        log.error(err)
-        return dispatch(self.displayWarning('Address book failed to update'))
-      }
-    })
-  }
-}
-
-function showLoadingIndication (message) {
-  return {
-    type: actions.SHOW_LOADING,
-    value: message,
-  }
-}
-
-function hideLoadingIndication () {
-  return {
-    type: actions.HIDE_LOADING,
-  }
-}
-
-function showSubLoadingIndication () {
-  return {
-    type: actions.SHOW_SUB_LOADING_INDICATION,
-  }
-}
-
-function hideSubLoadingIndication () {
-  return {
-    type: actions.HIDE_SUB_LOADING_INDICATION,
-  }
-}
-
-function displayWarning (text) {
-  return {
-    type: actions.DISPLAY_WARNING,
-    value: text,
-  }
-}
-
-function hideWarning () {
-  return {
-    type: actions.HIDE_WARNING,
-  }
-}
-
-function requestExportAccount () {
-  return {
-    type: actions.REQUEST_ACCOUNT_EXPORT,
-  }
-}
-
-function exportAccount (password, address) {
-  var self = this
-
-  return function (dispatch) {
-    dispatch(self.showLoadingIndication())
-
-    log.debug(`background.submitPassword`)
-    background.submitPassword(password, function (err) {
-      if (err) {
-        log.error('Error in submiting password.')
-        dispatch(self.hideLoadingIndication())
-        return dispatch(self.displayWarning('Incorrect Password.'))
-      }
-      log.debug(`background.exportAccount`)
-      background.exportAccount(address, function (err, result) {
-        dispatch(self.hideLoadingIndication())
-
-        if (err) {
-          log.error(err)
-          return dispatch(self.displayWarning('Had a problem exporting the account.'))
-        }
-
-        dispatch(self.showPrivateKey(result))
-      })
-    })
-  }
-}
-
-function showPrivateKey (key) {
-  return {
-    type: actions.SHOW_PRIVATE_KEY,
-    value: key,
-  }
-}
-
-function saveAccountLabel (account, label) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    log.debug(`background.saveAccountLabel`)
-    background.saveAccountLabel(account, label, (err) => {
-      dispatch(actions.hideLoadingIndication())
-      if (err) {
-        return dispatch(actions.displayWarning(err.message))
-      }
-      dispatch({
-        type: actions.SAVE_ACCOUNT_LABEL,
-        value: { account, label },
-      })
-    })
-  }
-}
-
-function showSendPage () {
-  return {
-    type: actions.SHOW_SEND_PAGE,
-  }
-}
-
-function buyEth (opts) {
-  return (dispatch) => {
-    const url = getBuyEthUrl(opts)
-    global.platform.openWindow({ url })
-    dispatch({
-      type: actions.BUY_ETH,
-    })
-  }
-}
-
-function onboardingBuyEthView (address) {
-  return {
-    type: actions.ONBOARDING_BUY_ETH_VIEW,
-    value: address,
-  }
-}
-
-function buyEthView (address) {
-  return {
-    type: actions.BUY_ETH_VIEW,
-    value: address,
-  }
-}
-
-function coinBaseSubview () {
-  return {
-    type: actions.COINBASE_SUBVIEW,
-  }
-}
-
-function pairUpdate (coin) {
-  return (dispatch) => {
-    dispatch(actions.showSubLoadingIndication())
-    dispatch(actions.hideWarning())
-    shapeShiftRequest('marketinfo', {pair: `${coin.toLowerCase()}_eth`}, (mktResponse) => {
-      dispatch(actions.hideSubLoadingIndication())
-      dispatch({
-        type: actions.PAIR_UPDATE,
-        value: {
-          marketinfo: mktResponse,
-        },
-      })
-    })
-  }
-}
-
-function shapeShiftSubview (network) {
-  var pair = 'btc_eth'
-
-  return (dispatch) => {
-    dispatch(actions.showSubLoadingIndication())
-    shapeShiftRequest('marketinfo', {pair}, (mktResponse) => {
-      shapeShiftRequest('getcoins', {}, (response) => {
-        dispatch(actions.hideSubLoadingIndication())
-        if (mktResponse.error) return dispatch(actions.displayWarning(mktResponse.error))
-        dispatch({
-          type: actions.SHAPESHIFT_SUBVIEW,
-          value: {
-            marketinfo: mktResponse,
-            coinOptions: response,
-          },
-        })
-      })
-    })
-  }
-}
-
-function coinShiftRquest (data, marketData) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    shapeShiftRequest('shift', { method: 'POST', data}, (response) => {
-      dispatch(actions.hideLoadingIndication())
-      if (response.error) return dispatch(actions.displayWarning(response.error))
-      var message = `
-        Deposit your ${response.depositType} to the address bellow:`
-      log.debug(`background.createShapeShiftTx`)
-      background.createShapeShiftTx(response.deposit, response.depositType)
-      dispatch(actions.showQrView(response.deposit, [message].concat(marketData)))
-    })
-  }
-}
-
-function buyWithShapeShift (data) {
-  return dispatch => new Promise((resolve, reject) => {
-    shapeShiftRequest('shift', { method: 'POST', data}, (response) => {
-      if (response.error) {
-        return reject(response.error)
-      }
-      background.createShapeShiftTx(response.deposit, response.depositType)
-      return resolve(response)
-    })
-  })
-}
-
-function showQrView (data, message) {
-  return {
-    type: actions.SHOW_QR_VIEW,
-    value: {
-      message: message,
-      data: data,
-    },
-  }
-}
-function reshowQrCode (data, coin) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    shapeShiftRequest('marketinfo', {pair: `${coin.toLowerCase()}_eth`}, (mktResponse) => {
-      if (mktResponse.error) return dispatch(actions.displayWarning(mktResponse.error))
-
-      var message = [
-        `Deposit your ${coin} to the address bellow:`,
-        `Deposit Limit: ${mktResponse.limit}`,
-        `Deposit Minimum:${mktResponse.minimum}`,
-      ]
-
-      dispatch(actions.hideLoadingIndication())
-      return dispatch(actions.showQrView(data, message))
-    })
-  }
-}
-
-function shapeShiftRequest (query, options, cb) {
-  var queryResponse, method
-  !options ? options = {} : null
-  options.method ? method = options.method : method = 'GET'
-
-  var requestListner = function (request) {
-    try {
-      queryResponse = JSON.parse(this.responseText)
-      cb ? cb(queryResponse) : null
-      return queryResponse
-    } catch (e) {
-      cb ? cb({error: e}) : null
-      return e
-    }
-  }
-
-  var shapShiftReq = new XMLHttpRequest()
-  shapShiftReq.addEventListener('load', requestListner)
-  shapShiftReq.open(method, `https://shapeshift.io/${query}/${options.pair ? options.pair : ''}`, true)
-
-  if (options.method === 'POST') {
-    var jsonObj = JSON.stringify(options.data)
-    shapShiftReq.setRequestHeader('Content-Type', 'application/json')
-    return shapShiftReq.send(jsonObj)
-  } else {
-    return shapShiftReq.send()
-  }
-}
-
-function setFeatureFlag (feature, activated) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    return new Promise((resolve, reject) => {
-      background.setFeatureFlag(feature, activated, (err, updatedFeatureFlags) => {
-        dispatch(actions.hideLoadingIndication())
-        if (err) {
-          dispatch(actions.displayWarning(err.message))
-          reject(err)
-        }
-        dispatch(actions.updateFeatureFlags(updatedFeatureFlags))
-        resolve(updatedFeatureFlags)
-      })
-    })
-  }
-}
-
-function updateFeatureFlags (updatedFeatureFlags) {
-  return {
-    type: actions.UPDATE_FEATURE_FLAGS,
-    value: updatedFeatureFlags,
-  }
-}
-
-// Call Background Then Update
-//
-// A function generator for a common pattern wherein:
-// We show loading indication.
-// We call a background method.
-// We hide loading indication.
-// If it errored, we show a warning.
-// If it didn't, we update the state.
-function callBackgroundThenUpdateNoSpinner (method, ...args) {
-  return (dispatch) => {
-    method.call(background, ...args, (err) => {
-      if (err) {
-        return dispatch(actions.displayWarning(err.message))
-      }
-      forceUpdateMetamaskState(dispatch)
-    })
-  }
-}
-
-function callBackgroundThenUpdate (method, ...args) {
-  return (dispatch) => {
-    dispatch(actions.showLoadingIndication())
-    method.call(background, ...args, (err) => {
-      dispatch(actions.hideLoadingIndication())
-      if (err) {
-        return dispatch(actions.displayWarning(err.message))
-      }
-      forceUpdateMetamaskState(dispatch)
-    })
-  }
-}
-
-function forceUpdateMetamaskState (dispatch) {
-  log.debug(`background.getState`)
-  background.getState((err, newState) => {
-    if (err) {
-      return dispatch(actions.displayWarning(err.message))
-    }
-    dispatch(actions.updateMetamaskState(newState))
-  })
-}
diff --git a/old-ui/app/reducers.js b/old-ui/app/reducers.js
deleted file mode 100644
index 70b7e71dc..000000000
--- a/old-ui/app/reducers.js
+++ /dev/null
@@ -1,76 +0,0 @@
-const extend = require('xtend')
-const copyToClipboard = require('copy-to-clipboard')
-
-//
-// Sub-Reducers take in the complete state and return their sub-state
-//
-const reduceIdentities = require('./reducers/identities')
-const reduceMetamask = require('./reducers/metamask')
-const reduceApp = require('./reducers/app')
-
-window.METAMASK_CACHED_LOG_STATE = null
-
-module.exports = rootReducer
-
-function rootReducer (state, action) {
-  // clone
-  state = extend(state)
-
-  if (action.type === 'GLOBAL_FORCE_UPDATE') {
-    return action.value
-  }
-
-  //
-  // Identities
-  //
-
-  state.identities = reduceIdentities(state, action)
-
-  //
-  // MetaMask
-  //
-
-  state.metamask = reduceMetamask(state, action)
-
-  //
-  // AppState
-  //
-
-  state.appState = reduceApp(state, action)
-
-  window.METAMASK_CACHED_LOG_STATE = state
-  return state
-}
-
-window.logStateString = function (cb) {
-  const state = window.METAMASK_CACHED_LOG_STATE
-  const version = global.platform.getVersion()
-  const browser = window.navigator.userAgent
-  return global.platform.getPlatformInfo((err, platform) => {
-    if (err) {
-      return cb(err)
-    }
-    state.version = version
-    state.platform = platform
-    state.browser = browser
-    const stateString = JSON.stringify(state, removeSeedWords, 2)
-    return cb(null, stateString)
-  })
-}
-
-window.logState = function (toClipboard) {
-  return window.logStateString((err, result) => {
-    if (err) {
-      console.error(err.message)
-    } else if (toClipboard) {
-      copyToClipboard(result)
-      console.log('State log copied')
-    } else {
-      console.log(result)
-    }
-  })
-}
-
-function removeSeedWords (key, value) {
-  return key === 'seedWords' ? undefined : value
-}
diff --git a/old-ui/app/reducers/app.js b/old-ui/app/reducers/app.js
deleted file mode 100644
index 0d7419f9a..000000000
--- a/old-ui/app/reducers/app.js
+++ /dev/null
@@ -1,599 +0,0 @@
-const extend = require('xtend')
-const actions = require('../../../ui/app/actions')
-const txHelper = require('../../lib/tx-helper')
-
-module.exports = reduceApp
-
-
-function reduceApp (state, action) {
-  log.debug('App Reducer got ' + action.type)
-  // clone and defaults
-  const selectedAddress = state.metamask.selectedAddress
-  const hasUnconfActions = checkUnconfActions(state)
-  let name = 'accounts'
-  if (selectedAddress) {
-    name = 'accountDetail'
-  }
-  if (hasUnconfActions) {
-    log.debug('pending txs detected, defaulting to conf-tx view.')
-    name = 'confTx'
-  }
-
-  var defaultView = {
-    name,
-    detailView: null,
-    context: selectedAddress,
-  }
-
-  // confirm seed words
-  var seedWords = state.metamask.seedWords
-  var seedConfView = {
-    name: 'createVaultComplete',
-    seedWords,
-  }
-
-  // default state
-  var appState = extend({
-    shouldClose: false,
-    menuOpen: false,
-    currentView: seedWords ? seedConfView : defaultView,
-    accountDetail: {
-      subview: 'transactions',
-    },
-    // Used to render transition direction
-    transForward: true,
-    // Used to display loading indicator
-    isLoading: false,
-    // Used to display error text
-    warning: null,
-  }, state.appState)
-
-  switch (action.type) {
-
-    // transition methods
-
-    case actions.TRANSITION_FORWARD:
-      return extend(appState, {
-        transForward: true,
-      })
-
-    case actions.TRANSITION_BACKWARD:
-      return extend(appState, {
-        transForward: false,
-      })
-
-    // intialize
-
-    case actions.SHOW_CREATE_VAULT:
-      return extend(appState, {
-        currentView: {
-          name: 'createVault',
-        },
-        transForward: true,
-        warning: null,
-      })
-
-    case actions.SHOW_RESTORE_VAULT:
-      return extend(appState, {
-        currentView: {
-          name: 'restoreVault',
-        },
-        transForward: true,
-        forgottenPassword: true,
-      })
-
-    case actions.FORGOT_PASSWORD:
-      return extend(appState, {
-        currentView: {
-          name: 'restoreVault',
-        },
-        transForward: false,
-        forgottenPassword: true,
-      })
-
-    case actions.SHOW_INIT_MENU:
-      return extend(appState, {
-        currentView: defaultView,
-        transForward: false,
-      })
-
-    case actions.SHOW_CONFIG_PAGE:
-      return extend(appState, {
-        currentView: {
-          name: 'config',
-          context: appState.currentView.context,
-        },
-        transForward: action.value,
-      })
-
-    case actions.SHOW_ADD_TOKEN_PAGE:
-      return extend(appState, {
-        currentView: {
-          name: 'add-token',
-          context: appState.currentView.context,
-        },
-        transForward: action.value,
-      })
-
-    case actions.SHOW_IMPORT_PAGE:
-
-      return extend(appState, {
-        currentView: {
-          name: 'import-menu',
-        },
-        transForward: true,
-        warning: null,
-      })
-
-    case actions.SHOW_INFO_PAGE:
-      return extend(appState, {
-        currentView: {
-          name: 'info',
-          context: appState.currentView.context,
-        },
-        transForward: true,
-      })
-
-    case actions.CREATE_NEW_VAULT_IN_PROGRESS:
-      return extend(appState, {
-        currentView: {
-          name: 'createVault',
-          inProgress: true,
-        },
-        transForward: true,
-        isLoading: true,
-      })
-
-    case actions.SHOW_NEW_VAULT_SEED:
-      return extend(appState, {
-        currentView: {
-          name: 'createVaultComplete',
-          seedWords: action.value,
-        },
-        transForward: true,
-        isLoading: false,
-      })
-
-    case actions.NEW_ACCOUNT_SCREEN:
-      return extend(appState, {
-        currentView: {
-          name: 'new-account',
-          context: appState.currentView.context,
-        },
-        transForward: true,
-      })
-
-    case actions.SHOW_SEND_PAGE:
-      return extend(appState, {
-        currentView: {
-          name: 'sendTransaction',
-          context: appState.currentView.context,
-        },
-        transForward: true,
-        warning: null,
-      })
-
-    case actions.SHOW_NEW_KEYCHAIN:
-      return extend(appState, {
-        currentView: {
-          name: 'newKeychain',
-          context: appState.currentView.context,
-        },
-        transForward: true,
-      })
-
-  // unlock
-
-    case actions.UNLOCK_METAMASK:
-      return extend(appState, {
-        forgottenPassword: appState.forgottenPassword ? !appState.forgottenPassword : null,
-        detailView: {},
-        transForward: true,
-        isLoading: false,
-        warning: null,
-      })
-
-    case actions.LOCK_METAMASK:
-      return extend(appState, {
-        currentView: defaultView,
-        transForward: false,
-        warning: null,
-      })
-
-    case actions.BACK_TO_INIT_MENU:
-      return extend(appState, {
-        warning: null,
-        transForward: false,
-        forgottenPassword: true,
-        currentView: {
-          name: 'InitMenu',
-        },
-      })
-
-    case actions.BACK_TO_UNLOCK_VIEW:
-      return extend(appState, {
-        warning: null,
-        transForward: true,
-        forgottenPassword: false,
-        currentView: {
-          name: 'UnlockScreen',
-        },
-      })
-  // reveal seed words
-
-    case actions.REVEAL_SEED_CONFIRMATION:
-      return extend(appState, {
-        currentView: {
-          name: 'reveal-seed-conf',
-        },
-        transForward: true,
-        warning: null,
-      })
-
-  // accounts
-
-    case actions.SET_SELECTED_ACCOUNT:
-      return extend(appState, {
-        activeAddress: action.value,
-      })
-
-    case actions.GO_HOME:
-      return extend(appState, {
-        currentView: extend(appState.currentView, {
-          name: 'accountDetail',
-        }),
-        accountDetail: {
-          subview: 'transactions',
-          accountExport: 'none',
-          privateKey: '',
-        },
-        transForward: false,
-        warning: null,
-      })
-
-    case actions.SHOW_ACCOUNT_DETAIL:
-      return extend(appState, {
-        forgottenPassword: appState.forgottenPassword ? !appState.forgottenPassword : null,
-        currentView: {
-          name: 'accountDetail',
-          context: action.value,
-        },
-        accountDetail: {
-          subview: 'transactions',
-          accountExport: 'none',
-          privateKey: '',
-        },
-        transForward: false,
-      })
-
-    case actions.BACK_TO_ACCOUNT_DETAIL:
-      return extend(appState, {
-        currentView: {
-          name: 'accountDetail',
-          context: action.value,
-        },
-        accountDetail: {
-          subview: 'transactions',
-          accountExport: 'none',
-          privateKey: '',
-        },
-        transForward: false,
-      })
-
-    case actions.SHOW_ACCOUNTS_PAGE:
-      return extend(appState, {
-        currentView: {
-          name: seedWords ? 'createVaultComplete' : 'accounts',
-          seedWords,
-        },
-        transForward: true,
-        isLoading: false,
-        warning: null,
-        scrollToBottom: false,
-        forgottenPassword: false,
-      })
-
-    case actions.SHOW_NOTICE:
-      return extend(appState, {
-        transForward: true,
-        isLoading: false,
-      })
-
-    case actions.REVEAL_ACCOUNT:
-      return extend(appState, {
-        scrollToBottom: true,
-      })
-
-    case actions.SHOW_CONF_TX_PAGE:
-      return extend(appState, {
-        currentView: {
-          name: 'confTx',
-          context: 0,
-        },
-        transForward: action.transForward,
-        warning: null,
-        isLoading: false,
-      })
-
-    case actions.SHOW_CONF_MSG_PAGE:
-      return extend(appState, {
-        currentView: {
-          name: hasUnconfActions ? 'confTx' : 'account-detail',
-          context: 0,
-        },
-        transForward: true,
-        warning: null,
-        isLoading: false,
-      })
-
-    case actions.COMPLETED_TX:
-      log.debug('reducing COMPLETED_TX for tx ' + action.value)
-      const otherUnconfActions = getUnconfActionList(state)
-      .filter(tx => tx.id !== action.value)
-      const hasOtherUnconfActions = otherUnconfActions.length > 0
-
-      if (hasOtherUnconfActions) {
-        log.debug('reducer detected txs - rendering confTx view')
-        return extend(appState, {
-          transForward: false,
-          currentView: {
-            name: 'confTx',
-            context: 0,
-          },
-          warning: null,
-        })
-      } else {
-        log.debug('attempting to close popup')
-        return extend(appState, {
-          // indicate notification should close
-          shouldClose: true,
-          transForward: false,
-          warning: null,
-          currentView: {
-            name: 'accountDetail',
-            context: state.metamask.selectedAddress,
-          },
-          accountDetail: {
-            subview: 'transactions',
-          },
-        })
-      }
-
-    case actions.NEXT_TX:
-      return extend(appState, {
-        transForward: true,
-        currentView: {
-          name: 'confTx',
-          context: ++appState.currentView.context,
-          warning: null,
-        },
-      })
-
-    case actions.VIEW_PENDING_TX:
-      const context = indexForPending(state, action.value)
-      return extend(appState, {
-        transForward: true,
-        currentView: {
-          name: 'confTx',
-          context,
-          warning: null,
-        },
-      })
-
-    case actions.PREVIOUS_TX:
-      return extend(appState, {
-        transForward: false,
-        currentView: {
-          name: 'confTx',
-          context: --appState.currentView.context,
-          warning: null,
-        },
-      })
-
-    case actions.TRANSACTION_ERROR:
-      return extend(appState, {
-        currentView: {
-          name: 'confTx',
-          errorMessage: 'There was a problem submitting this transaction.',
-        },
-      })
-
-    case actions.UNLOCK_FAILED:
-      return extend(appState, {
-        warning: action.value || 'Incorrect password. Try again.',
-      })
-
-    case actions.SHOW_LOADING:
-      return extend(appState, {
-        isLoading: true,
-        loadingMessage: action.value,
-      })
-
-    case actions.HIDE_LOADING:
-      return extend(appState, {
-        isLoading: false,
-      })
-
-    case actions.SHOW_SUB_LOADING_INDICATION:
-      return extend(appState, {
-        isSubLoading: true,
-      })
-
-    case actions.HIDE_SUB_LOADING_INDICATION:
-      return extend(appState, {
-        isSubLoading: false,
-      })
-    case actions.CLEAR_SEED_WORD_CACHE:
-      return extend(appState, {
-        transForward: true,
-        currentView: {},
-        isLoading: false,
-        accountDetail: {
-          subview: 'transactions',
-          accountExport: 'none',
-          privateKey: '',
-        },
-      })
-
-    case actions.DISPLAY_WARNING:
-      return extend(appState, {
-        warning: action.value,
-        isLoading: false,
-      })
-
-    case actions.HIDE_WARNING:
-      return extend(appState, {
-        warning: undefined,
-      })
-
-    case actions.REQUEST_ACCOUNT_EXPORT:
-      return extend(appState, {
-        transForward: true,
-        currentView: {
-          name: 'accountDetail',
-          context: appState.currentView.context,
-        },
-        accountDetail: {
-          subview: 'export',
-          accountExport: 'requested',
-        },
-      })
-
-    case actions.EXPORT_ACCOUNT:
-      return extend(appState, {
-        accountDetail: {
-          subview: 'export',
-          accountExport: 'completed',
-        },
-      })
-
-    case actions.SHOW_PRIVATE_KEY:
-      return extend(appState, {
-        accountDetail: {
-          subview: 'export',
-          accountExport: 'completed',
-          privateKey: action.value,
-        },
-      })
-
-    case actions.BUY_ETH_VIEW:
-      return extend(appState, {
-        transForward: true,
-        currentView: {
-          name: 'buyEth',
-          context: appState.currentView.name,
-        },
-        identity: state.metamask.identities[action.value],
-        buyView: {
-          subview: 'Coinbase',
-          amount: '15.00',
-          buyAddress: action.value,
-          formView: {
-            coinbase: true,
-            shapeshift: false,
-          },
-        },
-      })
-
-    case actions.ONBOARDING_BUY_ETH_VIEW:
-      return extend(appState, {
-        transForward: true,
-        currentView: {
-          name: 'onboardingBuyEth',
-          context: appState.currentView.name,
-        },
-        identity: state.metamask.identities[action.value],
-      })
-
-    case actions.COINBASE_SUBVIEW:
-      return extend(appState, {
-        buyView: {
-          subview: 'Coinbase',
-          formView: {
-            coinbase: true,
-            shapeshift: false,
-          },
-          buyAddress: appState.buyView.buyAddress,
-          amount: appState.buyView.amount,
-        },
-      })
-
-    case actions.SHAPESHIFT_SUBVIEW:
-      return extend(appState, {
-        buyView: {
-          subview: 'ShapeShift',
-          formView: {
-            coinbase: false,
-            shapeshift: true,
-            marketinfo: action.value.marketinfo,
-            coinOptions: action.value.coinOptions,
-          },
-          buyAddress: appState.buyView.buyAddress,
-          amount: appState.buyView.amount,
-        },
-      })
-
-    case actions.PAIR_UPDATE:
-      return extend(appState, {
-        buyView: {
-          subview: 'ShapeShift',
-          formView: {
-            coinbase: false,
-            shapeshift: true,
-            marketinfo: action.value.marketinfo,
-            coinOptions: appState.buyView.formView.coinOptions,
-          },
-          buyAddress: appState.buyView.buyAddress,
-          amount: appState.buyView.amount,
-          warning: null,
-        },
-      })
-
-    case actions.SHOW_QR:
-      return extend(appState, {
-        qrRequested: true,
-        transForward: true,
-
-        Qr: {
-          message: action.value.message,
-          data: action.value.data,
-        },
-      })
-
-    case actions.SHOW_QR_VIEW:
-      return extend(appState, {
-        currentView: {
-          name: 'qr',
-          context: appState.currentView.context,
-        },
-        transForward: true,
-        Qr: {
-          message: action.value.message,
-          data: action.value.data,
-        },
-      })
-    default:
-      return appState
-  }
-}
-
-function checkUnconfActions (state) {
-  const unconfActionList = getUnconfActionList(state)
-  const hasUnconfActions = unconfActionList.length > 0
-  return hasUnconfActions
-}
-
-function getUnconfActionList (state) {
-  const { unapprovedTxs, unapprovedMsgs,
-    unapprovedPersonalMsgs, unapprovedTypedMessages, network } = state.metamask
-
-  const unconfActionList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, unapprovedTypedMessages, network)
-  return unconfActionList
-}
-
-function indexForPending (state, txId) {
-  const unconfTxList = getUnconfActionList(state)
-  const match = unconfTxList.find((tx) => tx.id === txId)
-  const index = unconfTxList.indexOf(match)
-  return index
-}
diff --git a/old-ui/app/reducers/identities.js b/old-ui/app/reducers/identities.js
deleted file mode 100644
index 341a404e7..000000000
--- a/old-ui/app/reducers/identities.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const extend = require('xtend')
-
-module.exports = reduceIdentities
-
-function reduceIdentities (state, action) {
-  // clone + defaults
-  var idState = extend({
-
-  }, state.identities)
-
-  switch (action.type) {
-    default:
-      return idState
-  }
-}
diff --git a/old-ui/app/reducers/metamask.js b/old-ui/app/reducers/metamask.js
deleted file mode 100644
index 68ad975a7..000000000
--- a/old-ui/app/reducers/metamask.js
+++ /dev/null
@@ -1,166 +0,0 @@
-const extend = require('xtend')
-const actions = require('../../../ui/app/actions')
-const MetamascaraPlatform = require('../../../app/scripts/platforms/window')
-
-module.exports = reduceMetamask
-
-function reduceMetamask (state, action) {
-  let newState
-
-  // clone + defaults
-  var metamaskState = extend({
-    isInitialized: false,
-    isUnlocked: false,
-    isMascara: window.platform instanceof MetamascaraPlatform,
-    rpcTarget: 'https://rawtestrpc.metamask.io/',
-    identities: {},
-    unapprovedTxs: {},
-    noActiveNotices: true,
-    lastUnreadNotice: undefined,
-    frequentRpcList: [],
-    addressBook: [],
-    tokenExchangeRates: {},
-    coinOptions: {},
-    featureFlags: {},
-  }, state.metamask)
-
-  switch (action.type) {
-
-    case actions.SHOW_ACCOUNTS_PAGE:
-      newState = extend(metamaskState)
-      delete newState.seedWords
-      return newState
-
-    case actions.SHOW_NOTICE:
-      return extend(metamaskState, {
-        noActiveNotices: false,
-        lastUnreadNotice: action.value,
-      })
-
-    case actions.CLEAR_NOTICES:
-      return extend(metamaskState, {
-        noActiveNotices: true,
-      })
-
-    case actions.UPDATE_METAMASK_STATE:
-      return extend(metamaskState, action.value)
-
-    case actions.UNLOCK_METAMASK:
-      return extend(metamaskState, {
-        isUnlocked: true,
-        isInitialized: true,
-        selectedAddress: action.value,
-      })
-
-    case actions.LOCK_METAMASK:
-      return extend(metamaskState, {
-        isUnlocked: false,
-      })
-
-    case actions.SET_RPC_LIST:
-      return extend(metamaskState, {
-        frequentRpcList: action.value,
-      })
-
-    case actions.SET_RPC_TARGET:
-      return extend(metamaskState, {
-        provider: {
-          type: 'rpc',
-          rpcTarget: action.value,
-        },
-      })
-
-    case actions.SET_PROVIDER_TYPE:
-      return extend(metamaskState, {
-        provider: {
-          type: action.value,
-        },
-      })
-
-    case actions.COMPLETED_TX:
-      var stringId = String(action.id)
-      newState = extend(metamaskState, {
-        unapprovedTxs: {},
-        unapprovedMsgs: {},
-      })
-      for (const id in metamaskState.unapprovedTxs) {
-        if (id !== stringId) {
-          newState.unapprovedTxs[id] = metamaskState.unapprovedTxs[id]
-        }
-      }
-      for (const id in metamaskState.unapprovedMsgs) {
-        if (id !== stringId) {
-          newState.unapprovedMsgs[id] = metamaskState.unapprovedMsgs[id]
-        }
-      }
-      return newState
-
-    case actions.SHOW_NEW_VAULT_SEED:
-      return extend(metamaskState, {
-        isUnlocked: true,
-        isInitialized: false,
-        seedWords: action.value,
-      })
-
-    case actions.CLEAR_SEED_WORD_CACHE:
-      newState = extend(metamaskState, {
-        isUnlocked: true,
-        isInitialized: true,
-        selectedAddress: action.value,
-      })
-      delete newState.seedWords
-      return newState
-
-    case actions.SHOW_ACCOUNT_DETAIL:
-      newState = extend(metamaskState, {
-        isUnlocked: true,
-        isInitialized: true,
-        selectedAddress: action.value,
-      })
-      delete newState.seedWords
-      return newState
-
-    case actions.SAVE_ACCOUNT_LABEL:
-      const account = action.value.account
-      const name = action.value.label
-      var id = {}
-      id[account] = extend(metamaskState.identities[account], { name })
-      var identities = extend(metamaskState.identities, id)
-      return extend(metamaskState, { identities })
-
-    case actions.SET_CURRENT_FIAT:
-      return extend(metamaskState, {
-        currentCurrency: action.value.currentCurrency,
-        conversionRate: action.value.conversionRate,
-        conversionDate: action.value.conversionDate,
-      })
-
-    case actions.PAIR_UPDATE:
-      const { value: { marketinfo: pairMarketInfo } } = action
-      return extend(metamaskState, {
-        tokenExchangeRates: {
-          ...metamaskState.tokenExchangeRates,
-          [pairMarketInfo.pair]: pairMarketInfo,
-        },
-      })
-
-    case actions.SHAPESHIFT_SUBVIEW:
-      const { value: { marketinfo, coinOptions } } = action
-      return extend(metamaskState, {
-        tokenExchangeRates: {
-          ...metamaskState.tokenExchangeRates,
-          [marketinfo.pair]: marketinfo,
-        },
-        coinOptions,
-      })
-
-    case actions.UPDATE_FEATURE_FLAGS:
-      return extend(metamaskState, {
-        featureFlags: action.value,
-      })
-
-    default:
-      return metamaskState
-
-  }
-}
diff --git a/old-ui/app/root.js b/old-ui/app/root.js
deleted file mode 100644
index 9fea85572..000000000
--- a/old-ui/app/root.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const inherits = require('util').inherits
-const Component = require('react').Component
-const Provider = require('react-redux').Provider
-const h = require('react-hyperscript')
-const App = require('./app')
-
-module.exports = Root
-
-inherits(Root, Component)
-function Root () { Component.call(this) }
-
-Root.prototype.render = function () {
-	console.log(123454)
-  return (
-
-    h(Provider, {
-      store: this.props.store,
-    }, [
-      h(App),
-    ])
-
-  )
-}
diff --git a/old-ui/app/store.js b/old-ui/app/store.js
deleted file mode 100644
index 3bafdee11..000000000
--- a/old-ui/app/store.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const createStore = require('redux').createStore
-const applyMiddleware = require('redux').applyMiddleware
-const thunkMiddleware = require('redux-thunk').default
-const rootReducer = require('./reducers')
-const createLogger = require('redux-logger').createLogger
-
-global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
-
-module.exports = configureStore
-
-const loggerMiddleware = createLogger({
-  predicate: () => global.METAMASK_DEBUG,
-})
-
-const middlewares = [thunkMiddleware, loggerMiddleware]
-
-const createStoreWithMiddleware = applyMiddleware(...middlewares)(createStore)
-
-function configureStore (initialState) {
-  return createStoreWithMiddleware(rootReducer, initialState)
-}
diff --git a/old-ui/index.html b/old-ui/index.html
deleted file mode 100644
index 9dfaefbb3..000000000
--- a/old-ui/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>MetaMask</title>
-  </head>
-  <body>
-
-    <!-- app content -->
-    <div id="app-content"></div>
-    <script src="./bundle.js" type="text/javascript" charset="utf-8"></script>
-
-    <!-- design reference -->
-    <link rel="stylesheet" type="text/css" href="./app/css/debug.css">
-    <div id="design-container">
-      <img id="design-img" src="./design/metamask_wfs_jan_13.png">
-    </div>
-
-  </body>
-</html>
diff --git a/old-ui/index.js b/old-ui/index.js
deleted file mode 100644
index ae05cbe67..000000000
--- a/old-ui/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-const render = require('react-dom').render
-const h = require('react-hyperscript')
-const Root = require('./app/root')
-const actions = require('./app/actions')
-const configureStore = require('./app/store')
-const txHelper = require('./lib/tx-helper')
-global.log = require('loglevel')
-
-module.exports = launchMetamaskUi
-
-
-log.setLevel(global.METAMASK_DEBUG ? 'debug' : 'warn')
-
-function launchMetamaskUi (opts, cb) {
-  var accountManager = opts.accountManager
-  actions._setBackgroundConnection(accountManager)
-  // check if we are unlocked first
-  accountManager.getState(function (err, metamaskState) {
-    if (err) return cb(err)
-    const store = startApp(metamaskState, accountManager, opts)
-    cb(null, store)
-  })
-}
-
-function startApp (metamaskState, accountManager, opts) {
-  // parse opts
-  const store = configureStore({
-
-    // metamaskState represents the cross-tab state
-    metamask: metamaskState,
-
-    // appState represents the current tab's popup state
-    appState: {},
-
-    // Which blockchain we are using:
-    networkVersion: opts.networkVersion,
-  })
-
-  // if unconfirmed txs, start on txConf page
-  const unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.unapprovedPersonalMsgs, metamaskState.unapprovedTypedMessages, metamaskState.network)
-  if (unapprovedTxsAll.length > 0) {
-    store.dispatch(actions.showConfTxPage())
-  }
-
-  accountManager.on('update', function (metamaskState) {
-    store.dispatch(actions.updateMetamaskState(metamaskState))
-  })
-
-  // start app
-  render(
-    h(Root, {
-      // inject initial state
-      store: store,
-    }
-  ), opts.container)
-
-  return store
-}