Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/ddw-881
Browse files Browse the repository at this point in the history
  • Loading branch information
szymonmaslowski committed Feb 3, 2022
2 parents 3a8ff36 + 1cb7177 commit 649c731
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ 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 (Go to Github Actions tab -> Select Chromatic workflow -> Run on your working branch)
- [ ] 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)
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
name: 'Chromatic'
on:
workflow_dispatch:
pull_request:
types:
- labeled
push:
branches:
- develop

jobs:
chromatic-deployment:
if: contains(github.event.pull_request.labels.*.name, 'run Chromatic')
runs-on: ubuntu-latest
env:
STORYBOOK_FREEZE_DATE: "true"
steps:
- uses: actions/checkout@v1
- name: Setup Node.js
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@

### Fixes

- Fixed behaviour of wallet settings option of the app menu ([PR 2838](https://github.com/input-output-hk/daedalus/pull/2838))
- Fixed behaviour of wallet settings option of the app menu ([PR 2838](https://github.com/input-output-hk/daedalus/pull/2838))
- Fixed available disk space takes a long time to show ([PR 2849](https://github.com/input-output-hk/daedalus/pull/2849))

### Chores

Expand Down
2 changes: 1 addition & 1 deletion source/renderer/app/i18n/locales/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@
"voting.votingRegistration.enterPinCode.step.continueButtonLabel": "続ける",
"voting.votingRegistration.enterPinCode.step.description": "Fund{nextVotingFundNumber}有権者登録のPINコードを入力してください。ここで設定したPINコードと、次のステップで表示されるQRコードは、スマートフォンでCatalyst Votingアプリを使用して投票するときに必要となります。",
"voting.votingRegistration.enterPinCode.step.enterPinCodeLabel": "PINコードを入力してください",
"voting.votingRegistration.enterPinCode.step.errors.invalidPinCode": "!!!Invalid PIN",
"voting.votingRegistration.enterPinCode.step.errors.invalidPinCode": "無効なPINコード",
"voting.votingRegistration.enterPinCode.step.errors.invalidRepeatPinCode": "PINコードが一致しません",
"voting.votingRegistration.enterPinCode.step.reminder": "<span>PINコードを忘れないでください。</span>PINを忘れると本登録で投票することができなくなり、登録手続きをやり直すことになります。",
"voting.votingRegistration.enterPinCode.step.repeatPinCodeLabel": "PINコードを再入力してください",
Expand Down
1 change: 1 addition & 0 deletions source/renderer/app/stores/NetworkStatusStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ export default class NetworkStatusStore extends Store {

// Setup disk space checks
getDiskSpaceStatusChannel.onReceive(this._onCheckDiskSpace);
this._checkDiskSpace();

this._getStateDirectoryPath();

Expand Down
5 changes: 1 addition & 4 deletions storybook/config.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import './monkeyPatchDateTime';
import React from 'react';
import { configure, addDecorator } from '@storybook/react';
import timemachine from 'timemachine';
import StoryWrapper from './stories/_support/StoryWrapper';
import '!style-loader!css-loader!sass-loader!../source/renderer/app/themes/index.global.scss'; // eslint-disable-line

Expand All @@ -13,6 +13,3 @@ function loadStories() {
}

configure(loadStories, module);
timemachine.config({
dateString: 'Sat, 01 Jan 2022 10:00:00 GMT',
});
9 changes: 9 additions & 0 deletions storybook/monkeyPatchDateTime.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// 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',
});
}
2 changes: 1 addition & 1 deletion storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ module.exports = async ({ config }) => {
rules: [
jsxRule,
{
test: /.tsx?$/,
test: /\.tsx?$/,
loader: 'babel-loader',
options: {
presets: [
Expand Down

0 comments on commit 649c731

Please sign in to comment.