Jl/test api specs revert redesigned confirmations enabled

app/scripts/lib/setupSentry.js

@@ -246,7 +246,6 @@ export const SENTRY_BACKGROUND_STATE = {
     preferences: {
       autoLockTimeLimit: true,
       hideZeroBalanceTokens: true,
-      redesignedConfirmationsEnabled: true,
       isRedesignedConfirmationsDeveloperEnabled: false,
       showExtensionInFullSizeView: true,
       showFiatInTestnets: true,

app/scripts/migrations/index.js

@@ -133,7 +133,7 @@ const migrations = [
   require('./120'),
   require('./120.1'),
   require('./121'),
-  require('./122'),
+
   require('./123'),
 ];
 

test/e2e/accounts/snap-account-signatures-and-disconnects.spec.ts

@@ -1,10 +1,6 @@
 import { Suite } from 'mocha';
 import FixtureBuilder from '../fixture-builder';
-import {
-  withFixtures,
-  multipleGanacheOptions,
-  tempToggleSettingRedesignedConfirmations,
-} from '../helpers';
+import { withFixtures, multipleGanacheOptions } from '../helpers';
 import { Driver } from '../webdriver/driver';
 import {
   installSnapSimpleKeyring,
@@ -31,8 +27,6 @@ describe('Snap Account Signatures and Disconnects', function (this: Suite) {
 
         const newPublicKey = await makeNewAccountAndSwitch(driver);
 
-        await tempToggleSettingRedesignedConfirmations(driver);
-
         // open the Test Dapp and connect Account 2 to it
         await connectAccountToTestDapp(driver);
 

test/e2e/accounts/snap-account-signatures.spec.ts

@@ -1,8 +1,5 @@
 import { Suite } from 'mocha';
-import {
-  tempToggleSettingRedesignedConfirmations,
-  withFixtures,
-} from '../helpers';
+import { openDapp, withFixtures } from '../helpers';
 import { Driver } from '../webdriver/driver';
 import {
   accountSnapFixtures,
@@ -30,7 +27,7 @@ describe('Snap Account Signatures', function (this: Suite) {
 
           const newPublicKey = await makeNewAccountAndSwitch(driver);
 
-          await tempToggleSettingRedesignedConfirmations(driver);
+          await openDapp(driver);
 
           // Run all 6 signature types
           const locatorIDs = [

test/e2e/helpers.js

@@ -1268,6 +1268,5 @@ module.exports = {
   defaultGanacheOptionsForType2Transactions,
   removeSelectedAccount,
   getSelectedAccountAddress,
-  tempToggleSettingRedesignedConfirmations,
   openMenuSafe,
 };

test/e2e/snaps/test-snap-siginsights.spec.js

@@ -5,7 +5,6 @@ const {
   openDapp,
   unlockWallet,
   switchToNotificationWindow,
-  tempToggleSettingRedesignedConfirmations,
   WINDOW_TITLES,
 } = require('../helpers');
 const FixtureBuilder = require('../fixture-builder');
@@ -30,7 +29,6 @@ describe('Test Snap Signature Insights', function () {
       },
       async ({ driver }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
 
         // navigate to test snaps page and connect
         await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);

test/e2e/tests/dapp-interactions/signin-with-ethereum.spec.js

@@ -4,7 +4,6 @@ const {
   withFixtures,
   openDapp,
   DAPP_URL,
-  tempToggleSettingRedesignedConfirmations,
   unlockWallet,
   WINDOW_TITLES,
 } = require('../../helpers');
@@ -29,7 +28,6 @@ describe('Sign in with ethereum', function () {
       },
       async ({ driver }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
 
         // Create a signin with ethereum request in test dapp
         await openDapp(driver);

test/e2e/tests/metrics/signature-approved.spec.js

@@ -8,7 +8,6 @@ const {
   unlockWallet,
   getEventPayloads,
   clickSignOnSignatureConfirmation,
-  tempToggleSettingRedesignedConfirmations,
   validateContractDetails,
 } = require('../../helpers');
 const FixtureBuilder = require('../../fixture-builder');
@@ -66,7 +65,6 @@ describe('Signature Approved Event @no-mmi', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
         await openDapp(driver);
 
         // creates a sign typed data signature request
@@ -118,7 +116,6 @@ describe('Signature Approved Event @no-mmi', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
         await openDapp(driver);
 
         // creates a sign typed data signature request
@@ -166,7 +163,6 @@ describe('Signature Approved Event @no-mmi', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
         await openDapp(driver);
 
         // creates a sign typed data signature request
@@ -213,7 +209,6 @@ describe('Signature Approved Event @no-mmi', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
         await openDapp(driver);
 
         // creates a sign typed data signature request
@@ -265,7 +260,6 @@ describe('Signature Approved Event @no-mmi', function () {
       },
       async ({ driver, mockedEndpoint: mockedEndpoints }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
         await openDapp(driver);
 
         // creates a sign typed data signature request

test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json

@@ -204,7 +204,6 @@
       "useNativeCurrencyAsPrimaryCurrency": true,
       "petnamesEnabled": true,
       "showTokenAutodetectModal": "boolean",
-      "redesignedConfirmationsEnabled": true,
       "isRedesignedConfirmationsDeveloperEnabled": "boolean"
     },
     "ipfsGateway": "string",
@@ -269,14 +268,14 @@
       "errorKey": "",
       "topAggId": "object",
       "routeState": "",
+      "swapsFeatureFlags": {},
       "swapsFeatureIsLive": true,
       "saveFetchedQuotes": false,
       "swapsQuoteRefreshTime": 60000,
       "swapsQuotePrefetchingRefreshTime": 60000,
       "swapsStxBatchStatusRefreshTime": 10000,
       "swapsStxGetTransactionsRefreshTime": 10000,
-      "swapsStxMaxFeeMultiplier": 2,
-      "swapsFeatureFlags": {}
+      "swapsStxMaxFeeMultiplier": 2
     }
   },
   "TokenListController": {

test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json

@@ -35,7 +35,6 @@
       "useNativeCurrencyAsPrimaryCurrency": true,
       "petnamesEnabled": true,
       "showTokenAutodetectModal": "boolean",
-      "redesignedConfirmationsEnabled": true,
       "isRedesignedConfirmationsDeveloperEnabled": "boolean"
     },
     "firstTimeFlowType": "import",
@@ -63,6 +62,11 @@
     },
     "connectedStatusPopoverHasBeenShown": true,
     "defaultHomeActiveTabName": null,
+    "bridgeState": {
+      "bridgeFeatureFlags": {
+        "extensionSupport": "boolean"
+      }
+    },
     "browserEnvironment": { "os": "string", "browser": "string" },
     "popupGasPollTokens": "object",
     "notificationGasPollTokens": "object",
@@ -117,9 +121,9 @@
     "useRequestQueue": true,
     "openSeaEnabled": false,
     "securityAlertsEnabled": "boolean",
+    "addSnapAccountEnabled": "boolean",
     "bitcoinSupportEnabled": "boolean",
     "bitcoinTestnetSupportEnabled": "boolean",
-    "addSnapAccountEnabled": "boolean",
     "advancedGasFee": {},
     "incomingTransactionsPreferences": {},
     "identities": "object",
@@ -244,16 +248,15 @@
       "errorKey": "",
       "topAggId": "object",
       "routeState": "",
+      "swapsFeatureFlags": {},
       "swapsFeatureIsLive": true,
       "saveFetchedQuotes": false,
       "swapsQuoteRefreshTime": 60000,
       "swapsQuotePrefetchingRefreshTime": 60000,
       "swapsStxBatchStatusRefreshTime": 10000,
       "swapsStxGetTransactionsRefreshTime": 10000,
-      "swapsStxMaxFeeMultiplier": 2,
-      "swapsFeatureFlags": {}
+      "swapsStxMaxFeeMultiplier": 2
     },
-    "bridgeState": { "bridgeFeatureFlags": { "extensionSupport": "boolean" } },
     "ensEntries": "object",
     "ensResolutionsByAddress": "object",
     "pendingApprovals": "object",

test/e2e/tests/petnames/petnames-signatures.spec.js

@@ -2,7 +2,6 @@ const {
   openDapp,
   switchToNotificationWindow,
   withFixtures,
-  tempToggleSettingRedesignedConfirmations,
   unlockWallet,
   defaultGanacheOptions,
 } = require('../../helpers');
@@ -109,7 +108,6 @@ describe('Petnames - Signatures', function () {
       },
       async ({ driver }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
         await openDapp(driver);
         await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V3);
         await switchToNotificationWindow(driver, 3);
@@ -146,7 +144,6 @@ describe('Petnames - Signatures', function () {
       },
       async ({ driver }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
         await openDapp(driver);
         await createSignatureRequest(driver, SIGNATURE_TYPE.TYPED_V4);
         await switchToNotificationWindow(driver, 3);
@@ -188,7 +185,6 @@ describe('Petnames - Signatures', function () {
       },
       async ({ driver }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
         await openDapp(driver);
         await openTestSnaps(driver);
         await installNameLookupSnap(driver);

test/e2e/tests/request-queuing/dapp1-send-dapp2-signTypedData.spec.js

@@ -7,7 +7,6 @@ const {
   DAPP_ONE_URL,
   regularDelayMs,
   defaultGanacheOptions,
-  tempToggleSettingRedesignedConfirmations,
   WINDOW_TITLES,
 } = require('../../helpers');
 
@@ -43,7 +42,6 @@ describe('Request Queuing Dapp 1, Switch Tx -> Dapp 2 Send Tx', function () {
       },
       async ({ driver }) => {
         await unlockWallet(driver);
-        await tempToggleSettingRedesignedConfirmations(driver);
 
         // Open Dapp One
         await openDapp(driver, undefined, DAPP_URL);