From 3a2bd9141ed353fabd1cabbbfd0165c8db0ed3d7 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 25 Nov 2021 20:10:38 +0100 Subject: [PATCH 1/6] small typos --- src/language/en-US.json | 2 +- src/language/translations.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/language/en-US.json b/src/language/en-US.json index 00ac158c0..37ac5de95 100644 --- a/src/language/en-US.json +++ b/src/language/en-US.json @@ -338,7 +338,7 @@ "bridge.form.errorSameChain": "The two chains cannot be the same", "bridge.form.errorBridgeNotSupported": "The selected bridge transfer is not supported", "bridge.form.amount": "Amount", - "bridge.form.willReceive": "You will receieve: ", + "bridge.form.willReceive": "You will receive: ", "bridge.form.fee": "Fee: ", "bridge.form.destination": "Destination: ", "bridge.form.toAddress": "To Address: ", diff --git a/src/language/translations.json b/src/language/translations.json index 53caff081..ad90f41cb 100644 --- a/src/language/translations.json +++ b/src/language/translations.json @@ -612,7 +612,7 @@ "errorSameChain": "The two chains cannot be the same", "errorBridgeNotSupported": "The selected bridge transfer is not supported", "amount": "Amount", - "willReceive": "You will receieve: ", + "willReceive": "You will receive: ", "fee": "Fee: ", "destination": "Destination: ", "toAddress": "To Address: ", From 7fbdac2fab19f35f516e6d9a7484711b4725eb4a Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 25 Nov 2021 20:12:44 +0100 Subject: [PATCH 2/6] correct link --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3059b8206..a0ec493fb 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,7 +3,7 @@ # PR Checklist: -- [ ] Have you read the [CONTRIBUTING.md](https://github.com/crypto-com/chain-desktip-wallet/blob/master/CONTRIBUTING.md)? +- [ ] Have you read the [CONTRIBUTING.md](https://github.com/crypto-com/chain-desktop-wallet/blob/master/CONTRIBUTING.md)? - [ ] Does your PR follow the [C4 patch requirements](https://rfc.zeromq.org/spec:42/C4/#23-patch-requirements)? - [ ] Have you rebased your work on top of the latest master? - [ ] Have you checked your code compiles? (`yarn build`) From 7e59ea65cc9bd5a3562ca121f8fa30ac1f11e92c Mon Sep 17 00:00:00 2001 From: crypto-matto Date: Tue, 30 Nov 2021 15:46:36 +0800 Subject: [PATCH 3/6] Fix custom address support in Ledger --- src/pages/bridge/bridge.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/bridge/bridge.tsx b/src/pages/bridge/bridge.tsx index 14446d0f3..da453517f 100644 --- a/src/pages/bridge/bridge.tsx +++ b/src/pages/bridge/bridge.tsx @@ -245,8 +245,8 @@ const CronosBridge = props => { }); if (decryptedPhrase || session.wallet.walletType === LEDGER_WALLET_TYPE) { - const { tendermintAddress, evmAddress, toAddress, isCustomToAddress } = formValues; - // const { isCustomToAddress } = form.getFieldsValue(); + const { tendermintAddress, evmAddress } = formValues; + const { toAddress, isCustomToAddress } = form.getFieldsValue(); let amount = form.getFieldValue('amount'); amount = fromScientificNotation(amount).toString(); From d26d02ce0a2123d823988d95dd7560db2de91cc1 Mon Sep 17 00:00:00 2001 From: crypto-matto Date: Tue, 30 Nov 2021 15:49:35 +0800 Subject: [PATCH 4/6] Bridge timeout sync to 1 hour --- src/config/StaticConfig.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/StaticConfig.ts b/src/config/StaticConfig.ts index 538ea9070..5e56f3ef4 100644 --- a/src/config/StaticConfig.ts +++ b/src/config/StaticConfig.ts @@ -199,7 +199,7 @@ export type WalletConfig = { export const FIXED_DEFAULT_FEE = String(10_000); export const FIXED_DEFAULT_GAS_LIMIT = String(300_000); -export const DEFAULT_IBC_TRANSFER_TIMEOUT = 600_000; +export const DEFAULT_IBC_TRANSFER_TIMEOUT = 3_600_000; export const EVM_MINIMUM_GAS_PRICE = String(42_000_000_000); export const EVM_MINIMUM_GAS_LIMIT = String(42_000); From b9d74c5814ed479341108893166772a18d8b71ab Mon Sep 17 00:00:00 2001 From: crypto-matto Date: Thu, 2 Dec 2021 15:55:23 +0800 Subject: [PATCH 5/6] CHANGELOG update --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d17b5c0a1..4c425efc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file. *Released* +## [v0.5.7] - 2021-12-02 + +### Bug fixes +- Fix missing custom destination address support for Ledger wallets on Cronos Bridge. +- Extend IBC Transfer timeout to 1 hour + ## [v0.5.6] - 2021-11-23 ### Additions diff --git a/package.json b/package.json index 051ca5092..6106be134 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "chain-desktop-wallet", - "version": "0.5.6", + "version": "0.5.7", "description": "Crypto.com Chain Desktop Wallet App", "repository": "github:crypto-com/chain-desktop-wallet", "author": "Crypto.org ", From 6fc6746ac3825d8fc2dc73e76b2f53b70d508fe2 Mon Sep 17 00:00:00 2001 From: crypto-matto Date: Thu, 2 Dec 2021 15:56:24 +0800 Subject: [PATCH 6/6] CHANGELOG update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c425efc4..32ccd8b13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ## [v0.5.7] - 2021-12-02 ### Bug fixes -- Fix missing custom destination address support for Ledger wallets on Cronos Bridge. +- Fix missing custom destination address support for Ledger wallets on Cronos Bridge - Extend IBC Transfer timeout to 1 hour ## [v0.5.6] - 2021-11-23