Skip to content

Commit 4c813c7

Browse files
nikolaglumacnikolaglumac
committed
[DDW-706] Merges develop
2 parents 053de28 + 88c5401 commit 4c813c7

File tree

20 files changed

+139
-121
lines changed

20 files changed

+139
-121
lines changed

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Changelog
22

3+
## vNext
4+
5+
### Features
6+
7+
- Removed "Alonzo tada" icon and "Alonzo countdown" screen ([PR 2708](https://github.com/input-output-hk/daedalus/pull/2708))
8+
9+
### Fixes
10+
11+
- Updated "Trezor T" image shown on the "Pair a hardware wallet device" dialog ([PR 2712](https://github.com/input-output-hk/daedalus/pull/2712))
12+
- Fixed transaction timestamps localization ([PR 2702](https://github.com/input-output-hk/daedalus/pull/2702))
13+
14+
### Chores
15+
16+
- Added hardware wallet support for all non-public testnets ([PR 2672](https://github.com/input-output-hk/daedalus/pull/2672))
17+
18+
## 4.4.1
19+
20+
### Fixes
21+
22+
- Updated Electron package to the version which includes a fix for crashes on Windows
23+
324
## 4.4.0
425

526
### Features

‎installers/nix/electron.nix‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
libdrm, libxkbcommon, mesa }:
33

44
let
5-
version = "13.1.0";
5+
version = "13.1.1";
66
name = "electron-${version}";
77

88
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
@@ -21,19 +21,19 @@ let
2121
src = {
2222
i686-linux = fetchurl {
2323
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
24-
sha256 = "e4d8cc19689b1f9c00894bb776083f8543abeba9203d3297268c1644f1300355";
24+
sha256 = "fed00edaaba0c4a615fe835baf7d0d0ff893dff902800006bf63cc994c24d3dd";
2525
};
2626
x86_64-linux = fetchurl {
2727
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
28-
sha256 = "6681078971d2e99e9f8b3c598de65869d3596356af901bbbabcc4860c0496bb4";
28+
sha256 = "eb6ae81d71a4d390ec5140d907b191a84c37621176eec9369bb6fc3bf8570e3b";
2929
};
3030
armv7l-linux = fetchurl {
3131
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
32-
sha256 = "ac5a19e31fd83db5775a2af57f742c7b3e5fc4528958329ec3c81f82e7bd611a";
32+
sha256 = "7e745a38c6761fa9826b3b9b8d0bd060126a3949da6f3f09f11b842e5e22cee4";
3333
};
3434
aarch64-linux = fetchurl {
3535
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
36-
sha256 = "0ed0cc3afae5cc7e1e6c6204866a1cecdf97e0ab658789e8951842bd0d28e1bb";
36+
sha256 = "445c88e9c9b33abbdb263103736fb5203938b0643bc5377fbdf12b444d26f211";
3737
};
3838
}.${stdenv.hostPlatform.system} or throwSystem;
3939

@@ -66,11 +66,11 @@ let
6666
src = {
6767
x86_64-darwin = fetchurl {
6868
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
69-
sha256 = "d62a561e80fcbcb0f249e74c487313192451046f288478add65be997793831de";
69+
sha256 = "1594ba9aa2e2aa059a03e6b70e16b8116de1998b38f8360801e113fa8d72938c";
7070
};
7171
aarch64-darwin = fetchurl {
7272
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-arm64.zip";
73-
sha256 = "6da46d2861011263af2953a3e0186735e54708c01c50967ff5f8ed71b73f7fea";
73+
sha256 = "7045538917c36214127b7f11a3223396c7199ac19e989e5648a0963773962e6c";
7474
};
7575
}.${stdenv.hostPlatform.system} or throwSystem;
7676

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "daedalus",
33
"productName": "Daedalus",
4-
"version": "4.4.0",
4+
"version": "4.4.1",
55
"description": "Cryptocurrency Wallet",
66
"main": "./dist/main/index.js",
77
"scripts": {
@@ -191,7 +191,7 @@
191191
"classnames": "2.2.6",
192192
"csv-stringify": "5.5.1",
193193
"cucumber-html-reporter": "5.2.0",
194-
"electron": "13.1.0",
194+
"electron": "13.1.1",
195195
"electron-log-daedalus": "2.2.21",
196196
"electron-store": "8.0.0",
197197
"es6-error": "4.1.1",

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

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
// @flow
2+
import {
3+
MAINNET,
4+
TESTNET,
5+
STAGING,
6+
SHELLEY_QA,
7+
ALONZO_PURPLE,
8+
SELFNODE,
9+
} from './environment.types';
10+
211
export type TlsConfig = {
312
hostname: string,
413
port: number,
@@ -142,17 +151,26 @@ export type CardanoStatus = {
142151
cardanoWalletPID: number,
143152
};
144153

145-
// Cardano Mainet network magic
146-
export const MAINNET_MAGIC = [1, null];
147-
148-
// Cardano Byron Testnet network magic
149-
export const TESTNET_MAGIC = [1097911063, 0];
150-
151-
// Cardano Staging network magic
152-
export const STAGING_MAGIC = [633343913, 1];
154+
export type NetworkMagicType = Array<?number>;
153155

154-
// Cardano Alonzo Purple network magic
155-
export const ALONZO_PURPLE_MAGIC = [8, 0];
156-
157-
// Cardano Selfnode network magic
158-
export const SELFNODE_MAGIC = MAINNET_MAGIC;
156+
export const NetworkMagics: {
157+
mainnet: NetworkMagicType,
158+
testnet: NetworkMagicType,
159+
staging: NetworkMagicType,
160+
alonzo_purple: NetworkMagicType,
161+
shelley_qa: NetworkMagicType,
162+
selfnode: NetworkMagicType,
163+
} = {
164+
// Cardano Mainet network magic
165+
[MAINNET]: [1, null],
166+
// Cardano Staging network magic
167+
[STAGING]: [633343913, 1],
168+
// Cardano Byron Testnet network magic
169+
[TESTNET]: [1097911063, 0],
170+
// Cardano Alonzo Purple network magic
171+
[ALONZO_PURPLE]: [8, 0],
172+
// Cardano Shelley QA network magic
173+
[SHELLEY_QA]: [3, 0],
174+
// Cardano Selfnode network magic
175+
[SELFNODE]: [1, null],
176+
};

‎source/common/types/environment.types.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export type Environment = {
1212
isStaging: boolean,
1313
isTestnet: boolean,
1414
isAlonzoPurple: boolean,
15+
isShelleyQA: boolean,
1516
isSelfnode: boolean,
1617
isDevelopment: boolean,
1718
isWatchMode: boolean,

‎source/common/utils/environmentCheckers.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { upperFirst } from 'lodash';
33
import {
44
ALONZO_PURPLE,
5+
SHELLEY_QA,
56
DEVELOPMENT,
67
LINUX,
78
MAC_OS,
@@ -54,6 +55,7 @@ export const checkIsMainnet = (network: string) => network === MAINNET;
5455
export const checkIsTestnet = (network: string) => network === TESTNET;
5556
export const checkIsAlonzoPurple = (network: string) =>
5657
network === ALONZO_PURPLE;
58+
export const checkIsShelleyQA = (network: string) => network === SHELLEY_QA;
5759
export const checkIsStaging = (network: string) => network === STAGING;
5860
export const checkIsSelfnode = (network: string) => network === SELFNODE;
5961
export const checkIsDevelopment = (network: string) => network === DEVELOPMENT;

‎source/main/environment.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { DEVELOPMENT, OS_NAMES } from '../common/types/environment.types';
77
import {
88
evaluateNetwork,
99
checkIsAlonzoPurple,
10+
checkIsShelleyQA,
1011
checkIsDev,
1112
checkIsTest,
1213
checkIsProduction,
@@ -34,6 +35,7 @@ const isMainnet = checkIsMainnet(NETWORK);
3435
const isStaging = checkIsStaging(NETWORK);
3536
const isTestnet = checkIsTestnet(NETWORK);
3637
const isAlonzoPurple = checkIsAlonzoPurple(NETWORK);
38+
const isShelleyQA = checkIsShelleyQA(NETWORK);
3739
const isSelfnode = checkIsSelfnode(NETWORK);
3840
const isDevelopment = checkIsDevelopment(NETWORK);
3941
const isWatchMode = process.env.IS_WATCH_MODE;
@@ -75,6 +77,7 @@ export const environment: Environment = Object.assign(
7577
isStaging,
7678
isTestnet,
7779
isAlonzoPurple,
80+
isShelleyQA,
7881
isSelfnode,
7982
isDevelopment,
8083
isWatchMode,

‎source/renderer/app/Routes.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import WalletTokensPage from './containers/wallet/WalletTokensPage';
3434
import WalletSettingsPage from './containers/wallet/WalletSettingsPage';
3535
import WalletUtxoPage from './containers/wallet/WalletUtxoPage';
3636
import VotingRegistrationPage from './containers/voting/VotingRegistrationPage';
37+
import { IS_STAKING_INFO_PAGE_AVAILABLE } from './config/stakingConfig';
3738

3839
export const Routes = withRouter(() => (
3940
<Route path={ROUTES.ROOT}>
@@ -145,7 +146,9 @@ export const Routes = withRouter(() => (
145146
component={StakingRewardsPage}
146147
/>
147148
<Route path={ROUTES.STAKING.EPOCHS} component={StakingEpochsPage} />
148-
<Route path={ROUTES.STAKING.INFO} component={StakingInfoPage} />
149+
{IS_STAKING_INFO_PAGE_AVAILABLE && (
150+
<Route path={ROUTES.STAKING.INFO} component={StakingInfoPage} />
151+
)}
149152
</Staking>
150153
<Route
151154
path={ROUTES.REDEEM_ITN_REWARDS}

‎source/renderer/app/assets/images/hardware-wallet/trezor-ledger.inline.svg‎

Lines changed: 4 additions & 2 deletions
Loading

‎source/renderer/app/assets/images/hardware-wallet/trezor.inline.svg‎

Lines changed: 5 additions & 3 deletions
Loading

0 commit comments

Comments
 (0)