2 files changed, 47 insertions, 3 deletions
diff --git a/ui/app/select-app.js b/ui/app/select-app.js
index 3cba44052..ffa31b767 100644
--- a/ui/app/select-app.js
+++ b/ui/app/select-app.js
@@ -4,18 +4,44 @@ const connect = require('react-redux').connect
 const h = require('react-hyperscript')
 const App = require('./app')
 const OldApp = require('../../old-ui/app/app')
+const { autoAddToBetaUI } = require('./selectors')
+const { setFeatureFlag } = require('./actions')
 
 function mapStateToProps (state) {
-	return { betaUI: state.metamask.featureFlags.betaUI }
+	return {
+		betaUI: state.metamask.featureFlags.betaUI,
+		autoAdd: autoAddToBetaUI(state),
+		isUnlocked: state.metamask.isUnlocked,
+	}
 }
 
-module.exports = connect(mapStateToProps)(SelectedApp)
+function mapDispatchToProps (dispatch) {
+  return {
+    setFeatureFlagToBeta: () => dispatch(setFeatureFlag('betaUI', true)),
+  }
+}
+module.exports = connect(mapStateToProps, mapDispatchToProps)(SelectedApp)
 
 inherits(SelectedApp, Component)
-function SelectedApp () { Component.call(this) }
+function SelectedApp () {
+	this.state = {
+		autoAdd: false,
+	}
+	Component.call(this)
+}
+
+SelectedApp.prototype.componentWillReceiveProps = function (nextProps) {
+	const { isUnlocked, setFeatureFlagToBeta } = this.props
+
+	if (!isUnlocked && nextProps.isUnlocked && nextProps.autoAdd) {
+		this.setState({ autoAdd: nextProps.autoAdd })
+		setFeatureFlagToBeta()
+	}
+}
 
 SelectedApp.prototype.render = function () {
   const { betaUI } = this.props
+  const { autoAdd } = this.state 
   const Selected = betaUI ? App : OldApp
   return h(Selected)
 }
diff --git a/ui/app/selectors.js b/ui/app/selectors.js
index a5f9a75d8..8aea7864a 100644
--- a/ui/app/selectors.js
+++ b/ui/app/selectors.js
@@ -24,6 +24,7 @@ const selectors = {
   getSendAmount,
   getSelectedTokenToFiatRate,
   getSelectedTokenContract,
+  autoAddToBetaUI,
 }
 
 module.exports = selectors
@@ -158,3 +159,20 @@ function getSelectedTokenContract (state) {
     ? global.eth.contract(abi).at(selectedToken.address)
     : null
 }
+
+function autoAddToBetaUI (state) {
+  const autoAddTransactionThreshold = 12
+  const autoAddAccountsThreshold = 2
+  const autoAddTokensThreshold = 1
+
+  const numberOfTransactions = state.metamask.selectedAddressTxList.length
+  const numberOfAccounts = Object.keys(state.metamask.accounts).length
+  const numberOfTokensAdded = state.metamask.tokens.length
+
+  const userPassesThreshold = (numberOfTransactions > autoAddTransactionThreshold) &&
+    (numberOfAccounts > autoAddAccountsThreshold) &&
+    (numberOfTokensAdded > autoAddTokensThreshold)
+  const userIsNotInBeta = !state.metamask.featureFlags.betaUI
+  
+  return userIsNotInBeta && userPassesThreshold
+}
+\ No newline at end of file