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-develop-to-public #819

Merged
merged 101 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
3986258
[ENG-3842] feat: Add the mixpanel events for featured apps in the ext…
dhriaznov Mar 11, 2024
07cc83f
Update src/app/utils/mixpanel.ts
dhriaznov Mar 12, 2024
f50379f
Add the MIX_PANEL_TOKEN_EXPLORE_APP import
dhriaznov Mar 12, 2024
b23e451
Add the MIX_PANEL_TOKEN_EXPLORE_APP to the .env.example file, as well…
dhriaznov Mar 13, 2024
0d302cd
Add lazy loading for the mixpanel instances
dhriaznov Mar 13, 2024
b5cdcff
Trigger CI build
dhriaznov Mar 14, 2024
6adb01f
Merge branch 'develop' into denys/eng-3842-add-the-mixpanel-events-fo…
dhriaznov Mar 14, 2024
f946599
Merge branch 'develop' into denys/eng-3842-add-the-mixpanel-events-fo…
teebszet Mar 15, 2024
06d6165
Merge pull request #147 from secretkeylabs/release/v0.32.3
teebszet Mar 19, 2024
b510d70
Merge branch 'develop' into denys/eng-3842-add-the-mixpanel-events-fo…
dhriaznov Mar 19, 2024
10653d1
[ENG-3477] feat: Open the onboarding screen right after user installs…
dhriaznov Mar 21, 2024
c11a9d2
Merge branch 'develop' into denys/eng-3842-add-the-mixpanel-events-fo…
dhriaznov Mar 21, 2024
6c08ff9
[ENG-3937] Replace the old STX logo leftovers on the web-extension (#…
dhriaznov Mar 25, 2024
3980cae
fix: remove satributes component from receive section in payment addr…
fedeerbes Mar 25, 2024
a62315f
fix: qr config, avoid hiding dots covered by image (#154)
fedeerbes Mar 25, 2024
5759028
[ENG-3972] fix: Issue with balance sip-10 tokens fiat value does not …
dhriaznov Mar 25, 2024
59ae427
Add sighash none warning (#152)
victorkirov Mar 25, 2024
66fafe6
[ENG-3340] feat: Add UI warning about the Non default sighash Ledger …
dhriaznov Mar 25, 2024
f13eb25
[ENG-3956] setup healthcheck test (#153)
Christine-Pinto Mar 25, 2024
9e3ba2b
Merge pull request #130 from secretkeylabs/denys/eng-3842-add-the-mix…
dhriaznov Mar 25, 2024
b0f8c32
Sats connect RPC support (#141)
m-aboelenein Mar 27, 2024
7473e00
feat: add support for BLOCK9_450, BLOCK286 and LEGACY satributes (#156)
fedeerbes Mar 27, 2024
98ef0f9
release: v0.33.0
Mar 27, 2024
1bf2015
Merge branch 'main' into release/v0.33.0
teebszet Mar 27, 2024
dcd7859
fix: add mixpanel types and fix type errors (#165)
teebszet Mar 28, 2024
34cd1d1
Merge branch 'develop' into release/v0.33.0
teebszet Mar 28, 2024
1e4d7a1
[ENG-3978] Onboarding UI Test part 1 (#159)
Christine-Pinto Mar 28, 2024
f9ffbba
[ENG-3808] chore: script merge public to private (#155)
teebszet Apr 2, 2024
489ab8d
Merge pull request #161 from secretkeylabs/release/v0.33.0
teebszet Apr 2, 2024
b14951a
Merge pull request #162 from secretkeylabs/release/v0.33.0
teebszet Apr 2, 2024
0da55ee
chore: fix release develop workflow file (#167)
teebszet Apr 2, 2024
5da5a1b
chore: fix merge repos workflow permissions
teebszet Apr 2, 2024
ce08b87
chore: use https git remote url when on CI
teebszet Apr 3, 2024
df25a7c
chore: fix merge git remote ternary
teebszet Apr 3, 2024
ba3a57e
chore: fix merge git remote ternary
teebszet Apr 3, 2024
be1fe66
chore: fix permissions for merge
teebszet Apr 3, 2024
b86f0aa
chore: fix permissions for merge
teebszet Apr 3, 2024
a6a40a8
chore: only fetch the branch to be merged
teebszet Apr 3, 2024
ffb71da
chore: only fetch the branch to be merged
teebszet Apr 3, 2024
37560a9
chore: try using GITHUB_ACTIONS env var
teebszet Apr 3, 2024
2a912f7
Merge branch 'chore/fix-merge-script' into develop
teebszet Apr 3, 2024
70eeac2
chore: add debug echo
teebszet Apr 3, 2024
5b9ecde
chore: debug remotes
teebszet Apr 3, 2024
d0cb273
chore: debug push
teebszet Apr 3, 2024
0a05d42
fix: never generate wallet from random seed phrase (#158)
teebszet Apr 3, 2024
c163763
release: v0.33.1
Apr 3, 2024
4322fb9
Merge remote-tracking branch 'origin/main' into release/v0.33.1
Apr 3, 2024
46418f6
chore: fix release.yml
teebszet Apr 3, 2024
e66cc85
chore: fix release.yml (#173)
fedeerbes 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
aa2b5ae
Merge pull request #171 from secretkeylabs/release/v0.33.1
teebszet Apr 10, 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
1b059b6
[ENG-4028] fix: Restore wallet: reload page instead of showing error …
dhriaznov Apr 17, 2024
2e6c2d8
Adjust locator for inputSeedPhraseWordDisabled
Christine-Pinto Apr 18, 2024
195e164
[ENG-4133] Add "switch to testnet and back to mainnet" flow(#206)
Christine-Pinto Apr 19, 2024
fff34fc
Merge branch 'develop' into denys/eng-4028-restore-wallet-reload-page…
dhriaznov Apr 22, 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
ddd24be
Merge branch 'develop' into denys/eng-4028-restore-wallet-reload-page…
dhriaznov Apr 22, 2024
9fa58e8
Merge pull request #205 from secretkeylabs/denys/eng-4028-restore-wal…
dhriaznov 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
b17314d
[ENG-4080] Account management (#207)
Christine-Pinto Apr 23, 2024
74fe75e
Show cenotaph warning (#219)
victorkirov Apr 23, 2024
49a0e87
Allow building multiple wallets (#209)
aryzing Apr 23, 2024
df64a70
[ENG-4078] Manage tokens (#221)
Christine-Pinto Apr 24, 2024
1cb3f80
fix ledger full screen crash issue (#215)
terencehh Apr 24, 2024
dfce6f6
[ENG-4212] Add visual check for explore Tab (#222)
Christine-Pinto Apr 24, 2024
987b0fe
Merge pull request #213 from secretkeylabs/release/v0.34.1
teebszet Apr 25, 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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ MOON_PAY_API_KEY=

# Analytics
MIX_PANEL_TOKEN=
MIX_PANEL_EXPLORE_APP_TOKEN=
14 changes: 13 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"plugins": ["react", "prettier", "eslint-plugin-no-inline-styles", "@tanstack/query"],
"rules": {
"consistent-return": "off",
"no-await-in-loop": "off",
"import/prefer-default-export": 1,
"no-restricted-imports": [
"warn",
Expand Down Expand Up @@ -50,8 +51,19 @@
}
],
"no-plusplus": "off",
"@tanstack/query/exhaustive-deps": 1
"@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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @secretkeylabs/reviewers-web-extension
122 changes: 101 additions & 21 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-20.04
strategy:
fail-fast: false
matrix:
shardIndex: [1, 2, 3, 4, 5, 6]
shardTotal: [6]
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,25 +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 }}
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
14 changes: 13 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:
if: ${{ !startsWith(github.head_ref, 'release/') }}
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- name: Use Node.js
Expand All @@ -36,7 +36,19 @@ jobs:
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: 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 --grep "#smoketest" --reporter=html
- name: Upload Playwright report
if: always()
uses: actions/upload-artifact@v3
with:
name: playwright-report
path: playwright-report/
retention-days: 30
- name: Save Filename
run: |
BRANCH_NAME=$(echo ${{ github.head_ref }} | sed 's/\//-/g')
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/merge-repos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Merge branch to remote

on:
workflow_dispatch:
inputs:
branch:
description: 'Merge branch'
required: true
default: develop
type: choice
options:
- develop
- main

jobs:
merge-branch-to-remote:
runs-on: ubuntu-latest
permissions:
pull-requests: write
contents: write
steps:
- uses: actions/checkout@v4
- id: run-merge-script
env:
ORIGIN_BRANCH: ${{ inputs.branch }}
REMOTE_REPO: ${{ secrets.REMOTE_REPO }}
GH_TOKEN: ${{ secrets.GH_REPOS_RW_PAT }}
run: |
# git config
git config user.name "GitHub Actions Bot"
git config user.email "<>"
# run shell script
cd scripts
ORIGIN_BRANCH=$ORIGIN_BRANCH REMOTE_REPO=$REMOTE_REPO ./merge-to-remote.sh
119 changes: 119 additions & 0 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
name: UI Test Suite
on:
pull_request:
branches:
- develop
workflow_dispatch:

jobs:
build:
if: ${{ startsWith(github.head_ref, 'e2etest/') || github.event_name == 'workflow_dispatch' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- 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 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-20.04
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
if: ${{ always() && needs.UItest.result != 'skipped' }}
needs: [UItest]
runs-on: ubuntu-20.04
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
Loading
Loading