QA - Handle new swap default tokens and small fixes

packages/core-mobile/app/screens/swap/SwapView.tsx

@@ -188,6 +188,7 @@ export default function SwapView(): JSX.Element {
           <Space y={20} />
 
           <UniversalTokenSelector
+            testID="from_token_selector"
             label={'From'}
             hideZeroBalanceTokens
             onTokenChange={token => {
@@ -226,6 +227,7 @@ export default function SwapView(): JSX.Element {
           </AvaButton.Base>
           <Space y={20} />
           <UniversalTokenSelector
+            testID="to_token_selector"
             label={'To'}
             onTokenChange={token => {
               const tkWithBalance = token as TokenWithBalance

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

@@ -3,7 +3,6 @@ export default {
   avaxSymbol: 'AVAX',
   usdcToken: 'USD Coin',
   tokenValueAvax: '0.01',
-  selectTokenDropdown: 'Select',
   amountField: 'universal_token_selector__amount_field',
   from: 'From',
   reviewOrderBtn: 'review_order_button',
@@ -13,5 +12,7 @@ export default {
   approveBtn: 'approve_button',
   rejectBtn: 'reject_button',
   tokenSpendApproval: 'Token Spend Approval',
-  swapTitle: 'Swap'
+  swapTitle: 'Swap',
+  fromTokenSelector: 'from_token_selector',
+  toTokenSelector: 'to_token_selector'
 }

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

@@ -86,14 +86,14 @@ class CreatePinPage {
   }
 
   async enterNewCurrentPin() {
-    while (await Action.isVisible(this.numpadOne, 0)) {
+    while (await Action.isVisible(this.setNewPinHeader, 0)) {
       await element(this.numpadOne).multiTap(6)
     }
   }
 
-  async enterCurrentPin() {
-    while (await Action.isVisible(this.numpadZero, 0)) {
-      await element(this.numpadZero).multiTap(6)
+  async enterCurrentPin(pin = '0') {
+    while (await Action.isVisible(this.enterYourPinHeader, 0)) {
+      await element(by.id(pin)).multiTap(6)
     }
   }
 }

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

@@ -73,7 +73,7 @@ class SendPage {
   }
 
   async waitForNextBtnEnabled() {
-    await Actions.waitForElement(this.nextButton, 5000)
+    await Actions.waitForElementNoSync(this.nextButton, 8000)
   }
 
   async tapMyAccounts() {

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

@@ -11,10 +11,6 @@ import sendPage from './send.page'
 const platformIndex = Actions.platform() === Platform.Android ? 1 : 0
 
 class SwapTabPage {
-  get selectTokenDropdown() {
-    return by.text(swapTab.selectTokenDropdown)
-  }
-
   get avaxToken() {
     return by.text(swapTab.avaxToken)
   }
@@ -63,20 +59,31 @@ class SwapTabPage {
     return by.text(swapTab.swapTitle)
   }
 
+  get fromTokenSelector() {
+    return by.id(swapTab.fromTokenSelector)
+  }
+
+  get toTokenSelector() {
+    return by.id(swapTab.toTokenSelector)
+  }
+
   async tapAvaxToken() {
     return Actions.tapElementAtIndex(this.avaxToken, 0)
   }
 
   async tapUsdcToken() {
     return Actions.tapElementAtIndex(this.usdcToken, 0)
   }
+  async tapFromTokenSelector() {
+    await Actions.tapElementAtIndex(this.fromTokenSelector, 0)
+  }
 
-  async tapSelectTokenDropdown() {
-    await Actions.tapElementAtIndex(this.selectTokenDropdown, 0)
+  async tapToTokenSelector() {
+    await Actions.tapElementAtIndex(this.toTokenSelector, 0)
   }
 
   async tapReviewOrderButton(index = 0) {
-    await Actions.waitForElementNoSync(this.reviewOrderBtn, 8000)
+    await Actions.waitForElementNoSync(this.reviewOrderBtn, 15000)
     await Actions.tapElementAtIndex(this.reviewOrderBtn, index)
   }
 
@@ -116,14 +123,18 @@ class SwapTabPage {
   async swap(from: string, to: string, amount = '0.00001') {
     await bottomTabsPage.tapPlusIcon()
     await plusMenuPage.tapSwapButton()
-    await this.tapSelectTokenDropdown()
-    await sendPage.selectToken(from)
+    if (from !== 'AVAX') {
+      await this.tapFromTokenSelector()
+      await sendPage.selectToken(from)
+    }
+    if (to !== 'USDC') {
+      await this.tapToTokenSelector()
+      await sendPage.selectToken(to)
+    }
     await this.inputTokenAmount(amount)
-    await this.tapSelectTokenDropdown()
-    await sendPage.selectToken(to)
     await this.tapReviewOrderButton()
     try {
-      await Actions.waitForElement(this.tokenSpendApproval, 5000)
+      await Actions.waitForElementNoSync(this.tokenSpendApproval, 8000)
       await this.tapApproveButton()
     } catch (e) {
       console.error('Token spend approval not found')
@@ -134,7 +145,6 @@ class SwapTabPage {
 
   async verifySwapScreen() {
     await Actions.waitForElement(this.swapTitle)
-    await Actions.waitForElement(this.selectTokenDropdown)
     await Actions.waitForElement(this.disabledReviewOrderBtn)
   }
 }

packages/core-mobile/e2e/tests/settings/changePin.e2e.smoke.ts

@@ -24,7 +24,7 @@ describe('Change Pin', () => {
   it('Should set previous Pin', async () => {
     await Actions.waitForElement(SecurityAndPrivacyPage.changePin)
     await SecurityAndPrivacyPage.tapChangePin()
-    await CreatePinPage.enterNewCurrentPin()
+    await CreatePinPage.enterCurrentPin('1')
     await CreatePinPage.createPin()
   })
 })