Merge in latest develop

Adamj1232 · Adamj1232 · commit 0603a2021fa5 · 2022-08-24T13:30:11.000-05:00
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -167,10 +167,6 @@ function init(options: InitOptions): OnboardAPI {
         }
       }
 
-      if (!apiKey || !notifyUpdate.enabled) {
-        notifyUpdate.enabled = false
-      }
-
       updateNotify(notifyUpdate)
     } else {
       const error = validateNotify(notify as Notify)
@@ -184,19 +180,11 @@ function init(options: InitOptions): OnboardAPI {
         ...notify
       }
 
-      if (!apiKey || !notifyUpdate.enabled) {
-        notifyUpdate.enabled = false
-      }
-
       updateNotify(notifyUpdate)
     }
   } else {
     const notifyUpdate: Partial<Notify> = APP_INITIAL_STATE.notify
 
-    if (!apiKey) {
-      notifyUpdate.enabled = false
-    }
-
     updateNotify(notifyUpdate)
   }
 
diff --git a/packages/core/src/views/Index.svelte b/packages/core/src/views/Index.svelte
@@ -76,8 +76,8 @@
     (!$accountCenter$.enabled ||
       ($notify$.position !== $accountCenter$.position &&
         device.type !== 'mobile') ||
-      separateMobileContainerCheck) &&
-    $wallets$.length
+      separateMobileContainerCheck ||
+      !$wallets$.length)
 
   $: displayAccountCenterSeparate =
     $accountCenter$.enabled &&
diff --git a/packages/dcent/src/index.ts b/packages/dcent/src/index.ts
@@ -108,7 +108,9 @@ function dcent({
           currentChain =
             chains.find(({ id }: Chain) => id === chainId) || currentChain
 
-          const provider = new StaticJsonRpcProvider(currentChain.rpcUrl)
+          const provider = new StaticJsonRpcProvider(
+            currentChain.rpcUrl
+          ) as providers.StaticJsonRpcProvider
 
           return generateAccounts(dcentKeyring, provider)
         }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -62,7 +62,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/core": "^2.8.0",
+    "@web3-onboard/core": "^2.8.1",
     "@web3-onboard/common": "^2.2.1",
     "use-sync-external-store": "1.0.0"
   },
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -63,7 +63,7 @@
     "@vueuse/core": "^8.4.2",
     "@vueuse/rxjs": "^8.2.0",
     "@web3-onboard/common": "^2.2.1",
-    "@web3-onboard/core": "^2.8.0",
+    "@web3-onboard/core": "^2.8.1",
     "vue-demi": "^0.12.4"
   },
   "peerDependencies": {

Original file line number	Diff line number	Diff line change
`@@ -167,10 +167,6 @@ function init(options: InitOptions): OnboardAPI {`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
`170`		`- if (!apiKey \|\| !notifyUpdate.enabled) {`
`171`		`- notifyUpdate.enabled = false`
`172`		`- }`
`173`		`-`
`174`	`170`	`updateNotify(notifyUpdate)`
`175`	`171`	`} else {`
`176`	`172`	`const error = validateNotify(notify as Notify)`
`@@ -184,19 +180,11 @@ function init(options: InitOptions): OnboardAPI {`
`184`	`180`	`...notify`
`185`	`181`	`}`
`186`	`182`
`187`		`- if (!apiKey \|\| !notifyUpdate.enabled) {`
`188`		`- notifyUpdate.enabled = false`
`189`		`- }`
`190`		`-`
`191`	`183`	`updateNotify(notifyUpdate)`
`192`	`184`	`}`
`193`	`185`	`} else {`
`194`	`186`	`const notifyUpdate: Partial<Notify> = APP_INITIAL_STATE.notify`
`195`	`187`
`196`		`- if (!apiKey) {`
`197`		`- notifyUpdate.enabled = false`
`198`		`- }`
`199`		`-`
`200`	`188`	`updateNotify(notifyUpdate)`
`201`	`189`	`}`
`202`	`190`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,9 @@ function dcent({`
`108`	`108`	`currentChain =`
`109`	`109`	`chains.find(({ id }: Chain) => id === chainId) \|\| currentChain`
`110`	`110`
`111`		`- const provider = new StaticJsonRpcProvider(currentChain.rpcUrl)`
	`111`	`+ const provider = new StaticJsonRpcProvider(`
	`112`	`+ currentChain.rpcUrl`
	`113`	`+ ) as providers.StaticJsonRpcProvider`
`112`	`114`
`113`	`115`	`return generateAccounts(dcentKeyring, provider)`
`114`	`116`	`}`