Sui and Monad

Author: zgz2020

.github/workflows/codeql.yml

@@ -1,30 +1,30 @@
-# name: CodeQL
+name: CodeQL
 
-# on:
-#   push:
-#     branches:
-#       - dev
-#   pull_request:
-#   schedule:
-#     - cron: '0 6 * * 3'
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+  schedule:
+    - cron: '0 6 * * 3'
 
-# jobs:
-#   analyze:
-#     runs-on: ubuntu-latest
-#     permissions:
-#         security-events: write
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    permissions:
+        security-events: write
 
-#     steps:
-#       - name: Checkout
-#         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # [email protected]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # [email protected]
 
-#       - name: Initialize CodeQL
-#         uses: github/codeql-action/init@7e3036b9cd87fc26dd06747b7aa4b96c27aaef3a # [email protected]
-#         with:
-#           queries: security-and-quality
-#           languages: javascript-typescript
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@7e3036b9cd87fc26dd06747b7aa4b96c27aaef3a # [email protected]
+        with:
+          queries: security-and-quality
+          languages: javascript-typescript
 
-#       - name: Perform CodeQL Analysis
-#         uses: github/codeql-action/analyze@7e3036b9cd87fc26dd06747b7aa4b96c27aaef3a # [email protected]
-#         with:
-#           category: "/language:javascript-typescript"
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@7e3036b9cd87fc26dd06747b7aa4b96c27aaef3a # [email protected]
+        with:
+          category: "/language:javascript-typescript"

.github/workflows/lint.yml

@@ -1,24 +1,24 @@
-# name: 🎨 Lint
+name: 🎨 Lint
 
-# on:
-#   push:
-#     branches:
-#       - dev
-#   pull_request:
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
 
-# jobs:
-#   style:
-#     name: Check code style
-#     runs-on: ubuntu-latest
-#     steps:
-#       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # [email protected]
+jobs:
+  style:
+    name: Check code style
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # [email protected]
 
-#       - name: Setup Node & Install dependencies
-#         uses: ./.github/actions/setup
+      - name: Setup Node & Install dependencies
+        uses: ./.github/actions/setup
 
-#       - name: Check linter
-#         run: pnpm run lint:check
+      - name: Check linter
+        run: pnpm run lint:check
 
-#       - name: Check order in package.json
-#         if: success() || failure() # Run even if the previous step fails
-#         run: pnpm run sort-package-json:check
+      - name: Check order in package.json
+        if: success() || failure() # Run even if the previous step fails
+        run: pnpm run sort-package-json:check

.github/workflows/testjj2.yml

@@ -1,4 +1,4 @@
-name: 🧑‍🔧 Test
+name: 🧑‍🔧 Test - Phantom
 
 on:
   push:

wallets/phantom/playwright.config.ts

@@ -45,7 +45,9 @@ export default defineConfig({
 
     // Collect all traces on CI, and only traces for failed tests when running locally.
     // See https://playwright.dev/docs/trace-viewer.
-    trace: process.env.CI ? 'on' : 'retain-on-failure',
+    // trace: process.env.CI ? 'on' : 'retain-on-failure',
+    screenshot: 'only-on-failure',
+    video: 'retain-on-failure',
     // Added for getting account address
     permissions: ['clipboard-read']
   },

wallets/phantom/src/playwright/fixtures/phantomFixtures.ts

@@ -12,6 +12,7 @@ import { prepareExtensionPhantom } from '../../prepareExtensionPhantom'
 import { Phantom } from '../Phantom'
 import { getExtensionIdPhantom, unlockForFixturePhantom } from '../fixture-actions'
 import { persistLocalStorage } from '../fixture-actions/persistLocalStorage'
+import { closeSuiAndMonadIfPresent } from '../pages/HomePage/actions'
 import { waitForPhantomWindowToBeStable } from '../utils/waitFor'
 
 type PhantomFixtures = {
@@ -90,6 +91,8 @@ export const phantomFixtures = (walletSetup: ReturnType<typeof defineWalletSetup
       await context.close()
     },
     phantomPage: async ({ context: _ }, use) => {
+      await closeSuiAndMonadIfPresent(_phantomPage)
+
       await use(_phantomPage)
     },
     extensionId: async ({ context }, use) => {

wallets/phantom/src/playwright/pages/HomePage/actions/closeSuiAndMonadScreen.ts

@@ -1,17 +1,28 @@
-import type { Page } from '@playwright/test'
+import { type Page, expect } from '@playwright/test'
 
 export async function closeSuiAndMonadIfPresent(page: Page) {
-  const suiIsVisible = await page.getByRole('button', { name: 'Enable Sui' }).isVisible()
+  // Wait for Phantom page to fully load
+  const walletValueUsdRegExp = new RegExp('\\$[0-9].[0-9]{3,4}.*[0-9]{1,2}\\%')
+  await expect(page.getByText(walletValueUsdRegExp), 'Wallet value should be visible').toBeVisible({ timeout: 10_000 })
 
-  if (suiIsVisible) {
-    await page.getByRole('button', { name: 'Not Now' }).click()
-  }
+  // Reload page to trigger Sui and/or Monad screens
+  await page.reload()
 
-  await page.waitForTimeout(2_000)
+  // Loop until Sui/Monad screens have been closed and Phantompage is ready for testing
+  //   => 'ready for testing' = top 'fungible token' row is clickable
+  await expect(async () => {
+    const suiIsVisible = await page.getByRole('button', { name: 'Enable Sui' }).isVisible()
 
-  const monadIsVisible = await page.getByRole('button', { name: 'Enable Monad' }).isVisible()
+    if (suiIsVisible) {
+      await page.getByRole('button', { name: 'Not Now' }).click()
+    }
 
-  if (monadIsVisible) {
-    await page.getByRole('button', { name: 'Not Now' }).click()
-  }
+    const monadIsVisible = await page.getByRole('button', { name: 'Enable Monad' }).isVisible()
+
+    if (monadIsVisible) {
+      await page.getByRole('button', { name: 'Not Now' }).click()
+    }
+
+    await page.locator('[data-testid*="fungible-token-row-"]').first().click({ timeout: 3_000 })
+  }).toPass()
 }

wallets/phantom/src/playwright/pages/HomePage/actions/importWalletFromPrivateKey.ts

@@ -2,7 +2,7 @@ import { type Page, expect } from '@playwright/test'
 import Selectors from '../../../../selectors/pages/HomePage'
 import type { Networks } from '../../../../type/Networks'
 import { waitFor } from '../../../utils/waitFor'
-import { closeSuiAndMonadIfPresent } from './closeSuiAndMonadScreen'
+// import { closeSuiAndMonadIfPresent } from './closeSuiAndMonadScreen'
 
 export async function importWalletFromPrivateKey(
   page: Page,
@@ -14,14 +14,14 @@ export async function importWalletFromPrivateKey(
 
   await page.goto(extensionUrl.replace('onboarding', 'popup'))
 
-  await page.waitForTimeout(5_000)
-  await closeSuiAndMonadIfPresent(page)
+  // await page.waitForTimeout(5_000)
+  // await closeSuiAndMonadIfPresent(page)
 
   await expect(page.locator(Selectors.accountMenu.accountButton)).toBeVisible()
   await page.locator(Selectors.accountMenu.accountButton).click()
 
-  await page.waitForTimeout(3_000)
-  await closeSuiAndMonadIfPresent(page)
+  // await page.waitForTimeout(3_000)
+  // await closeSuiAndMonadIfPresent(page)
 
   await expect(page.locator(Selectors.accountMenu.addAccountMenu.addAccountButton)).toBeVisible()
 

wallets/phantom/test/playwright/commonSteps/solanaSandboxSetup.ts

@@ -2,7 +2,7 @@ import { type Page, expect } from '@playwright/test'
 import type { Phantom } from '../../../src/playwright'
 
 export const solanaSandboxSetup = async (page: Page, phantom: Phantom) => {
-  await phantom.page.waitForTimeout(1_000)
+  // await phantom.page.waitForTimeout(1_000)
   await phantom.importWalletFromPrivateKey(
     'solana',
     'XQaKFLLSKbzpVzmfJrj4yUjAyFy2Eu7JcNdbPdnLuod2Uw3yf3tjGd4ha1DBfFdjkZFX1PZg3knth2Tz2tvd8C4'