From bf94a5b82be33085deba89236e6390d9674100ff Mon Sep 17 00:00:00 2001 From: Nicolas Gotchac Date: Fri, 4 Nov 2016 12:38:05 +0100 Subject: [PATCH 1/5] Fixes #3171 (#3175) --- js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js | 6 ++++-- js/src/modals/Transfer/transfer.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js b/js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js index 0dcee8f9d..adf644c4e 100644 --- a/js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js +++ b/js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js @@ -539,7 +539,7 @@ export default class GasPriceSelector extends Component { const gasPriceBIdx = gasPriceAIdx + 1; if (gasPriceBIdx === N + 1) { - const gasPrice = gasPrices[gasPriceAIdx]; + const gasPrice = gasPrices[gasPriceAIdx].round(); this.props.onChange(event, gasPrice); return; } @@ -548,7 +548,9 @@ export default class GasPriceSelector extends Component { const gasPriceB = gasPrices[gasPriceBIdx]; const mult = Math.round((sliderValue % 1) * 100) / 100; - const gasPrice = gasPriceA.plus(gasPriceB.minus(gasPriceA).times(mult)); + const gasPrice = gasPriceA + .plus(gasPriceB.minus(gasPriceA).times(mult)) + .round(); this.setSliderValue(sliderValue, gasPrice); this.props.onChange(event, gasPrice); diff --git a/js/src/modals/Transfer/transfer.js b/js/src/modals/Transfer/transfer.js index 192b2f460..b505ad0ae 100644 --- a/js/src/modals/Transfer/transfer.js +++ b/js/src/modals/Transfer/transfer.js @@ -411,6 +411,7 @@ export default class Transfer extends Component { const { api } = this.context; const { account } = this.props; const { data, gas, gasPrice, recipient, value } = this.state; + const options = { from: account.address, to: recipient, From 6667373a80227b67100c314beff05565477f51bd Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 4 Nov 2016 12:45:50 +0100 Subject: [PATCH 2/5] Remove extra cd js (#3177) --- js/scripts/release.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/js/scripts/release.sh b/js/scripts/release.sh index 0fab71e2c..3cb2869d4 100755 --- a/js/scripts/release.sh +++ b/js/scripts/release.sh @@ -57,7 +57,6 @@ if [ "$BRANCH" == "master" ]; then npm version patch echo "*** Building packages for npmjs" - cd js # echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login echo "$NPM_TOKEN" >> ~/.npmrc npm run ci:build:npm From e80771b3ca5bfef6ad5ac72b6ef28f6669a2f4b2 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 4 Nov 2016 12:54:23 +0100 Subject: [PATCH 3/5] Back to real root (#3178) --- js/scripts/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/scripts/release.sh b/js/scripts/release.sh index 3cb2869d4..fd95e00b8 100755 --- a/js/scripts/release.sh +++ b/js/scripts/release.sh @@ -64,7 +64,7 @@ if [ "$BRANCH" == "master" ]; then echo "*** Publishing $PACKAGE to npmjs" cd .npmjs npm publish --access public - cd .. + cd ../.. fi echo "*** Updating cargo parity-ui-precompiled#$PRECOMPILED_HASH" From 67b1bde355c5d66d01cd0763a4b3a4360cbc3e9c Mon Sep 17 00:00:00 2001 From: GitLab Build Bot Date: Fri, 4 Nov 2016 12:14:06 +0000 Subject: [PATCH 4/5] [ci skip] js-precompiled 20161104-121251 --- Cargo.lock | 2 +- js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d9891668b..ae27075a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1249,7 +1249,7 @@ dependencies = [ [[package]] name = "parity-ui-precompiled" version = "1.4.0" -source = "git+https://github.com/ethcore/js-precompiled.git#3a77750a2d29e2babb52bc4dfa5c40b2e26b97ce" +source = "git+https://github.com/ethcore/js-precompiled.git#ae1fec0a333d93cae8e228de2b80847e6cd0b658" dependencies = [ "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/js/package.json b/js/package.json index 4f441f328..5217f2808 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "parity.js", - "version": "0.1.61", + "version": "0.1.62", "main": "release/index.js", "jsnext:main": "src/index.js", "author": "Parity Team ", From df33aa920bbb67ed957b6e28ec0cab3dfc21f3fe Mon Sep 17 00:00:00 2001 From: GitLab Build Bot Date: Fri, 4 Nov 2016 13:11:00 +0000 Subject: [PATCH 5/5] [ci skip] js-precompiled 20161104-130943 --- Cargo.lock | 2 +- js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae27075a3..d4504a278 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1249,7 +1249,7 @@ dependencies = [ [[package]] name = "parity-ui-precompiled" version = "1.4.0" -source = "git+https://github.com/ethcore/js-precompiled.git#ae1fec0a333d93cae8e228de2b80847e6cd0b658" +source = "git+https://github.com/ethcore/js-precompiled.git#cb99e22b536486190f3e19b2760e1142096b5fd7" dependencies = [ "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/js/package.json b/js/package.json index 5217f2808..36d5a4250 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "parity.js", - "version": "0.1.62", + "version": "0.1.63", "main": "release/index.js", "jsnext:main": "src/index.js", "author": "Parity Team ",