From fa218bdca4d3c085bba5742360867be311a8da4c Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Tue, 14 May 2019 18:43:51 +0200
Subject: [PATCH] standart

---
 src/app/tabs/runTab/model/settings.js |  3 ++-
 src/app/tabs/runTab/settings.js       |  3 ++-
 test-browser/helpers/contracts.js     | 12 ++++++------
 test-browser/tests/generalTests.js    | 16 ++++++++--------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/app/tabs/runTab/model/settings.js b/src/app/tabs/runTab/model/settings.js
index cae8039a51..a11f76b19a 100644
--- a/src/app/tabs/runTab/model/settings.js
+++ b/src/app/tabs/runTab/model/settings.js
@@ -1,6 +1,7 @@
 var ethJSUtil = require('ethereumjs-util')
 var Personal = require('web3-eth-personal')
 var remixLib = require('remix-lib')
+const addTooltip = require('../../../ui/tooltip')
 var EventManager = remixLib.EventManager
 var executionContext = remixLib.execution.executionContext
 
@@ -97,7 +98,7 @@ class Settings {
       const hashedMsg = executionContext.web3().sha3(message)
       try {
         executionContext.web3().eth.sign(account, hashedMsg, (error, signedData) => {
-          if (!error) alert("Please check your provider")
+          if (!error) addTooltip('Please check your provider to approve')
           cb(error, hashedMsg, signedData)
         })
       } catch (e) {
diff --git a/src/app/tabs/runTab/settings.js b/src/app/tabs/runTab/settings.js
index 165b3ba7c2..1d4350913e 100644
--- a/src/app/tabs/runTab/settings.js
+++ b/src/app/tabs/runTab/settings.js
@@ -223,8 +223,9 @@ class SettingsUI {
 
       var signMessageDialog = { 'title': 'Sign a message', 'text': 'Enter a message to sign', 'inputvalue': 'Message to sign' }
       var $txOrigin = this.el.querySelector('#txorigin')
-      if (!$txOrigin.selectedOptions[0] && this.settings.isInjectedWeb3())
+      if (!$txOrigin.selectedOptions[0] && this.settings.isInjectedWeb3()) {
         return addTooltip(`Account list is empty, please login to your wallet to load it`)
+      }
       var account = $txOrigin.selectedOptions[0].value
 
       var promptCb = (passphrase) => {
diff --git a/test-browser/helpers/contracts.js b/test-browser/helpers/contracts.js
index 36d77e4b03..949afb0217 100644
--- a/test-browser/helpers/contracts.js
+++ b/test-browser/helpers/contracts.js
@@ -173,20 +173,20 @@ function signMsg (browser, msg, cb) {
   let hash, signature
   browser
     .click('i[id="remixRunSignMsg"]')
-    .setValue('textarea[id="prompt_text"]', msg, ()=>{
+    .setValue('textarea[id="prompt_text"]', msg, () => {
       browser.modalFooterOKClick().perform(
-        (client, done)=>{
-          browser.getText('span[id="remixRunSignMsgHash"]', (v)=>{ hash = v; done()})
+        (client, done) => {
+          browser.getText('span[id="remixRunSignMsgHash"]', (v) => { hash = v; done() })
         }
       )
       .perform(
-        (client, done)=>{
-          browser.getText('span[id="remixRunSignMsgSignature"]', (v)=>{ signature = v; done()})
+        (client, done) => {
+          browser.getText('span[id="remixRunSignMsgSignature"]', (v) => { signature = v; done() })
         }
       )
       .modalFooterOKClick()
       .perform(
-        ()=>{
+        () => {
           cb(hash, signature)
         }
       )
diff --git a/test-browser/tests/generalTests.js b/test-browser/tests/generalTests.js
index 49aab073cc..35e7c25fdf 100644
--- a/test-browser/tests/generalTests.js
+++ b/test-browser/tests/generalTests.js
@@ -163,23 +163,23 @@ function checkDeployShouldSucceed (browser, address, callback) {
 
 function testSignature (browser, callback) {
   let hash, signature
-  browser.clickLaunchIcon("run").pause(4000).perform((client, done)=>{
-    contractHelper.signMsg(browser, "test message", (h, s)=>{
+  browser.clickLaunchIcon('run').pause(4000).perform((client, done) => {
+    contractHelper.signMsg(browser, 'test message', (h, s) => {
       hash = h
       signature = s
-      contractHelper.addFile(browser, "signMassage.sol", sources[6]["browser/signMassage.sol"], ()=>{
+      contractHelper.addFile(browser, 'signMassage.sol', sources[6]['browser/signMassage.sol'], () => {
         contractHelper.switchFile(browser, 'browser/signMassage.sol', () => {
           contractHelper.selectContract(browser, 'ECVerify', () => { // deploy lib
             contractHelper.createContract(browser, '', () => {
               browser.waitForElementPresent('.instance:nth-of-type(4)')
               .click('.instance:nth-of-type(4) > div > button')
-              .clickFunction("ecrecovery - call", {types: "bytes32 hash, bytes sig", values: `"${hash.value}","${signature.value}"`}).perform(
-                ()=>{
-                  contractHelper.verifyCallReturnValue(
+              .clickFunction('ecrecovery - call', {types: 'bytes32 hash, bytes sig', values: `"${hash.value}","${signature.value}"`}).perform(
+                () => {
+                  contractHelper.verifyCallReturnalue(
                     browser,
-                    "0x08970fed061e7747cd9a38d680a601510cb659fb",
+                    '0x08970fed061e7747cd9a38d680a601510cb659fb',
                     ['0: address: 0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c'],
-                    ()=>{callback(null, browser)}
+                    () => { callback(null, browser) }
                   )
                 }
               )