diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-10 08:03:22 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-10 08:03:22 +0800 |
| commit | b0023f66b06fe1248168420a9526a64c3e09cd75 (patch) | |
| tree | 6219b965a791c537abd86110da067d76938170a9 /ethereal/assets/qml | |
| parent | a77dcd10414e94fbd255931b0a539bbfefd91f56 (diff) | |
| parent | 109395daaaac5882fcefac7577d464051c11a841 (diff) | |
| download | go-tangerine-b0023f66b06fe1248168420a9526a64c3e09cd75.tar go-tangerine-b0023f66b06fe1248168420a9526a64c3e09cd75.tar.gz go-tangerine-b0023f66b06fe1248168420a9526a64c3e09cd75.tar.bz2 go-tangerine-b0023f66b06fe1248168420a9526a64c3e09cd75.tar.lz go-tangerine-b0023f66b06fe1248168420a9526a64c3e09cd75.tar.xz go-tangerine-b0023f66b06fe1248168420a9526a64c3e09cd75.tar.zst go-tangerine-b0023f66b06fe1248168420a9526a64c3e09cd75.zip | |
Merge branch 'release/poc5-rc2'poc5-rc2
Diffstat (limited to 'ethereal/assets/qml')
| -rw-r--r-- | ethereal/assets/qml/newTransaction/_new_contract.qml | 4 | ||||
| -rw-r--r-- | ethereal/assets/qml/newTransaction/_simple_send.qml | 4 | ||||
| -rw-r--r-- | ethereal/assets/qml/webapp.qml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ethereal/assets/qml/newTransaction/_new_contract.qml b/ethereal/assets/qml/newTransaction/_new_contract.qml index 0794d3dcd..f8f3d53a0 100644 --- a/ethereal/assets/qml/newTransaction/_new_contract.qml +++ b/ethereal/assets/qml/newTransaction/_new_contract.qml @@ -150,7 +150,7 @@ Component { text: "Send" onClicked: { //this.enabled = false - var res = eth.createTx(txFuelRecipient.text, txValue.text, txGas.text, txGasPrice.text, codeView.text) + var res = eth.create(txFuelRecipient.text, txValue.text, txGas.text, txGasPrice.text, codeView.text) if(res[1]) { txResult.text = "Your contract <b>could not</b> be send over the network:\n<b>" txResult.text += res[1].error() @@ -158,7 +158,7 @@ Component { mainContractColumn.state = "ERROR" } else { txResult.text = "Your transaction has been submitted:\n" - txOutput.text = res[0] + txOutput.text = res[0].address mainContractColumn.state = "DONE" } } diff --git a/ethereal/assets/qml/newTransaction/_simple_send.qml b/ethereal/assets/qml/newTransaction/_simple_send.qml index d460797ea..12420c15a 100644 --- a/ethereal/assets/qml/newTransaction/_simple_send.qml +++ b/ethereal/assets/qml/newTransaction/_simple_send.qml @@ -77,12 +77,12 @@ Component { text: "Send" onClicked: { //this.enabled = false - var res = eth.createTx(txSimpleRecipient.text, txSimpleValue.text,"","","") + var res = eth.transact(txSimpleRecipient.text, txSimpleValue.text,"","","") if(res[1]) { txSimpleResult.text = "There has been an error broadcasting your transaction:" + res[1].error() } else { txSimpleResult.text = "Your transaction has been broadcasted over the network.\nYour transaction id is:" - txSimpleOutput.text = res[0] + txSimpleOutput.text = res[0].hash this.visible = false simpleSendColumn.state = "DONE" } diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index d02c9a82e..1f3c3874a 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -39,7 +39,7 @@ ApplicationWindow { experimental.preferences.javascriptEnabled: true experimental.preferences.navigatorQtObjectEnabled: true experimental.preferences.developerExtrasEnabled: true - experimental.userScripts: [ui.assetPath("ethereum.js")] + experimental.userScripts: [ui.assetPath("ext/pre.js"), ui.assetPath("ext/big.js"), ui.assetPath("ext/string.js"), ui.assetPath("ext/ethereum.js")] experimental.onMessageReceived: { console.log("[onMessageReceived]: ", message.data) // TODO move to messaging.js |