Skip to content

Commit bd13ba1

Browse files
danielmainDominikGuzeinikolaglumaccleverca22mchappell
authored
Merge release/4.6.0 into master (#2785)
* 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-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 * Merges release/4.5.1 into release/4.5.0 * Fixes CHANGELOG link * [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 * [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-854] Remove opacity property * [DDW-854] Added flow return type * Fixed duplicated text, wrong order * Bump version to 4.6.0 * Bump version to 4.6.0 (#2780) * Removed RTS Flags from CHANGELOG * Bump version to 4.6.0 Co-authored-by: Dominik Guzei <[email protected]> Co-authored-by: Nikola Glumac <[email protected]> Co-authored-by: Michael Bishop <[email protected]> Co-authored-by: Michael Chappell <[email protected]> Co-authored-by: Daniel Main <[email protected]> Co-authored-by: Renan Ferreira <[email protected]> Co-authored-by: Tomislav Horaček <[email protected]> Co-authored-by: Lucas <[email protected]> Co-authored-by: Lucas Araujo <[email protected]> Co-authored-by: Danilo Prates <[email protected]>
1 parent ccd4cbd commit bd13ba1

File tree

191 files changed

+7497
-2056
lines changed

Some content is hidden

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

191 files changed

+7497
-2056
lines changed

.eslintrc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
"prettier",
1313
"prettier/babel",
1414
"prettier/flowtype",
15-
"prettier/react"
15+
"prettier/react",
16+
"plugin:jest/recommended"
1617
],
1718
"env": {
1819
"browser": true,
1920
"mocha": true,
20-
"node": true
21+
"node": true,
22+
"jest": true
2123
},
2224
"rules": {
2325
"class-methods-use-this": 0,
@@ -77,7 +79,8 @@
7779
"flowtype",
7880
"import",
7981
"promise",
80-
"react"
82+
"react",
83+
"jest"
8184
],
8285
"globals": {
8386
"API": true,
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Run Tests for Pull Requests
2+
on:
3+
pull_request:
4+
branches:
5+
- develop
6+
- master
7+
jobs:
8+
tests:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout Repo
12+
uses: actions/checkout@v2
13+
- name: Setup Node.js
14+
uses: actions/setup-node@v2
15+
with:
16+
node-version: "12"
17+
- run: yarn install
18+
- run: yarn test:jest

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ mainnet-genesis-dryrun-with-stakeholders.json
8686

8787
# nix-build results
8888
result*
89+
!result*.js
90+
!result*.jsx
91+
!result*.ts
92+
!result*.tsx
8993

9094
# Npm
9195
package-lock.json

CHANGELOG.md

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

3+
## 4.6.0
4+
5+
### Features
6+
7+
- Implement catalyst state snapshot phase ([PR 2771](https://github.com/input-output-hk/daedalus/pull/2771))
8+
- Implemented "discreet mode" ([PR 2723](https://github.com/input-output-hk/daedalus/pull/2723), [PR 2724](https://github.com/input-output-hk/daedalus/pull/2724), [PR 2725](https://github.com/input-output-hk/daedalus/pull/2725), [PR 2742](https://github.com/input-output-hk/daedalus/pull/2742), [PR 2740](https://github.com/input-output-hk/daedalus/pull/2740), [PR 2756](https://github.com/input-output-hk/daedalus/pull/2756))
9+
- Updated slider component to only execute onAfterChange if slider had moved ([PR 2766](https://github.com/input-output-hk/daedalus/pull/2766))
10+
11+
### Fixes
12+
13+
- Fixed app update for specific platform ([PR 2759](https://github.com/input-output-hk/daedalus/pull/2759))
14+
- Fixed checkbox tick offset ([PR 2751](https://github.com/input-output-hk/daedalus/pull/2751))
15+
16+
### Chores
17+
18+
- Improve startup and shutdown messages ([PR 2770](https://github.com/input-output-hk/daedalus/pull/2770))
19+
- Updated `cardano-wallet` to version `2021-11-11` ([PR 2765](https://github.com/input-output-hk/daedalus/pull/2765))
20+
- Added jest library for unit testing ([PR 2633](https://github.com/input-output-hk/daedalus/pull/2633))
21+
- Updated `cardano-launcher` to version `0.20211105.1`
22+
323
## 4.5.2
424

525
### Fixes

default.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ let
3030
});
3131
};
3232
};
33-
pkgs = localLib.iohkNix.getPkgsDefault { inherit system config; };
33+
pkgs = import sources.nixpkgs { inherit system config; };
3434
pkgsNative = localLib.iohkNix.getPkgsDefault {};
3535
sources = localLib.sources;
3636
walletPkgs = import "${sources.cardano-wallet}/nix" {};
@@ -51,6 +51,7 @@ let
5151
ostable.x86_64-darwin = "macos64";
5252
packages = self: {
5353
inherit cluster pkgs version target nodeImplementation;
54+
inherit (pkgs) hello cabal2nix;
5455
cardanoLib = localLib.iohkNix.cardanoLib;
5556
daedalus-bridge = self.bridgeTable.${nodeImplementation};
5657

@@ -313,7 +314,7 @@ let
313314
};
314315
rawapp-win64 = self.rawapp.override { win64 = true; };
315316
source = builtins.filterSource localLib.cleanSourceFilter ./.;
316-
yaml2json = pkgs.haskell.lib.disableCabalFlag pkgs.haskellPackages.yaml "no-exe";
317+
yaml2json = pkgs.haskell.lib.addExtraLibrary (pkgs.haskell.lib.disableCabalFlag pkgs.haskellPackages.yaml "no-exe") pkgs.haskellPackages.optparse-applicative;
317318

318319
electron = pkgs.callPackage ./installers/nix/electron.nix {};
319320

0 commit comments

Comments
 (0)