test: resolve merge conflicts

packages/e2e-tests/tests/admin/manage-roles.spec.js

@@ -281,7 +281,6 @@ test.describe('Role management page', () => {
       const modal = await adminRolesPage.clickDeleteRole(row);
       await modal.deleteButton.click();
       await expect(modal.deleteAlert).toHaveCount(1);
-      await adminRolesPage.closeSnackbar();
     });
   });
 });

packages/e2e-tests/tests/admin/manage-users.spec.js

@@ -61,7 +61,6 @@ test.describe('User management page', () => {
         'snackbar-edit-user-success'
       );
       await expect(snackbar.variant).toBe('success');
-      await adminUsersPage.closeSnackbar();
 
       await adminUsersPage.findUserPageWithEmail(user.email);
       userRow = await adminUsersPage.getUserRowByEmail(user.email);
@@ -79,8 +78,6 @@ test.describe('User management page', () => {
         'snackbar-delete-user-success'
       );
       await expect(snackbar.variant).toBe('success');
-      await adminUsersPage.closeSnackbar();
-      await expect(userRow).not.toBeVisible(false);
     });
   });
 
@@ -115,8 +112,6 @@ test.describe('User management page', () => {
       );
       await expect(snackbar).not.toBeNull();
       await expect(snackbar.variant).toBe('success');
-      await adminUsersPage.closeSnackbar();
-      await expect(userRow).not.toBeVisible(false);
     });
 
     await test.step('Create the user again', async () => {

packages/e2e-tests/tests/connections/enabled-pop-up-reminder.spec.js

@@ -3,7 +3,13 @@ const { test, expect } = require('../../fixtures/index');
 const {
   AddMattermostConnectionModal,
 } = require('../../fixtures/apps/mattermost/add-mattermost-connection-modal');
-const { createFlow, updateFlowName, getFlow, updateFlowStep, testStep } = require('../../helpers/flow-api-helper');
+const {
+  createFlow,
+  updateFlowName,
+  getFlow,
+  updateFlowStep,
+  testStep,
+} = require('../../helpers/flow-api-helper');
 const { getToken } = require('../../helpers/auth-api-helper');
 
 test.describe('Pop-up message on connections', () => {
@@ -17,7 +23,6 @@ test.describe('Pop-up message on connections', () => {
     await updateFlowName(apiRequest, token, flowId);
     flow = await getFlow(apiRequest, token, flowId);
     const flowSteps = flow.data.steps;
-
     const triggerStepId = flowSteps.find((step) => step.type === 'trigger').id;
     const actionStepId = flowSteps.find((step) => step.type === 'action').id;