From 895350e77c8fcfbf5c2ccc7c0b6ff89fb0d62ad6 Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Sat, 15 Jul 2017 19:58:52 +0200 Subject: [PATCH 01/48] fix error message (#6065) --- ethcore/src/builtin.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs index d5dc459b2..7f71802b3 100644 --- a/ethcore/src/builtin.rs +++ b/ethcore/src/builtin.rs @@ -352,7 +352,7 @@ fn read_point(reader: &mut io::Chain<&[u8], io::Repeat>) -> Result<::bn::G1, Err let px = Fq::from_slice(&buf[0..32]).map_err(|_| Error::from("Invalid point x coordinate"))?; reader.read_exact(&mut buf[..]).expect("reading from zero-extended memory cannot fail; qed"); - let py = Fq::from_slice(&buf[0..32]).map_err(|_| Error::from("Invalid point x coordinate"))?; + let py = Fq::from_slice(&buf[0..32]).map_err(|_| Error::from("Invalid point y coordinate"))?; Ok( if px == Fq::zero() && py == Fq::zero() { From 4fc16a9eec7473b1e7497b45f8d0f1d189ad9f93 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 16 Jul 2017 11:05:36 +0200 Subject: [PATCH 02/48] Show busy indicator on Address forget (#6066) * Shw busy indicator on Address forget * Remove debug logs --- js/src/ui/ConfirmDialog/confirmDialog.js | 4 ++-- js/src/views/Address/Delete/delete.js | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/js/src/ui/ConfirmDialog/confirmDialog.js b/js/src/ui/ConfirmDialog/confirmDialog.js index 02f400e93..86f668a28 100644 --- a/js/src/ui/ConfirmDialog/confirmDialog.js +++ b/js/src/ui/ConfirmDialog/confirmDialog.js @@ -69,14 +69,14 @@ export default class ConfirmDialog extends Component { } key='deny' label={ labelDeny || DEFAULT_NO } onClick={ onDeny } />,