Skip to content

Commit

Permalink
Merge branch 'develop' into fix/ddw-330-fix-wallet-delegation-min-amo…
Browse files Browse the repository at this point in the history
…unt-logic
  • Loading branch information
thedanheller committed Aug 3, 2020
2 parents f89648d + 55967d4 commit 6efd30b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Expand Up @@ -13,6 +13,10 @@ Changelog
- Fixed Daedalus logo animation on the "Loading" screen ([PR 2124](https://github.com/input-output-hk/daedalus/pull/2124))
- Fixed text copy on the "Delegation center" screen ([PR 2125](https://github.com/input-output-hk/daedalus/pull/2125))

### Chores

- Updated `cardano-wallet` to revision `03b7568b` ([PR 2119](https://github.com/input-output-hk/daedalus/pull/2119))

## 2.0.0

### Features
Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
Expand Up @@ -29,10 +29,10 @@
"homepage": null,
"owner": "input-output-hk",
"repo": "cardano-wallet",
"rev": "1c7041e5d396dad6871d3fb9d9989cdb2fb32b1a",
"sha256": "144iyq4nlsbvbbaaajqaz6gz96xmmmvmz1qbjirbxih3jmfyyqny",
"rev": "03b7568bebe587d1e45d402536953c6ea1dc2d99",
"sha256": "0drmqrw9h4as57lix51ddafw25wcvj3bs1wvxrn8gbff1ilghnjh",
"type": "tarball",
"url": "https://github.com/input-output-hk/cardano-wallet/archive/1c7041e5d396dad6871d3fb9d9989cdb2fb32b1a.tar.gz",
"url": "https://github.com/input-output-hk/cardano-wallet/archive/03b7568bebe587d1e45d402536953c6ea1dc2d99.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "v2020-04-28"
},
Expand Down
Expand Up @@ -21,6 +21,6 @@ export const createTransaction = (
path: `/v2/wallets/${walletId}/transactions/`,
...config,
},
{ withdrawRewards: true },
{ withdrawRewards: 'self' },
data
);
Expand Up @@ -20,6 +20,6 @@ export const getTransactionFee = (
path: `/v2/wallets/${walletId}/payment-fees`,
...config,
},
{ withdrawRewards: true },
{ withdrawRewards: 'self' },
data
);

0 comments on commit 6efd30b

Please sign in to comment.