Removing EIP_1559_V2 feature flag (#13481)

.metamaskrc.dist

@@ -3,6 +3,5 @@ PASSWORD=METAMASK PASSWORD
 INFURA_PROJECT_ID=00000000000
 SEGMENT_WRITE_KEY=
 ONBOARDING_V2=
-EIP_1559_V2=
 SWAPS_USE_DEV_APIS=
 COLLECTIBLES_V1=

development/build/scripts.js

@@ -34,7 +34,6 @@ const metamaskrc = require('rc')('metamask', {
   INFURA_PROD_PROJECT_ID: process.env.INFURA_PROD_PROJECT_ID,
   ONBOARDING_V2: process.env.ONBOARDING_V2,
   COLLECTIBLES_V1: process.env.COLLECTIBLES_V1,
-  EIP_1559_V2: process.env.EIP_1559_V2,
   SEGMENT_HOST: process.env.SEGMENT_HOST,
   SEGMENT_WRITE_KEY: process.env.SEGMENT_WRITE_KEY,
   SEGMENT_BETA_WRITE_KEY: process.env.SEGMENT_BETA_WRITE_KEY,
@@ -797,7 +796,6 @@ function getEnvironmentVariables({ buildType, devMode, testing }) {
     SWAPS_USE_DEV_APIS: process.env.SWAPS_USE_DEV_APIS === '1',
     ONBOARDING_V2: metamaskrc.ONBOARDING_V2 === '1',
     COLLECTIBLES_V1: metamaskrc.COLLECTIBLES_V1 === '1',
-    EIP_1559_V2: metamaskrc.EIP_1559_V2 === '1',
   };
 }
 

test/e2e/tests/edit-gas-fee.spec.js

@@ -8,7 +8,6 @@ const {
   regularDelayMs,
 } = require('../helpers');
 
-if (process.env.EIP_1559_V2 === '1') {
 describe('Editing Confirm Transaction', function () {
   it('allows selecting high, medium, low gas estimates on edit gas fee popover', async function () {
     const ganacheOptions = {
@@ -274,4 +273,3 @@ if (process.env.EIP_1559_V2 === '1') {
     );
   });
 });
-}

test/e2e/tests/send-edit.spec.js

@@ -23,6 +23,7 @@ describe('Editing Confirm Transaction', function () {
         fixtures: 'send-edit',
         ganacheOptions,
         title: this.test.title,
+        failOnConsoleError: false,
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -92,7 +93,6 @@ describe('Editing Confirm Transaction', function () {
     );
   });
 
-  if (process.env.EIP_1559_V2 === '1') {
   it('goes back from confirm page to edit eth value, baseFee, priorityFee and gas limit - 1559 V2', async function () {
     const ganacheOptions = {
       hardfork: 'london',
@@ -109,6 +109,7 @@ describe('Editing Confirm Transaction', function () {
         fixtures: 'send-edit-v2',
         ganacheOptions,
         title: this.test.title,
+        failOnConsoleError: false,
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -200,5 +201,4 @@ describe('Editing Confirm Transaction', function () {
       },
     );
   });
-  }
 });

ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.test.js

@@ -26,6 +26,7 @@ jest.mock('../../../../store/actions', () => ({
   removePollingTokenFromAppState: jest.fn(),
   setAdvancedGasFee: jest.fn(),
   updateEventFragment: jest.fn(),
+  createTransactionEventFragment: jest.fn(),
 }));
 
 const render = (defaultGasParams, contextParams) => {

ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-popover.test.js

@@ -17,6 +17,7 @@ jest.mock('../../../store/actions', () => ({
     .mockImplementation(() => Promise.resolve()),
   addPollingTokenToAppState: jest.fn(),
   removePollingTokenFromAppState: jest.fn(),
+  createTransactionEventFragment: jest.fn(),
 }));
 
 jest.mock('../../../contexts/transaction-modal', () => ({

ui/components/app/cancel-speedup-popover/cancel-speedup-popover.test.js

@@ -22,6 +22,7 @@ jest.mock('../../../store/actions', () => ({
   addPollingTokenToAppState: jest.fn(),
   removePollingTokenFromAppState: jest.fn(),
   updateTransaction: () => ({ type: 'UPDATE_TRANSACTION_PARAMS' }),
+  createTransactionEventFragment: jest.fn(),
 }));
 
 jest.mock('../../../contexts/transaction-modal', () => ({

ui/components/app/confirm-page-container/confirm-page-container-container.test.js

@@ -41,6 +41,7 @@ describe('Confirm Page Container Container Test', () => {
       chainId: 'test',
       identities: [],
       featureFlags: {},
+      enableEIP1559V2NoticeDismissed: true,
     },
   };
 

ui/components/app/confirm-page-container/enableEIP1559V2-notice/enableEIP1559V2-notice.js

@@ -20,10 +20,6 @@ import { setEnableEIP1559V2NoticeDismissed } from '../../../../store/actions';
 import { getEnableEIP1559V2NoticeDismissed } from '../../../../ducks/metamask/metamask';
 import { getEIP1559V2Enabled } from '../../../../selectors';
 
-const EIP_1559_V2_ENABLED =
-  // This is a string in unit tests but is a boolean in the browser
-  process.env.EIP_1559_V2 === true || process.env.EIP_1559_V2 === 'true';
-
 export default function EnableEIP1559V2Notice({ isFirstAlert }) {
   const t = useI18nContext();
   const history = useHistory();
@@ -32,11 +28,7 @@ export default function EnableEIP1559V2Notice({ isFirstAlert }) {
   );
   const eip1559V2Enabled = useSelector(getEIP1559V2Enabled);
 
-  if (
+  if (eip1559V2Enabled || enableEIP1559V2NoticeDismissed) {
-    !EIP_1559_V2_ENABLED ||
-    eip1559V2Enabled ||
-    enableEIP1559V2NoticeDismissed
-  ) {
     return null;
   }
 

ui/components/app/edit-gas-fee-button/edit-gas-fee-button.test.js

@@ -22,6 +22,7 @@ jest.mock('../../../store/actions', () => ({
     .fn()
     .mockImplementation(() => Promise.resolve()),
   addPollingTokenToAppState: jest.fn(),
+  createTransactionEventFragment: jest.fn(),
 }));
 
 const render = ({ componentProps, contextProps } = {}) => {

ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.test.js

@@ -15,6 +15,7 @@ jest.mock('../../../store/actions', () => ({
     .fn()
     .mockImplementation(() => Promise.resolve()),
   addPollingTokenToAppState: jest.fn(),
+  createTransactionEventFragment: jest.fn(),
 }));
 
 jest.mock('../../../contexts/transaction-modal', () => ({

ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js

@@ -18,6 +18,7 @@ jest.mock('../../../../store/actions', () => ({
   getGasFeeTimeEstimate: jest
     .fn()
     .mockImplementation(() => Promise.resolve('unknown')),
+  createTransactionEventFragment: jest.fn(),
 }));
 
 const MOCK_FEE_ESTIMATE = {

ui/components/app/transaction-detail/transaction-detail.component.test.js

@@ -18,6 +18,7 @@ jest.mock('../../../store/actions', () => ({
     .fn()
     .mockImplementation(() => Promise.resolve()),
   addPollingTokenToAppState: jest.fn(),
+  createTransactionEventFragment: jest.fn(),
 }));
 
 const render = ({ componentProps, contextProps } = {}) => {

ui/hooks/useTransactionEventFragment.js

@@ -1,10 +1,31 @@
-import { useCallback } from 'react';
+import { useCallback, useEffect } from 'react';
+import { useSelector } from 'react-redux';
 
 import { useGasFeeContext } from '../contexts/gasFee';
-import { updateEventFragment } from '../store/actions';
+import {
+  createTransactionEventFragment,
+  updateEventFragment,
+} from '../store/actions';
+import { selectMatchingFragment } from '../selectors';
+import { TRANSACTION_EVENTS } from '../../shared/constants/transaction';
 
 export const useTransactionEventFragment = () => {
   const { transaction } = useGasFeeContext();
+  const fragment = useSelector((state) =>
+    selectMatchingFragment(state, {
+      fragmentOptions: {},
+      existingId: `transaction-added-${transaction?.id}`,
+    }),
+  );
+
+  useEffect(() => {
+    if (!fragment && transaction) {
+      createTransactionEventFragment(
+        transaction.id,
+        TRANSACTION_EVENTS.APPROVED,
+      );
+    }
+  }, [fragment, transaction]);
 
   const updateTransactionEventFragment = useCallback(
     (params) => {

ui/pages/settings/experimental-tab/experimental-tab.component.js

@@ -148,12 +148,6 @@ export default class ExperimentalTab extends PureComponent {
   }
 
   renderEIP1559V2EnabledToggle() {
-    const EIP_1559_V2_ENABLED =
-      // This is a string in unit tests but is a boolean in the browser
-      process.env.EIP_1559_V2 === true || process.env.EIP_1559_V2 === 'true';
-    if (!EIP_1559_V2_ENABLED) {
-      return null;
-    }
     const { t } = this.context;
     const { eip1559V2Enabled, setEIP1559V2Enabled } = this.props;
 

ui/pages/swaps/fee-card/fee-card.test.js

@@ -63,6 +63,7 @@ const generateUseSelectorRouter = () => (selector) => {
 setBackgroundConnection({
   getGasFeeTimeEstimate: jest.fn(),
   getGasFeeEstimatesAndStartPolling: jest.fn(),
+  createTransactionEventFragment: jest.fn(),
 });
 
 const createProps = (customProps = {}) => {

ui/store/actions.js

@@ -3108,6 +3108,13 @@ export function createEventFragment(options) {
   return promisifiedBackground.createEventFragment(options);
 }
 
+export function createTransactionEventFragment(transactionId, event) {
+  return promisifiedBackground.createTransactionEventFragment(
+    transactionId,
+    event,
+  );
+}
+
 export function updateEventFragment(id, payload) {
   return promisifiedBackground.updateEventFragment(id, payload);
 }