Skip to content

Commit

Permalink
Merge pull request #5176 from leather-wallet/release/abhorrent-evanes…
Browse files Browse the repository at this point in the history
…cent-giraffe

Release - Finally Centered the div
  • Loading branch information
pete-watters authored Apr 10, 2024
2 parents 69b1cbb + 868ee71 commit 034e7dc
Show file tree
Hide file tree
Showing 488 changed files with 9,001 additions and 7,856 deletions.
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2
updates:
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'weekly'

- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'daily'
groups:
leather:
applies-to: version-updates
patterns:
- '@leather-wallet/*'
16 changes: 5 additions & 11 deletions .github/workflows/build-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,17 @@ name: PR extension build

on: [pull_request, workflow_dispatch]

jobs:
pre-run:
runs-on: ubuntu-latest
steps:
- name: Cancel previous runs
uses: styfle/cancel-workflow-action@main
with:
access_token: ${{ github.token }}
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
sha-hash:
runs-on: ubuntu-latest
outputs:
SHORT_SHA: ${{ steps.short-sha.outputs.SHORT_SHA }}
steps:
- run: echo "${{ github.workflow }}-${{ github.ref }}"
- name: Make short commit SHA
id: short-sha
run: echo "SHORT_SHA=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_OUTPUT
Expand All @@ -24,7 +21,6 @@ jobs:
if: github.repository == 'leather-wallet/extension' && github.actor != 'dependabot[bot]'
runs-on: ubuntu-latest
needs:
- pre-run
- sha-hash
steps:
- uses: kyranjamie/[email protected]
Expand All @@ -36,7 +32,6 @@ jobs:
name: build-${{ matrix.target }}-extension
runs-on: ubuntu-latest
needs:
- pre-run
- sha-hash
strategy:
matrix:
Expand Down Expand Up @@ -73,7 +68,6 @@ jobs:
if: github.repository == 'leather-wallet/extension' && github.actor != 'dependabot[bot]'
runs-on: ubuntu-latest
needs:
- pre-run
- sha-hash
- build
steps:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ on:
branches:
- dev

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: Shard ${{ matrix.shardIndex }} of ${{ matrix.shardTotal }}
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/publish-extensions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ env:
IS_PUBLISHING: true

jobs:
pre-run:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@main
with:
access_token: ${{ github.token }}

extract-version:
runs-on: ubuntu-latest
outputs:
Expand All @@ -44,7 +36,6 @@ jobs:
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/v')
needs:
- pre-run
- extract-version
outputs:
publish_status: ${{ steps.publish-chrome.outputs.publish_status }}
Expand Down Expand Up @@ -89,7 +80,6 @@ jobs:
env:
TARGET_BROWSER: firefox
needs:
- pre-run
- extract-version
outputs:
publish_status: ${{ steps.publish-firefox.outputs.publish_status }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
push:
branches:
- 'dev'
- dev

permissions:
contents: read
Expand All @@ -13,7 +13,7 @@ permissions:

concurrency:
group: 'storybook-deploy'
cancel-in-progress: false
cancel-in-progress: true

jobs:
deploy:
Expand Down
6 changes: 6 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ const config: StorybookConfig = {
},
],
},

{
test: /\.(ts|tsx)$/,
loader: 'esbuild-loader',
options: { tsconfig: './tsconfig.json', target: 'es2020' },
},
],
},
},
Expand Down
7 changes: 7 additions & 0 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Preview } from '@storybook/react';

import '../src/app/index.css';
import { customViewports } from './viewports';

const preview: Preview = {
parameters: {
Expand All @@ -24,6 +25,12 @@ const preview: Preview = {
date: /Date$/i,
},
},
viewport: {
viewports: {
...customViewports,
},
},
toc: true,
},
};

Expand Down
46 changes: 46 additions & 0 deletions .storybook/viewports.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { breakpoints, tokens } from '@leather-wallet/tokens';

export const customViewports = {
popup: {
name: 'Popup',
styles: {
width: tokens.sizes.popupWidth.value,
height: tokens.sizes.popupHeight.value,
},
},
sm: {
name: 'sm',
styles: {
width: breakpoints.sm,
height: '100%',
},
},
md: {
name: 'md',
styles: {
width: breakpoints.md,
height: '100%',
},
},
lg: {
name: 'lg',
styles: {
width: breakpoints.lg,
height: '100%',
},
},
xl: {
name: 'xl',
styles: {
width: breakpoints.xl,
height: '100%',
},
},
'2xl': {
name: '2xl',
styles: {
width: breakpoints['2xl'],
height: '100%',
},
},
};
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ pnpm playwright install --with-deps

Note that the installed browsers are tied to the version of Playwright being used, and it may be necessary to run the above command again in some situations, such as when upgrading Playwright or switching branches. [Read the documentation for more information](https://playwright.dev/docs/cli#install-system-dependencies).

### Integration tests

All integration tests can be run using:

```bash
Expand All @@ -79,6 +77,14 @@ pnpm playwright test specs/TEST.spec.ts
pnpm playwright test tests/specs --shard=3/8
```

To get more information when running tests you can pass the `--debug` flag or the `--ui` flag to playwright.

When running tests locally you must add the following to your `.env` file:

```
WALLET_ENVIRONMENT=testing
```

### Unit tests

Unit tests can be run with vitest using:
Expand Down
13 changes: 12 additions & 1 deletion config/wallet-config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
{
"$schema": "./wallet-config.schema.json",
"messages": {
"global": []
"global": [
{
"chainTarget": "all",
"dismissible": true,
"id": "user-survey-announcement",
"publishedAt": "2024-04-03T12:55:46",
"text": "We want to hear what you think about Leather.",
"learnMoreText": "Take our user survey →",
"learnMoreUrl": "https://blocksurvey.io/leather-wallet-user-survey-YWvSDeY2RU2mBtmuG2sbwA",
"purpose": "info"
}
]
},
"activeFiatProviders": {
"coinbase": {
Expand Down
Loading

0 comments on commit 034e7dc

Please sign in to comment.