Merge pull request #487 from blocknative/feature/move-ws-init

Feature/move ws init

Author: lnbc1QWFyb24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.18.0-0.1.0",
+  "version": "1.18.0-0.2.0",
   "description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
   "keywords": [
     "ethereum",

src/services.ts

@@ -1,4 +1,6 @@
 import BlocknativeApi from 'bnc-sdk'
+import { get } from 'svelte/store'
+import { app } from './stores'
 
 let blocknative: any
 
@@ -17,5 +19,9 @@ export function initializeBlocknative(
 }
 
 export function getBlocknative(): any {
+  if (!blocknative) {
+    const {dappId, networkId, apiUrl} = get(app)
+    initializeBlocknative(dappId, networkId, apiUrl)
+  }
   return blocknative
 }

src/stores.ts

@@ -1,4 +1,4 @@
-import { getBlocknative, initializeBlocknative } from './services'
+import { getBlocknative } from './services'
 import { writable, derived, get } from 'svelte/store'
 import { wait, makeCancelable, createInterval } from './utilities'
 import { validateWalletInterface, validateType } from './validation'
@@ -309,14 +309,6 @@ function createBalanceStore(initialState: string | null): BalanceStore {
             currentBalance: get(balance)
           })
 
-          if (!getBlocknative()) {
-            initializeBlocknative(
-              get(app).dappId,
-              get(app).networkId,
-              get(app).apiUrl
-            )
-          }
-
           if (emitterAddress !== $address) {
             const blocknative = getBlocknative()