Merge branch 'master' into ui-2

# Conflicts: # js/src/views/Signer/RequestsPage/requestsPage.js
2017-04-25 11:10:23 +02:00
parent 234b8dd592 c9b2a7a980
commit b749718feb
12 changed files with 383 additions and 174 deletions
--- a/js/src/jsonrpc/interfaces/parity.js
+++ b/js/src/jsonrpc/interfaces/parity.js
@@ -1833,7 +1833,14 @@ export default {
        example: {
          from: '0xb60e8dd61c5d32be8058bb8eb970870f07233155',
          to: '0xd46e8dd67c5d32be8058bb8eb970870f07244567',
-          value: fromDecimal(2441406250)
+          gas: fromDecimal(30400),
+          gasPrice: fromDecimal(10000000000000),
+          value: fromDecimal(2441406250),
+          data: '0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675',
+          condition: {
+            block: 354221,
+            time: new Date()
+          }
        }
      }
    ],