Skip to content

Commit

Permalink
Merge branch develop into chore/ddw-596-webpack-5-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
DominikGuzei committed Mar 24, 2022
2 parents 2df8fc7 + 3ef535d commit 6beb2b8
Show file tree
Hide file tree
Showing 672 changed files with 15,020 additions and 7,324 deletions.
36 changes: 18 additions & 18 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -67,33 +67,24 @@
"react/no-array-index-key": "warn",
"react/no-unused-prop-types": "warn",
"react/prefer-stateless-function": 0,
"react/prop-types": "warn",
"react/prop-types": 0,
"react/require-default-props": 0,
"react/sort-comp": 0,
"react/state-in-constructor": 0,
"react/jsx-first-prop-new-line": [1, "multiline-multiprop"],
"@typescript-eslint/ban-ts-comment": 1,
"@typescript-eslint/no-empty-function": 1,
"@typescript-eslint/ban-types": 1,
"import/no-unresolved": 1,
"@typescript-eslint/no-var-requires": 1,
"camelcase": 1,
"no-empty": 1,
"no-empty": 1,
"@typescript-eslint/no-explicit-any": 1,
"no-shadow": 1,
"react/no-did-update-set-state": 1,
"react/static-property-placement": 0,
"react/jsx-one-expression-per-line": 0,
"react/jsx-curly-newline": 0,
"react/jsx-indent": 0
"react/sort-comp": 0,
"react/state-in-constructor": 0,
"react/static-property-placement": 0
},
"plugins": [
"@typescript-eslint",
"import",
"promise",
"react",
"jest"
],
"plugins": ["@typescript-eslint", "import", "promise", "react", "jest"],
"globals": {
"API": true,
"API_VERSION": true,
Expand All @@ -103,10 +94,19 @@
"Process": true // TODO: remove after fix
},
"settings": {
"import/resolver": {
"import/resolver": {
"node": {
"extensions": [".js", ".jsx",".ts", ".tsx"]
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
}
},
"overrides": [
{
"files": "**/*.ts",
"rules": {
"no-useless-constructor": "off",
"@typescript-eslint/no-useless-constructor": "error"
}
}
}
]
}
14 changes: 9 additions & 5 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ or animated GIFs of important UI changes in both English and Japanese.
Do not use shadow or any effects. On macOS this can be accomplished the following way:
1. Use the Command+Shift+4 keyboard shortcut.
2. Press the Spacebar.
3. Hold the Option button and click the window you want to capture.
3. Hold the Option button and click the window you want to capture.
-->

## Testing Checklist
Expand All @@ -29,7 +29,6 @@ Do not use shadow or any effects. On macOS this can be accomplished the followin
Open a thread on #daedalus-qa on Slack, mention `@daedalusqa` and `@daedalusteam`, link the thread below
-->


- [Slack QA thread](https://input-output-rnd.slack.com/messages/GGKFXSKC6)
- [ ] Test

Expand All @@ -38,33 +37,38 @@ Open a thread on #daedalus-qa on Slack, mention `@daedalusqa` and `@daedalusteam
## Review Checklist

### Basics
- [ ] PR assigned to the PR author(s)

- [ ] 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)
- [ ] PR has a good description that summarizes all changes
- [ ] PR contains screenshots (in case of UI changes)
- [ ] CHANGELOG entry has been added to the top of the appropriate section (*Features*, *Fixes*, *Chores*) and is linked to the correct PR on GitHub
- [ ] CHANGELOG entry has been added to the top of the appropriate section (_Features_, _Fixes_, _Chores_) and is linked to the correct PR on GitHub
- [ ] There are no missing translations (running `yarn manage:translations` produces no changes)
- [ ] Text changes are proofread and approved (Jane Wild / Amy Reeve)
- [ ] Japanese text changes are proofread and approved (Junko Oda)
- [ ] Storybook works and no stories are broken (`yarn storybook`)
- [ ] In case of dependency changes `yarn.lock` file is updated

### Code Quality

- [ ] Important parts of the code are properly commented and documented
- [ ] Code is properly typed with flow
- [ ] Code is properly typed with typescript types
- [ ] React components are split-up enough to avoid unnecessary re-renderings
- [ ] Any code that only works in main process is neatly separated from components

### Testing

- [ ] New feature/change is covered by acceptance tests
- [ ] New feature/change is manually tested and approved by QA team
- [ ] All existing acceptance tests are still up-to-date
- [ ] New feature/change is covered by Daedalus Testing scenario
- [ ] All existing Daedalus Testing scenarios are still up-to-date

### After Review

- [ ] Update Slack QA thread by marking it with a green checkmark
14 changes: 13 additions & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
name: 'Chromatic'
on: push
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
Expand All @@ -18,10 +28,12 @@ jobs:
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'
18 changes: 0 additions & 18 deletions .github/workflows/run_tests_on_pr.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/verify_pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Verify Pull Request
on:
pull_request:
jobs:
tests:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: "14"
- name: Restore node_modules from cache
uses: actions/cache@v2
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
- name: Install dependencies
run: yarn --frozen-lockfile
- name: Run checks
run: yarn check:all
- name: Ensure there are no uncommited changes
run: git diff --exit-code || (echo "Did you forget to run 'yarn check:all' and commit changes?" && exit 1)
- name: Run tests
run: yarn test:jest --maxWorkers=3
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,6 @@ Debug
/cardano-cli
/cardano-wallet
.vscode

# Typescript
*.scss.d.ts
4 changes: 2 additions & 2 deletions BESTPRACTICES.md
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@ type Props = {
};
```

For preventing syntax errors, leave a comma after the last key/value pair incase the type definition's properties are rearranged or expanded upon in the future.
For preventing syntax errors, leave a comma after the last key/value pair in case the type definition's properties are rearranged or expanded upon in the future.

:white_check_mark: ***Do***

Expand Down Expand Up @@ -1204,7 +1204,7 @@ const Names = () => (<div>
## Formatting Selectors

* Use class selectors instead of ID selectors.
* Use camelCase or dashed-case instead of PascelCase or names_with_underscores.
* Use camel case or dashed-case instead of pascal case or names_with_underscores.
* Give each selector its own line.
* Put a space before the opening brace `{` in rule declarations.
* Put closing braces `}` of rule declarations on a new line.
Expand Down
104 changes: 104 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,110 @@

## vNext

### Features

- Added ASCII name to token header when metadata name is missing ([PR 2904](https://github.com/input-output-hk/daedalus/pull/2904))
- Improved IPC by reducing the amount of messages from periodic events ([PR 2892](https://github.com/input-output-hk/daedalus/pull/2892))
- Improved RTS flags splash screen message ([PR 2901](https://github.com/input-output-hk/daedalus/pull/2901))
- Implemented error message when trying to leave wallet without enough ada to support tokens ([PR 2783](https://github.com/input-output-hk/daedalus/pull/2783))

### Fixes

- Fixed stake pool list view overlapping news feed ([PR 2917](https://github.com/input-output-hk/daedalus/pull/2917))
- Restored opacity for search icon when focused ([PR 2909](https://github.com/input-output-hk/daedalus/pull/2909))
- Fixed styling of the incentivized testnet rewards wallet dropdown ([PR 2907](https://github.com/input-output-hk/daedalus/pull/2907))
- Fix warning sign displayed when recommend decimals is zero ([PR 2905](https://github.com/input-output-hk/daedalus/pull/2905))
- Fixed discrete tooltip being clipped by loading overlay when stake pools are adjusted ([PR 2902](https://github.com/input-output-hk/daedalus/pull/2902))
- Sets minimum transaction fee to ada input field when tokens are removed ([PR 2918](https://github.com/input-output-hk/daedalus/pull/2918))

### Chores

- Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915))
- Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
- Enabled debugging of the main process ([PR 2893](https://github.com/input-output-hk/daedalus/pull/2893))

## 4.9.0

### Features

- Added display of current/unspent rewards ([PR 2803](https://github.com/input-output-hk/daedalus/pull/2803))
- Improve the syncing screen by showing syncing progress split into three stages ([PR 2877](https://github.com/input-output-hk/daedalus/pull/2877))
- Improved stake pool searchbar ([PR 2847](https://github.com/input-output-hk/daedalus/pull/2847))
- Implemented catalyst dynamic content ([PR 2856](https://github.com/input-output-hk/daedalus/pull/2856))

### Fixes

- Fixed main container zIndex ([PR 2863](https://github.com/input-output-hk/daedalus/pull/2863))
- Fixed ui overlap issues ([PR 2881](https://github.com/input-output-hk/daedalus/pull/2881))
- Fixed the gap between Stake Pool View options ([PR 2899](https://github.com/input-output-hk/daedalus/pull/2899))

### Chores

- Fixed Daedalus menu in Storybook used for theme and language selection ([PR 2886](https://github.com/input-output-hk/daedalus/pull/2886))

## 4.9.0-FC1

### Features

- Added table view for delegated stake pools list ([PR 2837](https://github.com/input-output-hk/daedalus/pull/2837))
- Removed Discreet mode notification ([PR 2852](https://github.com/input-output-hk/daedalus/pull/2852))
- Unified CPU info in diagnostics dialog ([PR 2818](https://github.com/input-output-hk/daedalus/pull/2818))
- Implemented wallet sorting on sidebar menu ([PR 2775](https://github.com/input-output-hk/daedalus/pull/2775))
- Implemented new token picker ([PR 2787](https://github.com/input-output-hk/daedalus/pull/2787))
- Improved wallet send form ([PR 2791](https://github.com/input-output-hk/daedalus/pull/2791), [PR 2859](https://github.com/input-output-hk/daedalus/pull/2859))

### Fixes

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

### Chores

- Migrated codebase from javascript to typescript ([PR 2843](https://github.com/input-output-hk/daedalus/pull/2843))
- Updated the list of team members ([PR 2805](https://github.com/input-output-hk/daedalus/pull/2805))

## 4.8.0

### Features

- Added dynamic RTS flags setting ([PR 2758](https://github.com/input-output-hk/daedalus/pull/2758/files))
- Improved UI/UX of RTS flags settings ([PR 2842](https://github.com/input-output-hk/daedalus/pull/2842), [PR 2846](https://github.com/input-output-hk/daedalus/pull/2846))
- Updated messages about Cardano node sync on the initial screen ([PR 2827](https://github.com/input-output-hk/daedalus/pull/2827), [PR 2831](https://github.com/input-output-hk/daedalus/pull/2831))

### Chores

- Updated check-disk-space version ([PR 2845](https://github.com/input-output-hk/daedalus/pull/2845))
- Updated CWB and Cardano Node ([PR 2822](https://github.com/input-output-hk/daedalus/pull/2822))

### Fixes

- Fixed blockchain verification progress text ([PR 2840](https://github.com/input-output-hk/daedalus/pull/2840))

## 4.8.0-FC1

### Features

- Added dynamic RTS flags setting ([PR 2758](https://github.com/input-output-hk/daedalus/pull/2758/files))
- Improved UI/UX of RTS flags settings ([PR 2842](https://github.com/input-output-hk/daedalus/pull/2842), [PR 2846](https://github.com/input-output-hk/daedalus/pull/2846))
- Updated messages about Cardano node sync on the initial screen ([PR 2827](https://github.com/input-output-hk/daedalus/pull/2827), [PR 2831](https://github.com/input-output-hk/daedalus/pull/2831))

### Chores

- Updated check-disk-space version ([PR 2845](https://github.com/input-output-hk/daedalus/pull/2845))
- Updated CWB and Cardano Node ([PR 2822](https://github.com/input-output-hk/daedalus/pull/2822))

### Fixes

- Fixed blockchain verification progress text ([PR 2840](https://github.com/input-output-hk/daedalus/pull/2840))

## 4.7.0

### Features

- Updated Catalyst dates ([PR 2812](https://github.com/input-output-hk/daedalus/pull/2812))

### Fixes

- Fixed immediate language updates of application top menu bar ([PR 2813](https://github.com/input-output-hk/daedalus/pull/2813))
Expand Down
Loading

0 comments on commit 6beb2b8

Please sign in to comment.