[DDW-779] Merges-in latest develo branch and fix yarn.lock conflicts

Author: tomislavhoracek

CHANGELOG.md

@@ -4,10 +4,24 @@
 
 ### Chores
 
-- Updated `trezor-connect` dependency to version `8.2.2` ([PR 2726](https://github.com/input-output-hk/daedalus/pull/2726))
+- Updated `trezor-connect` dependency to version `8.2.3` ([PR 2726](https://github.com/input-output-hk/daedalus/pull/2726))
+- Updated `cardano-wallet` to version `2021-11-11` ([PR 2765](https://github.com/input-output-hk/daedalus/pull/2765))
 - Added jest library for unit testing ([PR 2633](https://github.com/input-output-hk/daedalus/pull/2633))
 - Updated `cardano-launcher` to version `0.20211105.1` and added Cardano Node RTS flags which improve resource usage ([PR 2735](https://github.com/input-output-hk/daedalus/pull/2735), [PR 2741](https://github.com/input-output-hk/daedalus/pull/2741))
 
+### Features
+
+- 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))
+- Updated slider component to only execute onAfterChange if slider had moved ([PR 2766](https://github.com/input-output-hk/daedalus/pull/2766))
+
+### Fixes
+
+- Fixed app update for specific platform ([PR 2759](https://github.com/input-output-hk/daedalus/pull/2759))
+
+### Fixes
+
+- Fixed checkbox tick offset ([PR 2751](https://github.com/input-output-hk/daedalus/pull/2751))
+
 ## 4.5.2
 
 ### Fixes

jest.config.js

@@ -85,7 +85,11 @@ module.exports = {
   // ],
 
   // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
-  // moduleNameMapper: {},
+  moduleNameMapper: {
+    // Jest does not support WASM imports from ESM modules
+    // https://github.com/facebook/jest/issues/9430
+    '^@iohk-jormungandr/wallet-js$': 'identity-obj-proxy',
+  },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
   // modulePathIgnorePatterns: [],
@@ -121,7 +125,7 @@ module.exports = {
   // rootDir: undefined,
 
   // A list of paths to directories that Jest should use to search for files in
-  roots: ['<rootDir>/tests'],
+  roots: ['<rootDir>/tests', '<rootDir>/source'],
 
   // Allows you to use a custom runner instead of Jest's default test runner
   // runner: "jest-runner",
@@ -171,7 +175,11 @@ module.exports = {
   // timers: "real",
 
   // A map from regular expressions to paths to transformers
-  // transform: undefined,
+  transform: {
+    '\\.[jt]sx?$': 'babel-jest',
+    '^.+\\.svg$': 'jest-svg-transformer',
+    '.+\\.(css|styl|less|sass|scss)$': 'jest-css-modules-transform',
+  },
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
   // transformIgnorePatterns: [

nix/sources.json

@@ -29,10 +29,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-wallet",
-        "rev": "6626489542ce442a8451fb46fb5339346e62b4ee",
-        "sha256": "0n1vgbz3m73v33462ifg3qas9djwlpcvi1m0qxc7j15l3w5qhlw5",
+        "rev": "dac16ba7e3bf64bf5474497656932fd342c3b720",
+        "sha256": "012lnp5rah4qyl8r0v04d0rz28b1rdaz6flhjrahf45b9gx7mny1",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-wallet/archive/6626489542ce442a8451fb46fb5339346e62b4ee.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-wallet/archive/dac16ba7e3bf64bf5474497656932fd342c3b720.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "gitignore": {

package.json

@@ -12,7 +12,7 @@
     "start:dev": "NODE_ENV=development gulp start",
     "dev": "IS_WATCH_MODE=true gulp dev",
     "test": "NODE_ENV=test yarn build && yarn test:unit && yarn test:e2e:fail-fast",
-    "test:jest": "jest",
+    "test:jest": "NODE_OPTIONS=--experimental-vm-modules jest",
     "test:generate:report": "node tests/reporter.js",
     "test:unit": "yarn cucumber:run --require 'tests/**/unit/**/*.js' --tags '@unit and not @skip and not @wip'",
     "test:unit:rerun": "yarn cucumber:rerun --require 'tests/**/unit/**/*.js' --tags '@unit and not @skip and not @wip'",
@@ -87,6 +87,8 @@
     "@storybook/addons": "5.3.14",
     "@storybook/core": "5.3.14",
     "@storybook/react": "5.3.14",
+    "@testing-library/jest-dom": "5.15.1",
+    "@testing-library/react": "12.1.2",
     "asar": "2.1.0",
     "autodll-webpack-plugin": "0.4.2",
     "axios": "0.21.1",
@@ -130,8 +132,11 @@
     "hash.js": "1.1.7",
     "html-loader": "0.5.5",
     "husky": "4.3.0",
+    "identity-obj-proxy": "3.0.0",
     "jest": "26.6.3",
+    "jest-css-modules-transform": "^4.3.0",
     "jest-environment-jsdom": "26.6.2",
+    "jest-svg-transformer": "^1.0.0",
     "markdown-loader": "5.1.0",
     "mini-css-extract-plugin": "0.9.0",
     "minimist": "1.2.5",
@@ -278,7 +283,6 @@
     "**/**/node-fetch": "2.6.1",
     "**/**/mobx-react-lite": "2.2.2",
     "**/**/ini": "1.3.8",
-    "**/**/usb": "1.7.2",
-    "**/**/istanbul-lib-report": "2.0.8"
+    "**/**/usb": "1.7.2"
   }
 }

source/common/config/electron-store.config.js

@@ -20,9 +20,12 @@ export const STORAGE_KEYS: {
   CURRENCY_ACTIVE: 'CURRENCY-ACTIVE',
   CURRENCY_SELECTED: 'CURRENCY-SELECTED',
   DATA_LAYER_MIGRATION_ACCEPTANCE: 'DATA-LAYER-MIGRATION-ACCEPTANCE',
+  DISCREET_MODE_ENABLED: 'DISCREET-MODE-ENABLED',
+  DISCREET_MODE_SETTINGS_TOOLTIP: 'DISCREET-MODE-SETTINGS-TOOLTIP',
+  DISCREET_MODE_NOTIFICATION: 'DISCREET-MODE-NOTIFICATION',
   DOWNLOAD_MANAGER: 'DOWNLOAD-MANAGER',
-  HARDWARE_WALLET_DEVICES: 'HARDWARE-WALLET-DEVICES',
   HARDWARE_WALLETS: 'HARDWARE-WALLETS',
+  HARDWARE_WALLET_DEVICES: 'HARDWARE-WALLET-DEVICES',
   READ_NEWS: 'READ-NEWS',
   RESET: 'RESET',
   SMASH_SERVER: 'SMASH-SERVER',
@@ -35,7 +38,7 @@ export const STORAGE_KEYS: {
   USER_LOCALE: 'USER-LOCALE',
   USER_NUMBER_FORMAT: 'USER-NUMBER-FORMAT',
   USER_TIME_FORMAT: 'USER-TIME-FORMAT',
-  WALLET_MIGRATION_STATUS: 'WALLET-MIGRATION-STATUS',
   WALLETS: 'WALLETS',
+  WALLET_MIGRATION_STATUS: 'WALLET-MIGRATION-STATUS',
   WINDOW_BOUNDS: 'WINDOW-BOUNDS',
 };

source/common/types/electron-store.types.js

@@ -11,6 +11,9 @@ export type StorageKey =
   | 'CURRENCY-ACTIVE'
   | 'CURRENCY-SELECTED'
   | 'DATA-LAYER-MIGRATION-ACCEPTANCE'
+  | 'DISCREET-MODE-ENABLED'
+  | 'DISCREET-MODE-SETTINGS-TOOLTIP'
+  | 'DISCREET-MODE-NOTIFICATION'
   | 'DOWNLOAD-MANAGER'
   | 'HARDWARE-WALLET-DEVICES'
   | 'HARDWARE-WALLETS'

source/main/cardano/CardanoWalletLauncher.js

@@ -140,9 +140,7 @@ export async function CardanoWalletLauncher(
       });
 
       // RTS flags:
-      // 1) "-H4G -M6553M -c70"  16.0% peak RSS reduction and a sub-percentile CPU regression
-      // 2) "-H4G -M6553M"       18.5% peak RSS reduction and a second-best CPU regression
-      nodeConfig.rtsOpts = ['-H4G', '-M6553M', '-c70'];
+      nodeConfig.rtsOpts = [];
       logger.info('Launching Cardano Node with RTS flags', {
         rtsFlags: nodeConfig.rtsOpts,
       });

source/main/ipc/electronStoreConversation.js

@@ -32,6 +32,9 @@ const reset = async () => {
   await unset(keys.CURRENCY_ACTIVE);
   await unset(keys.CURRENCY_SELECTED);
   await unset(keys.DATA_LAYER_MIGRATION_ACCEPTANCE);
+  await unset(keys.DISCREET_MODE_ENABLED);
+  await unset(keys.DISCREET_MODE_SETTINGS_TOOLTIP);
+  await unset(keys.DISCREET_MODE_NOTIFICATION);
   await unset(keys.DOWNLOAD_MANAGER);
   await unset(keys.HARDWARE_WALLET_DEVICES);
   await unset(keys.HARDWARE_WALLETS);

source/main/utils/installChromeExtensions.js

@@ -1,14 +1,20 @@
 // @flow
 export const installChromeExtensions = async (isDev: boolean) => {
   if (isDev) {
-    const installer = require('electron-devtools-installer'); // eslint-disable-line global-require
+    const {
+      default: installExtension,
+      REACT_DEVELOPER_TOOLS,
+    } = require('electron-devtools-installer'); // eslint-disable-line global-require
+    const { app } = require('electron');
 
-    const extensions = ['REACT_DEVELOPER_TOOLS'];
-    const forceDownload = !!process.env.UPGRADE_EXTENSIONS;
-    for (const name of extensions) {
-      try {
-        await installer.default(installer[name], forceDownload);
-      } catch (e) {} // eslint-disable-line
-    }
+    const extensions = [REACT_DEVELOPER_TOOLS];
+    const options = {
+      loadExtensionOptions: { allowFileAccess: true },
+    };
+
+    try {
+      await app.whenReady();
+      await installExtension(extensions, options);
+    } catch (e) {} // eslint-disable-line
   }
 };

source/renderer/app/App.js

@@ -48,6 +48,10 @@ export default class App extends Component<{
       !isNodeStopping && // Daedalus is not shutting down
       !isNodeStopped; // Daedalus is not shutting down
 
+    if (document.documentElement) {
+      document.documentElement.lang = locale;
+    }
+
     return (
       <Fragment>
         <ThemeManager variables={themeVars} />