diff --git a/.eslintrc.js b/.eslintrc.js index 4df5195583c..14b2024420e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -47,6 +47,11 @@ module.exports = { property: 'open', message: avoidWindowOpenMsg, }, + { + object: 'window', + property: 'close', + message: 'Use `closeWindow` utility helper', + }, ], '@typescript-eslint/no-floating-promises': ['warn'], '@typescript-eslint/no-unnecessary-type-assertion': ['warn'], diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index 4dc89dedcc9..c57fe668daa 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -13,12 +13,13 @@ jobs: set-in-progress-message: if: github.repository == 'leather-wallet/extension' && github.actor != 'dependabot[bot]' runs-on: ubuntu-latest - needs: - - pre-run steps: + - name: Make short commit SHA + run: echo "SHORT_SHA=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_ENV + - uses: kyranjamie/pull-request-fixed-header@v1.0.1 with: - header: '> _Building Leather…_' + header: '> _Building Leather at commit `${{ env.SHORT_SHA }}`_' GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build: @@ -29,16 +30,6 @@ jobs: strategy: matrix: target: [chromium, firefox] - env: - WALLET_ENVIRONMENT: feature - TARGET_BROWSER: ${{ matrix.target }} - COINBASE_APP_ID: ${{ secrets.COINBASE_APP_ID }} - MOONPAY_API_KEY: ${{ secrets.MOONPAY_API_KEY }} - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY_STAGING }} - TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }} - PR_NUMBER: ${{ github.event.number }} - COMMIT_SHA: ${{ github.event.pull_request.head.sha }} steps: - uses: actions/checkout@v4 with: @@ -46,11 +37,20 @@ jobs: - uses: ./.github/actions/provision - - name: Add SHORT_SHA env property with commit short sha - run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV + - run: echo "SHORT_SHA=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_ENV - name: Build project run: yarn build + env: + WALLET_ENVIRONMENT: feature + TARGET_BROWSER: ${{ matrix.target }} + COINBASE_APP_ID: ${{ secrets.COINBASE_APP_ID }} + MOONPAY_API_KEY: ${{ secrets.MOONPAY_API_KEY }} + SENTRY_DSN: ${{ secrets.SENTRY_DSN }} + SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY_STAGING }} + TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }} + PR_NUMBER: ${{ github.event.number }} + COMMIT_SHA: ${{ env.SHORT_SHA }} - uses: actions/upload-artifact@v3 name: Upload ${{ matrix.target }} Extension Zip diff --git a/.github/workflows/create-version.yml b/.github/workflows/create-version.yml index 9e73f17dd29..731ec99fb2a 100644 --- a/.github/workflows/create-version.yml +++ b/.github/workflows/create-version.yml @@ -74,4 +74,5 @@ jobs: type: now from_branch: main target_branch: dev + message: 'chore: post-release merge back' github_token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }} diff --git a/package.json b/package.json index 6577d0a4277..72c7b88ebe6 100644 --- a/package.json +++ b/package.json @@ -239,7 +239,7 @@ "@babel/preset-typescript": "7.23.0", "@btckit/types": "0.0.19", "@ls-lint/ls-lint": "2.1.0", - "@pandacss/dev": "0.15.4", + "@pandacss/dev": "0.16.0", "@playwright/test": "1.38.1", "@pmmmwh/react-refresh-webpack-plugin": "0.5.11", "@redux-devtools/cli": "3.0.2", diff --git a/public/assets/base.css b/public/assets/base.css index 6b96383d423..e0e4f0ec10d 100644 --- a/public/assets/base.css +++ b/public/assets/base.css @@ -1,16 +1,3 @@ -/* - * Web Fonts from colophon-foundry.org - * - * The fonts included in this stylesheet are subject to the End User License you purchased - * from Colophon Foundry. The fonts are protected under domestic and international trademark and - * copyright law. You are prohibited from modifying, reverse engineering, duplicating, or - * distributing this font software. - * - * (c) 2023 Colophon Foundry - * - * Licenced to Trustmachines, -*/ - @font-face { font-family: 'Diatype'; src: url('/assets/fonts/diatype/diatype-regular.woff2') format('woff2'); @@ -55,208 +42,3 @@ font-weight: 400; font-style: normal; } - -html, -body { - -webkit-font-smoothing: antialiased; - font-size: 100%; - line-height: 1.15; - -webkit-text-size-adjust: 100%; -} - -html, -body { - font-family: 'Diatype', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, - 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -} - -body { - margin: 0; -} - -main { - display: block; -} - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -hr { - box-sizing: content-box; - height: 0; - overflow: visible; -} - -pre { - font-family: 'Fira Code', monospace; - font-size: 1em; -} - -code { - font-family: 'Fira Code', monospace; -} - -a { - background-color: transparent; -} - -abbr[title] { - border-bottom: none; - text-decoration: underline; - text-decoration: underline dotted; -} - -b, -strong { - font-weight: bolder; -} - -code, -kbd, -samp { - font-family: monospace, monospace; - font-size: 1em; -} - -small { - font-size: 80%; -} - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -img { - border-style: none; -} - -button, -input, -optgroup, -select, -textarea { - font-family: inherit; - font-size: 100%; - line-height: 1.15; - margin: 0; -} - -button, -input { - overflow: visible; -} - -button, -select { - text-transform: none; -} - -button, -[type='button'], -[type='reset'], -[type='submit'] { - -webkit-appearance: button; -} - -button::-moz-focus-inner, -[type='button']::-moz-focus-inner, -[type='reset']::-moz-focus-inner, -[type='submit']::-moz-focus-inner { - border-style: none; - padding: 0; -} - -button:-moz-focusring, -[type='button']:-moz-focusring, -[type='reset']:-moz-focusring, -[type='submit']:-moz-focusring { - outline: 1px dotted ButtonText; -} - -fieldset { - padding: 0.35em 0.75em 0.625em; -} - -legend { - box-sizing: border-box; - color: inherit; - display: table; - max-width: 100%; - padding: 0; - white-space: normal; -} - -progress { - vertical-align: baseline; -} - -textarea { - overflow: auto; -} - -[type='checkbox'], -[type='radio'] { - box-sizing: border-box; - padding: 0; -} - -[type='number']::-webkit-inner-spin-button, -[type='number']::-webkit-outer-spin-button { - -webkit-appearance: none; - height: auto; - margin: 0; -} - -[type='search'] { - -webkit-appearance: textfield; - outline-offset: -2px; -} - -[type='search']::-webkit-search-decoration { - -webkit-appearance: none; -} - -::-webkit-file-upload-button { - -webkit-appearance: button; - font: inherit; -} - -details { - display: block; -} - -summary { - display: list-item; -} - -template { - display: none; -} - -[hidden] { - display: none; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - font-family: 'Diatype', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, - sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -} diff --git a/public/assets/images/ledger/connect-ledger-error.png b/public/assets/images/ledger/connect-ledger-error.png deleted file mode 100644 index b503c4e1b90..00000000000 Binary files a/public/assets/images/ledger/connect-ledger-error.png and /dev/null differ diff --git a/public/html/debug.html b/public/html/debug.html index 27c05f4db2d..5670b484e77 100644 --- a/public/html/debug.html +++ b/public/html/debug.html @@ -1,4 +1,4 @@ - + diff --git a/public/html/devtool.html b/public/html/devtool.html index 5e8e3f694bb..9e92fec5a85 100644 --- a/public/html/devtool.html +++ b/public/html/devtool.html @@ -1,4 +1,4 @@ - + diff --git a/public/html/index.html b/public/html/index.html index 6d80d47dcdd..87b1295a388 100644 --- a/public/html/index.html +++ b/public/html/index.html @@ -1,4 +1,4 @@ - +