3 files changed, 8 insertions, 8 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index c15c9be7e..1a3557cb4 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -393,7 +393,7 @@ function signPersonalMsg (msgData) {
 
 function signTx (txData) {
   return (dispatch) => {
-    web3.eth.sendTransaction(txData, (err, data) => {
+    global.ethQuery.sendTransaction(txData, (err, data) => {
       dispatch(actions.hideLoadingIndication())
       if (err) return dispatch(actions.displayWarning(err.message))
       dispatch(actions.hideWarning())
diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js
index 001c227c4..ec3cd60ed 100644
--- a/ui/app/components/ens-input.js
+++ b/ui/app/components/ens-input.js
@@ -76,7 +76,7 @@ EnsInput.prototype.componentDidMount = function () {
   const resolverAddress = networkResolvers[network]
 
   if (resolverAddress) {
-    const provider = web3.currentProvider
+    const provider = global.ethereumProvider
     this.ens = new ENS({ provider, network })
     this.checkName = debounce(this.lookupEnsName.bind(this), 200)
   }
diff --git a/ui/app/unlock.js b/ui/app/unlock.js
index 5014744f5..1aee3c5d0 100644
--- a/ui/app/unlock.js
+++ b/ui/app/unlock.js
@@ -109,10 +109,10 @@ UnlockScreen.prototype.submitPassword = function (event) {
 UnlockScreen.prototype.inputChanged = function (event) {
   // tell mascot to look at page action
   var element = event.target
-  var viewRect = element.getBoundingClientRect()
-  var carat = getCaretCoordinates(element, element.selectionEnd)
-  var x = viewRect.right - carat.left + element.scrollLeft
-  var y = 100
-  var pointAt = { x, y }
-  this.animationEventEmitter.emit('point', pointAt)
+  var boundingRect = element.getBoundingClientRect()
+  var coordinates = getCaretCoordinates(element, element.selectionEnd)
+  this.animationEventEmitter.emit('point', {
+    x: boundingRect.left + coordinates.left - element.scrollLeft,
+    y: boundingRect.top + coordinates.top - element.scrollTop,
+  })
 }