Updating the UI tests to use the new modal close button where needed

Author: niamh-coleman

example/e2e/helpers.ts

@@ -45,7 +45,17 @@ const closeOverlay = async (customCloseButtonId?: string) => {
   await closeButton.waitForDisplayed({ timeout: 22000 });
   await closeButton.click();
 };
+
+const closeModalOverlay = async (customCloseButtonId?: string) => {
+  const buttonId = browser.isAndroid ? `~Close` : customCloseButtonId || `~intercom modal close button`;
+
+  const closeButton = await $(buttonId);
+  await closeButton.waitForDisplayed({ timeout: 22000 });
+  await closeButton.click();
+};
+
 browser.addCommand('closeOverlay', closeOverlay);
+browser.addCommand('closeModalOverlay', closeModalOverlay);
 
 const closeArticleOverlay = async () => {
   if (browser.isAndroid) {
@@ -55,7 +65,7 @@ const closeArticleOverlay = async () => {
     await closeButton.waitForDisplayed({ timeout: 22000 });
     await closeButton.click();
   } else {
-    await closeOverlay();
+    await closeModalOverlay();
   }
 };
 browser.addCommand('closeArticleOverlay', closeArticleOverlay);

example/e2e/tests/mainIntercom.e2e.ts

@@ -70,7 +70,7 @@ describe('Intercom E2E', () => {
   it('Should display carousel', async () => {
     await driver.scrollToElementByAccessibilityLabel('display-carousel');
     await (await $('~display-carousel')).click();
-    await driver.closeOverlay();
+    await driver.closeModalOverlay();
   });
 
   it('Should get unread messages count', async () => {