Merge pull request #2295 from input-output-hk/release-with-master

Merge release/3.1.0 into master

Author: nikolaglumac

CHANGELOG.md

@@ -1,6 +1,23 @@
 Changelog
 =========
 
+## 3.1.0
+
+### Features
+
+- Included stake pool ID on the "Confirmation" step of the "Delegation" wizard and enabled search by stake pool ID on the "Stake Pools" screen ([PR 2281](https://github.com/input-output-hk/daedalus/pull/2281))
+
+### Fixes
+
+- Added initial loading state to UTXO screen ([PR 2265](https://github.com/input-output-hk/daedalus/pull/2265))
+
+### Chores
+
+- Canceled running fee estimation api requests once new request is made ([PR 2239](https://github.com/input-output-hk/daedalus/pull/2239))
+- Updated `iohk-nix` in order to fix `cardano-node` logging levels ([PR 2283](https://github.com/input-output-hk/daedalus/pull/2283))
+- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` package to version `2.1.0` ([PR 2279](https://github.com/input-output-hk/daedalus/pull/2279))
+- Updated `ini` package ([PR 2278](https://github.com/input-output-hk/daedalus/pull/2278))
+
 ## 3.0.0
 
 ### Features
@@ -16,7 +33,7 @@ Changelog
 ### Chores
 
 - Reduced the size of Linux installer ([PR 2260](https://github.com/input-output-hk/daedalus/pull/2260))
-- Bumped cardano-wallet to v2020-12-08 and cardano-node to 1.24.2 ([PR 2270](https://github.com/input-output-hk/daedalus/pull/2270))
+- Bumped `cardano-wallet` to version `2020-12-08` and `cardano-node` to version `1.24.2` ([PR 2270](https://github.com/input-output-hk/daedalus/pull/2270))
 
 ## 3.0.0-FC4
 

gulpfile.js

@@ -191,10 +191,7 @@ gulp.task(
 
 gulp.task('test:e2e:watch', gulp.series('build:watch', 'test:e2e:nodemon'));
 
-gulp.task(
-  'purge:translations',
-  shell.task('rimraf ./translations/messages/source')
-);
+gulp.task('purge:translations', shell.task('rimraf ./translations/messages'));
 
 gulp.task('electron:inspector', shell.task('yarn electron:inspector'));
 

nix/sources.json

@@ -66,10 +66,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "iohk-nix",
-        "rev": "0e5128870dc9de4f603fb35e6c7f659e18c8b6d6",
-        "sha256": "0pbm85jpmi166wb3hahmg791ycqcy6iryvimk7r8d051sf4rkmvb",
+        "rev": "5b86d63a0b59b7666d19901b654d8fbde27d9500",
+        "sha256": "1mfb93nnw0x4gyq93v6lh6h7imliw4j0wp5l9gpdafy3rw621xzb",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/iohk-nix/archive/0e5128870dc9de4f603fb35e6c7f659e18c8b6d6.tar.gz",
+        "url": "https://github.com/input-output-hk/iohk-nix/archive/5b86d63a0b59b7666d19901b654d8fbde27d9500.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "js-chain-libs": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {
@@ -171,7 +171,7 @@
     "yarn-lockfile": "1.1.1"
   },
   "dependencies": {
-    "@cardano-foundation/ledgerjs-hw-app-cardano": "2.0.1",
+    "@cardano-foundation/ledgerjs-hw-app-cardano": "2.1.0",
     "aes-js": "3.1.2",
     "bignumber.js": "5.0.0",
     "bip39": "2.3.0",
@@ -273,6 +273,7 @@
     "**/**/yargs-parser": "^20.2.0",
     "**/**/braces": "^2.3.1",
     "**/**/node-fetch": "^2.6.1",
-    "**/**/mobx-react-lite": "2.2.2"
+    "**/**/mobx-react-lite": "2.2.2",
+    "**/**/ini": "^1.3.8"
   }
 }

source/main/ipc/getHardwareWalletChannel.js

@@ -1,10 +1,7 @@
 // @flow
 import TransportNodeHid from '@ledgerhq/hw-transport-node-hid';
 import { getDevices } from '@ledgerhq/hw-transport-node-hid-noevents';
-import AppAda, {
-  cardano,
-  utils,
-} from '@cardano-foundation/ledgerjs-hw-app-cardano';
+import AppAda, { utils } from '@cardano-foundation/ledgerjs-hw-app-cardano';
 import { BrowserWindow } from 'electron';
 import TrezorConnect, {
   DEVICE_EVENT,
@@ -526,7 +523,7 @@ export const handleHardwareWalletRequests = async (
         throw new Error('Ledger device not connected');
       }
       const extendedPublicKey = await deviceConnection.getExtendedPublicKey(
-        cardano.str_to_path(path)
+        utils.str_to_path(path)
       );
       const deviceSerial = await deviceConnection.getSerial();
       return Promise.resolve({

source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsConfirmationDialog.js

@@ -53,6 +53,12 @@ const messages = defineMessages({
     description:
       'Description on the delegation setup "confirmation" step dialog.',
   },
+  stakePoolIdLabel: {
+    id: 'staking.delegationSetup.confirmation.step.dialog.stakePoolIdLabel',
+    defaultMessage: '!!!Stake pool ID',
+    description:
+      'Stake pool ID label on the delegation setup "confirmation" step dialog.',
+  },
   feesLabel: {
     id: 'staking.delegationSetup.confirmation.step.dialog.feesLabel',
     defaultMessage: '!!!Fees',
@@ -185,6 +191,7 @@ export default class DelegationStepsConfirmationDialog extends Component<Props>
     const selectedWalletName = get(selectedWallet, 'name');
     const isHardwareWallet = get(selectedWallet, 'isHardwareWallet');
     const selectedPoolTicker = get(selectedPool, 'ticker');
+    const selectedPoolId = get(selectedPool, 'id');
     const spendingPasswordField = form.$('spendingPassword');
 
     const buttonLabel = !isSubmitting ? (
@@ -262,6 +269,13 @@ export default class DelegationStepsConfirmationDialog extends Component<Props>
             />
           </p>
 
+          <div className={styles.stakePoolIdWrapper}>
+            <p className={styles.stakePoolIdLabel}>
+              {intl.formatMessage(messages.stakePoolIdLabel)}
+            </p>
+            <p className={styles.stakePoolId}>{selectedPoolId}</p>
+          </div>
+
           <div className={styles.feesWrapper}>
             <p className={styles.feesLabel}>
               {intl.formatMessage(messages.feesLabel)}

source/renderer/app/components/staking/delegation-setup-wizard/DelegationStepsConfirmationDialog.scss

@@ -14,17 +14,25 @@
       }
     }
 
+    .stakePoolIdWrapper,
     .feesWrapper {
       font-family: var(--font-medium);
       font-weight: 500;
       line-height: 1.38;
       margin-bottom: 20px;
 
+      .stakePoolIdLabel,
       .feesLabel {
         color: var(--theme-delegation-steps-confirmation-fees-label-color);
         margin-bottom: 6px;
       }
 
+      .stakePoolId {
+        color: var(--theme-delegation-steps-confirmation-description-color);
+        font-family: var(--font-light);
+        user-select: text;
+      }
+
       .calculatingFeesLabel {
         @include animated-ellipsis($duration: 1500, $width: 20px);
         --webkit-backface-visibility: hidden;

source/renderer/app/components/staking/stake-pools/helpers.js

@@ -2,7 +2,7 @@
 import StakePool from '../../../domains/StakePool';
 import type { StakePoolProps } from '../../../domains/StakePool';
 
-const searchFields = ['ticker', 'name'];
+const searchFields = ['id', 'ticker', 'name'];
 
 const stakePoolsListSearch = (stakePool: StakePoolProps, rawSearch: string) => {
   const search = rawSearch.replace(/[.*+?^${}()|[\]\\]/g, '\\$&').trim();