release 0.6.2

cmeisl · cmeisl · commit 25981112d9b4 · 2019-05-06T15:49:28.000-06:00
diff --git a/README.md b/README.md
@@ -43,16 +43,16 @@ yarn add bnc-assist
 #### Script Tag
 
 The library uses [semantic versioning](https://semver.org/spec/v2.0.0.html).
-The current version is 0.6.1.
+The current version is 0.6.2.
 There are minified and non-minified versions.
 Put this script at the top of your `<head>`
 
 ```html
-<script src="https://assist.blocknative.com/0-6-1/assist.js"></script>
+<script src="https://assist.blocknative.com/0-6-2/assist.js"></script>
 
 <!-- OR... -->
 
-<script src="https://assist.blocknative.com/0-6-1/assist.min.js"></script>
+<script src="https://assist.blocknative.com/0-6-2/assist.min.js"></script>
 ```
 
 ### Initialize the Library
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bnc-assist",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Blocknative Assist js library for Dapp developers",
   "main": "lib/assist.min.js",
   "scripts": {
diff --git a/src/js/helpers/web3.js b/src/js/helpers/web3.js
@@ -103,7 +103,11 @@ export function configureWeb3(web3) {
   let modernWeb3
   let web3Version
 
-  if (web3.version.api && typeof web3.version.api === 'string') {
+  if (
+    web3.version &&
+    web3.version.api &&
+    typeof web3.version.api === 'string'
+  ) {
     legacyWeb3 = true
     modernWeb3 = false
     web3Version = web3.version.api
@@ -127,15 +131,15 @@ export function configureWeb3(web3) {
 }
 
 export function checkForWallet() {
-  if (window.ethereum) {
+  if (window.ethereum && window.web3.version) {
     updateState({
       currentProvider: getCurrentProvider(),
       validBrowser: true,
       web3Wallet: true,
       legacyWallet: false,
       modernWallet: true
     })
-  } else if (window.web3) {
+  } else if (window.web3 && window.web3.version) {
     updateState({
       currentProvider: getCurrentProvider(),
       validBrowser: true,
@@ -259,7 +263,11 @@ export function getAccounts() {
 }
 
 export function checkUnlocked() {
-  return window.ethereum._metamask.isUnlocked()
+  return (
+    window.ethereum &&
+    window.ethereum._metamask &&
+    window.ethereum._metamask.isUnlocked()
+  )
 }
 
 export function requestLoginEnable() {
diff --git a/src/js/logic/user.js b/src/js/logic/user.js
@@ -219,9 +219,7 @@ function checkAccountAccess() {
         walletEnabled: true
       })
     } else {
-      const loggedIn = state.modernWallet
-        ? await checkUnlocked().catch(resolve)
-        : false
+      const loggedIn = state.modernWallet ? await checkUnlocked() : false
 
       updateState({
         accessToAccounts: false,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bnc-assist",`
`3`		`- "version": "0.6.1",`
	`3`	`+ "version": "0.6.2",`
`4`	`4`	`"description": "Blocknative Assist js library for Dapp developers",`
`5`	`5`	`"main": "lib/assist.min.js",`
`6`	`6`	`"scripts": {`