Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge-main-to-public #820

Merged
merged 42 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
46418f6
chore: fix release.yml
teebszet Apr 3, 2024
0362175
[ENG-4029]Integration of Playwright UI Tests in PR Workflow (#168)
Christine-Pinto Apr 3, 2024
6067642
feat: add balance dynamic font size and fix cache issue when changing…
fedeerbes Apr 8, 2024
e884b5f
[ENG-4066] fix-failing-build-uitest(#177)
Christine-Pinto Apr 8, 2024
17df617
feat: add warning for spending delegated stx (#174)
fedeerbes Apr 8, 2024
95b0292
Merge pull request #172 from secretkeylabs/release/v0.33.1
teebszet Apr 10, 2024
f9936b5
Update core to 0.17 compatible version (#179)
victorkirov Apr 11, 2024
d452bd4
release: v0.33.2
Apr 11, 2024
ac17c40
Merge remote-tracking branch 'origin/main' into release/v0.33.2
Apr 11, 2024
8e72606
chore: whitespace
teebszet Apr 11, 2024
177644b
Fix insufficient balance showing on load (#185)
victorkirov Apr 11, 2024
6c92ace
Merge pull request #182 from secretkeylabs/release/v0.33.2
teebszet Apr 15, 2024
e861116
Merge pull request #183 from secretkeylabs/release/v0.33.2
teebszet Apr 15, 2024
708032d
chore(deps): update alex-sdk to 0.1.26 (#160)
teebszet Apr 15, 2024
d2425ef
[ENG-3999] Onboarding part 2 (#184)
Christine-Pinto Apr 15, 2024
b0f153e
fix: hitman satribute description text (#189)
fedeerbes Apr 15, 2024
6f5b395
[ENG-4138] tim/set client version for internal api providers (#192)
teebszet Apr 16, 2024
a4d46a5
[ENG-3979] Implement Execution plan (#190)
Christine-Pinto Apr 16, 2024
7a8ac61
fix: ui and navigation issues related to swap (#176)
fedeerbes Apr 16, 2024
669603f
Terence - Runes - implement UI for each scenario (#150)
terencehh Apr 16, 2024
55080f1
commit (#175)
terencehh Apr 16, 2024
083e276
[ENG-3720] [ANALYTICS-EXT🌍-🔌Connect] Track app connect wallet events …
dhriaznov Apr 17, 2024
c886eb6
update order for transfer section (#197)
terencehh Apr 17, 2024
a1ac000
[ENG-4153] feat: Make a notification banner (#196)
dhriaznov Apr 17, 2024
5278ed6
[ENG-4131] feat: do a remote request for useHasFeature hook (#191)
teebszet Apr 17, 2024
d5a59ff
fix: psbt margins in receive and transfer section and remove output s…
fedeerbes Apr 17, 2024
f961797
[ENG-3722] [ANALYTICS-EXT🌍-💹View assets] Track view assets events (#137)
dhriaznov Apr 17, 2024
7eff9b2
release: v0.34.0
Apr 17, 2024
31f1169
Merge remote-tracking branch 'origin/main' into release/v0.34.0
Apr 17, 2024
4ab010e
fix: missing divisibility in runes psbt amount and layout in runes am…
fedeerbes Apr 17, 2024
27e796f
fix (#198)
terencehh Apr 17, 2024
195e164
[ENG-4133] Add "switch to testnet and back to mainnet" flow(#206)
Christine-Pinto Apr 19, 2024
5731ff2
Merge pull request #200 from secretkeylabs/release/v0.34.0
teebszet Apr 22, 2024
a8872e8
Merge branch 'develop' into release/v0.34.0
teebszet Apr 22, 2024
299d9e8
Merge pull request #201 from secretkeylabs/release/v0.34.0
teebszet Apr 22, 2024
364caf1
release: v0.34.1
Apr 22, 2024
6e9df0a
Merge remote-tracking branch 'origin/main' into release/v0.34.1
Apr 22, 2024
9cdb407
Don't show rune burn label on partial transaction (#208)
victorkirov Apr 23, 2024
59de2a2
Add Rune recovery screen (#214)
victorkirov Apr 23, 2024
1250117
chore: add missing divisibility prop in delegation section (#218)
fedeerbes Apr 23, 2024
74fe75e
Show cenotaph warning (#219)
victorkirov Apr 23, 2024
c3b74a9
Merge pull request #212 from secretkeylabs/release/v0.34.1
teebszet Apr 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"airbnb-typescript",
"airbnb/hooks",
"prettier",
"plugin:@tanstack/eslint-plugin-query/recommended",
"plugin:playwright/recommended"
"plugin:@tanstack/eslint-plugin-query/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
Expand All @@ -21,17 +20,10 @@
"sourceType": "module",
"project": "./tsconfig.json"
},
"plugins": [
"react",
"prettier",
"eslint-plugin-no-inline-styles",
"@tanstack/query",
"eslint-plugin-playwright"
],
"plugins": ["react", "prettier", "eslint-plugin-no-inline-styles", "@tanstack/query"],
"rules": {
"consistent-return": "off",
"no-await-in-loop": "off",
"playwright/valid-title": "off",
"import/prefer-default-export": 1,
"no-restricted-imports": [
"warn",
Expand Down Expand Up @@ -62,6 +54,16 @@
"@tanstack/query/exhaustive-deps": 1,
"import/order": 0
},
"overrides": [
{
"files": ["tests/**/*.{js,jsx,ts,tsx}"],
"plugins": ["playwright"],
"extends": ["plugin:playwright/playwright-test"],
"rules": {
"playwright/expect-expect": "off"
}
}
],
"settings": {
"import/resolver": {
"node": {
Expand Down
123 changes: 101 additions & 22 deletions .github/workflows/build-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ on:
- main
- develop
jobs:
test:
build:
if: ${{ startsWith(github.head_ref, 'release/') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
always-auth: true
node-version: 18
Expand All @@ -33,10 +34,100 @@ jobs:
npx eslint .
npx tsc --noEmit
npm test
- name: Build
env:
TRANSAC_API_KEY: ${{ secrets.TRANSAC_API_KEY }}
MOON_PAY_API_KEY: ${{ secrets.MOON_PAY_API_KEY }}
MIX_PANEL_TOKEN: ${{ secrets.MIX_PANEL_TOKEN }}
MIX_PANEL_EXPLORE_APP_TOKEN: ${{ secrets.MIX_PANEL_EXPLORE_APP_TOKEN }}
run: npm run build
- name: Upload Archive
uses: actions/upload-artifact@v3
with:
name: web-extension1
path: ./build
retention-days: 5
if-no-files-found: error
UItest:
needs: [build]
name: UI Test ${{ matrix.shardIndex }} of ${{ matrix.shardTotal }}
timeout-minutes: 10
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
shardIndex: [1, 2, 3, 4, 5]
shardTotal: [5]
steps:
- uses: actions/checkout@v4
- name: Download build artifact
uses: actions/download-artifact@v3
with:
name: web-extension1
path: ./build
- name: Use Node.js
uses: actions/setup-node@v4
with:
always-auth: true
node-version: 18
registry-url: https://npm.pkg.github.com
scope: '@secretkeylabs'
cache: npm
- name: Install dependencies
env:
NODE_AUTH_TOKEN: ${{ secrets.GH_PACKAGE_REGISTRY_TOKEN }}
run: npm install playwright
- name: Install Playwright Browsers
run: npx playwright install chromium --with-deps
- name: Run UI test suite
run: xvfb-run --auto-servernum --server-args="-screen 0 360x360x24" npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
- name: Upload Playwright report
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v3
with:
name: all-blob-reports
path: blob-report
retention-days: 1

merge-reports:
# Merge reports after playwright-tests, even if some shards have failed but not if the job was skipped
if: ${{ always() && needs.UItest.result != 'skipped' }}
needs: [UItest]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
always-auth: true
node-version: 18
registry-url: https://npm.pkg.github.com
scope: '@secretkeylabs'
cache: npm
- name: Install dependencies
env:
NODE_AUTH_TOKEN: ${{ secrets.GH_PACKAGE_REGISTRY_TOKEN }}
run: npm install playwright

- name: Download blob reports from GitHub Actions Artifacts
uses: actions/download-artifact@v3
with:
name: all-blob-reports
path: all-blob-reports

- name: Merge into HTML Report
run: npx playwright merge-reports --reporter html ./all-blob-reports

- name: Upload HTML report
uses: actions/upload-artifact@v3
with:
name: html-report--attempt-${{ github.run_attempt }}
path: playwright-report
retention-days: 5

publish-rc:
# TODO also keep the develop PR description up to date
if: ${{ github.base_ref == 'main' }}
needs: test
needs: [UItest]
runs-on: ubuntu-latest
permissions:
contents: write
Expand Down Expand Up @@ -101,26 +192,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- name: Download build artifact
uses: actions/download-artifact@v3
with:
always-auth: true
node-version: 18
registry-url: https://npm.pkg.github.com
scope: '@secretkeylabs'
cache: npm
- name: Install dependencies
env:
NODE_AUTH_TOKEN: ${{ secrets.GH_PACKAGE_REGISTRY_TOKEN }}
run: npm ci
- name: Build & zip
env:
TRANSAC_API_KEY: ${{ secrets.TRANSAC_API_KEY }}
MOON_PAY_API_KEY: ${{ secrets.MOON_PAY_API_KEY }}
MIX_PANEL_TOKEN: ${{ secrets.MIX_PANEL_TOKEN }}
MIX_PANEL_EXPLORE_APP_TOKEN: ${{ secrets.MIX_PANEL_EXPLORE_APP_TOKEN }}
run: |
npm run build
zip -rj build.zip ./build
name: web-extension1
path: ./build
- uses: actions/setup-node@v4
- name: zip
run: zip -rj build.zip ./build
- name: Upload release asset
uses: actions/upload-release-asset@v1
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
run: npm run build --if-present
- name: Install Playwright Browsers
run: npx playwright install chromium --with-deps
- name: Run health check
run: xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" npx playwright test tests/specs/healthcheck.spec.ts --reporter=html
- name: Run UI test suite
run: xvfb-run --auto-servernum --server-args="-screen 0 360x360x24" npx playwright test --grep "#smoketest" --reporter=html
- name: Upload Playwright report
if: always()
uses: actions/upload-artifact@v3
Expand Down
95 changes: 83 additions & 12 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
name: Playwright Tests
on:
workflow_dispatch:
inputs:
branch:
description: Branch name
required: true
default: develop
jobs:
test:
timeout-minutes: 10
build:
if: ${{ !startsWith(github.head_ref, 'release/') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -24,21 +19,97 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.GH_PACKAGE_REGISTRY_TOKEN }}
run: npm ci
- name: Test
run: |
npx eslint .
npx tsc --noEmit
npm test
- name: Build
env:
TRANSAC_API_KEY: ${{ secrets.TRANSAC_API_KEY }}
MOON_PAY_API_KEY: ${{ secrets.MOON_PAY_API_KEY }}
MIX_PANEL_TOKEN: ${{ secrets.MIX_PANEL_TOKEN }}
MIX_PANEL_EXPLORE_APP_TOKEN: ${{ secrets.MIX_PANEL_EXPLORE_APP_TOKEN }}
run: npm run build --if-present
- name: Upload Archive
uses: actions/upload-artifact@v3
with:
name: web-extension1
path: ./build
retention-days: 5
if-no-files-found: error
UItest:
needs: [build]
name: UI Test ${{ matrix.shardIndex }} of ${{ matrix.shardTotal }}
timeout-minutes: 10
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
shardIndex: [1, 2, 3, 4, 5]
shardTotal: [5]
steps:
- uses: actions/checkout@v4
- name: Download build artifact
uses: actions/download-artifact@v3
with:
name: web-extension1
path: ./build
- name: Use Node.js
uses: actions/setup-node@v4
with:
always-auth: true
node-version: 18
registry-url: https://npm.pkg.github.com
scope: '@secretkeylabs'
cache: npm
- name: Install dependencies
env:
NODE_AUTH_TOKEN: ${{ secrets.GH_PACKAGE_REGISTRY_TOKEN }}
run: npm install playwright
- name: Install Playwright Browsers
run: npx playwright install chromium --with-deps
- name: Run UI test suite
run: xvfb-run --auto-servernum --server-args="-screen 0 360x360x24" npx playwright test --reporter=html
run: xvfb-run --auto-servernum --server-args="-screen 0 360x360x24" npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
- name: Upload Playwright report
if: always()
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v3
with:
name: all-blob-reports
path: blob-report
retention-days: 1

merge-reports:
# Merge reports after playwright-tests, even if some shards have failed
if: ${{ !cancelled() }}
needs: [UItest]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
always-auth: true
node-version: 18
registry-url: https://npm.pkg.github.com
scope: '@secretkeylabs'
cache: npm
- name: Install dependencies
env:
NODE_AUTH_TOKEN: ${{ secrets.GH_PACKAGE_REGISTRY_TOKEN }}
run: npm install playwright

- name: Download blob reports from GitHub Actions Artifacts
uses: actions/download-artifact@v3
with:
name: all-blob-reports
path: all-blob-reports

- name: Merge into HTML Report
run: npx playwright merge-reports --reporter html ./all-blob-reports

- name: Upload HTML report
uses: actions/upload-artifact@v3
with:
name: playwright-report
path: playwright-report/
retention-days: 30
name: html-report--attempt-${{ github.run_attempt }}
path: playwright-report
retention-days: 5
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ jobs:
./merge-to-remote.sh
- id: copy-release-to-public
name: Copy release to public remote
needs: push-to-public
env:
REMOTE_REPO: xverse-web-extension
run: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,5 @@ yarn-error.log*
/playwright-report/
/blob-report/
/playwright/.cache/
tests/specs/seedWords.json
tests/specs/addresses.json
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
1. Check if your [Node.js](https://nodejs.org/) version is >= **14**.
2. Clone this repository.
3. Make sure you're logged in to the @secretkeylabs scope on the GitHub NPM package registry. See the [Guide](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-npm-registry#authenticating-with-a-personal-access-token)
1. Create a GitHub personal access token (classic)
1. Create a GitHub personal access token (classic)
2. Run `npm login --scope=@secretkeylabs --registry=https://npm.pkg.github.com`
3. Username: GITHUB USERNAME
Password: PERSONAL_ACCESS_TOKEN
Expand Down Expand Up @@ -42,4 +42,4 @@ npm run uitest
To generate test report, run:
```
npm run uitest:report
```
```
Loading