Merge pull request #7299 from MetaMask/Version-v7.3.1

Version v7.3.1 RC

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Current Develop Branch
 
+## 7.3.1 Mon Oct 21 2019
+- [#7298](https://github.com/MetaMask/metamask-extension/pull/7298): Turn off full screen vs popup a/b test 
+
 ## 7.3.0 Fri Sep 27 2019
 - [#6972](https://github.com/MetaMask/metamask-extension/pull/6972): 3box integration
 - [#7168](https://github.com/MetaMask/metamask-extension/pull/7168): Add fixes for German translations

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "7.3.0",
+  "version": "7.3.1",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",

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

ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js

@@ -8,6 +8,7 @@ import BasicTabContent from './basic-tab-content'
 export default class GasModalPageContainer extends Component {
   static contextTypes = {
     t: PropTypes.func,
+    metricsEvent: PropTypes.func,
   }
 
   static propTypes = {
@@ -162,6 +163,7 @@ export default class GasModalPageContainer extends Component {
       customModalGasPriceInHex,
       customModalGasLimitInHex,
       disableSave,
+      isSpeedUp,
       ...tabProps
     } = this.props
 
@@ -175,6 +177,15 @@ export default class GasModalPageContainer extends Component {
           onCancel={() => cancelAndClose()}
           onClose={() => cancelAndClose()}
           onSubmit={() => {
+            if (isSpeedUp) {
+              this.context.metricsEvent({
+                eventOpts: {
+                  category: 'Navigation',
+                  action: 'Activity Log',
+                  name: 'Saved "Speed Up"',
+                },
+              })
+            }
             onSubmit(customModalGasLimitInHex, customModalGasPriceInHex)
           }}
           submitText={this.context.t('save')}

ui/app/components/app/transaction-list-item/transaction-list-item.component.js

@@ -113,6 +113,14 @@ export default class TransactionListItem extends PureComponent {
 
     const retryId = id || initialTransactionId
 
+    this.context.metricsEvent({
+      eventOpts: {
+        category: 'Navigation',
+        action: 'Activity Log',
+        name: 'Clicked "Speed Up"',
+      },
+    })
+
     return fetchBasicGasAndTimeEstimates()
       .then(basicEstimates => fetchGasEstimates(basicEstimates.blockTime))
       .then(retryTransaction(retryId, gasPrice))

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,