QA handle slide button to logout and other fixes (#2053)

packages/core-mobile/app/components/UniversalTokenSelector.tsx

@@ -181,7 +181,10 @@ const UniversalTokenSelector: FC<Props> = ({
       <Space y={8} />
       <Row>
         {hasError && (
-          <Text variant="body2" sx={{ color: '$dangerMain' }}>
+          <Text
+            testID="error_msg"
+            variant="body2"
+            sx={{ color: '$dangerMain' }}>
             {error}
           </Text>
         )}

packages/core-mobile/app/screens/earn/components/SlideToConfirm.tsx

@@ -69,7 +69,7 @@ const SlideToConfirm = ({
         <Animated.View
           {...panResponder.panHandlers}
           style={[styles.slider, { width: sliderWidth }]}>
-          <Animated.View style={{ opacity: iconOpacityAnim }}>
+          <Animated.View testID="slide" style={{ opacity: iconOpacityAnim }}>
             <Icons.Navigation.ArrowForwardIOS color={colors.$neutral900} />
           </Animated.View>
         </Animated.View>

packages/core-mobile/app/screens/mainView/SignOutModal.tsx

@@ -33,6 +33,7 @@ const SignOutModal = ({
       <FlexSpacer />
       <SlideToConfirm onConfirm={onConfirm} text={'Slide to confirm'} />
       <Button
+        testID="cancel_btn"
         type="tertiary"
         size="xlarge"
         style={{ marginTop: 16 }}

packages/core-mobile/app/screens/portfolio/network/NetworkTokens.tsx

@@ -151,6 +151,7 @@ const NetworkTokens = (): JSX.Element => {
 
   const renderTokens = (): JSX.Element => (
     <FlatList
+      testID="portfolio_token_list"
       contentContainerStyle={{
         paddingHorizontal: 16,
         paddingBottom: 100,

packages/core-mobile/e2e/helpers/actions.ts

@@ -240,6 +240,19 @@ const isVisible = async (
     .catch(() => false)
 }
 
+const hasText = async (
+  item: Detox.NativeMatcher,
+  text: string,
+  index = 1,
+  timeout = 2000
+): Promise<boolean> => {
+  return await waitFor(element(item).atIndex(index))
+    .toHaveText(text)
+    .withTimeout(timeout)
+    .then(() => true)
+    .catch(() => false)
+}
+
 const swipeUp = async (
   item: Detox.NativeMatcher,
   speed: Detox.Speed,
@@ -348,10 +361,28 @@ async function waitForCondition(func: any, condition: any, timeout = 5000) {
 const drag = async (
   item: Detox.NativeMatcher,
   direction: Detox.Direction = 'down',
+  percentage = 0.2,
   index = 0
 ) => {
   await element(item).atIndex(index).longPress()
-  await element(item).atIndex(index).swipe(direction, 'fast', 0.2)
+  await element(item).atIndex(index).swipe(direction, 'fast', percentage)
+}
+
+const dragTo = async (
+  fromEle: Detox.NativeMatcher,
+  targetEle: Detox.NativeMatcher,
+  targetOffset: [number, number] // [targetOffsetX, targetOffsetY]
+) => {
+  await element(fromEle).longPressAndDrag(
+    500,
+    NaN,
+    NaN,
+    element(targetEle),
+    targetOffset[0],
+    targetOffset[1],
+    'fast',
+    0
+  )
 }
 
 const shuffleArray = <T>(array: T[]): T[] =>
@@ -390,7 +421,9 @@ export default {
   clearTextInput,
   getElementTextNoSync,
   drag,
+  dragTo,
   shuffleArray,
   scrollToBottom,
-  scrollToTop
+  scrollToTop,
+  hasText
 }

packages/core-mobile/e2e/locators/burgerMenu/bugerMenu.loc.ts

@@ -10,5 +10,6 @@ export default {
   showRecoveryPhrase: 'Show recovery phrase',
   notifications: 'Notifications',
   deleteWalletBtn: 'Delete Wallet',
-  iUnderstand: 'I understand, continue'
+  slideBtn: 'slide',
+  cancel: 'cancel_btn'
 }

packages/core-mobile/e2e/locators/portfolio.loc.ts

@@ -40,5 +40,6 @@ export default {
   tokensTab: 'Tokens',
   benqi: 'BENQI',
   activeNetworkBalance: 'active_network_balance',
-  tokensTabListView: 'tokens_tab_list_view'
+  tokensTabListView: 'tokens_tab_list_view',
+  portfolioTokenList: 'portfolio_token_list'
 }

packages/core-mobile/e2e/pages/browser.page.ts

@@ -203,12 +203,6 @@ class BrowserPage {
   }
 
   async sendRpcCall(rpcCall: string) {
-    await bottomTabsPage.tapBrowserTab()
-    try {
-      await this.reconnectRpc()
-    } catch (e) {
-      console.log('No need to reconnect RPC Playground')
-    }
     await this.goToRpcCallPage()
     await this.enterRpcCall(rpcCall)
     await this.tapSend()

packages/core-mobile/e2e/pages/burgerMenu/burgerMenu.page.ts

@@ -38,8 +38,12 @@ class BurgerMenuPage {
     return by.text(burgerMenu.deleteWalletBtn)
   }
 
-  get iUnderstand() {
-    return by.text(burgerMenu.iUnderstand)
+  get slideBtn() {
+    return by.id(burgerMenu.slideBtn)
+  }
+
+  get cancel() {
+    return by.id(burgerMenu.cancel)
   }
 
   async swipeLeft() {
@@ -90,7 +94,14 @@ class BurgerMenuPage {
 
   async deleteWallet() {
     await Actions.tapElementAtIndex(this.deleteWalletBtn, 0)
-    await Actions.tapElementAtIndex(this.iUnderstand, 0)
+    await this.swipeToLogout()
+  }
+  async swipeToLogout() {
+    if (Actions.platform() === Platform.iOS) {
+      await Actions.dragTo(this.slideBtn, this.cancel, [1, 0])
+    } else {
+      await Actions.drag(this.slideBtn, 'right', 1)
+    }
   }
 }
 

packages/core-mobile/e2e/pages/portfolio.page.ts

@@ -157,6 +157,10 @@ class PortfolioPage {
     return by.id(portfolio.tokensTabListView)
   }
 
+  get portfolioTokenList() {
+    return by.id(portfolio.portfolioTokenList)
+  }
+
   async verifyPorfolioScreen() {
     await Assert.isVisible(this.viewAllBtn)
     await Assert.isVisible(this.favoritesHeader)
@@ -309,7 +313,12 @@ class PortfolioPage {
   }
 
   async tapToken(token: string) {
-    await Action.waitForElement(by.id(`${token}_portfolio_list_item`))
+    await Action.waitForElement(this.portfolioTokenList)
+    await Action.scrollListUntil(
+      by.id(`${token}_portfolio_list_item`),
+      this.portfolioTokenList,
+      100
+    )
     await Action.tap(by.id(`${token}_portfolio_list_item`))
   }
 

packages/core-mobile/e2e/pages/swapTab.page.ts

@@ -84,7 +84,10 @@ class SwapTabPage {
 
   async tapReviewOrderButton(index = 0) {
     await Actions.waitForElementNoSync(this.reviewOrderBtn, 15000)
-    await Actions.tapElementAtIndex(this.reviewOrderBtn, index)
+    while (await Actions.isVisible(this.reviewOrderBtn, index)) {
+      await Actions.tapElementAtIndex(this.reviewOrderBtn, index)
+      await delay(3000)
+    }
   }
 
   async tapApproveButton() {
@@ -126,34 +129,30 @@ class SwapTabPage {
   }
 
   async swap(from: string, to: string, amount = '0.000001') {
+    // Go to swap form
     await bottomTabsPage.tapPlusIcon()
     await plusMenuPage.tapSwapButton()
+
+    // Select From Token
     if (from !== 'AVAX') {
       await this.tapFromTokenSelector()
       await sendPage.selectToken(from)
     }
+
+    // Select To Token
     if (to !== 'USDC') {
       await this.tapToTokenSelector()
       await sendPage.selectToken(to)
     }
+
+    // Enter input
     await this.inputTokenAmount(amount)
     let newAmount = amount
+
+    // Update input if error message is displayed
     while (
-      (await Actions.isVisible(
-        by.text('No routes found with enough liquidity'),
-        0,
-        500
-      )) ||
-      (await Actions.isVisible(
-        by.text('ESTIMATED_LOSS_GREATER_THAN_MAX_IMPACT'),
-        0,
-        500
-      )) ||
-      (await Actions.isVisible(
-        by.text('Amount 1 is too small to proceed'),
-        0,
-        500
-      ))
+      (await Actions.isVisible(by.id('error_msg'), 0, 500)) ||
+      (await Actions.hasText(this.amountField, ''))
     ) {
       newAmount = await this.adjustAmount(newAmount)
       console.log(newAmount)
@@ -162,13 +161,16 @@ class SwapTabPage {
         break
       }
     }
+    // Tap Review Order
     await this.tapReviewOrderButton()
     try {
       await Actions.waitForElementNoSync(this.tokenSpendApproval, 8000)
       await this.tapApproveButton()
     } catch (e) {
       console.error('Token spend approval not found')
     }
+
+    // Verify fee and approve
     await popUpModalPage.verifyFeeIsLegit(false, 0.2)
     await this.tapApproveButton()
   }

packages/core-mobile/e2e/tests/plusIcon/walletConnect/dappIntegrationsRPCPlayground.e2e.ts

@@ -2,8 +2,7 @@
 /**
  * @jest-environment ./environment.ts
  */
-import actions from '../../../helpers/actions'
-import assertions from '../../../helpers/assertions'
+// import assertions from '../../../helpers/assertions'
 import { warmup } from '../../../helpers/warmup'
 import popUpModalPage from '../../../pages/popUpModal.page'
 import bottomTabsPage from '../../../pages/bottomTabs.page'
@@ -14,10 +13,14 @@ import connectToSitePage from '../../../pages/connectToSite.page'
 import plusMenuPage from '../../../pages/plusMenu.page'
 import portfolioPage from '../../../pages/portfolio.page'
 import sendPage from '../../../pages/send.page'
+import assertions from '../../../helpers/assertions'
 
 describe('Dapp - Core Playground', () => {
   beforeAll(async () => {
     await warmup()
+  })
+
+  it('should connect to Core Playground', async () => {
     await browserPage.connectTo(
       'https://ava-labs.github.io/extension-avalanche-playground/',
       false,
@@ -29,12 +32,8 @@ describe('Dapp - Core Playground', () => {
     await bottomTabsPage.tapPortfolioTab()
   })
 
-  beforeEach(async () => {
-    const newInstance = actions.platform() === 'android' ? true : false
-    await warmup(newInstance)
-  })
-
   it('should handle eth_sendTransaction', async () => {
+    await bottomTabsPage.tapBrowserTab()
     await browserPage.sendRpcCall('eth_sendTransaction')
     await popUpModalPage.verifyApproveTransactionItems()
     await popUpModalPage.tapApproveBtn()
@@ -89,6 +88,7 @@ describe('Dapp - Core Playground', () => {
   })
 
   it('should handle wallet_switchEthereumChain', async () => {
+    await bottomTabsPage.tapBrowserTab()
     await browserPage.sendRpcCall('wallet_switchEthereumChain')
     await popUpModalPage.verifySwitchToFujiNetworkModal()
     await popUpModalPage.tapApproveBtn()