diff --git a/src/app/tabs/styles/run-tab-styles.js b/src/app/tabs/styles/run-tab-styles.js
index 47661923d3..75a14112b4 100644
--- a/src/app/tabs/styles/run-tab-styles.js
+++ b/src/app/tabs/styles/run-tab-styles.js
@@ -117,7 +117,7 @@ var css = csjs`
margin: 0;
min-width: 100px;
width: 100px;
- font-size: 10px;
+ /* font-size: 10px; */
word-break: inherit;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
diff --git a/src/multiParamManager.js b/src/multiParamManager.js
index a780119cb9..1f431cf48f 100644
--- a/src/multiParamManager.js
+++ b/src/multiParamManager.js
@@ -123,6 +123,9 @@ class MultiParamManager {
var onClick = (domEl) => {
this.clickCallBack(this.funABI.inputs, this.basicInputField.value)
}
+// TODO: if this is a lookup only make this button btn-info
+// otherwise it needs to have btn-warning injected
+// or do we need to only do this in 1 place - I have a feeling that this will happen in multiple places
this.contractActionsContainerSingle = yo`
-
${contractName} at ${shortAddress} (${context})
- ${copyToClipboard(() => address)}
+
`
- var close = yo`
`
- title.appendChild(close)
+ var close = yo`
`
+ title.querySelector('.btn-group').appendChild(close)
+
+ var contractActionsWrapper = yo`
+
+
`
function remove () {
instance.remove()
// @TODO perhaps add a callack here to warn the caller that the instance has been removed
}
- function toggleClass () {
+ function toggleClass (e) {
$(instance).toggleClass(`${css.hidesub}`)
+ // e.currentTarget.querySelector('i')
+ e.currentTarget.querySelector('i').classList.toggle(`fa-caret-right`)
+ e.currentTarget.querySelector('i').classList.toggle(`fa-caret-down`)
}
instance.appendChild(title)
+ instance.appendChild(contractActionsWrapper)
// Add the fallback function
var fallback = self.udapp.getFallbackInterface(contractABI)
if (fallback) {
- instance.appendChild(this.getCallButton({
+ contractActionsWrapper.appendChild(this.getCallButton({
funABI: fallback,
address: address,
contractAbi: contractABI,
@@ -103,7 +116,7 @@ UniversalDAppUI.prototype.renderInstanceFromABI = function (contractABI, address
return
}
// @todo getData cannot be used with overloaded functions
- instance.appendChild(this.getCallButton({
+ contractActionsWrapper.appendChild(this.getCallButton({
funABI: funABI,
address: address,
contractAbi: contractABI,
diff --git a/test-browser/tests/ballot.js b/test-browser/tests/ballot.js
index 64ceee05db..8460565673 100644
--- a/test-browser/tests/ballot.js
+++ b/test-browser/tests/ballot.js
@@ -38,7 +38,7 @@ function runTests (browser, testData) {
.setValue('input[placeholder="uint8 _numProposals"]', '1')
.click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)')
- .click('.instance:nth-of-type(2)')
+ .click('.instance:nth-of-type(2) > div > button')
.testFunction('delegate - transact (not payable)', '0x0571a2439ea58bd349dd130afb8aff62a33af14c06de0dbc3928519bdf13ce2e',
`[vm]\nfrom:0xca3...a733c\nto:Ballot.delegate(address) 0x692...77b3a\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0x057...3ce2e`,
{types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"'}, null, null)
@@ -66,7 +66,7 @@ function runTests (browser, testData) {
})
})
.clickLaunchIcon('run')
- .click('div[class^="udappClose"]')
+ .click('button[class^="udappClose"]')
.perform((client, done) => {
console.log('ballot.abi')
contractHelper.addFile(browser, 'ballot.abi', { content: ballotABI }, () => {
@@ -89,7 +89,7 @@ function runTests (browser, testData) {
.pause(500)
.perform((client, done) => {
console.log('delegate - transact (not payable)')
- browser.waitForElementPresent('.instance:nth-of-type(2)').click('.instance:nth-of-type(2)').testFunction('delegate - transact (not payable)', '0xd3cd54e2f76f3993078ecf9e1b54a148def4520afc141a182293b3610bddf10f',
+ browser.waitForElementPresent('.instance:nth-of-type(2)').click('.instance:nth-of-type(2) > div > button').testFunction('delegate - transact (not payable)', '0xd3cd54e2f76f3993078ecf9e1b54a148def4520afc141a182293b3610bddf10f',
`[vm]\nfrom:0xca3...a733c\nto:Ballot.delegate(address) 0x692...77b3a\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0xd3c...df10f`,
{types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"'}, null, null, () => { done() })
}).end()
diff --git a/test-browser/tests/compiling.js b/test-browser/tests/compiling.js
index 7817299af6..f961f7304d 100644
--- a/test-browser/tests/compiling.js
+++ b/test-browser/tests/compiling.js
@@ -41,7 +41,7 @@ function testSimpleContract (browser, callback) {
browser.clickLaunchIcon('run')
.click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)')
- .click('.instance:nth-of-type(2)')
+ .click('.instance:nth-of-type(2) > div > button')
.click('#runTabView .instance div[class^="title"]')
.click('#runTabView .instance div[class^="title"]')
.testFunction('f - transact (not payable)',
@@ -72,7 +72,7 @@ function testReturnValues (browser, callback) {
browser.clickLaunchIcon('run')
.click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)')
- .click('.instance:nth-of-type(2)')
+ .click('.instance:nth-of-type(2) > div > button')
.testFunction('retunValues1 - transact (not payable)',
'0xc3660c7ab6899f196e77d3ab3749169e22c00ae7f1b8fe3af0ce54df49504019',
`[vm]\nfrom:0xca3...a733c\nto:testReturnValues.retunValues1() 0x5e7...26e9f\nvalue:0 wei\ndata:0x9ed...59eb7\nlogs:0\nhash:0xc36...04019`,
@@ -110,7 +110,7 @@ function testInputValues (browser, callback) {
browser.clickLaunchIcon('run')
.click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)')
- .click('.instance:nth-of-type(2)')
+ .click('.instance:nth-of-type(2) > div > button')
.testFunction('inputValue1 - transact (not payable)',
'0xf3265e3d9cd9299958bf81bed3cdfdd537942f85b9e0b95c5468c691d9396505',
`[vm]\nfrom:0xca3...a733c\nto:test.inputValue1(uint256,int256,string) 0x8c1...401f5\nvalue:0 wei\ndata:0xd69...00000\nlogs:0\nhash:0xf32...96505`,
diff --git a/test-browser/tests/simpleContract.js b/test-browser/tests/simpleContract.js
index 6b76b83989..eeffaffcdc 100644
--- a/test-browser/tests/simpleContract.js
+++ b/test-browser/tests/simpleContract.js
@@ -84,7 +84,7 @@ function testAutoDeployLib (browser, callback) {
contractHelper.createContract(browser, '', () => {
contractHelper.getAddressAtPosition(browser, 0, (address) => {
console.log(address)
- browser.waitForElementPresent('.instance:nth-of-type(2)').click('.instance:nth-of-type(2)').perform(() => {
+ browser.waitForElementPresent('.instance:nth-of-type(2)').click('.instance:nth-of-type(2) > div > button').perform(() => {
contractHelper.testConstantFunction(browser, address, 'get - call', '', '0: uint256: 45', () => { callback(null, browser) })
})
})
@@ -145,7 +145,7 @@ function checkDeployShouldSucceed (browser, address, callback) {
contractHelper.createContract(browser, '', () => {
contractHelper.getAddressAtPosition(browser, 1, (address) => {
browser.waitForElementPresent('.instance:nth-of-type(3)')
- .click('.instance:nth-of-type(3)').perform(() => {
+ .click('.instance:nth-of-type(3) > div > button').perform(() => {
contractHelper.testConstantFunction(browser, address, 'get - call', '', '0: uint256: 45', () => { callback(null, browser) })
})
})
diff --git a/test-browser/tests/units/testRecorder.js b/test-browser/tests/units/testRecorder.js
index 5f5f5f201d..ac8eb30322 100644
--- a/test-browser/tests/units/testRecorder.js
+++ b/test-browser/tests/units/testRecorder.js
@@ -14,9 +14,9 @@ module.exports = {
.click('div[class^="cardContainer"] i[class^="arrow"]')
.click('#runTabView .runtransaction')
.waitForElementPresent('.instance:nth-of-type(2)')
- .click('.instance:nth-of-type(2)')
+ .click('.instance:nth-of-type(2) > div > button')
.waitForElementPresent('.instance:nth-of-type(3)')
- .click('.instance:nth-of-type(3)')
+ .click('.instance:nth-of-type(3) > div > button')
.clickFunction('getInt - call')
.clickFunction('getAddress - call')
.clickFunction('getFromLib - call')
@@ -38,7 +38,7 @@ module.exports = {
})
})
.waitForElementPresent('.instance:nth-of-type(2)')
- .click('.instance:nth-of-type(2)')
+ .click('.instance:nth-of-type(2) > div > button')
.perform((client, done) => {
browser.clickFunction('set - transact (not payable)', {types: 'uint256 _p', values: '34'})
.click('i.savetransaction').modalFooterOKClick().getEditorValue(function (result) {