From aa60944e30b7d1d9680b5ca53e8b61a8edb47904 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 30 Aug 2017 00:08:35 -0230 Subject: Remove default to confirm screen on login. --- ui/index.js | 6 ------ 1 file changed, 6 deletions(-) (limited to 'ui/index.js') diff --git a/ui/index.js b/ui/index.js index a729138d3..f748c1ea2 100644 --- a/ui/index.js +++ b/ui/index.js @@ -36,12 +36,6 @@ function startApp (metamaskState, accountManager, opts) { networkVersion: opts.networkVersion, }) - // if unconfirmed txs, start on txConf page - const unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.unapprovedPersonalMsgs, metamaskState.network) - if (unapprovedTxsAll.length > 0) { - store.dispatch(actions.showConfTxPage()) - } - accountManager.on('update', function (metamaskState) { store.dispatch(actions.updateMetamaskState(metamaskState)) }) -- cgit v1.2.3 From 25c2865076784f3e5346f7e34cbf80b9fe210ade Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 26 Sep 2017 21:33:36 -0230 Subject: Restore notification functionality --- ui/index.js | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'ui/index.js') diff --git a/ui/index.js b/ui/index.js index f748c1ea2..1afc08683 100644 --- a/ui/index.js +++ b/ui/index.js @@ -36,6 +36,15 @@ function startApp (metamaskState, accountManager, opts) { networkVersion: opts.networkVersion, }) + // if unconfirmed txs, start on txConf page + const unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.unapprovedPersonalMsgs, metamaskState.network) + const numberOfUnapprivedTx = unapprovedTxsAll.length + if (numberOfUnapprivedTx > 0) { + store.dispatch(actions.showConfTxPage({ + id: unapprovedTxsAll[numberOfUnapprivedTx - 1].id, + })) + } + accountManager.on('update', function (metamaskState) { store.dispatch(actions.updateMetamaskState(metamaskState)) }) -- cgit v1.2.3 From 4acd48966edf2e6cf4ced6e3e0983a44dcb2ec13 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Thu, 21 Dec 2017 23:33:01 -0330 Subject: [NewUI] Fixes tests and sends user to NewUI after registering. (#2788) * Fixes tests and sends user to NewUI after registering. * Karma config? * Empty commit * Remove unneeded json state mock file. --- ui/index.js | 1 - 1 file changed, 1 deletion(-) (limited to 'ui/index.js') diff --git a/ui/index.js b/ui/index.js index fff677471..2aa30d3fe 100644 --- a/ui/index.js +++ b/ui/index.js @@ -8,7 +8,6 @@ global.log = require('loglevel') module.exports = launchMetamaskUi - log.setLevel(global.METAMASK_DEBUG ? 'debug' : 'warn') function launchMetamaskUi (opts, cb) { -- cgit v1.2.3 From a218008adf85dfb5fa8ca93c789e14d9f2090813 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Fri, 22 Dec 2017 10:43:02 -0800 Subject: Track usage of old and new UI (#2794) [NewUI] Track usage of old and new UI --- ui/index.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ui/index.js') diff --git a/ui/index.js b/ui/index.js index 2aa30d3fe..bc3676c1f 100644 --- a/ui/index.js +++ b/ui/index.js @@ -4,6 +4,8 @@ const Root = require('./app/root') const actions = require('./app/actions') const configureStore = require('./app/store') const txHelper = require('./lib/tx-helper') +const { OLD_UI_NETWORK_TYPE, BETA_UI_NETWORK_TYPE } = require('../app/scripts/config').enums + global.log = require('loglevel') module.exports = launchMetamaskUi @@ -35,6 +37,10 @@ function startApp (metamaskState, accountManager, opts) { networkVersion: opts.networkVersion, }) + const useBetaUi = metamaskState.featureFlags.betaUI + const networkEndpointType = useBetaUi ? BETA_UI_NETWORK_TYPE : OLD_UI_NETWORK_TYPE + store.dispatch(actions.setNetworkEndpoints(networkEndpointType)) + // if unconfirmed txs, start on txConf page const unapprovedTxsAll = txHelper(metamaskState.unapprovedTxs, metamaskState.unapprovedMsgs, metamaskState.unapprovedPersonalMsgs, metamaskState.unapprovedTypedMessages, metamaskState.network) const numberOfUnapprivedTx = unapprovedTxsAll.length -- cgit v1.2.3