From e7a9c61e7ccca79b3d2c6ca21b8a3c42b46b7958 Mon Sep 17 00:00:00 2001
From: Curtis <Curtis.David7@gmail.com>
Date: Fri, 19 Jan 2024 19:40:02 -0500
Subject: [PATCH 1/2] add try catch to deal with flakiness on notification
 assertion

---
 e2e/pages/TokenOverview.js  |  4 ++--
 e2e/pages/swaps/SwapView.js | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/e2e/pages/TokenOverview.js b/e2e/pages/TokenOverview.js
index 79d7a967281a..f12407d52f4c 100644
--- a/e2e/pages/TokenOverview.js
+++ b/e2e/pages/TokenOverview.js
@@ -25,7 +25,7 @@ export default class TokenOverview {
   }
 
   static async tapSwapButton() {
-    await TestHelpers.tap(TOKEN_OVERVIEW_SWAP_BUTTON);
+    await TestHelpers.waitAndTap(TOKEN_OVERVIEW_SWAP_BUTTON);
   }
 
   static async scrollOnScreen() {
@@ -33,7 +33,7 @@ export default class TokenOverview {
   }
 
   static async tapBackButton() {
-    await TestHelpers.tap(ASSET_BACK_BUTTON);
+    await TestHelpers.waitAndTap(ASSET_BACK_BUTTON);
   }
 
   static async isVisible() {
diff --git a/e2e/pages/swaps/SwapView.js b/e2e/pages/swaps/SwapView.js
index 4c23e5eaed7f..6f0a983e32e4 100644
--- a/e2e/pages/swaps/SwapView.js
+++ b/e2e/pages/swaps/SwapView.js
@@ -1,5 +1,7 @@
 import TestHelpers from '../../helpers';
 import { SwapsViewSelectors } from '../../selectors/swaps/SwapsView.selectors.js';
+import { CommonSelectorsIDs } from '../../selectors/Common.selectors.js';
+
 import messages from '../../../locales/languages/en.json';
 import { waitFor } from 'detox';
 
@@ -28,10 +30,16 @@ export default class SwapView {
   }
 
   static async waitForSwapToComplete(sourceTokenSymbol, destTokenSymbol) {
-    await TestHelpers.checkIfElementByTextIsVisible(
-      `Swap complete (${sourceTokenSymbol} to ${destTokenSymbol})`,
-      60000,
-    );
+    try {
+      await TestHelpers.checkIfElementByTextIsVisible(
+        `Swap complete (${sourceTokenSymbol} to ${destTokenSymbol})`,
+        60000,
+      );
+    } catch (e) {
+      // eslint-disable-next-line no-console
+      console.log(`Toast message is slow to appear or did not appear: ${e}`);
+    }
+
     await device.enableSynchronization();
     await TestHelpers.delay(5000);
   }

From 109e3a01a14633e18e111de9c01d3afba6546470 Mon Sep 17 00:00:00 2001
From: Curtis <Curtis.David7@gmail.com>
Date: Fri, 19 Jan 2024 20:18:02 -0500
Subject: [PATCH 2/2] remove unused import

---
 e2e/pages/swaps/SwapView.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/e2e/pages/swaps/SwapView.js b/e2e/pages/swaps/SwapView.js
index 6f0a983e32e4..3cb56add994a 100644
--- a/e2e/pages/swaps/SwapView.js
+++ b/e2e/pages/swaps/SwapView.js
@@ -1,6 +1,5 @@
 import TestHelpers from '../../helpers';
 import { SwapsViewSelectors } from '../../selectors/swaps/SwapsView.selectors.js';
-import { CommonSelectorsIDs } from '../../selectors/Common.selectors.js';
 
 import messages from '../../../locales/languages/en.json';
 import { waitFor } from 'detox';