Skip to content

Commit 9a6c79d

Browse files
author
Marcin Mazurek
committed
Merge remote-tracking branch 'origin/develop' into chore/ddw-940-update-faker
2 parents 2bb1ab7 + 00372b5 commit 9a6c79d

File tree

473 files changed

+5182
-3932
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

473 files changed

+5182
-3932
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"react/no-array-index-key": "warn",
7070
"react/no-unused-prop-types": "warn",
7171
"react/prefer-stateless-function": 0,
72-
"react/prop-types": "warn",
72+
"react/prop-types": 0,
7373
"react/require-default-props": 0,
7474
"react/jsx-first-prop-new-line": [1, "multiline-multiprop"],
7575
"@typescript-eslint/ban-ts-comment": 1,

.github/workflows/chromatic.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ jobs:
2828
token: ${{ secrets.GITHUB_TOKEN }}
2929
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
3030
exitZeroOnChanges: true
31+
buildScriptName: 'storybook:build:chromatic'
3132
- name: Publish to Chromatic and auto accept changes
3233
if: github.ref == 'refs/heads/develop'
3334
uses: chromaui/action@v1
3435
with:
3536
token: ${{ secrets.GITHUB_TOKEN }}
3637
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
3738
autoAcceptChanges: true
39+
buildScriptName: 'storybook:build:chromatic'

.github/workflows/linter.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/workflows/run_tests_on_pr.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/workflows/verify_pr.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Verify Pull Request
2+
on:
3+
pull_request:
4+
jobs:
5+
tests:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- name: Checkout Repo
9+
uses: actions/checkout@v2
10+
- name: Setup Node.js
11+
uses: actions/setup-node@v2
12+
with:
13+
node-version: "14"
14+
- name: Restore node_modules from cache
15+
uses: actions/cache@v2
16+
with:
17+
path: '**/node_modules'
18+
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
19+
- name: Install dependencies
20+
run: yarn --frozen-lockfile
21+
- name: Run checks
22+
run: yarn check:all
23+
- name: Ensure there are no uncommited changes
24+
run: git diff --exit-code || (echo "Did you forget to run 'yarn check:all' and commit changes?" && exit 1)
25+
- name: Run tests
26+
run: yarn test:jest --maxWorkers=3

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,6 @@ Debug
119119
/cardano-cli
120120
/cardano-wallet
121121
.vscode
122+
123+
# Typescript
124+
*.scss.d.ts

BESTPRACTICES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ type Props = {
11081108
};
11091109
```
11101110

1111-
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.
1111+
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.
11121112

11131113
:white_check_mark: ***Do***
11141114

@@ -1204,7 +1204,7 @@ const Names = () => (<div>
12041204
## Formatting Selectors
12051205

12061206
* Use class selectors instead of ID selectors.
1207-
* Use camelCase or dashed-case instead of PascelCase or names_with_underscores.
1207+
* Use camel case or dashed-case instead of pascal case or names_with_underscores.
12081208
* Give each selector its own line.
12091209
* Put a space before the opening brace `{` in rule declarations.
12101210
* Put closing braces `}` of rule declarations on a new line.

CHANGELOG.md

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,46 @@
44

55
### Features
66

7+
- Improved RTS flags splash screen message ([PR 2901](https://github.com/input-output-hk/daedalus/pull/2901))
8+
- 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))
9+
10+
### Fixes
11+
12+
- Restored opacity for search icon when focused ([PR 2909](https://github.com/input-output-hk/daedalus/pull/2909))
13+
- Fixed styling of the incentivized testnet rewards wallet dropdown ([PR 2907](https://github.com/input-output-hk/daedalus/pull/2907))
14+
- Fix warning sign displayed when recommend decimals is zero ([PR 2905](https://github.com/input-output-hk/daedalus/pull/2905))
15+
- Fixed discrete tooltip being clipped by loading overlay when stake pools are adjusted ([PR 2902](https://github.com/input-output-hk/daedalus/pull/2902))
16+
- Sets minimum transaction fee to ada input field when tokens are removed ([PR 2918](https://github.com/input-output-hk/daedalus/pull/2918))
17+
18+
### Chores
19+
20+
- Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915))
21+
- Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
22+
- Enabled debugging of the main process ([PR 2893](https://github.com/input-output-hk/daedalus/pull/2893))
23+
24+
## 4.9.0
25+
26+
### Features
27+
28+
- Added display of current/unspent rewards ([PR 2803](https://github.com/input-output-hk/daedalus/pull/2803))
29+
- Improve the syncing screen by showing syncing progress split into three stages ([PR 2877](https://github.com/input-output-hk/daedalus/pull/2877))
30+
- Improved stake pool searchbar ([PR 2847](https://github.com/input-output-hk/daedalus/pull/2847))
31+
- Implemented catalyst dynamic content ([PR 2856](https://github.com/input-output-hk/daedalus/pull/2856))
32+
33+
### Fixes
34+
35+
- Fixed main container zIndex ([PR 2863](https://github.com/input-output-hk/daedalus/pull/2863))
36+
- Fixed ui overlap issues ([PR 2881](https://github.com/input-output-hk/daedalus/pull/2881))
37+
- Fixed the gap between Stake Pool View options ([PR 2899](https://github.com/input-output-hk/daedalus/pull/2899))
38+
39+
### Chores
40+
41+
- Fixed Daedalus menu in Storybook used for theme and language selection ([PR 2886](https://github.com/input-output-hk/daedalus/pull/2886))
42+
43+
## 4.9.0-FC1
44+
45+
### Features
46+
747
- Added table view for delegated stake pools list ([PR 2837](https://github.com/input-output-hk/daedalus/pull/2837))
848
- Removed Discreet mode notification ([PR 2852](https://github.com/input-output-hk/daedalus/pull/2852))
949
- Unified CPU info in diagnostics dialog ([PR 2818](https://github.com/input-output-hk/daedalus/pull/2818))
@@ -13,10 +53,11 @@
1353

1454
### Fixes
1555

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

2263
- Migrated codebase from javascript to typescript ([PR 2843](https://github.com/input-output-hk/daedalus/pull/2843))
@@ -54,7 +95,6 @@
5495

5596
### Fixes
5697

57-
- Fixed styling of the incentivized testnet rewards wallet dropdown ([PR 2816](https://github.com/input-output-hk/daedalus/pull/2816/files))
5898
- Fixed blockchain verification progress text ([PR 2840](https://github.com/input-output-hk/daedalus/pull/2840))
5999

60100
## 4.7.0
@@ -65,10 +105,12 @@
65105

66106
### Fixes
67107

108+
- Fixed immediate language updates of application top menu bar ([PR 2813](https://github.com/input-output-hk/daedalus/pull/2813))
68109
- Fixed receiver address validation by disallowing rewards addresses ([PR 2781](https://github.com/input-output-hk/daedalus/pull/2781))
69110

70111
### Chores
71112

113+
- Integrated Chromatic for visual regression testing ([PR 2776](https://github.com/input-output-hk/daedalus/pull/2776))
72114
- Updated `trezor-connect` dependency to version `8.2.4` ([PR 2726](https://github.com/input-output-hk/daedalus/pull/2726))
73115
- Updated vulnerable dependencies ([PR 2769](https://github.com/input-output-hk/daedalus/pull/2769))
74116
- Updated CWB and Cardano Node ([PR 2799](https://github.com/input-output-hk/daedalus/pull/2799))

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,15 @@ Make sure to list bootstrap in externals in `webpack.config.base.js` or the app
194194
externals: ['bootstrap']
195195
```
196196

197+
### Debugging
198+
199+
You can debug the main process by following one of these approaches:
200+
- [VSCode](https://code.visualstudio.com/docs/nodejs/nodejs-debugging#_attaching-to-nodejs)
201+
- [Chrome](https://nodejs.org/en/docs/guides/debugging-getting-started/#inspector-clients)
202+
- [IntelliJ](https://www.jetbrains.com/help/idea/run-debug-configuration-node-js-remote-debug.html)
203+
204+
The inspector runs on port 9229
205+
197206
## Testing
198207

199208
You can find more details regarding tests setup within

default.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ let
4040
inherit (pkgs.lib) optionalString optional concatStringsSep;
4141
inherit (pkgs) writeTextFile;
4242
crossSystem = lib: (crossSystemTable lib).${target} or null;
43-
# TODO, nsis cant cross-compile with the nixpkgs daedalus currently uses
43+
# TODO, nsis can't cross-compile with the nixpkgs daedalus currently uses
4444
nsisNixPkgs = import localLib.sources.nixpkgs-nsis {};
4545
installPath = ".daedalus";
4646
needSignedBinaries = (signingKeys != null) || (HSMServer != null);
@@ -319,8 +319,6 @@ let
319319
electron = pkgs.callPackage ./installers/nix/electron.nix {};
320320

321321
tests = {
322-
runTsc = self.callPackage ./tests/tsc.nix {};
323-
runLint = self.callPackage ./tests/lint.nix {};
324322
runShellcheck = self.callPackage ./tests/shellcheck.nix { src = ./.;};
325323
};
326324
nix-bundle = import sources.nix-bundle { nixpkgs = pkgs; };

0 commit comments

Comments
 (0)