[core-v2.8.5-alpha.1, react-v2.3.5-alpha.1, vue-v2.2.5-alpha.1] : Fix - Handle add new chain canceled by user (#1279)

* Fix bug when user cancels add new chain to wallet, bump versions
* Update packages/core/src/chain.ts
Co-authored-by: Aaron <abarnard@protonmail.com>

Author: Adamj1232

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.8.4",
+  "version": "2.8.5-alpha.1",
   "description": "Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",

packages/core/src/chain.ts

@@ -1,6 +1,6 @@
-import { firstValueFrom } from 'rxjs'
+import { BehaviorSubject, firstValueFrom } from 'rxjs'
 import { filter, map } from 'rxjs/operators'
-import { ProviderRpcErrorCode } from '@web3-onboard/common'
+import { Chain, ProviderRpcErrorCode } from '@web3-onboard/common'
 import { addNewChain, switchChain } from './provider.js'
 import { state } from './store/index.js'
 import { switchChainModal$ } from './streams.js'
@@ -66,21 +66,12 @@ async function setChain(options: {
       filter(x => x === null),
       map(() => false)
     )
-
     if (
       code === ProviderRpcErrorCode.CHAIN_NOT_ADDED ||
       code === ProviderRpcErrorCode.UNRECOGNIZED_CHAIN_ID
     ) {
       // chain has not been added to wallet
-      try {
-        await addNewChain(wallet.provider, chain)
-        await switchChain(wallet.provider, chainIdHex)
-        return true
-      } catch (error) {
-        // display notification to user to switch chain
-        switchChainModal$.next({ chain })
-        return firstValueFrom(switchChainModalClosed$)
-      }
+      return chainNotInWallet(wallet, chain, switchChainModal$, chainIdHex)
     }
 
     if (code === ProviderRpcErrorCode.UNSUPPORTED_METHOD) {
@@ -93,4 +84,28 @@ async function setChain(options: {
   return false
 }
 
+const chainNotInWallet = async (
+  wallet: WalletState,
+  chain: Chain,
+  switchChainModalClosed$: BehaviorSubject<{
+    chain: Chain
+  }>,
+  chainIdHex: string
+) => {
+  try {
+    await addNewChain(wallet.provider, chain)
+    await switchChain(wallet.provider, chainIdHex)
+    return true
+  } catch (error) {
+    const { code } = error as { code: number }
+    if (code === ProviderRpcErrorCode.ACCOUNT_ACCESS_REJECTED) {
+      // add new chain rejected by user
+      return false
+    }
+    // display notification to user to switch chain
+    switchChainModal$.next({ chain })
+    return firstValueFrom(switchChainModalClosed$)
+  }
+}
+
 export default setChain

packages/demo/package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@web3-onboard/coinbase": "^2.1.2",
-    "@web3-onboard/core": "^2.8.4",
+    "@web3-onboard/core": "^2.8.5-alpha.1",
     "@web3-onboard/dcent": "^2.2.0",
     "@web3-onboard/fortmatic": "^2.0.13",
     "@web3-onboard/gas": "^2.1.2",

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/react",
-  "version": "2.3.4",
+  "version": "2.3.5-alpha.1",
   "description": "A collection of React hooks for integrating Web3-Onboard in to React and Next.js projects. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -62,7 +62,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/core": "^2.8.4",
+    "@web3-onboard/core": "^2.8.5-alpha.1",
     "@web3-onboard/common": "^2.2.2",
     "use-sync-external-store": "1.0.0"
   },

packages/vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/vue",
-  "version": "2.2.4",
+  "version": "2.2.5-alpha.1",
   "description": "A collection of Vue Composables for integrating Web3-Onboard in to a Vue or Nuxt project. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -63,7 +63,7 @@
     "@vueuse/core": "^8.4.2",
     "@vueuse/rxjs": "^8.2.0",
     "@web3-onboard/common": "^2.2.2",
-    "@web3-onboard/core": "^2.8.4",
+    "@web3-onboard/core": "^2.8.5-alpha.1",
     "vue-demi": "^0.12.4"
   },
   "peerDependencies": {