Skip to content

Commit 81fdcfd

Browse files
mchappelldanielmainDominikGuzeinikolaglumactomislavhoracek
authored
Merge release/4.8.0 into master (#2858)
* Added jest and couple of unit tests for DDW-706 * Applied code review suggestions * Fixed wrong dependencies * Added a new test and a default config file * unicode-property pump * [DDW-706] Move new jest specs into tests folder * [DDW-706] Add Github action workflow for jest tests * Fix build issues * [DDW-706] Use supported node version in Github actions * [DDW-706] fix github action node version * Fix yarn.lock * Fix CI issues * Fix CI issues * downgrade to jest 26 * fix lockfile * Testing adding the conflict dependency as primary * Downgrade of istanbul-lib-report * [DDW-735] Merge and gix conflicts * [DDW-735] Merge and fix conflicts * [DDW-779] Update trezor-connect to the latest version 8.2.2-rc.1-multisig * [DDW-779] Add util-deprecate to yarn2nix * [DDW-815] Fix broken Ledger support on Linux (#2741) * fix yarn dev on linux * fix ledger on linux * [DDW-815] Adds CHANGELOG entery * fix windows builds * remove LD_PRELOAD to make the code more stable Co-authored-by: Nikola Glumac <[email protected]> * Fix wallet restore dialog and continue disable check (#2745) * Fix walleFix wallet restore dialog and continue disable check * Updated CHANGELOG Co-authored-by: Nikola Glumac <[email protected]> * Updated CHANGELOG.md * Change istanbul-lib-report resolution to 3.0.0 * Revert "Change istanbul-lib-report resolution to 3.0.0" This reverts commit 9f63133. * Reverted bump * Reverted bump * [DDW-779] Update trezor-connect to the 8.2.3-beta.3 version * [DDW-779] Remove hd-wallet from yarn2nix * [DDW-779] Update yarn.lock * [DDW-779] Remove hw-wallet from MacInstaller * [DDW-779] Remove merkle-lib from MacInstaller * [DDW-779] Remove multiple sub-dependencies from MacInstaller * [DDW-779] Remove secp256k1 from yarn2nix * [DDW-779] Replace secp256k1 with tiny-secp256k1 in yarn2nix * Merges release/4.5.1 into release/4.5.0 * Fixes CHANGELOG link * [DDW-779] Remove tiny-secp256k1 from yarn2nix * [DDW-779] Add bech32 to yarn2nix * [DDW-779] Add blake-hash to yarn2nix * [DDW-779] Add blake-hash to MacInstaller * [DDW-779] Add tiny-secp256k1 to MacInstaller * [DDW-779] Add bn.js to MacInstaller * [DDW-779] Add elliptic to MacInstaller * [DDW-779] Add minimalistic-assert to MacInstaller * [DDW-779] Add minimalistic-crypto-utils to MacInstaller * [DDW-779] Add minimalistic-crypto-utils to MacInstaller * [DDW-779] Add brorand to MacInstaller * [DDW-779] Add hash.js and hmac-drbg to MacInstaller * [DDW-779] Add int64-buffer to MacInstaller * [DDW-771] Add apache license to npm package * [DDW-771] Remove apache license from package.json again * [DDW-771] refactor to multi-line template literals * [DDW-811] Normalize checkbox tick offset * [DDW-824] Introduce a fix for app update on specific platform * [DDW-824] Improve faked data loading * [DDW-824] CHANGELOG update * [DDW-824] Remove unnecessary comment * fix linux build * [DDW-847] Bump CWB to v2021-11-11 * [DDW-847] CHANGELOG update * [DDW-683] Adjusted slider onAfterChange * [DDW-683] Updated CHANGELOG * [DDW-683] Converted component from class to functional * Removed unstable rts flags * [DDW-824] Restrict FAKED news QA loader to DEV mode only * [DDW-785] Discreet mode - Create the Discreet Mode variables * [DDW-738] Setup feature-driven design Co-authored-by: Lucas <[email protected]> Co-authored-by: Dominik Guzei <[email protected]> * [DDW-813] Move discreet mode behavior to its own feature * [DDW-738] Fix circular dependency * [DDW-786] Discreet mode - Create the TopBar icon (#2725) * [DDW-786] Added discreet mode toggle component * [DDW-789] Remove specific styles from component * [DDW-789] Fix translations * [DDW-789] CHANGELOG * [DDW-789] Fix eslint issue * [DDW-789] Remove popover theme variables * [DDW-789] Increase height for hide icon * [DDW-789] Remove style * [DDW-789] Rearrange icons to group by action or info * [DDW-786] Add japanese translations * [DDW-786] Rearrange icons order * [DDW-786] Add opacity * [DDW-786] Add isDiscreetMode control to story * [DDW-786] Fix gap width * [DDW-786] Fix default message * [DDW-786] Update to use mobx feature pattern * [DDW-786] Fix style * [DDW-738] Move toggle component to discreet mode feature folder * [DDW-738] Update translations file * [DDW-738] Remove popOver from DiscreetToggle * [DDW-814] Discreet mode - hide sensitive information (#2742) * [DDW-814] Fix React Dev Tools installation * [DDW-814] Hide sensitive values * [DDW-814] Setup storybook * [DDW-814] Localstorage factory * [DDW-814] Hide token amount for decimal config * [DDW-814] Refactor discreet mode ui components * [DDW-814] Directly use discreet mode feature in toggle * [DDW-814] Introduce configurable replacer pattern * [DDW-814] Create LocalStorageFeatureProvider * [DDW-814] Fix flow * [DDW-814] Fix topbar * [DDW-814] React to state changes on WalletUTXO description * [DDW-814] Preseve Stake pools ranking slider value * [DDW-814] Hide filter input * [DDW-814] Prevent stake pools from refreshing * [DDW-814] Update README * [DDW-814] Hide wallets dropdown in discreet mode * [DDW-814] Disable All transactions button on Filter dialog * [DDW-814] Rename DiscreetToggle component * [DDW-814] Add unit tests for discreet replacers * [DDW-814] Cleanup minor issues * [DDW-814] Fix prettier * [DDW-814] Revert istanbul * [DDW-814] Fix flow errors * [DDW-814] Add discreet toggle mode knob Co-authored-by: Dominik Guzei <[email protected]> * [DDW-787] Discreet mode - Implement the Settings option (#2740) * [DDW-785] Discreet mode - Create the Discreet Mode variables * [DDW-786] Discreet mode - Create the TopBar icon (#2725) * [DDW-786] Added discreet mode toggle component * [DDW-789] Remove specific styles from component * [DDW-789] Fix translations * [DDW-789] CHANGELOG * [DDW-789] Fix eslint issue * [DDW-789] Remove popover theme variables * [DDW-789] Increase height for hide icon * [DDW-789] Remove style * [DDW-789] Rearrange icons to group by action or info * [DDW-786] Add japanese translations * [DDW-786] Rearrange icons order * [DDW-786] Add opacity * [DDW-786] Add isDiscreetMode control to story * [DDW-786] Fix gap width * [DDW-786] Fix default message * [DDW-786] Update to use mobx feature pattern * [DDW-786] Fix style * [DDW-787] Implement discreet mode settings * [DDW-787] Fix text * [DDW-787] Add story * [DDW-787] Update translations * [DDW-787] Update translations * [DDW-787] Discreet mode tooltip local storage setting * [DDW-787] NotificationPopOver component * [DDW-787] Migrate Sidebar to functional component * [DDW-787] Wrap categories with NotificationPopOver * [DDW-787] Fix lint * [DDW-787] Add new placements * [DDW-787] Add default translations * [DDW-787] Adjust styles * [DDW-787] One time fixed popOver * [DDW-787] Add red dot to discreet mode settings * [DDW-787] Update initial translations * [DDW-787] Add styles specific for language * [DDW-787] Update action text * [DDW-787] Review changes * [DDW-787] Update translations * [DDW-787] Changelog * [DDW-787] Fix tooltip showing after accessing security tab * [DDW-787] Fix notification dot click * [DDW-787] Fix jumping icons * [DDW-787] Add jp translation * [DDW-787] Fix styling issues * [DDW-787] Remove red dot when user leaves security tab * [DDW-787] Fix tooltip overlap * [DDW-787] Fix click through tooltip * [DDW-787] Fix tooltip overlap dialogs * [DDW-787] Fix prettier issue * [DDW-787] Dismiss tooltip on route leave * [DDW-787] Fix tooltip overlaping issues * [DDW-787] Fix closing discreet mode popover on staking page * [DDW-787] Fix merge conflicts * [DDW-787] Move condition to const * [DDW-787] Move trigger component to stand alone hook * [DDW-787] Fix type import * [DDW-787] Remove unused * [DDW-787] Review changes Co-authored-by: Renan Ferreira <[email protected]> * [DDW-738] Notification knob * [DDW-839] Discreet mode - automated tests (#2756) * [DDW-839] Discreet mode integration tests * [DDW-839] Remove aria-query from yarnlock * [DDW-839] Remove istanbul from yarnlock * [DDW-839] Tests for public api * [DDW-839] Run lockfile:fix * [DDW-839] Update changelog * [DDW-738] Fix font weights * [DDW-738] Fix button style * [DDW-738] Fix button style * [DDW-738] Pin package version * [DDW-738] Fix name/icon overlapping * [DDW-738] Update yarn.lock * [DDW-738] Review changes * [DDW-738] Fix yarn.lock * [DDW-738] Review changes * [DDW-738] Review changes - use lang selector * [DDW-738] Fix flow issue * [DDW-738] Fix discreet mode logic on filter component * [DDW-854] Init * [DDW-854] New line * [DDW-854] Adjustments * [DDW-854] Update copy * [DDW-854] Small fix * [DDW-854] Small adjustment * [DDW-854] Update icon size * [DDW-854] Fix sass lint * [DDW-854] Update description color * [DDW-854] Update changelog * [DDW-854] Update changelog * [DDW-854] Update message for verifyng stage * [DDW-854] Update colors * [DDW-796] Refactor and voting phases * [DDW-796] Remove closed voting logic * [DDW-796] Exclude js/ts files from nix-build glob * [DDW-796] Fund phase logic * [DDW-796] Fund phase components * [DDW-796] Fix lint issues * [DDW-796] Fix flow issues * [DDW-796] Style fix * [DDW-796] Add observer * [DDW-796] Remove unused * [DDW-796] Lazy validation * [DDW-796] Update text * [DDW-858] Fix eslint warnings * [DDW-796] Add jp translations * [DDW-796] Enable voting in all env for testing only * [DDW-796] Add function for external link * [DDW-796] Review changes * [DDW-796] VotingStore unit test * [DDW-796] Update story * [DDW-796] Test only * Revert "[DDW-796] Test only" This reverts commit 3140b65. * Revert "[DDW-796] Enable voting in all env for testing only" This reverts commit 454c7e1. * [DDW-779] Update trezor connect to the official 8.2.3-extended version * [DDW-779] Remove bigi from MacInstaller * [DDW-779] Remove bigi from MacInstaller * [DDW-779] Remove bigi from MacInstaller * [DDW-779] Remove bytebuffer-old-fixed-webpack from MacInstaller * [DDW-779] Add babel-runtime 7.12.5 to yarn.lock * [DDW-854] Remove opacity property * [DDW-779] Rebuild yarn.lock * [DDW-779] Add protobufjs and bytebuffer to MacInstaller * [DDW-854] Added flow return type * [DDW-779] Update trezor-connect to 8.2.3-beta.8 version * Fixed duplicated text, wrong order * Bump version to 4.6.0 (#2780) * Removed RTS Flags from CHANGELOG * Bump version to 4.6.0 * [DDW-779] Update trezor-connect to v.8.2.4-extended and fix MacInstaller/yarn2nix * [DDW-779] Remove protobufjs from MacInstaller/yarn2nix * [DDW-779] Add @protobufjs * [DDW-779] CHANGELOG update * [DDW-821] Update packages with vulnerabilities (#2769) * [DDW-821] Upgrade packages with vulnerabilities * [DDW-821] Update node headers SHA checksum * [DDW-821] Update CHANGELOG.md * [DDW-821] Upgrade packages with vulnerabilities * [DDW-821] Update node headers SHA checksum * [DDW-821] Update CHANGELOG.md * [DDW-821] Downgrade electron-rebuild * Revert "[DDW-821] Downgrade electron-rebuild" This reverts commit ce4eabb. * Run lockfile:fix * Revert "Revert "[DDW-821] Downgrade electron-rebuild"" This reverts commit debe1c3. * [DDW-821] upgrate low severity vulnerabilities * [DDW-821] align babel config for private methods, class properties and object properties * [DDW-821] Remove explicit resolve-url installation * [DDW-821] Replace deprecated babel-eslint with @babel/eslint-parser * [DDW-821] Fix eslint error by wrapping util script in IIFE * [DDW-821] Fix yarn.lock Co-authored-by: Michael Chappell <[email protected]> Co-authored-by: Tomislav Horaček <[email protected]> * [DDW-874] Update README with nix.conf for Apple M1 (only for development purposes) (#2792) * [DDW-874] Update README with nix.conf for Apple M1 * [DDW-874] Update README - simplify nix.conf for M1 chip * [DDW-874] Update README nix.conf Co-authored-by: Daniel Main <[email protected]> * [DDW-742] Fix receiver address validation (disallow rewards address) (#2781) * [DDW-882] Update cardano-wallet and cardano-node (#2799) Co-authored-by: Daniel Main <[email protected]> * [DDW-857][DEBT] Integrate Chromatic (#2776) * [DDW-893] Update the PR checklist (#2811) * [DDW-892] Use fresh locale while rebuilding the application menu (#2813) Co-authored-by: Daniel Main <[email protected]> * Update develop with release 4.7.0 (#2819) Co-authored-by: Daniel Main <[email protected]> Co-authored-by: Lucas <[email protected]> Co-authored-by: Jean-Baptiste Giraudeau <[email protected]> * [DDW-891] update cardano-node to 1.33.0 (#2822) Co-authored-by: Daniel Main <[email protected]> * [DDW-916] Change the message for syncing the blockchain (#2827) * [DDW-916] Update second message on the initial screen to in include part regarding the waiting time (#2831) * [DDW-862] Enable dynamic RTS flags setting (#2758) Co-authored-by: Daniel Main <[email protected]> Co-authored-by: Danilo Prates <[email protected]> Co-authored-by: Marcin Mazurek <[email protected]> * Bump version to 4.8.0 * [DDW-918] Update blockchain verification progress (#2840) Co-authored-by: Daniel Main <[email protected]> Co-authored-by: Szymon Masłowski <[email protected]> * [DDW-920] RTS flags UI/UX improvements (#2842) Co-authored-by: Danilo Prates <[email protected]> Co-authored-by: Daniel Main <[email protected]> * [DDW-867] Check disk space (release ver) (#2845) Work originally done by @lucas-barros all credits to him * [DDW-920] Reduce the RAM threshold for RTS mode recommendation (#2846) * [DDW-920] Missing Japanese translations for RTS flags (#2848) Co-authored-by: Daniel Main <[email protected]> Co-authored-by: Dominik Guzei <[email protected]> Co-authored-by: Nikola Glumac <[email protected]> Co-authored-by: Tomislav Horaček <[email protected]> Co-authored-by: Michael Bishop <[email protected]> Co-authored-by: Daniel Main <[email protected]> Co-authored-by: Renan Ferreira <[email protected]> Co-authored-by: Lucas <[email protected]> Co-authored-by: Lucas Araujo <[email protected]> Co-authored-by: Danilo Prates <[email protected]> Co-authored-by: Przemysław Włodek <[email protected]> Co-authored-by: Marcin Mazurek <[email protected]> Co-authored-by: Szymon Masłowski <[email protected]> Co-authored-by: Jean-Baptiste Giraudeau <[email protected]> Co-authored-by: Szymon Masłowski <[email protected]> Co-authored-by: Marcin Mazurek <[email protected]>
1 parent c37df82 commit 81fdcfd

File tree

67 files changed

+1778
-523
lines changed

Some content is hidden

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

67 files changed

+1778
-523
lines changed

.github/pull_request_template.md

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
1-
This PR CHANGES.
1+
<!---
2+
Briefly describe the change.
3+
-->
4+
5+
This PR ...
26

37
## Todos
48

5-
- [ ] Todo
9+
<!---
10+
Consider creating a TODO list to help others understand the progress of work in a WIP pull request.
11+
-->
612

7-
## Screenshots
13+
- [ ] TODO
814

9-
- Screenshot
15+
## Screenshots
1016

11-
---
17+
<!---
18+
Use the GitHub drag&drop feature to upload default-sized Daedalus window screenshots
19+
or animated GIFs of important UI changes in both English and Japanese.
20+
Do not use shadow or any effects. On macOS this can be accomplished the following way:
21+
1. Use the Command+Shift+4 keyboard shortcut.
22+
2. Press the Spacebar.
23+
3. Hold the Option button and click the window you want to capture.
24+
-->
1225

1326
## Testing Checklist
1427

28+
<!---
29+
Open a thread on #daedalus-qa on Slack, mention `@daedalusqa` and `@daedalusteam`, link the thread below
30+
-->
31+
32+
1533
- [Slack QA thread](https://input-output-rnd.slack.com/messages/GGKFXSKC6)
1634
- [ ] Test
1735

@@ -20,24 +38,18 @@ This PR CHANGES.
2038
## Review Checklist
2139

2240
### Basics
23-
24-
- [ ] PR has been assigned and has appropriate labels (`feature`/`bug`/`chore`, `release-x.x.x`)
41+
- [ ] PR assigned to the PR author(s)
42+
- [ ] `input-output-hk/daedalus-dev` and `input-output-hk/daedalus-qa` assigned as PR reviewers
43+
- [ ] If there are UI changes, Alexander Rukin assigned as an additional reviewer
44+
- [ ] PR has appropriate labels (`release-vNext`, `feature`/`bug`/`chore`, `WIP`)
45+
- [ ] PR link is added to a Jira ticket, ticket moved to In Review
2546
- [ ] PR is updated to the most recent version of the target branch (and there are no conflicts)
2647
- [ ] PR has a good description that summarizes all changes
27-
- [ ] PR has default-sized Daedalus window screenshots or animated GIFs of important UI changes:
28-
- [ ] In English
29-
- [ ] In Japanese
48+
- [ ] PR contains screenshots (in case of UI changes)
3049
- [ ] CHANGELOG entry has been added to the top of the appropriate section (*Features*, *Fixes*, *Chores*) and is linked to the correct PR on GitHub
31-
- [ ] Automated tests: All acceptance and unit tests are passing (`yarn test`)
32-
- [ ] Manual tests (minimum tests should cover newly added feature/fix): App works correctly in *development* build (`yarn dev`)
33-
- [ ] Manual tests (minimum tests should cover newly added feature/fix): App works correctly in *production* build (`yarn package` / CI builds)
34-
- [ ] There are no *flow* errors or warnings (`yarn flow:test`)
35-
- [ ] There are no *lint* errors or warnings (`yarn lint`)
36-
- [ ] There are no *prettier* errors or warnings (`yarn prettier:check`)
3750
- [ ] There are no missing translations (running `yarn manage:translations` produces no changes)
3851
- [ ] Text changes are proofread and approved (Jane Wild / Amy Reeve)
3952
- [ ] Japanese text changes are proofread and approved (Junko Oda)
40-
- [ ] UI changes look good in all themes (Alexander Rukin)
4153
- [ ] Storybook works and no stories are broken (`yarn storybook`)
4254
- [ ] In case of dependency changes `yarn.lock` file is updated
4355

@@ -55,7 +67,4 @@ This PR CHANGES.
5567
- [ ] All existing Daedalus Testing scenarios are still up-to-date
5668

5769
### After Review
58-
- [ ] Merge the PR
59-
- [ ] Delete the source branch
60-
- [ ] Move the ticket to `done` column on the YouTrack board
6170
- [ ] Update Slack QA thread by marking it with a green checkmark

.github/workflows/chromatic.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: 'Chromatic'
2+
on: push
3+
jobs:
4+
chromatic-deployment:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v1
8+
- name: Setup Node.js
9+
uses: actions/setup-node@v2
10+
with:
11+
node-version: "14"
12+
- name: Install dependencies
13+
run: yarn
14+
- name: Publish to Chromatic
15+
if: github.ref != 'refs/heads/develop'
16+
uses: chromaui/action@v1
17+
with:
18+
token: ${{ secrets.GITHUB_TOKEN }}
19+
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
20+
exitZeroOnChanges: true
21+
- name: Publish to Chromatic and auto accept changes
22+
if: github.ref == 'refs/heads/develop'
23+
uses: chromaui/action@v1
24+
with:
25+
token: ${{ secrets.GITHUB_TOKEN }}
26+
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
27+
autoAcceptChanges: true

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Changelog
22

3+
## 4.8.0
4+
5+
### Features
6+
7+
- Added dynamic RTS flags setting ([PR 2758](https://github.com/input-output-hk/daedalus/pull/2758/files))
8+
- 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))
9+
- 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))
10+
11+
### Chores
12+
13+
- Updated check-disk-space version ([PR 2845](https://github.com/input-output-hk/daedalus/pull/2845))
14+
- Updated CWB and Cardano Node ([PR 2822](https://github.com/input-output-hk/daedalus/pull/2822))
15+
16+
### Fixes
17+
18+
- Fixed blockain verification progress text ([PR 2840](https://github.com/input-output-hk/daedalus/pull/2840))
19+
320
## 4.7.0
421

522
### Features
@@ -8,10 +25,12 @@
825

926
### Fixes
1027

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

1331
### Chores
1432

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

0 commit comments

Comments
 (0)