Merge branch 'develop' into contextTypes

# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js

1 files changed, 3 insertions, 3 deletions

diff --git a/mascara/example/app.js b/mascara/example/app.js
index 598e2c84c..7b6421fdc 100644
--- a/mascara/example/app.js
+++ b/mascara/example/app.js
@@ -3,7 +3,7 @@ const EthQuery = require('ethjs-query')
 window.addEventListener('load', loadProvider)
 window.addEventListener('message', console.warn)
 
-async function loadProvider() {
+async function loadProvider () {
   const ethereumProvider = window.metamask.createDefaultProvider({ host: 'http://localhost:9001' })
   const ethQuery = new EthQuery(ethereumProvider)
   const accounts = await ethQuery.accounts()
@@ -13,7 +13,7 @@ async function loadProvider() {
 }
 
 
-function logToDom(message, context){
+function logToDom (message, context) {
   document.getElementById(context).innerText = message
   console.log(message)
 }
@@ -35,4 +35,4 @@ function setupButtons (ethQuery) {
     })
     logToDom(txHash, 'cb-value')
   })
-}
\ No newline at end of file
+}