fix merge conflicts

MetaMask · Oct 1, 2024 · ba77578 · ba77578
1 parent 224ce27
commit ba77578
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/test/e2e/tests/confirmations/transactions/contract-interaction-redesign.spec.ts b/test/e2e/tests/confirmations/transactions/contract-interaction-redesign.spec.ts
@@ -107,7 +107,7 @@ describe('Confirmation Redesign Contract Interaction Component', function () {
           title: this.test?.fullTitle(),
           testSpecificMock: mockOptimismOracle,
         },
-        async ({ driver }: TestSuiteArguments) => {
+        async ({ driver, contractRegistry }: TestSuiteArguments) => {
           await unlockWallet(driver);
           await createLayer2Transaction(driver);
 

diff --git a/test/e2e/tests/transaction/edit-gas-fee.spec.js b/test/e2e/tests/transaction/edit-gas-fee.spec.js
@@ -9,7 +9,6 @@ const {
   unlockWallet,
   generateGanacheOptions,
   WINDOW_TITLES,
-  createInternalTransaction,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
 

diff --git a/test/e2e/tests/transaction/send-edit.spec.js b/test/e2e/tests/transaction/send-edit.spec.js
@@ -1,7 +1,4 @@
 const { strict: assert } = require('assert');
-const {
-  createInternalTransaction,
-} = require('../../page-objects/flows/transaction');
 
 const {
   defaultGanacheOptions,
@@ -16,7 +13,7 @@ describe('Editing Confirm Transaction', function () {
   it('goes back from confirm page to edit eth value, gas price and gas limit', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder().withConversionRateDisabled().build(),
+        fixtures: new FixtureBuilder().build(),
         ganacheOptions: defaultGanacheOptions,
         title: this.test.fullTitle(),
       },
@@ -91,7 +88,7 @@ describe('Editing Confirm Transaction', function () {
   it('goes back from confirm page to edit eth value, baseFee, priorityFee and gas limit - 1559 V2', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder().withConversionRateDisabled().build(),
+        fixtures: new FixtureBuilder().build(),
         ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
         title: this.test.fullTitle(),
       },