Skip to content

Commit

Permalink
Merge pull request #855 from crypto-com/dev
Browse files Browse the repository at this point in the history
Internal Release v0.5.7
  • Loading branch information
crypto-matto authored Dec 2, 2021
2 parents 019d542 + 5e97be1 commit 109ecd5
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion src/config/StaticConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/language/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -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: ",
Expand Down
2 changes: 1 addition & 1 deletion src/language/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -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: ",
Expand Down
4 changes: 2 additions & 2 deletions src/pages/bridge/bridge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit 109ecd5

Please sign in to comment.