From 650eac88a5aa2622ab20028a279e28ad1bd3c282 Mon Sep 17 00:00:00 2001
From: Niranjana Binoy <43930900+NiranjanaBinoy@users.noreply.github.com>
Date: Tue, 16 Aug 2022 10:22:05 -0400
Subject: [PATCH] Cleanup after TOKEN_DETECTION_V2 flag removal (#15564)

---
 .metamaskrc.dist                              |  1 -
 development/build/scripts.js                  |  2 --
 .../advanced-tab/advanced-tab.component.js    |  6 ++--
 .../advanced-tab.component.test.js            | 35 -------------------
 4 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/.metamaskrc.dist b/.metamaskrc.dist
index 3bddebfa2..7a7ab0da7 100644
--- a/.metamaskrc.dist
+++ b/.metamaskrc.dist
@@ -5,7 +5,6 @@ SEGMENT_WRITE_KEY=
 ONBOARDING_V2=
 SWAPS_USE_DEV_APIS=
 COLLECTIBLES_V1=
-TOKEN_DETECTION_V2=
 
 ; Set this to '1' to enable support for Sign-In with Ethereum [EIP-4361](https://eips.ethereum.org/EIPS/eip-4361)
 SIWE_V1=
diff --git a/development/build/scripts.js b/development/build/scripts.js
index c05748f90..098c6af47 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -47,7 +47,6 @@ const metamaskrc = {
   ONBOARDING_V2: process.env.ONBOARDING_V2,
   COLLECTIBLES_V1: process.env.COLLECTIBLES_V1,
   PHISHING_WARNING_PAGE_URL: process.env.PHISHING_WARNING_PAGE_URL,
-  TOKEN_DETECTION_V2: process.env.TOKEN_DETECTION_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,
@@ -1114,7 +1113,6 @@ function getEnvironmentVariables({ buildTarget, buildType, version }) {
     SENTRY_DSN_DEV: metamaskrc.SENTRY_DSN_DEV,
     SIWE_V1: metamaskrc.SIWE_V1 === '1',
     SWAPS_USE_DEV_APIS: process.env.SWAPS_USE_DEV_APIS === '1',
-    TOKEN_DETECTION_V2: metamaskrc.TOKEN_DETECTION_V2 === '1',
   };
 }
 
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index 072d8be80..1f33b4fda 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -165,10 +165,9 @@ export default class AdvancedTab extends PureComponent {
     const { t } = this.context;
     const { showResultMessage, restoreSuccessful } = this.state;
 
-    const settingsRefIndex = process.env.TOKEN_DETECTION_V2 ? 15 : 14;
     return (
       <div
-        ref={this.settingsRefs[settingsRefIndex]}
+        ref={this.settingsRefs[15]}
         className="settings-page__content-row"
         data-testid="advanced-setting-data-restore"
       >
@@ -209,10 +208,9 @@ export default class AdvancedTab extends PureComponent {
 
   renderUserDataBackup() {
     const { t } = this.context;
-    const settingsRefIndex = process.env.TOKEN_DETECTION_V2 ? 15 : 13;
     return (
       <div
-        ref={this.settingsRefs[settingsRefIndex]}
+        ref={this.settingsRefs[14]}
         className="settings-page__content-row"
         data-testid="advanced-setting-data-backup"
       >
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
index 0aad2d496..d9b0af042 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -190,39 +190,4 @@ describe('AdvancedTab Component', () => {
     toggleButton.first().simulate('toggle');
     expect(toggleTokenDetection.calledOnce).toStrictEqual(true);
   });
-
-  /** TODO: Remove during TOKEN_DETECTION_V2 feature flag clean up */
-  it('should not show token detection toggle', () => {
-    process.env.TOKEN_DETECTION_V2 = false;
-    component = shallow(
-      <AdvancedTab
-        ipfsGateway=""
-        setAutoLockTimeLimit={setAutoLockTimeLimitSpy}
-        setIpfsGateway={() => undefined}
-        setShowFiatConversionOnTestnetsPreference={() => undefined}
-        setThreeBoxSyncingPermission={() => undefined}
-        setShowTestNetworks={toggleTestnet}
-        showTestNetworks={false}
-        threeBoxDisabled
-        threeBoxSyncingAllowed={false}
-        ledgerTransportType={LEDGER_TRANSPORT_TYPES.U2F}
-        setLedgerTransportPreference={() => undefined}
-        setDismissSeedBackUpReminder={() => undefined}
-        dismissSeedBackUpReminder={false}
-        useTokenDetection
-        setUseTokenDetection={toggleTokenDetection}
-        userHasALedgerAccount
-        backupUserData={() => undefined}
-        restoreUserData={() => undefined}
-      />,
-      {
-        context: {
-          trackEvent: () => undefined,
-          t: (s) => `_${s}`,
-        },
-      },
-    );
-    const tokenDetectionText = component.find({ text: 'Token detection' });
-    expect(tokenDetectionText).toHaveLength(0);
-  });
 });