fix: alert system and refine SIWE and contract interaction alerts

test/e2e/tests/confirmations/alerts/insufficient-funds.spec.ts

@@ -7,7 +7,6 @@ import {
   WINDOW_TITLES,
 } from '../../../helpers';
 import { SMART_CONTRACTS } from '../../../seeder/smart-contracts';
-import { scrollAndConfirmAndAssertConfirm } from '../helpers';
 import {
   TestSuiteArguments,
   openDAppWithContract,
@@ -47,37 +46,19 @@ describe('Alert for insufficient funds @no-mmi', function () {
         await mintNft(driver);
 
         await verifyAlertForInsufficientBalance(driver);
-
-        await scrollAndConfirmAndAssertConfirm(driver);
-
-        await verifyConfirmationIsDisabled(driver);
       },
     );
   });
 });
 
-async function verifyConfirmationIsDisabled(driver: Driver) {
-  const confirmButton = await driver.findElement(
-    '[data-testid="confirm-alert-modal-submit-button"]',
-  );
-  assert.equal(await confirmButton.isEnabled(), false);
-}
-
 async function verifyAlertForInsufficientBalance(driver: Driver) {
   const alert = await driver.findElement('[data-testid="inline-alert"]');
   assert.equal(await alert.getText(), 'Alert');
   await driver.clickElementSafe('.confirm-scroll-to-bottom__button');
   await driver.clickElement('[data-testid="inline-alert"]');
 
-  const alertDescription = await driver.findElement(
-    '[data-testid="alert-modal__selected-alert"]',
-  );
-  const alertDescriptionText = await alertDescription.getText();
-  assert.equal(
-    alertDescriptionText,
-    'You do not have enough ETH in your account to pay for transaction fees.',
-  );
-  await driver.clickElement('[data-testid="alert-modal-close-button"]');
+  await displayAlertForInsufficientBalance(driver);
+  await driver.clickElement('[data-testid="alert-modal-button"]');
 }
 
 async function mintNft(driver: Driver) {
@@ -87,3 +68,14 @@ async function mintNft(driver: Driver) {
   await driver.waitUntilXWindowHandles(3);
   await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
 }
+
+async function displayAlertForInsufficientBalance(driver: Driver) {
+  const alertDescription = await driver.findElement(
+    '[data-testid="alert-modal__selected-alert"]',
+  );
+  const alertDescriptionText = await alertDescription.getText();
+  assert.equal(
+    alertDescriptionText,
+    'You do not have enough ETH in your account to pay for transaction fees.',
+  );
+}

test/e2e/tests/confirmations/signatures/malicious-signatures.spec.ts

@@ -95,6 +95,8 @@ describe('Malicious Confirmation Signature - Bad Domain @no-mmi', function (this
 
         await scrollAndConfirmAndAssertConfirm(driver);
 
+        await acknowledgeAlert(driver);
+
         await driver.clickElement(
           '[data-testid="confirm-alert-modal-cancel-button"]',
         );
@@ -118,8 +120,8 @@ describe('Malicious Confirmation Signature - Bad Domain @no-mmi', function (this
           expectedProps: {
             alert_action_clicked: [],
             alert_key_clicked: [],
-            alert_resolved: [],
-            alert_resolved_count: 0,
+            alert_resolved: ['requestFrom'],
+            alert_resolved_count: 1,
             alert_triggered: ['requestFrom'],
             alert_triggered_count: 1,
             alert_visualized: ['requestFrom'],

ui/components/app/alert-system/alert-modal/alert-modal.test.tsx

@@ -147,11 +147,14 @@ describe('AlertModal', () => {
 
   it('sets the alert as confirmed when checkbox is called', () => {
     const setAlertConfirmedMock = jest.fn();
+    const dangerAlertMock = alertsMock.find(
+      (alert) => alert.key === DATA_ALERT_KEY_MOCK,
+    );
     const useAlertsSpy = jest.spyOn(useAlertsModule, 'default');
     const newMockStore = configureMockStore([])({
       ...STATE_MOCK,
       confirmAlerts: {
-        alerts: { [OWNER_ID_MOCK]: [alertsMock[1]] },
+        alerts: { [OWNER_ID_MOCK]: [dangerAlertMock] },
         confirmed: {
           [OWNER_ID_MOCK]: {
             [DATA_ALERT_KEY_MOCK]: false,
@@ -162,10 +165,10 @@ describe('AlertModal', () => {
 
     (useAlertsSpy as jest.Mock).mockReturnValue({
       setAlertConfirmed: setAlertConfirmedMock,
-      alerts: [alertsMock[1]],
+      alerts: [dangerAlertMock],
       generalAlerts: [],
-      fieldAlerts: [alertsMock[1]],
-      getFieldAlerts: () => [],
+      fieldAlerts: [dangerAlertMock],
+      getFieldAlerts: () => [dangerAlertMock],
       isAlertConfirmed: () => false,
     });
     const { getByTestId } = renderWithProvider(
@@ -233,11 +236,11 @@ describe('AlertModal', () => {
       );
 
       expect(queryByTestId('alert-modal-acknowledge-checkbox')).toBeNull();
-      expect(queryByTestId('alert-modal-button')).toBeNull();
+      expect(queryByTestId('alert-modal-button')).toBeInTheDocument();
       expect(getByText(ACTION_LABEL_MOCK)).toBeInTheDocument();
     });
 
-    it('renders acknowledge button and checkbox for non-blocking alerts', () => {
+    it('renders checkbox for non-blocking alerts', () => {
       const { getByTestId } = renderWithProvider(
         <AlertModal
           ownerId={OWNER_ID_MOCK}