diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a91508a26b..eb60c469db 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -41,7 +41,6 @@ Open a thread on #daedalus-qa on Slack, mention `@daedalusqa` and `@daedalusteam - [ ] PR assigned to the PR author(s) - [ ] `input-output-hk/daedalus-dev` and `input-output-hk/daedalus-qa` assigned as PR reviewers - [ ] If there are UI changes, Alexander Rukin assigned as an additional reviewer -- [ ] All visual regression testing has been reviewed (assign `run Chromatic` label to PR to trigger the run) - [ ] PR has appropriate labels (`release-vNext`, `feature`/`bug`/`chore`, `WIP`) - [ ] PR link is added to a Jira ticket, ticket moved to In Review - [ ] PR is updated to the most recent version of the target branch (and there are no conflicts) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml deleted file mode 100644 index fc5a939007..0000000000 --- a/.github/workflows/chromatic.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: 'Chromatic' -on: - pull_request: - types: - - labeled - push: - branches: - - develop - -jobs: - chromatic-deployment: - if: contains(github.event.pull_request.labels.*.name, 'run Chromatic') || github.ref == 'refs/heads/develop' - runs-on: ubuntu-latest - env: - STORYBOOK_FREEZE_DATE: "true" - steps: - - uses: actions/checkout@v1 - - name: Setup Node.js - uses: actions/setup-node@v2 - with: - node-version: "16" - - name: Install dependencies - run: yarn - - name: Publish to Chromatic - if: github.ref != 'refs/heads/develop' - uses: chromaui/action@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} - exitZeroOnChanges: true - buildScriptName: 'storybook:build:chromatic' - - name: Publish to Chromatic and auto accept changes - if: github.ref == 'refs/heads/develop' - uses: chromaui/action@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} - autoAcceptChanges: true - buildScriptName: 'storybook:build:chromatic' diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c6bf2046a..3fbf0fd9af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ### Chores +- Removed Chromatic from project ([PR 3126](https://github.com/input-output-hk/daedalus/pull/3126)) - Upgraded Electron to 24.2, and Node.js to 18.× ([PR 3124](https://github.com/input-output-hk/daedalus/pull/3124)) - Defined a proxy for currency conversions ([PR 3121](https://github.com/input-output-hk/daedalus/pull/3121)) - Switched Daedalus to be built with Nix flakes ([PR 3008](https://github.com/input-output-hk/daedalus/pull/3008)) diff --git a/package.json b/package.json index 617c43c020..77d930f3d7 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "i18n:manage": "yarn i18n:extract && yarn i18n:check", "storybook": "start-storybook -p 6006 -c storybook --ci /", "storybook:build": "build-storybook -c storybook -o dist/storybook", - "storybook:build:chromatic": "build-storybook -c storybook", "themes:check:createTheme": "gulp build:themes && yarn node-swc ./dist/scripts/check.js", "themes:update": "gulp build:themes && yarn node-swc ./dist/scripts/update.js && yarn prettier --loglevel warn --write source/renderer/app/themes/daedalus/*.ts", "themes:copy": "yarn node-swc source/renderer/app/themes/utils/copyTheme.ts && yarn prettier --loglevel warn --write source/renderer/app/themes/daedalus/*.ts", diff --git a/source/renderer/app/components/loading/syncing-connecting/LogosDisplay.tsx b/source/renderer/app/components/loading/syncing-connecting/LogosDisplay.tsx index 8394f7b424..9882eb87ba 100644 --- a/source/renderer/app/components/loading/syncing-connecting/LogosDisplay.tsx +++ b/source/renderer/app/components/loading/syncing-connecting/LogosDisplay.tsx @@ -46,7 +46,7 @@ export default class LogosDisplay extends Component { return (
-
+
diff --git a/storybook/monkeyPatchDateTime.ts b/storybook/monkeyPatchDateTime.ts deleted file mode 100644 index cc22b35948..0000000000 --- a/storybook/monkeyPatchDateTime.ts +++ /dev/null @@ -1,9 +0,0 @@ -// freezing the date is required for producing consistent snapshots -// for visual regression testing with Chromatic -if (process.env.STORYBOOK_FREEZE_DATE === 'true') { - const timemachine = require('timemachine'); - - timemachine.config({ - dateString: 'Sat, 01 Jan 2022 10:00:00 GMT', - }); -} diff --git a/storybook/stories/settings/general/General.stories.tsx b/storybook/stories/settings/general/General.stories.tsx index 38a11ae2e5..f39b7849cc 100644 --- a/storybook/stories/settings/general/General.stories.tsx +++ b/storybook/stories/settings/general/General.stories.tsx @@ -37,6 +37,8 @@ const getParamName = (obj, itemName): any => Object.entries(obj).find((entry: [any, any]) => itemName === entry[1]); /* eslint-disable consistent-return */ +// @ts-ignore +// @ts-ignore storiesOf('Settings / General', module) .addDecorator(SettingsWrapper) // ====== Stories ====== .add( @@ -99,6 +101,7 @@ storiesOf('Settings / General', module) }} /> )) + // @ts-ignore ts-migrate(2345) .add('Terms of Service', (_, props) => { const termsOfUseSource = require(`../../../../source/renderer/app/i18n/locales/terms-of-use/${props.locale}.md`);