Merge branch 'develop' into fix/ddw-931-add-disabled-state-to-selects

Author: danielmain

BESTPRACTICES.md

@@ -1108,7 +1108,7 @@ type Props = {
 };
 ```
 
-For preventing syntax errors, leave a comma after the last key/value pair incase the type definition's properties are rearranged or expanded upon in the future.
+For preventing syntax errors, leave a comma after the last key/value pair in case the type definition's properties are rearranged or expanded upon in the future.
 
 :white_check_mark: ***Do***
 
@@ -1204,7 +1204,7 @@ const Names = () => (<div>
 ## Formatting Selectors
 
 * Use class selectors instead of ID selectors.
-* Use camelCase or dashed-case instead of PascelCase or names_with_underscores.
+* Use camel case or dashed-case instead of pascal case or names_with_underscores.
 * Give each selector its own line.
 * Put a space before the opening brace `{` in rule declarations.
 * Put closing braces `}` of rule declarations on a new line.

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Features
 
+- Improved RTS flags splash screen message ([PR 2901](https://github.com/input-output-hk/daedalus/pull/2901))
 - Implemented error message when trying to leave wallet without enough ada to support tokens ([PR 2783](https://github.com/input-output-hk/daedalus/pull/2783))
 
 ### Fixes
@@ -12,11 +13,13 @@
 
 ### Chores
 
+- Fixed spelling issues and typos ([PR 2915](https://github.com/input-output-hk/daedalus/pull/2915))
 - Removed SASS ts-lint ignore comments ([PR 2870](https://github.com/input-output-hk/daedalus/pull/2870))
 - Enabled debugging of the main process ([PR 2893](https://github.com/input-output-hk/daedalus/pull/2893))
 
 ### Fixes
 
+- Fix warning sign displayed when recommend decimals is zero ([PR 2905](https://github.com/input-output-hk/daedalus/pull/2905))
 - Fixed discrete tooltip being clipped by loading overlay when stake pools are adjusted ([PR 2902](https://github.com/input-output-hk/daedalus/pull/2902))
 
 ## 4.9.0
@@ -32,6 +35,7 @@
 
 - Fixed main container zIndex ([PR 2863](https://github.com/input-output-hk/daedalus/pull/2863))
 - Fixed ui overlap issues ([PR 2881](https://github.com/input-output-hk/daedalus/pull/2881))
+- Fixed the gap between Stake Pool View options ([PR 2899](https://github.com/input-output-hk/daedalus/pull/2899))
 
 ### Chores
 

default.nix

@@ -40,7 +40,7 @@ let
   inherit (pkgs.lib) optionalString optional concatStringsSep;
   inherit (pkgs) writeTextFile;
   crossSystem = lib: (crossSystemTable lib).${target} or null;
-  # TODO, nsis cant cross-compile with the nixpkgs daedalus currently uses
+  # TODO, nsis can't cross-compile with the nixpkgs daedalus currently uses
   nsisNixPkgs = import localLib.sources.nixpkgs-nsis {};
   installPath = ".daedalus";
   needSignedBinaries = (signingKeys != null) || (HSMServer != null);

jest.config.js

@@ -89,6 +89,7 @@ module.exports = {
     // Jest does not support WASM imports from ESM modules
     // https://github.com/facebook/jest/issues/9430
     '^@iohk-jormungandr/wallet-js$': 'identity-obj-proxy',
+    'tests/(.*)': '<rootDir>/tests/$1',
   },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader

nix/nsis-inner.nix

@@ -43,7 +43,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    descripition = "System to create Windows installers";
+    description = "System to create Windows installers";
     homepage = "https://nsis.sourceforge.io/";
   };
 }

package.json

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

source/common/config/downloadManagerConfig.ts

@@ -1,14 +1,13 @@
 // https://www.npmjs.com/package/node-downloader-helper
 import type {
-  AllowedDownloadDirectories,
+  AllowedDownloadDirectoriesValues,
+  AllowedDownloadDirectoriesKeys,
+  AllowedDownloadDirectoriesMap,
   DownloadState,
   DownloadEventType,
 } from '../types/downloadManager.types';
 
-export const ALLOWED_DOWNLOAD_DIRECTORIES: Record<
-  string,
-  AllowedDownloadDirectories
-> = {
+export const ALLOWED_DOWNLOAD_DIRECTORIES: AllowedDownloadDirectoriesMap = {
   DOWNLOADS: 'downloads',
   DESKTOP: 'desktop',
   STATE_DIRECTORY: 'stateDirectory',

source/common/ipc/api.ts

@@ -478,8 +478,8 @@ export type getCardanoAdaAppRendererRequest = {
 export type getCardanoAdaAppMainResponse = HardwareWalletCardanoAdaAppResponse;
 export const GET_HARDWARE_WALLET_CONNECTION_CHANNEL =
   'GET_HARDWARE_WALLET_CONNECTION_CHANNEL';
-export type getHardwareWalletConnectiontMainRequest = HardwareWalletConnectionRequest;
-export type getHardwareWalletConnectiontRendererResponse = Record<string, any>;
+export type getHardwareWalletConnectionMainRequest = HardwareWalletConnectionRequest;
+export type getHardwareWalletConnectionRendererResponse = Record<string, any>;
 export const SIGN_TRANSACTION_LEDGER_CHANNEL =
   'SIGN_TRANSACTION_LEDGER_CHANNEL';
 export type signTransactionLedgerRendererRequest = LedgerSignTransactionRequest;

source/common/types/downloadManager.types.ts

@@ -1,7 +1,17 @@
-export type AllowedDownloadDirectories =
+export type AllowedDownloadDirectoriesValues =
   | 'stateDirectory'
   | 'downloads'
   | 'desktop';
+
+export type AllowedDownloadDirectoriesKeys =
+  | 'DOWNLOADS'
+  | 'DESKTOP'
+  | 'STATE_DIRECTORY';
+
+export type AllowedDownloadDirectoriesMap = {
+  [day in AllowedDownloadDirectoriesKeys]: AllowedDownloadDirectoriesValues;
+};
+
 // https://www.npmjs.com/package/node-downloader-helper
 export type DownloadRequest = {
   /**
@@ -12,7 +22,7 @@ export type DownloadRequest = {
    */
   id?: string;
   fileUrl: string;
-  destinationDirectoryName?: AllowedDownloadDirectories;
+  destinationDirectoryName?: AllowedDownloadDirectoriesValues;
   options?: DownloadRequestOptions | null | undefined;
   resumeDownload?: {
     temporaryFilename: string;
@@ -47,7 +57,7 @@ export type DownloadRequestOptions = {
   httpsRequestOptions?: Record<string, any>;
   // Override the https request options, ex: to add SSL Certs
   progressIsThrottled?: boolean;
-  // by default, the progress is sent every second. if `false` it will be sent every milisecond
+  // by default, the progress is sent every second. if `false` it will be sent every millisecond
   persistLocalData?: boolean; // by default, the localdata information is deleted after the end of the download
 };
 // https://www.npmjs.com/package/node-downloader-helper
@@ -82,7 +92,7 @@ export type DownloadInfo = {
   fileUrl: string;
   originalFilename: string;
   temporaryFilename: string;
-  destinationDirectoryName: AllowedDownloadDirectories;
+  destinationDirectoryName: AllowedDownloadDirectoriesValues;
   destinationPath: string;
   options: DownloadRequestOptions;
 };
@@ -138,7 +148,7 @@ export type DownloadInfoProgress = {
   downloaded: number;
   // downloaded size in bytes
   progress: number;
-  // progress porcentage 0-100%
+  // progress percentage 0-100%
   speed: number; // download speed in bytes
 };
 export type DownloadInfoEnd = {
@@ -147,7 +157,7 @@ export type DownloadInfoEnd = {
   totalSize: number;
   // total file size got from the server
   incomplete: boolean;
-  // true/false if the download endend but still incomplete
+  // true/false if the download ended but still incomplete
   onDiskSize: number;
   // total size of file on the disk
   downloadedSize: number; // the total size downloaded

source/main/cardano/CardanoNode.ts

@@ -522,7 +522,7 @@ export class CardanoNode {
   }
 
   /**
-   * Kills cardano-node and waitsup to `killTimeout` for the node to
+   * Kills cardano-node and waits up to `killTimeout` for the node to
    * report the exit message.
    *
    * @returns {Promise<void>} resolves if the node could be killed, rejects with error otherwise.