Merges develop

Author: nikolaglumac

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## vNext
+
+### Features
+
+- Removed "Alonzo tada" icon and "Alonzo countdown" screen ([PR 2708](https://github.com/input-output-hk/daedalus/pull/2708))
+
+### Fixes
+
+- Fixed transaction timestamps localization ([PR 2702](https://github.com/input-output-hk/daedalus/pull/2702))
+
+### Chores
+
+- Added hardware wallet support for all non-public testnets ([PR 2672](https://github.com/input-output-hk/daedalus/pull/2672))
+
 ## 4.4.1
 
 ### Fixes

source/common/types/cardano-node.types.js

@@ -1,4 +1,13 @@
 // @flow
+import {
+  MAINNET,
+  TESTNET,
+  STAGING,
+  SHELLEY_QA,
+  ALONZO_PURPLE,
+  SELFNODE,
+} from './environment.types';
+
 export type TlsConfig = {
   hostname: string,
   port: number,
@@ -142,17 +151,26 @@ export type CardanoStatus = {
   cardanoWalletPID: number,
 };
 
-// Cardano Mainet network magic
-export const MAINNET_MAGIC = [1, null];
-
-// Cardano Byron Testnet network magic
-export const TESTNET_MAGIC = [1097911063, 0];
-
-// Cardano Staging network magic
-export const STAGING_MAGIC = [633343913, 1];
+export type NetworkMagicType = Array<?number>;
 
-// Cardano Alonzo Purple network magic
-export const ALONZO_PURPLE_MAGIC = [8, 0];
-
-// Cardano Selfnode network magic
-export const SELFNODE_MAGIC = MAINNET_MAGIC;
+export const NetworkMagics: {
+  mainnet: NetworkMagicType,
+  testnet: NetworkMagicType,
+  staging: NetworkMagicType,
+  alonzo_purple: NetworkMagicType,
+  shelley_qa: NetworkMagicType,
+  selfnode: NetworkMagicType,
+} = {
+  // Cardano Mainet network magic
+  [MAINNET]: [1, null],
+  // Cardano Staging network magic
+  [STAGING]: [633343913, 1],
+  // Cardano Byron Testnet network magic
+  [TESTNET]: [1097911063, 0],
+  // Cardano Alonzo Purple network magic
+  [ALONZO_PURPLE]: [8, 0],
+  // Cardano Shelley QA network magic
+  [SHELLEY_QA]: [3, 0],
+  // Cardano Selfnode network magic
+  [SELFNODE]: [1, null],
+};

source/common/types/environment.types.js

@@ -12,6 +12,7 @@ export type Environment = {
   isStaging: boolean,
   isTestnet: boolean,
   isAlonzoPurple: boolean,
+  isShelleyQA: boolean,
   isSelfnode: boolean,
   isDevelopment: boolean,
   isWatchMode: boolean,

source/common/utils/environmentCheckers.js

@@ -2,6 +2,7 @@
 import { upperFirst } from 'lodash';
 import {
   ALONZO_PURPLE,
+  SHELLEY_QA,
   DEVELOPMENT,
   LINUX,
   MAC_OS,
@@ -54,6 +55,7 @@ export const checkIsMainnet = (network: string) => network === MAINNET;
 export const checkIsTestnet = (network: string) => network === TESTNET;
 export const checkIsAlonzoPurple = (network: string) =>
   network === ALONZO_PURPLE;
+export const checkIsShelleyQA = (network: string) => network === SHELLEY_QA;
 export const checkIsStaging = (network: string) => network === STAGING;
 export const checkIsSelfnode = (network: string) => network === SELFNODE;
 export const checkIsDevelopment = (network: string) => network === DEVELOPMENT;

source/main/environment.js

@@ -7,6 +7,7 @@ import { DEVELOPMENT, OS_NAMES } from '../common/types/environment.types';
 import {
   evaluateNetwork,
   checkIsAlonzoPurple,
+  checkIsShelleyQA,
   checkIsDev,
   checkIsTest,
   checkIsProduction,
@@ -34,6 +35,7 @@ const isMainnet = checkIsMainnet(NETWORK);
 const isStaging = checkIsStaging(NETWORK);
 const isTestnet = checkIsTestnet(NETWORK);
 const isAlonzoPurple = checkIsAlonzoPurple(NETWORK);
+const isShelleyQA = checkIsShelleyQA(NETWORK);
 const isSelfnode = checkIsSelfnode(NETWORK);
 const isDevelopment = checkIsDevelopment(NETWORK);
 const isWatchMode = process.env.IS_WATCH_MODE;
@@ -75,6 +77,7 @@ export const environment: Environment = Object.assign(
     isStaging,
     isTestnet,
     isAlonzoPurple,
+    isShelleyQA,
     isSelfnode,
     isDevelopment,
     isWatchMode,

source/renderer/app/Routes.js

@@ -34,6 +34,7 @@ import WalletTokensPage from './containers/wallet/WalletTokensPage';
 import WalletSettingsPage from './containers/wallet/WalletSettingsPage';
 import WalletUtxoPage from './containers/wallet/WalletUtxoPage';
 import VotingRegistrationPage from './containers/voting/VotingRegistrationPage';
+import { IS_STAKING_INFO_PAGE_AVAILABLE } from './config/stakingConfig';
 
 export const Routes = withRouter(() => (
   <Route path={ROUTES.ROOT}>
@@ -145,7 +146,9 @@ export const Routes = withRouter(() => (
               component={StakingRewardsPage}
             />
             <Route path={ROUTES.STAKING.EPOCHS} component={StakingEpochsPage} />
-            <Route path={ROUTES.STAKING.INFO} component={StakingInfoPage} />
+            {IS_STAKING_INFO_PAGE_AVAILABLE && (
+              <Route path={ROUTES.STAKING.INFO} component={StakingInfoPage} />
+            )}
           </Staking>
           <Route
             path={ROUTES.REDEEM_ITN_REWARDS}

source/renderer/app/components/wallet/transactions/Transaction.js

@@ -576,7 +576,9 @@ export default class Transaction extends Component<Props, State> {
               <div className={styles.details}>
                 <div className={styles.type}>
                   {intl.formatMessage(messages.type, { typeOfTransaction })},{' '}
-                  {moment(data.date).format(currentTimeFormat)}
+                  {moment(data.date)
+                    .locale(intl.locale)
+                    .format(currentTimeFormat)}
                 </div>
                 {this.renderTxnStateTag()}
               </div>

source/renderer/app/config/hardwareWalletsConfig.js

@@ -1,4 +1,8 @@
-const { isMainnet, isTestnet } = global.environment;
+// @flow
+import { get, map } from 'lodash';
+import { NetworkMagics } from '../../../common/types/cardano-node.types';
+import type { NetworkMagicType } from '../../../common/types/cardano-node.types';
+import type { Network } from '../../../common/types/environment.types';
 
 export const HARDENED_HEX = 0x80000000;
 export const HARDENED = 2147483648;
@@ -7,25 +11,18 @@ export const BYRON_PURPOSE_INDEX = 44;
 export const ADA_COIN_TYPE = 1815;
 export const DEFAULT_ADDRESS_INDEX = 0;
 
+const { isMainnet, isStaging, isSelfnode } = global.environment;
+const hardwareWalletNetworksConfig = {};
+map(NetworkMagics, (networkMagic: NetworkMagicType, network: Network) => {
+  const isMainnetLikeNetwork = isMainnet || isSelfnode || isStaging;
+  hardwareWalletNetworksConfig[network] = {
+    networkId: isMainnetLikeNetwork ? 1 : networkMagic[1],
+    protocolMagic: isMainnetLikeNetwork ? 764824073 : networkMagic[0],
+  };
+});
+
 export const HW_SHELLEY_CONFIG = {
-  NETWORK: {
-    MAINNET: {
-      name: 'mainnet',
-      networkId: 1,
-      protocolMagic: 764824073,
-      trezorProtocolMagic: 764824073,
-      eraStartSlot: 4492800,
-      ttl: 3600,
-    },
-    TESTNET: {
-      name: 'testnet',
-      networkId: 0,
-      protocolMagic: 1097911063,
-      trezorProtocolMagic: 1097911063,
-      eraStartSlot: 4492800,
-      ttl: 3600,
-    },
-  },
+  NETWORK: hardwareWalletNetworksConfig,
   DEFAULT_DERIVATION_PATH: [
     HARDENED + SHELLEY_PURPOSE_INDEX,
     HARDENED + ADA_COIN_TYPE,
@@ -41,13 +38,7 @@ export const HW_SHELLEY_CONFIG = {
 };
 
 export const HW_BYRON_CONFIG = {
-  NETWORK: {
-    MAINNET: {
-      name: 'mainnet',
-      networkId: 1,
-      protocolMagic: 764824073,
-    },
-  },
+  NETWORK: hardwareWalletNetworksConfig,
   DEFAULT_DERIVATION_PATH: [
     HARDENED + BYRON_PURPOSE_INDEX,
     HARDENED + ADA_COIN_TYPE,
@@ -80,6 +71,11 @@ export const isTrezorEnabled = true;
 export const isLedgerEnabled = true;
 
 export const isHardwareWalletSupportEnabled =
-  (isMainnet || isTestnet) && (isTrezorEnabled || isLedgerEnabled);
+  isTrezorEnabled || isLedgerEnabled;
 
 export const isHardwareWalletIndicatorEnabled = false;
+
+export const getHardwareWalletsNetworkConfig = (network: Network) => {
+  const networkConfig = get(HW_SHELLEY_CONFIG, ['NETWORK', network], {});
+  return networkConfig;
+};

source/renderer/app/config/stakingConfig.js

@@ -117,5 +117,6 @@ export const DELEGATION_ACTIONS: {
 export const IS_GRID_REWARDS_VIEW_AVAILABLE = !isMainnet && !isFlight;
 export const IS_RANKING_DATA_AVAILABLE = true;
 export const IS_SATURATION_DATA_AVAILABLE = true;
+export const IS_STAKING_INFO_PAGE_AVAILABLE = false;
 
 export const EPOCH_COUNTDOWN_INTERVAL = 1 * 1000; // 1 second | unit: milliseconds

source/renderer/app/config/topBarConfig.js

@@ -0,0 +1,2 @@
+// @flow
+export const IS_TADA_ICON_AVAILABLE = false;