From 409bcf97d25e231bf9fe1437b2196c26c8a6b977 Mon Sep 17 00:00:00 2001
From: Eunji Song <32075932+eunjisong@users.noreply.github.com>
Date: Tue, 15 Oct 2024 11:56:11 -0400
Subject: [PATCH] QA - small fixes for the smoke test (#1961)

---
 .../app/screens/bridge/components/BridgeTransactionItem.tsx  | 2 +-
 packages/core-mobile/e2e/locators/activityTab.loc.ts         | 1 +
 packages/core-mobile/e2e/pages/activityTab.page.ts           | 4 ++++
 packages/core-mobile/e2e/pages/popUpModal.page.ts            | 5 ++---
 .../e2e/tests/activityTab/activityTab.e2e.smoke.ts           | 5 ++---
 .../plusIcon/walletConnect/dappIntegrationsCore.e2e.smoke.ts | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/core-mobile/app/screens/bridge/components/BridgeTransactionItem.tsx b/packages/core-mobile/app/screens/bridge/components/BridgeTransactionItem.tsx
index e681f96d88..bf55726174 100644
--- a/packages/core-mobile/app/screens/bridge/components/BridgeTransactionItem.tsx
+++ b/packages/core-mobile/app/screens/bridge/components/BridgeTransactionItem.tsx
@@ -43,7 +43,7 @@ const BridgeTransactionItem: FC<BridgeTransactionItemProps> = ({
 
   return (
     <AvaListItem.Base
-      testID="activityListItem"
+      testID="bridgeActivityListItem"
       title={pending ? 'Bridging...' : 'Bridge'}
       leftComponent={
         <View
diff --git a/packages/core-mobile/e2e/locators/activityTab.loc.ts b/packages/core-mobile/e2e/locators/activityTab.loc.ts
index f539a10c00..d41724c2fa 100644
--- a/packages/core-mobile/e2e/locators/activityTab.loc.ts
+++ b/packages/core-mobile/e2e/locators/activityTab.loc.ts
@@ -2,6 +2,7 @@ export default {
   transaction: 'activity_list__Contract Call',
   activityDetail: 'activity_detail__amount',
   activityListItem: 'activityListItem',
+  bridgeActivityListItem: 'bridgeActivityListItem',
   activityListItemAmount: 'acitivty_item_amount',
   avaxOutgoingTransactionDetail: '-0.0001 AVAX',
   avaxIncomingTransactionDetail: '+0.0001 AVAX',
diff --git a/packages/core-mobile/e2e/pages/activityTab.page.ts b/packages/core-mobile/e2e/pages/activityTab.page.ts
index fbb764d4f9..5054f52d93 100644
--- a/packages/core-mobile/e2e/pages/activityTab.page.ts
+++ b/packages/core-mobile/e2e/pages/activityTab.page.ts
@@ -32,6 +32,10 @@ class ActivityTabPage {
     return by.id(activityTab.activityListItemAmount)
   }
 
+  get bridgeActivityListItem() {
+    return by.id(activityTab.bridgeActivityListItem)
+  }
+
   get selectFilterDropdown() {
     return by.id(activityTab.currentFilter)
   }
diff --git a/packages/core-mobile/e2e/pages/popUpModal.page.ts b/packages/core-mobile/e2e/pages/popUpModal.page.ts
index ecd8dd79e2..7aab1616d5 100644
--- a/packages/core-mobile/e2e/pages/popUpModal.page.ts
+++ b/packages/core-mobile/e2e/pages/popUpModal.page.ts
@@ -160,11 +160,10 @@ class PopUpModalPage {
 
   async verifyApproveTransactionScreen() {
     try {
-      await actions.waitForElement(this.approveBtn, 5000)
-    } catch (e) {
       await sendPage.tapNextButton()
+    } catch (e) {
+      await actions.waitForElement(this.approveBtn, 10000)
     }
-    await actions.waitForElement(this.approveBtn, 5000)
   }
 
   async verifyFeeIsLegit(isPXChain = false, estimatedGasFee = 0.009) {
diff --git a/packages/core-mobile/e2e/tests/activityTab/activityTab.e2e.smoke.ts b/packages/core-mobile/e2e/tests/activityTab/activityTab.e2e.smoke.ts
index 6ebd48f63f..9dcbe1342b 100644
--- a/packages/core-mobile/e2e/tests/activityTab/activityTab.e2e.smoke.ts
+++ b/packages/core-mobile/e2e/tests/activityTab/activityTab.e2e.smoke.ts
@@ -2,7 +2,6 @@ import Actions from '../../helpers/actions'
 import ActivityTabPage from '../../pages/activityTab.page'
 import PortfolioPage from '../../pages/portfolio.page'
 import { warmup } from '../../helpers/warmup'
-import activityTabPage from '../../pages/activityTab.page'
 import accountManagePage from '../../pages/accountManage.page'
 
 describe('Filter transactions on Activity List', () => {
@@ -28,9 +27,9 @@ describe('Filter transactions on Activity List', () => {
     await ActivityTabPage.tapBridgeFilterOption()
     await ActivityTabPage.verifySelectedFilter('Bridge')
     try {
-      await ActivityTabPage.verifyExistingRow('Bridge')
+      await Actions.waitForElement(ActivityTabPage.bridgeActivityListItem)
     } catch (error) {
-      await Actions.waitForElement(activityTabPage.noRecentActivity)
+      await Actions.waitForElement(ActivityTabPage.noRecentActivity)
     }
   })
 
diff --git a/packages/core-mobile/e2e/tests/plusIcon/walletConnect/dappIntegrationsCore.e2e.smoke.ts b/packages/core-mobile/e2e/tests/plusIcon/walletConnect/dappIntegrationsCore.e2e.smoke.ts
index 63ce9eb9fe..eee36a2283 100644
--- a/packages/core-mobile/e2e/tests/plusIcon/walletConnect/dappIntegrationsCore.e2e.smoke.ts
+++ b/packages/core-mobile/e2e/tests/plusIcon/walletConnect/dappIntegrationsCore.e2e.smoke.ts
@@ -30,7 +30,7 @@ describe('Dapp - Core', () => {
     await browserPage.connectTermAndContinue()
     await browserPage.connectCore()
     await connectToSitePage.selectAccountAndconnect()
-  })
+  }, 60000)
 
   it('should verify core.app connected', async () => {
     await securityAndPrivacyPage.goToConnectedSites()