[DDW-779] Merges-in latest develop branch and fix conflicts

Author: tomislavhoracek

.gitignore

@@ -86,6 +86,10 @@ mainnet-genesis-dryrun-with-stakeholders.json
 
 # nix-build results
 result*
+!result*.js
+!result*.jsx
+!result*.ts
+!result*.tsx
 
 # Npm
 package-lock.json

CHANGELOG.md

@@ -2,25 +2,24 @@
 
 ## vNext
 
-### Chores
-
-- 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
 
+- Implement catalyst state snapshot phase ([PR 2771](https://github.com/input-output-hk/daedalus/pull/2771))
 - 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))
+- Fixed checkbox tick offset ([PR 2751](https://github.com/input-output-hk/daedalus/pull/2751))
 
-### Fixes
+### Chores
 
-- Fixed checkbox tick offset ([PR 2751](https://github.com/input-output-hk/daedalus/pull/2751))
+- Updated `trezor-connect` dependency to version `8.2.3` ([PR 2726](https://github.com/input-output-hk/daedalus/pull/2726))
+- Improve startup and shutdown messages ([PR 2770](https://github.com/input-output-hk/daedalus/pull/2770))
+- 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))
 
 ## 4.5.2
 

source/renderer/app/components/loading/syncing-connecting/StatusIcons.scss

@@ -9,27 +9,12 @@
   z-index: 2500;
 
   .icon {
+    display: block;
     height: 24px;
-    padding: 2px;
     width: 24px;
     svg {
-      height: 20px;
-      width: 20px;
-    }
-    &.icon-nodeState {
-      padding-right: 4px;
-      padding-top: 0;
-      svg {
-        height: 22px;
-        width: 22px;
-      }
-    }
-    &.icon-isNodeResponding {
-      padding: 3.2px 0 0;
-      svg {
-        height: 17.6px;
-        width: 24px;
-      }
+      height: 24px;
+      width: 24px;
     }
   }
 

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

@@ -1,6 +1,6 @@
 // @flow
 import React, { Component } from 'react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, intlShape, FormattedHTMLMessage } from 'react-intl';
 import classNames from 'classnames';
 import styles from './SyncingConnectingStatus.scss';
 import { CardanoNodeStates } from '../../../../../common/types/cardano-node.types';
@@ -12,11 +12,23 @@ const messages = defineMessages({
     defaultMessage: '!!!Starting Cardano node',
     description: 'Message "Starting Cardano node" on the loading screen.',
   },
+  startingDescription: {
+    id: 'loading.screen.startingCardanoDescription',
+    defaultMessage:
+      '!!!This process validates the integrity of local blockchain data and could take several minutes.',
+    description: 'Message "Starting Cardano node" on the loading screen.',
+  },
   stopping: {
     id: 'loading.screen.stoppingCardanoMessage',
     defaultMessage: '!!!Stopping Cardano node',
     description: 'Message "Stopping Cardano node" on the loading screen.',
   },
+  stoppingDescription: {
+    id: 'loading.screen.stoppingCardanoDescription',
+    defaultMessage:
+      '!!!This process updates the databases and could take several minutes.<br />To preserve data integrity, please wait until this process is complete.',
+    description: 'Message "Stopping Cardano node" on the loading screen.',
+  },
   stopped: {
     id: 'loading.screen.stoppedCardanoMessage',
     defaultMessage: '!!!Cardano node stopped',
@@ -91,24 +103,33 @@ export default class SyncingConnectingStatus extends Component<Props> {
     intl: intlShape.isRequired,
   };
 
-  _getConnectingMessage = () => {
+  _getConnectingMessage = (): {
+    connectingMessage: string,
+    connectingDescription?: string,
+  } => {
     const {
       cardanoNodeState,
       hasBeenConnected,
       isVerifyingBlockchain,
       isTlsCertInvalid,
       isConnected,
     } = this.props;
-    if (isConnected) return messages.loadingWalletData;
     let connectingMessage;
+    if (isConnected) {
+      connectingMessage = messages.loadingWalletData;
+      return { connectingMessage };
+    }
+    let connectingDescription;
     switch (cardanoNodeState) {
       case null:
       case CardanoNodeStates.STARTING:
         connectingMessage = messages.starting;
+        connectingDescription = messages.startingDescription;
         break;
       case CardanoNodeStates.STOPPING:
       case CardanoNodeStates.EXITING:
         connectingMessage = messages.stopping;
+        connectingDescription = messages.stoppingDescription;
         break;
       case CardanoNodeStates.STOPPED:
         connectingMessage = messages.stopped;
@@ -136,12 +157,12 @@ export default class SyncingConnectingStatus extends Component<Props> {
       connectingMessage === messages.connecting ||
       connectingMessage === messages.reconnecting;
     if (isTlsCertInvalid && isConnectingMessage) {
-      return messages.tlsCertificateNotValidError;
-    }
-    if (isVerifyingBlockchain && isConnectingMessage) {
-      return messages.verifyingBlockchain;
+      connectingMessage = messages.tlsCertificateNotValidError;
+    } else if (isVerifyingBlockchain && isConnectingMessage) {
+      connectingMessage = messages.verifyingBlockchain;
+      connectingDescription = messages.startingDescription;
     }
-    return connectingMessage;
+    return { connectingMessage, connectingDescription };
   };
 
   render() {
@@ -170,13 +191,23 @@ export default class SyncingConnectingStatus extends Component<Props> {
       showEllipsis ? styles.withoutAnimation : null,
     ]);
 
+    const {
+      connectingMessage,
+      connectingDescription,
+    } = this._getConnectingMessage();
+
     return (
       <div className={componentStyles}>
         <h1 className={headlineStyles}>
-          {intl.formatMessage(this._getConnectingMessage(), {
+          {intl.formatMessage(connectingMessage, {
             verificationProgress,
           })}
         </h1>
+        <div className={styles.description}>
+          {connectingDescription && (
+            <FormattedHTMLMessage {...connectingDescription} />
+          )}
+        </div>
       </div>
     );
   }

source/renderer/app/components/loading/syncing-connecting/SyncingConnectingStatus.scss

@@ -15,6 +15,16 @@
 .headline {
   font-family: var(--font-regular);
   font-size: 18px;
+  margin-bottom: 14px;
+}
+
+.description {
+  color: var(--theme-connecting-description-color);
+  font-family: var(--font-regular);
+  font-size: 16px;
+  line-height: 22px;
+  margin: 0 auto;
+  max-width: 580px;
 }
 
 .connecting {

source/renderer/app/components/staking/delegation-center/WalletRow.js

@@ -82,22 +82,16 @@ const messages = defineMessages({
 type Props = {
   wallet: Wallet,
   delegatedStakePool?: ?StakePool,
-  numberOfStakePools: number,
   numberOfRankedStakePools: number,
   onDelegate: Function,
   onUndelegate: Function,
   getStakePoolById: Function,
   nextEpochNumber: number,
   futureEpochNumber: number,
-  onSelect?: Function,
-  selectedPoolId?: ?number,
-  isListActive?: boolean,
   currentTheme: string,
   onOpenExternalLink: Function,
   showWithSelectButton?: boolean,
   containerClassName: string,
-  setListActive?: Function,
-  listName?: string,
 };
 
 type WalletRowState = {

source/renderer/app/components/voting/VotingUnavailable.js

@@ -1,132 +1,30 @@
 // @flow
-import React, { Component } from 'react';
+import React from 'react';
 import { observer } from 'mobx-react';
-import {
-  defineMessages,
-  intlShape,
-  FormattedMessage,
-  FormattedHTMLMessage,
-} from 'react-intl';
-import BigNumber from 'bignumber.js';
-import { Link } from 'react-polymorph/lib/components/Link';
+import { FormattedHTMLMessage } from 'react-intl';
 import globalMessages from '../../i18n/global-messages';
 import LoadingSpinner from '../widgets/LoadingSpinner';
-import {
-  CURRENT_VOTING_FUND_NUMBER,
-  NEXT_VOTING_FUND_NUMBER,
-} from '../../config/votingConfig';
 import styles from './VotingUnavailable.scss';
-
-const messages = defineMessages({
-  heading: {
-    id: 'voting.unavailable.heading',
-    defaultMessage: '!!!Project Catalyst voting registration',
-    description: 'Headline for the "Voting unavailable" screen',
-  },
-  paragraph1: {
-    id: 'voting.unavailable.paragraph1',
-    defaultMessage:
-      '!!!Project Catalyst Fund{currentVotingFundNumber} has now ended. Fund{nextVotingFundNumber} is currently in preparation, voting registration is not available yet.',
-    description: 'First paragraph on the "Voting unavailable" screen',
-  },
-  paragraph2: {
-    id: 'voting.unavailable.paragraph2',
-    defaultMessage:
-      '!!!Join our {link1} and {link2} Telegram channels for the latest updates (English language only).',
-    description: 'Second paragraph on the "Voting unavailable" screen',
-  },
-  link1Text: {
-    id: 'voting.unavailable.link1Text',
-    defaultMessage: '!!!Catalyst Announcements',
-    description: 'First link text on the "Voting unavailable" screen',
-  },
-  link2Text: {
-    id: 'voting.unavailable.link2Text',
-    defaultMessage: '!!!Project Catalyst Chat',
-    description: 'Second link text on the "Voting unavailable" screen',
-  },
-  link1Url: {
-    id: 'voting.unavailable.link1Url',
-    defaultMessage: '!!!https://t.me/cardanocatalyst',
-    description: 'First link URL on the "Voting unavailable" screen',
-  },
-  link2Url: {
-    id: 'voting.unavailable.link2Url',
-    defaultMessage: '!!!https://t.me/ProjectCatalystChat',
-    description: 'Second link URL on the "Voting unavailable" screen',
-  },
-});
+import { formattedNumber } from '../../utils/formatters';
 
 type Props = {
   syncPercentage: number,
-  isVotingRegistrationAvailable: boolean,
-  onExternalLinkClick: Function,
 };
 
-@observer
-export default class VotingUnavailable extends Component<Props> {
-  static contextTypes = {
-    intl: intlShape.isRequired,
-  };
-
-  render() {
-    const { intl } = this.context;
-    const {
-      syncPercentage,
-      isVotingRegistrationAvailable,
-      onExternalLinkClick,
-    } = this.props;
-
-    const heading = intl.formatMessage(messages.heading);
-    const paragraph1 = intl.formatMessage(messages.paragraph1, {
-      currentFundNumber: CURRENT_VOTING_FUND_NUMBER,
-      nextVotingFundNumber: NEXT_VOTING_FUND_NUMBER,
-    });
-    const link1 = (
-      <Link
-        className={styles.link}
-        label={intl.formatMessage(messages.link1Text)}
-        onClick={() =>
-          onExternalLinkClick(intl.formatMessage(messages.link1Url))
-        }
-      />
-    );
-    const link2 = (
-      <Link
-        className={styles.link}
-        label={intl.formatMessage(messages.link2Text)}
-        onClick={() =>
-          onExternalLinkClick(intl.formatMessage(messages.link2Url))
-        }
-      />
-    );
-
-    return (
-      <div className={styles.component}>
-        {isVotingRegistrationAvailable ? (
-          <>
-            <LoadingSpinner big />
-            <div className={styles.description}>
-              <FormattedHTMLMessage
-                {...globalMessages.featureUnavailableWhileSyncing}
-                values={{
-                  syncPercentage: new BigNumber(syncPercentage).toFormat(2),
-                }}
-              />
-            </div>
-          </>
-        ) : (
-          <>
-            <h1>{heading}</h1>
-            <p>{paragraph1}</p>
-            <FormattedMessage
-              {...messages.paragraph2}
-              values={{ link1, link2 }}
-              tagName="p"
-            />
-          </>
-        )}
+const VotingUnavailable = ({ syncPercentage }: Props) => {
+  return (
+    <div className={styles.component}>
+      <LoadingSpinner big />
+      <div className={styles.description}>
+        <FormattedHTMLMessage
+          {...globalMessages.featureUnavailableWhileSyncing}
+          values={{
+            syncPercentage: formattedNumber(syncPercentage, 2),
+          }}
+        />
       </div>
-    );
-  }
-}
+    </div>
+  );
+};
+
+export default observer(VotingUnavailable);