From 0e874bca82ae9d695819a05b5d664bd0f6e775dc Mon Sep 17 00:00:00 2001 From: Rob Stupay Date: Thu, 25 Apr 2019 16:00:59 +0200 Subject: [PATCH 1/3] remove the network info from Environment pulldown --- src/app/tabs/runTab/settings.js | 42 ++++++++++++++++----------- src/app/tabs/styles/run-tab-styles.js | 9 +----- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/app/tabs/runTab/settings.js b/src/app/tabs/runTab/settings.js index e5483c9218..dd467a89f5 100644 --- a/src/app/tabs/runTab/settings.js +++ b/src/app/tabs/runTab/settings.js @@ -1,12 +1,12 @@ -var $ = require('jquery') -var yo = require('yo-yo') -var remixLib = require('remix-lib') -var EventManager = remixLib.EventManager -var css = require('../styles/run-tab-styles') -var copyToClipboard = require('../../ui/copy-to-clipboard') -var modalDialogCustom = require('../../ui/modal-dialog-custom') -var addTooltip = require('../../ui/tooltip') -var helper = require('../../../lib/helper.js') +const $ = require('jquery') +const yo = require('yo-yo') +const remixLib = require('remix-lib') +const EventManager = remixLib.EventManager +const css = require('../styles/run-tab-styles') +const copyToClipboard = require('../../ui/copy-to-clipboard') +const modalDialogCustom = require('../../ui/modal-dialog-custom') +const addTooltip = require('../../ui/tooltip') +const helper = require('../../../lib/helper.js') class SettingsUI { @@ -40,7 +40,7 @@ class SettingsUI { } render () { - this.netUI = yo`` + this.netUI = yo`` var environmentEl = yo`
@@ -48,7 +48,6 @@ class SettingsUI { Environment
- ${this.netUI}
` - var valueEl = yo` + const valueEl = yo`
Value
@@ -105,9 +112,10 @@ class SettingsUI {
` - var el = yo` + const el = yo`
${environmentEl} + ${networkEl} ${accountEl} ${gasPriceEl} ${valueEl} @@ -231,7 +239,7 @@ class SettingsUI { this.netUI.innerHTML = 'can\'t detect network ' return } - this.netUI.innerHTML = ` ${name} (${id || '-'})` + this.netUI.innerHTML = `${name} (${id || '-'}) network` }) } diff --git a/src/app/tabs/styles/run-tab-styles.js b/src/app/tabs/styles/run-tab-styles.js index fa335535bd..b5f9879571 100644 --- a/src/app/tabs/styles/run-tab-styles.js +++ b/src/app/tabs/styles/run-tab-styles.js @@ -202,14 +202,7 @@ var css = csjs` display: inline; } .network { - display: flex; - justify-content: flex-end; - align-items: center; - position: absolute; - color: grey; - width: 100%; - height: 100%; - padding-right: 53px; + margin-left: 8px; pointer-events: none; } .networkItem { From 6f90da2968497b9f68cfa20d9c8adba4de7c0efe Mon Sep 17 00:00:00 2001 From: Rob Stupay Date: Mon, 29 Apr 2019 16:58:01 +0200 Subject: [PATCH 2/3] non-vm networks shows in bs badge --- src/app/tabs/runTab/settings.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/tabs/runTab/settings.js b/src/app/tabs/runTab/settings.js index dd467a89f5..b5f0126f6c 100644 --- a/src/app/tabs/runTab/settings.js +++ b/src/app/tabs/runTab/settings.js @@ -7,12 +7,14 @@ const copyToClipboard = require('../../ui/copy-to-clipboard') const modalDialogCustom = require('../../ui/modal-dialog-custom') const addTooltip = require('../../ui/tooltip') const helper = require('../../../lib/helper.js') +const globalRegistry = require('../../../global/registry') class SettingsUI { constructor (settings) { this.settings = settings this.event = new EventManager() + this._components = {} this.settings.event.register('transactionExecuted', (error, from, to, data, lookupOnly, txResult) => { if (error) return @@ -20,6 +22,11 @@ class SettingsUI { this.updateAccountBalances() }) + this._components.registry = globalRegistry + this._deps = { + networkModule: this._components.registry.get('network').api + } + setInterval(() => { this.updateAccountBalances() }, 10 * 1000) @@ -239,7 +246,8 @@ class SettingsUI { this.netUI.innerHTML = 'can\'t detect network ' return } - this.netUI.innerHTML = `${name} (${id || '-'}) network` + let network = this._deps.networkModule.getNetworkProvider + this.netUI.innerHTML = (network() !== 'vm') ? `${name} (${id || '-'}) network` : '' }) } From 443480da48a0ccd2f555888a9cbc3ef45287cc8a Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 30 Apr 2019 12:57:29 +0200 Subject: [PATCH 3/3] Update contracts.js --- test-browser/helpers/contracts.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test-browser/helpers/contracts.js b/test-browser/helpers/contracts.js index f3c90b1f73..e24dc23ef6 100644 --- a/test-browser/helpers/contracts.js +++ b/test-browser/helpers/contracts.js @@ -101,7 +101,7 @@ function clickFunction (fnFullName, expectedInput) { this.waitForElementPresent('.instance button[title="' + fnFullName + '"]') .perform(function (client, done) { client.execute(function () { - document.querySelector('#optionViews').scrollTop = document.querySelector('#optionViews').scrollHeight + document.querySelector('#runTabView').scrollTop = document.querySelector('#runTabView').scrollHeight }, [], function () { if (expectedInput) { client.setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, function () {}) @@ -143,7 +143,7 @@ function getAddressAtPosition (browser, index, callback) { function testConstantFunction (browser, address, fnFullName, expectedInput, expectedOutput, cb) { browser.waitForElementPresent('.instance button[title="' + fnFullName + '"]').perform(function (client, done) { client.execute(function () { - document.querySelector('#optionViews').scrollTop = document.querySelector('#optionViews').scrollHeight + document.querySelector('#runTabView').scrollTop = document.querySelector('#runTabView').scrollHeight }, [], function () { if (expectedInput) { client.setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, function () {}) @@ -181,7 +181,7 @@ function testFunction (fnFullName, txHash, log, expectedInput, expectedReturn, e this.waitForElementPresent('.instance button[title="' + fnFullName + '"]') .perform(function (client, done) { client.execute(function () { - document.querySelector('#optionViews').scrollTop = document.querySelector('#optionViews').scrollHeight + document.querySelector('#runTabView').scrollTop = document.querySelector('#runTabView').scrollHeight }, [], function () { if (expectedInput) { client.setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, function () {})