Merge branch 'develop' into feature/jest-unit-tests

Author: DominikGuzei

CHANGELOG.md

@@ -1,20 +1,36 @@
-Changelog
-=========
+# Changelog
 
-## vNext
+## 4.4.0
+
+### Features
+
+- Implemented the wallet Tokens dedicated screen ([PR 2671](https://github.com/input-output-hk/daedalus/pull/2671), [PR 2701](https://github.com/input-output-hk/daedalus/pull/2701), [PR 2703](https://github.com/input-output-hk/daedalus/pull/2703))
+
+### Fixes
+
+- Fixed wallet settings screen - no space at the bottom when scrolled down ([PR 2686](https://github.com/input-output-hk/daedalus/pull/2686))
+- Fixed the missing text for the DAPP static screens ([PR 2693](https://github.com/input-output-hk/daedalus/pull/2693))
+
+### Chores
+
+- Added the possibility to unpair a hardware wallet from Daedalus ([PR 2676](https://github.com/input-output-hk/daedalus/pull/2676))
+
+## 4.3.2
 
 ### Features
 
 - Implemented static screens for signing dApp interaction transactions ([PR 2626](https://github.com/input-output-hk/daedalus/pull/2626))
 
 ### Fixes
 
+- Fixed font used for unavailable staking while updating messages ([PR 2680](https://github.com/input-output-hk/daedalus/pull/2680))
 - Fixed crash when Yubikey is connected ([PR 2673](https://github.com/input-output-hk/daedalus/pull/2673))
 - Updated Electron and related packages ([PR 2206](https://github.com/input-output-hk/daedalus/pull/2206))
 - Fixed some Japanese translations for the external currencies ([PR 2667](https://github.com/input-output-hk/daedalus/pull/2667))
 
 ### Chores
 
+- Updated `cardano-wallet` to version `2021-09-29` which includes `cardano-node` 1.30.1
 - Updated `trezor-connect` dependency to version `8.2.0` ([PR 2675](https://github.com/input-output-hk/daedalus/pull/2675))
 
 ## 4.3.1
@@ -1104,7 +1120,7 @@ Changelog
 - Fixed paper wallet certificate restoration ([PR 1055](https://github.com/input-output-hk/daedalus/pull/1055))
 - Reduce layout re-renderings ([PR 1595](https://github.com/input-output-hk/daedalus/pull/1595))
 - Fixed green Cardano theme white color and borders color ([PR 1584](https://github.com/input-output-hk/daedalus/pull/1584))
-- Fixed flat button color  ([PR 1586](https://github.com/input-output-hk/daedalus/pull/1586))
+- Fixed flat button color ([PR 1586](https://github.com/input-output-hk/daedalus/pull/1586))
 
 ## 0.15.1
 
@@ -1506,6 +1522,7 @@ Changelog
 ## 0.9.1
 
 ### Features
+
 - New Edit section in system menu with copy & paste and related actions ([PR 817](https://github.com/input-output-hk/daedalus/pull/817))
 
 ### Fixes
@@ -1853,15 +1870,15 @@ Changelog
 
 - Added wallet creation screen that appears when there is no wallet yet
 - Updated to the latest design specs and refactor to
-[react-toolbox](http://react-toolbox.com/) instead of
-material-ui for the UI components. This gives us much better style
-customization and theming options.
+  [react-toolbox](http://react-toolbox.com/) instead of
+  material-ui for the UI components. This gives us much better style
+  customization and theming options.
 - Cleaned up the boilerplate app menus
 - Added basic form validations using [mobx-react-form](https://github.com/foxhound87/mobx-react-form)
 - Added i18n support with [react-intl](https://github.com/yahoo/react-intl)
 - Added wallet send / receive / transactions screens
 - Form submitting UX updated to the design specifications with introduction of button loading spinners
-and support for submitting the form with enter key
+  and support for submitting the form with enter key
 - Added cut, copy & paste application menu items and keyboard shortcuts
 
 ### Fixes

nix/sources.json

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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

shell.nix

@@ -113,9 +113,9 @@ let
       ln -svf $(type -P cardano-wallet)
       ln -svf $(type -P cardano-cli)
       mkdir -p ${BUILDTYPE}/
-      ln -sv $PWD/node_modules/usb/build/${BUILDTYPE}/usb_bindings.node ${BUILDTYPE}/
-      ln -sv $PWD/node_modules/node-hid/build/${BUILDTYPE}/HID.node ${BUILDTYPE}/
-      ln -sv $PWD/node_modules/node-hid/build/${BUILDTYPE}/HID_hidraw.node ${BUILDTYPE}/
+      ln -svf $PWD/node_modules/usb/build/${BUILDTYPE}/usb_bindings.node ${BUILDTYPE}/
+      ln -svf $PWD/node_modules/node-hid/build/${BUILDTYPE}/HID.node ${BUILDTYPE}/
+      ln -svf $PWD/node_modules/node-hid/build/${BUILDTYPE}/HID_hidraw.node ${BUILDTYPE}/
       ${pkgs.lib.optionalString (nodeImplementation == "cardano") ''
         source <(cardano-node --bash-completion-script `type -p cardano-node`)
       ''}

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

@@ -29,6 +29,7 @@ export const STORAGE_KEYS: {
   STAKING_INFO_WAS_OPEN: 'ALONZO-INFO-WAS-OPEN',
   TERMS_OF_USE_ACCEPTANCE: 'TERMS-OF-USE-ACCEPTANCE',
   THEME: 'THEME',
+  TOKEN_FAVORITES: 'TOKEN-FAVORITES',
   USER_DATE_FORMAT_ENGLISH: 'USER-DATE-FORMAT-ENGLISH',
   USER_DATE_FORMAT_JAPANESE: 'USER-DATE-FORMAT-JAPANESE',
   USER_LOCALE: 'USER-LOCALE',

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

@@ -19,6 +19,7 @@ export type StorageKey =
   | 'SMASH-SERVER'
   | 'TERMS-OF-USE-ACCEPTANCE'
   | 'THEME'
+  | 'TOKEN-FAVORITES'
   | 'USER-DATE-FORMAT-ENGLISH'
   | 'USER-DATE-FORMAT-JAPANESE'
   | 'USER-LOCALE'

source/main/environment.js

@@ -39,7 +39,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.29.0'; // TODO: pick up this value from process.env
+const NODE_VERSION = '1.30.1'; // TODO: pick up this value from process.env
 const mainProcessID = get(process, 'ppid', '-');
 const rendererProcessID = process.pid;
 const PLATFORM = os.platform();

source/renderer/app/Routes.js

@@ -30,6 +30,7 @@ import WalletSummaryPage from './containers/wallet/WalletSummaryPage';
 import WalletSendPage from './containers/wallet/WalletSendPage';
 import WalletReceivePage from './containers/wallet/WalletReceivePage';
 import WalletTransactionsPage from './containers/wallet/WalletTransactionsPage';
+import WalletTokensPage from './containers/wallet/WalletTokensPage';
 import WalletSettingsPage from './containers/wallet/WalletSettingsPage';
 import WalletUtxoPage from './containers/wallet/WalletUtxoPage';
 import VotingRegistrationPage from './containers/voting/VotingRegistrationPage';
@@ -64,15 +65,16 @@ export const Routes = withRouter(() => (
               path={ROUTES.WALLETS.SUMMARY}
               component={WalletSummaryPage}
             />
-            <Route
-              path={ROUTES.WALLETS.TRANSACTIONS}
-              component={WalletTransactionsPage}
-            />
             <Route path={ROUTES.WALLETS.SEND} component={WalletSendPage} />
             <Route
               path={ROUTES.WALLETS.RECEIVE}
               component={WalletReceivePage}
             />
+            <Route path={ROUTES.WALLETS.TOKENS} component={WalletTokensPage} />
+            <Route
+              path={ROUTES.WALLETS.TRANSACTIONS}
+              component={WalletTransactionsPage}
+            />
             <Route
               path={ROUTES.WALLETS.SETTINGS}
               component={WalletSettingsPage}

source/renderer/app/actions/assets-actions.js

@@ -11,4 +11,14 @@ export default class AssetsActions {
     decimals: number,
   }> = new Action();
   onAssetSettingsCancel: Action<any> = new Action();
+  onOpenAssetSend: Action<{ uniqueId: string }> = new Action();
+  onCopyAssetParam: Action<{ param: string, fullValue: string }> = new Action();
+  onToggleFavorite: Action<{
+    uniqueId: string,
+    isFavorite: boolean,
+  }> = new Action();
+  copyAssetParamNotification: Action<{
+    param: string,
+    shortValue: string,
+  }> = new Action();
 }

source/renderer/app/actions/wallets-actions.js

@@ -82,7 +82,6 @@ export default class WalletsActions {
   copyWalletPublicKey: Action<{ publicKey: string }> = new Action();
   copyICOPublicKey: Action<{ publicKey: string }> = new Action();
   copyAddress: Action<{ address: string }> = new Action();
-  copyAssetItem: Action<{ assetItem: string, value: string }> = new Action();
   updateCertificateStep: Action<any> = new Action();
   closeCertificateGeneration: Action<any> = new Action();
   closeRewardsCsvGeneration: Action<any> = new Action();