From 196b0fd4a3cca70dccd6aa4afb353c2f2d14b8c8 Mon Sep 17 00:00:00 2001 From: Daniel Main Date: Thu, 6 Oct 2022 08:50:52 +0200 Subject: [PATCH 1/5] [DDW-1147] Added new jp translations --- CHANGELOG.md | 1 + source/renderer/app/i18n/locales/ja-JP.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fefbbdd8a8..2a4607c66a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Chores +- Changed japanese translations in delegate screen ([PR ]) - Updated trezor-connect to v9 ([PR 3038](https://github.com/input-output-hk/daedalus/pull/3038)) - Added analytics data collection ([PR 2927](https://github.com/input-output-hk/daedalus/pull/2927), [PR 2989](https://github.com/input-output-hk/daedalus/pull/2989), [PR 3003](https://github.com/input-output-hk/daedalus/pull/3003), [PR 3028](https://github.com/input-output-hk/daedalus/pull/3028)) - Updated LedgerJS to 5.1.0 ([PR 3036](https://github.com/input-output-hk/daedalus/pull/3036)) diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json index 56659c05b2..1dea295021 100755 --- a/source/renderer/app/i18n/locales/ja-JP.json +++ b/source/renderer/app/i18n/locales/ja-JP.json @@ -465,7 +465,7 @@ "staking.delegationSetup.chooseStakePool.step.dialog.stepIndicatorLabel": "ステップ{currentStep}/{totalSteps}", "staking.delegationSetup.chooseStakePool.step.dialog.title": "ステークプールを選択する", "staking.delegationSetup.chooseWallet.step.dialog.continueButtonLabel": "続ける", - "staking.delegationSetup.chooseWallet.step.dialog.description": "このウォレットには委任を有効にするために必要な最低額{minDelegationFunds} ADAが入っていません。{minDelegationFunds} ADA以上入っているウォレットを選択して、[続ける]をクリックしてください。", + "staking.delegationSetup.chooseWallet.step.dialog.description": "委任する資金が入ったウォレットを選択してください。委任をオプションにするためには、選択したウォレットに10ADA以上入っている必要があります。", "staking.delegationSetup.chooseWallet.step.dialog.errorMinDelegationFunds": "選択されたウォレットには委任を有効にするために必要な最低額{minDelegationFunds} ADAが入っていません。{minDelegationFunds} ADA以上入っているウォレットを選択して、[続ける]をクリックしてください。", "staking.delegationSetup.chooseWallet.step.dialog.errorMinDelegationFundsRewardsOnly": "このウォレットに含まれているのは報酬残高のみであるため、委任はできません。", "staking.delegationSetup.chooseWallet.step.dialog.errorRestoringWallet": "このウォレットは現在同期中のため委任に使用することができません。", From c3dfb9d9dd2e118225c6d37ce127f8fa754ab685 Mon Sep 17 00:00:00 2001 From: Daniel Main Date: Thu, 6 Oct 2022 09:01:55 +0200 Subject: [PATCH 2/5] [DDW-1147] Added new entry in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a4607c66a..03c5a88e2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ ### Chores -- Changed japanese translations in delegate screen ([PR ]) +- Changed japanese translations in delegate screen ([PR 3044](https://github.com/input-output-hk/daedalus/pull/3044)) - Updated trezor-connect to v9 ([PR 3038](https://github.com/input-output-hk/daedalus/pull/3038)) - Added analytics data collection ([PR 2927](https://github.com/input-output-hk/daedalus/pull/2927), [PR 2989](https://github.com/input-output-hk/daedalus/pull/2989), [PR 3003](https://github.com/input-output-hk/daedalus/pull/3003), [PR 3028](https://github.com/input-output-hk/daedalus/pull/3028)) - Updated LedgerJS to 5.1.0 ([PR 3036](https://github.com/input-output-hk/daedalus/pull/3036)) From c7c819355ad43df1c0709e27b23b9e71b50c4ff4 Mon Sep 17 00:00:00 2001 From: Daniel Main Date: Thu, 6 Oct 2022 09:06:07 +0200 Subject: [PATCH 3/5] [DDW-1147] Added minDelegationFunds --- source/renderer/app/i18n/locales/ja-JP.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json index 1dea295021..deb5af41e8 100755 --- a/source/renderer/app/i18n/locales/ja-JP.json +++ b/source/renderer/app/i18n/locales/ja-JP.json @@ -465,7 +465,7 @@ "staking.delegationSetup.chooseStakePool.step.dialog.stepIndicatorLabel": "ステップ{currentStep}/{totalSteps}", "staking.delegationSetup.chooseStakePool.step.dialog.title": "ステークプールを選択する", "staking.delegationSetup.chooseWallet.step.dialog.continueButtonLabel": "続ける", - "staking.delegationSetup.chooseWallet.step.dialog.description": "委任する資金が入ったウォレットを選択してください。委任をオプションにするためには、選択したウォレットに10ADA以上入っている必要があります。", + "staking.delegationSetup.chooseWallet.step.dialog.description": "委任する資金が入ったウォレットを選択してください。委任をオプションにするためには、選択したウォレットに{minDelegationFunds}ADA以上入っている必要があります。", "staking.delegationSetup.chooseWallet.step.dialog.errorMinDelegationFunds": "選択されたウォレットには委任を有効にするために必要な最低額{minDelegationFunds} ADAが入っていません。{minDelegationFunds} ADA以上入っているウォレットを選択して、[続ける]をクリックしてください。", "staking.delegationSetup.chooseWallet.step.dialog.errorMinDelegationFundsRewardsOnly": "このウォレットに含まれているのは報酬残高のみであるため、委任はできません。", "staking.delegationSetup.chooseWallet.step.dialog.errorRestoringWallet": "このウォレットは現在同期中のため委任に使用することができません。", @@ -1345,4 +1345,4 @@ "wallet.transferFunds.dialog2.total.label": "合計", "widgets.itemsDropdown.syncingLabel": "同期", "widgets.itemsDropdown.syncingLabelProgress": "同期中 {syncingProgress}%" -} \ No newline at end of file +} From 101c6c7cddb1a5bf60d798c0207589a22b63e81c Mon Sep 17 00:00:00 2001 From: Daniel Main Date: Thu, 6 Oct 2022 09:06:46 +0200 Subject: [PATCH 4/5] [DDW-1147] Added minDelegationFunds --- source/renderer/app/i18n/locales/ja-JP.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json index deb5af41e8..728b3e0265 100755 --- a/source/renderer/app/i18n/locales/ja-JP.json +++ b/source/renderer/app/i18n/locales/ja-JP.json @@ -1345,4 +1345,4 @@ "wallet.transferFunds.dialog2.total.label": "合計", "widgets.itemsDropdown.syncingLabel": "同期", "widgets.itemsDropdown.syncingLabelProgress": "同期中 {syncingProgress}%" -} +} \ No newline at end of file From 9378af6cf75d94f8c951f39e68866a2d58cce06e Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Fri, 7 Oct 2022 13:00:52 +0200 Subject: [PATCH 5/5] [DDW-1150] Integrate `cardano-wallet` v2022-10-06 --- CHANGELOG.md | 3 ++- default.nix | 15 +++++++++------ nix/sources.json | 8 ++++---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03c5a88e2c..39b9b68125 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ ### Chores -- Changed japanese translations in delegate screen ([PR 3044](https://github.com/input-output-hk/daedalus/pull/3044)) +- Updated `cardano-wallet` to v2022-10-06 ([PR 3045](https://github.com/input-output-hk/daedalus/pull/3045)) +- Changed Japanese translations in delegate screen ([PR 3044](https://github.com/input-output-hk/daedalus/pull/3044)) - Updated trezor-connect to v9 ([PR 3038](https://github.com/input-output-hk/daedalus/pull/3038)) - Added analytics data collection ([PR 2927](https://github.com/input-output-hk/daedalus/pull/2927), [PR 2989](https://github.com/input-output-hk/daedalus/pull/2989), [PR 3003](https://github.com/input-output-hk/daedalus/pull/3003), [PR 3028](https://github.com/input-output-hk/daedalus/pull/3028)) - Updated LedgerJS to 5.1.0 ([PR 3036](https://github.com/input-output-hk/daedalus/pull/3036)) diff --git a/default.nix b/default.nix index 42d9746d6a..76e328ea40 100644 --- a/default.nix +++ b/default.nix @@ -32,12 +32,15 @@ let }; pkgs = import sources.nixpkgs { inherit system config; }; sources = localLib.sources // { - cardano-wallet = pkgs.runCommand "cardano-wallet" {} '' - cp -r ${localLib.sources.cardano-wallet} $out - chmod -R +w $out - cd $out - patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch} - ''; + cardano-wallet = + if target != "aarch64-darwin" + then localLib.sources.cardano-wallet + else pkgs.runCommand "cardano-wallet" {} '' + cp -r ${localLib.sources.cardano-wallet} $out + chmod -R +w $out + cd $out + patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch} + ''; }; haskellNix = import sources."haskell.nix" {}; inherit (import haskellNix.sources.nixpkgs-unstable haskellNix.nixpkgsArgs) haskell-nix; diff --git a/nix/sources.json b/nix/sources.json index 30dc8afee2..7ec42b1e2b 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -24,15 +24,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "cardano-wallet": { - "branch": "v2022-08-16", + "branch": "v2022-10-06", "description": "Official Wallet Backend & API for Cardano decentralized", "homepage": null, "owner": "input-output-hk", "repo": "cardano-wallet", - "rev": "afe575663a866c612b4a4dc3a90a8a700e387a86", - "sha256": "03shbj5kxvcb22k1bvfcv9q529lg47g9y9pvvwkyb2jy285rwyhv", + "rev": "2130fe0acf19fa218cef8de4ef325ae9078e356e", + "sha256": "0d0wk6n7vij4qkp2qml5qdghk41dvm1078ps48673waf4cxjxaz0", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-wallet/archive/afe575663a866c612b4a4dc3a90a8a700e387a86.tar.gz", + "url": "https://github.com/input-output-hk/cardano-wallet/archive/2130fe0acf19fa218cef8de4ef325ae9078e356e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "cardano-world": {