From 158607921e12e999a3f18968ac86da66187882d2 Mon Sep 17 00:00:00 2001
From: Curtis <Curtis.David7@gmail.com>
Date: Mon, 16 Dec 2024 11:15:32 -0500
Subject: [PATCH 1/3] test: Add new E2E to clear privacy data

---
 .../Sections/ClearPrivacy/ClearPrivacy.tsx    |  6 +-
 .../SecurityAndPrivacy/ClearPrivacyModal.js   | 29 ++++++++++
 .../SecurityAndPrivacyView.js                 | 15 +++++
 .../ClearPrivacyModal.selectors.js            | 10 ++++
 .../SecurityPrivacyView.selectors.js          |  4 +-
 e2e/specs/settings/clear-privacy-data.spec.js | 56 +++++++++++++++++++
 e2e/tags.js                                   | 18 +++---
 7 files changed, 127 insertions(+), 11 deletions(-)
 create mode 100644 e2e/pages/Settings/SecurityAndPrivacy/ClearPrivacyModal.js
 create mode 100644 e2e/selectors/Settings/SecurityAndPrivacy/ClearPrivacyModal.selectors.js
 create mode 100644 e2e/specs/settings/clear-privacy-data.spec.js

diff --git a/app/components/Views/Settings/SecuritySettings/Sections/ClearPrivacy/ClearPrivacy.tsx b/app/components/Views/Settings/SecuritySettings/Sections/ClearPrivacy/ClearPrivacy.tsx
index 0254820f002..2fb5910899d 100644
--- a/app/components/Views/Settings/SecuritySettings/Sections/ClearPrivacy/ClearPrivacy.tsx
+++ b/app/components/Views/Settings/SecuritySettings/Sections/ClearPrivacy/ClearPrivacy.tsx
@@ -16,6 +16,9 @@ import Button, {
   ButtonWidthTypes,
 } from '../../../../../../component-library/components/Buttons/Button';
 import SDKConnect from '../../../../../../../app/core/SDKConnect/SDKConnect';
+import { SecurityPrivacyViewSelectorsIDs } from '../../../../../../../e2e/selectors/Settings/SecurityAndPrivacy/SecurityPrivacyView.selectors';
+import { ClearPrivacyModalSelectorsIDs } from '../../../../../../../e2e/selectors/Settings/SecurityAndPrivacy/ClearPrivacyModal.selectors';
+
 
 const ClearPrivacy = () => {
   const { styles } = useStyles(styleSheet, {});
@@ -40,7 +43,7 @@ const ClearPrivacy = () => {
       onRequestClose={() => setModalVisible(false)}
       onConfirmPress={clearApprovals}
     >
-      <View style={styles.modalView}>
+      <View style={styles.modalView} testID={ClearPrivacyModalSelectorsIDs.CONTAINER}>
         <Text variant={TextVariant.HeadingMD} style={styles.modalTitle}>
           {strings('app_settings.clear_approvals_modal_title')}
         </Text>
@@ -66,6 +69,7 @@ const ClearPrivacy = () => {
       <View style={styles.accessory}>
         <Button
           variant={ButtonVariants.Secondary}
+          testID={SecurityPrivacyViewSelectorsIDs.CLEAR_PRIVACY_DATA_BUTTON}
           size={ButtonSize.Lg}
           width={ButtonWidthTypes.Full}
           label={strings('app_settings.clear_privacy_title')}
diff --git a/e2e/pages/Settings/SecurityAndPrivacy/ClearPrivacyModal.js b/e2e/pages/Settings/SecurityAndPrivacy/ClearPrivacyModal.js
new file mode 100644
index 00000000000..8421627e70a
--- /dev/null
+++ b/e2e/pages/Settings/SecurityAndPrivacy/ClearPrivacyModal.js
@@ -0,0 +1,29 @@
+import {
+  ClearPrivacyModalSelectorsIDs,
+  ClearPrivacyModalSelectorsText,
+} from '../../../selectors/Settings/SecurityAndPrivacy/ClearPrivacyModal.selectors';
+import Matchers from '../../../utils/Matchers';
+import Gestures from '../../../utils/Gestures';
+
+class ClearPrivacyModal {
+  get container() {
+    return Matchers.getElementByID(ClearPrivacyModalSelectorsIDs.CONTAINER);
+  }
+
+  get clearButton() {
+    return Matchers.getElementByText(
+      ClearPrivacyModalSelectorsText.CLEAR_BUTTON,
+    );
+  }
+  get cancelButton() {
+    return Matchers.getElementByText(
+      ClearPrivacyModalSelectorsText.CANCEL_BUTTON,
+    );
+  }
+
+  async tapClearButton() {
+    await Gestures.waitAndTap(this.clearButton);
+  }
+}
+
+export default new ClearPrivacyModal();
diff --git a/e2e/pages/Settings/SecurityAndPrivacy/SecurityAndPrivacyView.js b/e2e/pages/Settings/SecurityAndPrivacy/SecurityAndPrivacyView.js
index a743a3cecf4..fe26f8324e4 100644
--- a/e2e/pages/Settings/SecurityAndPrivacy/SecurityAndPrivacyView.js
+++ b/e2e/pages/Settings/SecurityAndPrivacy/SecurityAndPrivacyView.js
@@ -18,6 +18,11 @@ class SecurityAndPrivacy {
       SecurityPrivacyViewSelectorsIDs.REVEAL_SEED_BUTTON,
     );
   }
+  get clearPrivacyDataButton() {
+    return Matchers.getElementByID(
+      SecurityPrivacyViewSelectorsIDs.CLEAR_PRIVACY_DATA_BUTTON,
+    );
+  }
 
   get securityAndPrivacyHeading() {
     return Matchers.getElementByText(
@@ -144,6 +149,13 @@ class SecurityAndPrivacy {
     );
   }
 
+  async scrollToClearPrivacyData() {
+    await Gestures.scrollToElement(
+      this.clearPrivacyDataButton,
+      this.scrollViewIdentifier,
+    );
+  }
+
   async scrollToMetaMetrics() {
     await Gestures.scrollToElement(
       this.metaMetricsToggle,
@@ -165,6 +177,9 @@ class SecurityAndPrivacy {
   async tapMetaMetricsToggle() {
     await Gestures.waitAndTap(this.metaMetricsToggle);
   }
+  async tapClearPrivacyData() {
+    await Gestures.waitAndTap(this.clearPrivacyDataButton);
+  }
 
   async tapTurnOnRememberMeToggle() {
     await Gestures.waitAndTap(this.rememberMeToggle);
diff --git a/e2e/selectors/Settings/SecurityAndPrivacy/ClearPrivacyModal.selectors.js b/e2e/selectors/Settings/SecurityAndPrivacy/ClearPrivacyModal.selectors.js
new file mode 100644
index 00000000000..3bf110bef40
--- /dev/null
+++ b/e2e/selectors/Settings/SecurityAndPrivacy/ClearPrivacyModal.selectors.js
@@ -0,0 +1,10 @@
+import enContent from '../../../../locales/languages/en.json';
+
+export const ClearPrivacyModalSelectorsText = {
+  CLEAR_BUTTON: enContent.app_settings.clear,
+  CANCEL_BUTTON: enContent.app_settings.reset_account_cancel_button,
+};
+
+export const ClearPrivacyModalSelectorsIDs = {
+  CONTAINER: 'privacy-modal-container',
+};
diff --git a/e2e/selectors/Settings/SecurityAndPrivacy/SecurityPrivacyView.selectors.js b/e2e/selectors/Settings/SecurityAndPrivacy/SecurityPrivacyView.selectors.js
index 04483cfab90..9b35d69fbda 100644
--- a/e2e/selectors/Settings/SecurityAndPrivacy/SecurityPrivacyView.selectors.js
+++ b/e2e/selectors/Settings/SecurityAndPrivacy/SecurityPrivacyView.selectors.js
@@ -11,7 +11,8 @@ export const SecurityPrivacyViewSelectorsIDs = {
   REMEMBER_ME_TOGGLE: 'turn-on-remember-me',
   SHOW_PRIVATE_KEY: 'show-private-key',
   BIOMETRICS_TOGGLE: 'biometrics-option',
-  DEVICE_PASSCODE_TOGGLE: 'DevicePasscodeOption',
+  DEVICE_PASSCODE_TOGGLE: 'device-passcode-option',
+  CLEAR_PRIVACY_DATA_BUTTON: 'clear-privacy-data-button',
 };
 
 export const SecurityPrivacyViewSelectorsText = {
@@ -19,6 +20,7 @@ export const SecurityPrivacyViewSelectorsText = {
   BACK_UP_NOW: enContent.app_settings.back_up_now,
   PRIVACY_HEADING: enContent.app_settings.privacy_heading,
   CLEAR_BROWSER_COOKIES: enContent.app_settings.clear_browser_cookies_desc,
+  CLEAR_PRIVACY_DATA: enContent.app_settings.clear,
   AUTO_LOCK_30_SECONDS: enContent.app_settings.autolock_after.replace(
     '{{time}}',
     '30',
diff --git a/e2e/specs/settings/clear-privacy-data.spec.js b/e2e/specs/settings/clear-privacy-data.spec.js
new file mode 100644
index 00000000000..ec2e2f0b771
--- /dev/null
+++ b/e2e/specs/settings/clear-privacy-data.spec.js
@@ -0,0 +1,56 @@
+'use strict';
+import TestHelpers from '../../helpers';
+import { Regression } from '../../tags';
+
+import SettingsView from '../../pages/Settings/SettingsView';
+import SecurityAndPrivacyView from '../../pages/Settings/SecurityAndPrivacy/SecurityAndPrivacyView';
+
+import { loginToApp } from '../../viewHelper';
+import TabBarComponent from '../../pages/wallet/TabBarComponent';
+import FixtureBuilder from '../../fixtures/fixture-builder';
+import { withFixtures } from '../../fixtures/fixture-helper';
+import Assertions from '../../utils/Assertions';
+import ClearPrivacyModal from '../../pages/Settings/SecurityAndPrivacy/ClearPrivacyModal';
+import BrowserView from '../../pages/Browser/BrowserView';
+import ConnectedAccountsModal from '../../pages/Browser/ConnectedAccountsModal';
+
+describe(Regression('Clear Privacy data'), () => {
+  beforeAll(async () => {
+    jest.setTimeout(150000);
+    await TestHelpers.reverseServerPort();
+  });
+
+  it('should clear all dapp connections', async () => {
+    await withFixtures(
+      {
+        dapp: true,
+        fixture: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        restartDevice: true,
+      },
+      async () => {
+        await loginToApp();
+
+        await TabBarComponent.tapBrowser();
+        await BrowserView.navigateToTestDApp();
+        await BrowserView.tapNetworkAvatarButtonOnBrowser();
+        await Assertions.checkIfVisible(ConnectedAccountsModal.title);
+        await ConnectedAccountsModal.scrollToBottomOfModal();
+
+        // should go to settings then security & privacy
+        await TabBarComponent.tapSettings();
+        await SettingsView.tapSecurityAndPrivacy();
+        await SecurityAndPrivacyView.scrollToClearPrivacyData();
+        await SecurityAndPrivacyView.tapClearPrivacyData();
+
+        await Assertions.checkIfVisible(ClearPrivacyModal.container);
+        await ClearPrivacyModal.tapClearButton();
+
+        await TabBarComponent.tapBrowser();
+        await BrowserView.tapNetworkAvatarButtonOnBrowser();
+        await Assertions.checkIfNotVisible(ConnectedAccountsModal.title);
+      },
+    );
+  });
+});
diff --git a/e2e/tags.js b/e2e/tags.js
index 1251ff890fe..2c7e0950126 100644
--- a/e2e/tags.js
+++ b/e2e/tags.js
@@ -1,13 +1,13 @@
 const tags = {
-  regression: 'Regression',
-  smokeAccounts: 'SmokeAccounts',
-  smokeCore: 'SmokeCore',
-  smokeConfirmations: 'SmokeConfirmations',
-  SmokeSwaps: 'SmokeSwaps',
-  SmokeRest: 'SmokeRest',
-  smokeAssets: 'smokeAssets',
-  smokeIdentity: 'smokeIdentity',
-  smokeMultiChain: 'SmokeMultiChain',
+  regression: 'Regression:',
+  smokeAccounts: 'SmokeAccounts:',
+  smokeCore: 'SmokeCore:',
+  smokeConfirmations: 'SmokeConfirmations:',
+  SmokeSwaps: 'SmokeSwaps:',
+  SmokeRest: 'SmokeRest:',
+  smokeAssets: 'smokeAssets:',
+  smokeIdentity: 'smokeIdentity:',
+  smokeMultiChain: 'SmokeMultiChain:',
 };
 
 const Regression = (testName) => `${tags.regression} ${testName}`;

From 2d2277307d92e115835a6bf3c52f4928a1a19707 Mon Sep 17 00:00:00 2001
From: Curtis <Curtis.David7@gmail.com>
Date: Mon, 16 Dec 2024 11:28:05 -0500
Subject: [PATCH 2/3] update unit test

---
 .../__snapshots__/SecuritySettings.test.tsx.snap                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap b/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap
index 8cd3a457694..c9e11533f2e 100644
--- a/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap
+++ b/app/components/Views/Settings/SecuritySettings/__snapshots__/SecuritySettings.test.tsx.snap
@@ -1029,6 +1029,7 @@ exports[`SecuritySettings should render correctly 1`] = `
                 "paddingHorizontal": 16,
               }
             }
+            testID="clear-privacy-data-button"
           >
             <Text
               accessibilityRole="text"

From f55a90ea8e97168f8e192686e0f2bea8fe77e7db Mon Sep 17 00:00:00 2001
From: Curtis <Curtis.David7@gmail.com>
Date: Mon, 16 Dec 2024 11:40:03 -0500
Subject: [PATCH 3/3] remove redundant selector

---
 .../Settings/SecurityAndPrivacy/SecurityPrivacyView.selectors.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/e2e/selectors/Settings/SecurityAndPrivacy/SecurityPrivacyView.selectors.js b/e2e/selectors/Settings/SecurityAndPrivacy/SecurityPrivacyView.selectors.js
index 9b35d69fbda..dad94b581a5 100644
--- a/e2e/selectors/Settings/SecurityAndPrivacy/SecurityPrivacyView.selectors.js
+++ b/e2e/selectors/Settings/SecurityAndPrivacy/SecurityPrivacyView.selectors.js
@@ -20,7 +20,6 @@ export const SecurityPrivacyViewSelectorsText = {
   BACK_UP_NOW: enContent.app_settings.back_up_now,
   PRIVACY_HEADING: enContent.app_settings.privacy_heading,
   CLEAR_BROWSER_COOKIES: enContent.app_settings.clear_browser_cookies_desc,
-  CLEAR_PRIVACY_DATA: enContent.app_settings.clear,
   AUTO_LOCK_30_SECONDS: enContent.app_settings.autolock_after.replace(
     '{{time}}',
     '30',