Skip to content
Permalink
Browse files

v2.4.1 (#1284)

* fix: use webview instead of iframe for changelly (#1277)

* refactor: correct config endpoint order

* chore: update @arkecosystem/client

* hotfix: get fees for 7 days instead of 30

* chore: bump to 2.4.1
  • Loading branch information...
alexbarnsley committed Jun 12, 2019
1 parent ad08943 commit c923410ee75247b349491d823c1293c611b3de30
Showing with 22 additions and 15 deletions.
  1. +2 −2 package.json
  2. +3 −4 src/renderer/components/Wallet/WalletExchange/WalletExchange.vue
  3. +2 −2 src/renderer/services/client.js
  4. +15 −7 yarn.lock
@@ -1,7 +1,7 @@
{
"private": true,
"name": "ark-desktop-wallet",
"version": "2.4.0",
"version": "2.4.1",
"repository": {
"type": "git",
"url": "git+https://github.com/ArkEcosystem/desktop-wallet.git"
@@ -48,7 +48,7 @@
"test:unit:watch": "jest --config __tests__/unit.jest.conf.js --watch"
},
"dependencies": {
"@arkecosystem/client": "^0.1.23",
"@arkecosystem/client": "^0.1.25",
"@arkecosystem/crypto": "^2.2.2",
"@arkecosystem/ledger-transport": "^0.1.0",
"@babel/runtime": "^7.2.0",
@@ -76,12 +76,11 @@
v-else
class="WalletExchange__iframe mx-auto overflow-hidden mt-5"
>
<iframe
<webview
id="changelly"
:src="changellyWidgetURL"
width="100%"
height="550"
class="changelly overflow-y-hidden border-none"
scrolling="no"
style="width:100%; height:550px"
/>
</div>
</section>
@@ -75,8 +75,8 @@ export default class ClientService {
static async fetchPeerConfig (host, timeout = 3000) {
const walletApiHost = host.replace(/:\d+/, ':4040')
const endpoints = [
`${host}/config`,
`${walletApiHost}/config`,
`${host}/config`,
walletApiHost
]

@@ -113,7 +113,7 @@ export default class ClientService {
client.http.timeout = timeout
}

const { data } = await client.resource('node').fees(30)
const { data } = await client.resource('node').fees(7)

return data.data.map(fee => ({
type: Number(fee.type),
@@ -12,12 +12,12 @@
resolved "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz#9cafb171af82329490353b4816f03347aa150a30"
integrity sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA=

"@arkecosystem/client@^0.1.23":
version "0.1.23"
resolved "https://registry.yarnpkg.com/@arkecosystem/client/-/client-0.1.23.tgz#0dfd29e8c01d668f3edfce471838ef0fd130adf6"
integrity sha512-Gz2e+A7nNzSpNM3d4sywxHZfISwP9Jwm1SVreUu66W2jgVl68rCPFTZWiMBuoaKJly5ZZR2t1q5i0Ymqy0/yqQ==
"@arkecosystem/client@^0.1.25":
version "0.1.25"
resolved "https://registry.yarnpkg.com/@arkecosystem/client/-/client-0.1.25.tgz#a6fbca683a39a78d6c998156ef00cf2b4cddf35e"
integrity sha512-5DM1rZIAQoQe3Zj2dW3Ml9G2/g21MDfAPIoxSUE4Q+Xj5FhrIAb0ThUVfTr60Wj0sGBRmUZKNQ97aS9Idgih4A==
dependencies:
axios "^0.18.0"
axios "^0.19.0"
lodash.clonedeep "^4.5.0"
lodash.orderby "^4.6.0"
lodash.shuffle "^4.2.0"
@@ -1350,6 +1350,14 @@ axios@^0.18.0:
follow-redirects "^1.3.0"
is-buffer "^1.1.5"

axios@^0.19.0:
version "0.19.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
dependencies:
follow-redirects "1.5.10"
is-buffer "^2.0.2"

babel-code-frame@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -4767,7 +4775,7 @@ flush-write-stream@^1.0.0:
inherits "^2.0.1"
readable-stream "^2.0.4"

follow-redirects@^1.0.0, follow-redirects@^1.3.0:
follow-redirects@1.5.10, follow-redirects@^1.0.0, follow-redirects@^1.3.0:
version "1.5.10"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
@@ -5755,7 +5763,7 @@ is-buffer@^1.0.2, is-buffer@^1.1.5:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==

is-buffer@~2.0.3:
is-buffer@^2.0.2, is-buffer@~2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==

0 comments on commit c923410

Please sign in to comment.
You can’t perform that action at this time.