diff --git a/app/scripts/background.js b/app/scripts/background.js index 3080bd402..1867cf838 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -233,13 +233,11 @@ function setupController (initState, initLangCode) { // // MetaMask Controller // - const { ABTestController = {} } = initState - const { abTests = {} } = ABTestController const controller = new MetamaskController({ // User confirmation callbacks: showUnconfirmedMessage: triggerUi, - showUnapprovedTx: abTests.fullScreenVsPopup === 'fullScreen' ? triggerUiInNewTab : triggerUi, + showUnapprovedTx: triggerUi, openPopup: openPopup, closePopup: notificationManager.closePopup.bind(notificationManager), // initial state @@ -443,20 +441,6 @@ function triggerUi () { }) } -/** - * Opens a new browser tab for user confirmation - */ -function triggerUiInNewTab () { - const tabIdsArray = Object.keys(openMetamaskTabsIDs) - if (tabIdsArray.length) { - extension.tabs.update(parseInt(tabIdsArray[0], 10), { 'active': true }, () => { - extension.tabs.reload(parseInt(tabIdsArray[0], 10)) - }) - } else { - platform.openExtensionInBrowser() - } -} - /** * Opens the browser popup for user confirmation of watchAsset * then it waits until user interact with the UI diff --git a/ui/app/pages/confirm-transaction/confirm-transaction.container.js b/ui/app/pages/confirm-transaction/confirm-transaction.container.js index 058d5f6a9..9625db8ec 100644 --- a/ui/app/pages/confirm-transaction/confirm-transaction.container.js +++ b/ui/app/pages/confirm-transaction/confirm-transaction.container.js @@ -36,9 +36,9 @@ const mapStateToProps = (state, ownProps) => { const transaction = totalUnconfirmed ? unapprovedTxs[id] || unconfirmedTransactions[totalUnconfirmed - 1] : {} - const { id: transactionId, transactionCategory, origin } = transaction + const { id: transactionId, transactionCategory } = transaction - const trackABTest = origin !== 'MetaMask' + const trackABTest = false return { totalUnapprovedCount: totalUnconfirmed,