Merge remote-tracking branch 'origin/develop' into feature/ddw-809-im…

…plement-analytics

.github/pull_request_template.md

@@ -1,17 +1,35 @@
-This PR CHANGES.
+<!---
+Briefly describe the change.
+-->
+
+This PR ...
 
 ## Todos
 
-- [ ] Todo
+<!---
+Consider creating a TODO list to help others understand the progress of work in a WIP pull request.
+-->
 
-## Screenshots
+- [ ] TODO
 
-- Screenshot
+## Screenshots
 
----
+<!---
+Use the GitHub drag&drop feature to upload default-sized Daedalus window screenshots
+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. 
+-->
 
 ## Testing Checklist
 
+<!---
+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
 
@@ -20,24 +38,18 @@ This PR CHANGES.
 ## Review Checklist
 
 ### Basics
-
-- [ ] PR has been assigned and has appropriate labels (`feature`/`bug`/`chore`, `release-x.x.x`)
+- [ ] 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
+- [ ] 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 has default-sized Daedalus window screenshots or animated GIFs of important UI changes:
-  - [ ] In English
-  - [ ] In Japanese
+- [ ] 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
-- [ ] Automated tests: All acceptance and unit tests are passing (`yarn test`)
-- [ ] Manual tests (minimum tests should cover newly added feature/fix): App works correctly in *development* build (`yarn dev`)
-- [ ] Manual tests (minimum tests should cover newly added feature/fix): App works correctly in *production* build (`yarn package` / CI builds)
-- [ ] There are no *flow* errors or warnings (`yarn flow:test`)
-- [ ] There are no *lint* errors or warnings (`yarn lint`)
-- [ ] There are no *prettier* errors or warnings (`yarn prettier:check`)
 - [ ] 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)
-- [ ] UI changes look good in all themes (Alexander Rukin)
 - [ ] Storybook works and no stories are broken (`yarn storybook`)
 - [ ] In case of dependency changes `yarn.lock` file is updated
 
@@ -55,7 +67,4 @@ This PR CHANGES.
 - [ ] All existing Daedalus Testing scenarios are still up-to-date
 
 ### After Review
-- [ ] Merge the PR
-- [ ] Delete the source branch
-- [ ] Move the ticket to `done` column on the YouTrack board
 - [ ] Update Slack QA thread by marking it with a green checkmark

.github/workflows/chromatic.yml

@@ -0,0 +1,27 @@
+name: 'Chromatic'
+on: push
+jobs:
+  chromatic-deployment:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+      - name: Install dependencies
+        run: yarn
+      - name: Publish to Chromatic
+        if: github.ref != 'refs/heads/develop'
+        uses: chromaui/action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+          exitZeroOnChanges: true
+      - 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

CHANGELOG.md

@@ -4,11 +4,15 @@
 
 ### Fixes
 
+- Fixed immediate language updates of application top menu bar ([PR 2813](https://github.com/input-output-hk/daedalus/pull/2813))
 - Fixed receiver address validation by disallowing rewards addresses ([PR 2781](https://github.com/input-output-hk/daedalus/pull/2781))
 
 ### Chores
 
+- Integrated Chromatic for visual regression testing ([PR 2776](https://github.com/input-output-hk/daedalus/pull/2776))
+- Updated `trezor-connect` dependency to version `8.2.4` ([PR 2726](https://github.com/input-output-hk/daedalus/pull/2726))
 - Updated vulnerable dependencies ([PR 2769](https://github.com/input-output-hk/daedalus/pull/2769))
+- Updated CWB and Cardano Node ([PR 2799](https://github.com/input-output-hk/daedalus/pull/2799))
 
 ## 4.6.0
 

installers/common/MacInstaller.hs

@@ -232,60 +232,66 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
     externalYarn :: [FilePath]
     externalYarn =
       [ "@babel"
+      , "@protobufjs"
       , "@trezor"
       , "base-x"
       , "base64-js"
       , "bchaddrjs"
+      , "bech32"
       , "big-integer"
-      , "bigi"
       , "bignumber.js"
       , "bip66"
       , "bitcoin-ops"
       , "blake2b"
+      , "blake-hash"
       , "blake2b-wasm"
+      , "bn.js"
+      , "brorand"
       , "bs58"
       , "bs58check"
-      , "bytebuffer-old-fixed-webpack"
+      , "bytebuffer"
       , "call-bind"
       , "cashaddrjs"
       , "cbor-web"
       , "create-hash"
       , "create-hmac"
       , "cross-fetch"
       , "define-properties"
-      , "ecurve"
+      , "elliptic"
       , "es-abstract"
       , "function-bind"
       , "get-intrinsic"
       , "has"
       , "has-symbols"
-      , "hd-wallet"
+      , "hash.js"
+      , "hmac-drbg"
       , "ieee754"
       , "inherits"
       , "int64-buffer"
       , "js-chain-libs-node"
       , "json-stable-stringify"
       , "keccak"
       , "long"
-      , "merkle-lib"
       , "ms"
+      , "minimalistic-assert"
+      , "minimalistic-crypto-utils"
       , "nanoassert"
       , "node-fetch"
       , "object-keys"
       , "object.values"
       , "parse-uri"
-      , "protobufjs-old-fixed-webpack"
+      , "protobufjs"
       , "pushdata-bitcoin"
-      , "queue"
       , "randombytes"
       , "regenerator-runtime"
       , "runtypes"
       , "safe-buffer"
       , "semver-compare"
       , "tiny-worker"
       , "trezor-connect"
-      , "trezor-link"
+      , "tiny-secp256k1"
       , "typeforce"
+      , "util-deprecate"
       , "varuint-bitcoin"
       , "wif"
       ]

nix/sources.json

@@ -1,14 +1,14 @@
 {
     "cardano-node": {
-        "branch": "refs/tags/1.29.0-rc2",
+        "branch": "tags/1.32.1",
         "description": null,
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "cardano-node",
-        "rev": "cc78734d263d0eec2b12070380cdfea02a5a8342",
-        "sha256": "1bqrbgc11c4x5mrcm7shyvfs05fqi4v1pr4y9pw2aprab277czjr",
+        "rev": "4f65fb9a27aa7e3a1873ab4211e412af780a3648",
+        "sha256": "00k9fqrm0gphjji23x0nc9z6bqh8bqrncgivn3mi3csacjzicrrx",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/cardano-node/archive/cc78734d263d0eec2b12070380cdfea02a5a8342.tar.gz",
+        "url": "https://github.com/input-output-hk/cardano-node/archive/4f65fb9a27aa7e3a1873ab4211e412af780a3648.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "cardano-shell": {

package.json

@@ -156,6 +156,7 @@
     "react-syntax-highlighter": "13.5.3",
     "regenerator-runtime": "0.13.7",
     "sass-loader": "7.1.0",
+    "seedrandom": "3.0.5",
     "sinon": "9.2.2",
     "spawn-sync": "2.0.0",
     "spectron": "14.0.0",
@@ -164,6 +165,7 @@
     "stylelint-order": "4.1.0",
     "svg-inline-loader": "0.8.2",
     "thread-loader": "2.1.3",
+    "timemachine": "0.3.2",
     "transform-loader": "0.2.4",
     "url-loader": "2.0.1",
     "utf-8-validate": "5.0.2",
@@ -253,7 +255,7 @@
     "source-map-support": "0.5.19",
     "spectron-fake-dialog": "0.0.1",
     "tcp-port-used": "1.0.1",
-    "trezor-connect": "8.2.0-extended",
+    "trezor-connect": "8.2.4-extended",
     "unorm": "1.6.0",
     "validator": "13.7.0"
   },

source/main/environment.js

@@ -41,7 +41,7 @@ const isDevelopment = checkIsDevelopment(NETWORK);
 const isWatchMode = process.env.IS_WATCH_MODE;
 const keepLocalClusterRunning = process.env.KEEP_LOCAL_CLUSTER_RUNNING;
 const API_VERSION = process.env.API_VERSION || 'dev';
-const NODE_VERSION = '1.30.1'; // TODO: pick up this value from process.env
+const NODE_VERSION = '1.32.1'; // TODO: pick up this value from process.env
 const mainProcessID = get(process, 'ppid', '-');
 const rendererProcessID = process.pid;
 const PLATFORM = os.platform();

source/main/index.js

@@ -172,7 +172,8 @@ const onAppReady = async () => {
   enableApplicationMenuNavigationChannel.onReceive(
     () =>
       new Promise((resolve) => {
-        buildAppMenus(mainWindow, cardanoNode, userLocale, {
+        const locale = getLocale(network);
+        buildAppMenus(mainWindow, cardanoNode, locale, {
           isNavigationEnabled: true,
         });
         resolve();
@@ -182,10 +183,11 @@ const onAppReady = async () => {
   rebuildApplicationMenu.onReceive(
     (data) =>
       new Promise((resolve) => {
-        buildAppMenus(mainWindow, cardanoNode, userLocale, {
+        const locale = getLocale(network);
+        buildAppMenus(mainWindow, cardanoNode, locale, {
           isNavigationEnabled: data.isNavigationEnabled,
         });
-        mainWindow.updateTitle(userLocale);
+        mainWindow.updateTitle(locale);
         resolve();
       })
   );

source/renderer/app/components/loading/syncing-connecting/LogosDisplay.js

@@ -48,7 +48,7 @@ export default class LogosDisplay extends Component<Props> {
     return (
       <div className={styles.component}>
         <SVGInline svg={adaLogo} className={currencyLogoStyles} />
-        <div className={daedalusLogoStyles}>
+        <div className={daedalusLogoStyles} data-chromatic="ignore">
           <Lottie options={logoAnimationOptionsLottie} />
         </div>
         <SVGInline svg={cardanoLogo} className={apiLogoStyles} />

source/renderer/app/components/status/DaedalusDiagnostics.js

@@ -546,7 +546,7 @@ export default class DaedalusDiagnostics extends Component<Props, State> {
         <div className={styles.tables}>
           <div className={styles.table}>
             <div>
-              {getSectionRow('cardanoNodeStatus')}
+              {getSectionRow('systemInfo')}
               {getRow('platform', platform)}
               {getRow('platformVersion', platformVersion)}
               {getRow('cpu', <PopOver content={cpu}>{cpu}</PopOver>)}

source/renderer/app/components/wallet/settings/ICOPublicKeyQRCodeDialog.js

@@ -11,14 +11,14 @@ import Dialog from '../../widgets/Dialog';
 import iconCopy from '../../../assets/images/clipboard-ic.inline.svg';
 import styles from './PublicKeyQRCodeDialog.scss';
 import globalMessages from '../../../i18n/global-messages';
-import type { ReactIntlMessage } from '../../../types/i18nTypes';
+
+import { messages } from './ICOPublicKeyQRCodeDialog.messages';
 
 type Props = {
   walletName: string,
   walletPublicKey: string,
   onCopyWalletPublicKey: Function,
   onClose: Function,
-  messages: { [string]: ReactIntlMessage },
   derivationPath: string,
   intl: intlShape.isRequired,
 };
@@ -29,7 +29,6 @@ const ICOPublicKeyQRCodeDialog = observer((props: Props) => {
     walletPublicKey,
     onCopyWalletPublicKey,
     onClose,
-    messages,
     derivationPath,
     intl,
   } = props;

source/renderer/app/components/wallet/settings/ICOPublicKeyQRCodeDialog.messages.js

@@ -0,0 +1,23 @@
+// @flow
+import { defineMessages } from 'react-intl';
+import type { ReactIntlMessage } from '../../../types/i18nTypes';
+
+export const messages: {
+  [string]: ReactIntlMessage,
+} = defineMessages({
+  dialogTitle: {
+    id: 'wallet.settings.icoPublicKey',
+    defaultMessage: '!!!ICO Public Key',
+    description: 'Title for the "ICO Public Key QR Code" dialog.',
+  },
+  copyPublicKeyLabel: {
+    id: 'wallet.settings.copyICOPublicKey',
+    defaultMessage: '!!!Copy ICO public key',
+    description: 'Copy ICO public key label.',
+  },
+  derivationPathTooltip: {
+    id: 'wallet.settings.dialog.derivationPathTooltip',
+    defaultMessage: '!!!Derivation path',
+    description: 'Tooltip for the derivation path',
+  },
+});

source/renderer/app/containers/wallet/dialogs/settings/PublicKeyQRCodeDialogContainer.js

@@ -33,26 +33,6 @@ const walletMessages: {
   },
 });
 
-const icoMessages: {
-  [string]: ReactIntlMessage,
-} = defineMessages({
-  dialogTitle: {
-    id: 'wallet.settings.icoPublicKey',
-    defaultMessage: '!!!ICO Public Key',
-    description: 'Title for the "ICO Public Key QR Code" dialog.',
-  },
-  copyPublicKeyLabel: {
-    id: 'wallet.settings.copyICOPublicKey',
-    defaultMessage: '!!!Copy ICO public key',
-    description: 'Copy ICO public key label.',
-  },
-  derivationPathTooltip: {
-    id: 'wallet.settings.dialog.derivationPathTooltip',
-    defaultMessage: '!!!Derivation path',
-    description: 'Tooltip for the derivation path',
-  },
-});
-
 type Props = InjectedProps;
 
 @inject('actions', 'stores')
@@ -107,7 +87,6 @@ export default class PublicKeyQRCodeDialogContainer extends Component<Props> {
           onClose={() => {
             actions.dialogs.closeActiveDialog.trigger();
           }}
-          messages={icoMessages}
           derivationPath={ICO_PUBLIC_KEY_DERIVATION_PATH}
         />
       );