Merge branch 'main' of github.com:WalletConnect/web3modal into fix/ap…

…proved-caip-networks-data-upa
reown-com · Sep 25, 2024 · fd8c176 · fd8c176
2 parents 4fbc273 + ff68bb3
commit fd8c176
Show file tree

Hide file tree

Showing 37 changed files with 143 additions and 143 deletions.
diff --git a/apps/laboratory/src/pages/library/ethers-all-internal.tsx b/apps/laboratory/src/pages/library/ethers-all-internal.tsx
@@ -7,13 +7,15 @@ import { siweConfig } from '../../utils/SiweUtils'
 import { SiweData } from '../../components/Siwe/SiweData'
 import { EthersModalInfo } from '../../components/Ethers/EthersModalInfo'
 import { EthersAdapter } from '@reown/appkit-adapter-ethers'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.EvmNetworks
 
 const ethersAdapter = new EthersAdapter()
 
 const modal = createAppKit({
   adapters: [ethersAdapter],
-  networks: [arbitrum, mainnet, optimism, polygon, zkSync, sepolia],
+  networks,
   defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {

diff --git a/apps/laboratory/src/pages/library/ethers-all.tsx b/apps/laboratory/src/pages/library/ethers-all.tsx
@@ -7,13 +7,15 @@ import { siweConfig } from '../../utils/SiweUtils'
 import { SiweData } from '../../components/Siwe/SiweData'
 import { EthersModalInfo } from '../../components/Ethers/EthersModalInfo'
 import { EthersAdapter } from '@reown/appkit-adapter-ethers'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.EvmNetworks
 
 const ethersAdapter = new EthersAdapter()
 
 const modal = createAppKit({
   adapters: [ethersAdapter],
-  networks: [arbitrum, mainnet, optimism, polygon, zkSync, sepolia],
+  networks,
   defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {

diff --git a/apps/laboratory/src/pages/library/ethers-no-email.tsx b/apps/laboratory/src/pages/library/ethers-no-email.tsx
@@ -5,13 +5,15 @@ import { ConstantsUtil } from '../../utils/ConstantsUtil'
 import { EthersModalInfo } from '../../components/Ethers/EthersModalInfo'
 import { AppKitButtons } from '../../components/AppKitButtons'
 import { EthersTests } from '../../components/Ethers/EthersTests'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.EvmNetworks
 
 const ethersAdapter = new EthersAdapter()
 
 const modal = createAppKit({
   adapters: [ethersAdapter],
-  networks: [arbitrum, mainnet, optimism, polygon, zkSync, sepolia],
+  networks,
   defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {

diff --git a/apps/laboratory/src/pages/library/ethers-no-socials.tsx b/apps/laboratory/src/pages/library/ethers-no-socials.tsx
@@ -6,13 +6,15 @@ import { ConstantsUtil } from '../../utils/ConstantsUtil'
 import { EthersModalInfo } from '../../components/Ethers/EthersModalInfo'
 import { EthersAdapter } from '@reown/appkit-adapter-ethers'
 import { siweConfig } from '../../utils/SiweUtils'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.EvmNetworks
 
 const ethersAdapter = new EthersAdapter()
 
 const modal = createAppKit({
   adapters: [ethersAdapter],
-  networks: [arbitrum, mainnet, optimism, polygon, zkSync, sepolia],
+  networks,
   defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {

diff --git a/apps/laboratory/src/pages/library/ethers-siwe.tsx b/apps/laboratory/src/pages/library/ethers-siwe.tsx
@@ -7,13 +7,16 @@ import { ThemeStore } from '../../utils/StoreUtil'
 import { ConstantsUtil } from '../../utils/ConstantsUtil'
 import { siweConfig } from '../../utils/SiweUtils'
 import { EthersModalInfo } from '../../components/Ethers/EthersModalInfo'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.EvmNetworks
 
 const ethersAdapter = new EthersAdapter()
 
 const modal = createAppKit({
   adapters: [ethersAdapter],
-  networks: [mainnet, optimism, polygon, zkSync, arbitrum, sepolia],
+  networks,
+  defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {
     analytics: true

diff --git a/apps/laboratory/src/pages/library/ethers.tsx b/apps/laboratory/src/pages/library/ethers.tsx
@@ -5,13 +5,16 @@ import { AppKitButtons } from '../../components/AppKitButtons'
 import { ThemeStore } from '../../utils/StoreUtil'
 import { ConstantsUtil } from '../../utils/ConstantsUtil'
 import { EthersModalInfo } from '../../components/Ethers/EthersModalInfo'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.EvmNetworks
 
 const ethersAdapter = new EthersAdapter()
 
 const modal = createAppKit({
   adapters: [ethersAdapter],
-  networks: [mainnet, optimism, polygon, zkSync, arbitrum, sepolia],
+  networks,
+  defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {
     analytics: true

diff --git a/apps/laboratory/src/pages/library/ethers5-all-internal.tsx b/apps/laboratory/src/pages/library/ethers5-all-internal.tsx
@@ -6,14 +6,15 @@ import { siweConfig } from '../../utils/SiweUtils'
 import { SiweData } from '../../components/Siwe/SiweData'
 import { Ethers5Tests } from '../../components/Ethers/Ethers5Tests'
 import { Ethers5ModalInfo } from '../../components/Ethers/Ethers5ModalInfo'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
 import { Ethers5Adapter } from '@reown/appkit-adapter-ethers5'
+import { mainnet } from '@reown/appkit/networks'
 
+const networks = ConstantsUtil.EvmNetworks
 const ethers5Adapter = new Ethers5Adapter()
 
 const modal = createAppKit({
   adapters: [ethers5Adapter],
-  networks: [arbitrum, mainnet, optimism, polygon, zkSync, sepolia],
+  networks,
   defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {

diff --git a/apps/laboratory/src/pages/library/ethers5-all.tsx b/apps/laboratory/src/pages/library/ethers5-all.tsx
@@ -6,14 +6,16 @@ import { siweConfig } from '../../utils/SiweUtils'
 import { SiweData } from '../../components/Siwe/SiweData'
 import { Ethers5Tests } from '../../components/Ethers/Ethers5Tests'
 import { Ethers5ModalInfo } from '../../components/Ethers/Ethers5ModalInfo'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
 import { Ethers5Adapter } from '@reown/appkit-adapter-ethers5'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.EvmNetworks
 
 const ethers5Adapter = new Ethers5Adapter()
 
 const modal = createAppKit({
   adapters: [ethers5Adapter],
-  networks: [arbitrum, mainnet, optimism, polygon, zkSync, sepolia],
+  networks,
   defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {

diff --git a/apps/laboratory/src/pages/library/ethers5-no-email.tsx b/apps/laboratory/src/pages/library/ethers5-no-email.tsx
@@ -5,13 +5,15 @@ import { ConstantsUtil } from '../../utils/ConstantsUtil'
 import { Ethers5ModalInfo } from '../../components/Ethers/Ethers5ModalInfo'
 import { AppKitButtons } from '../../components/AppKitButtons'
 import { Ethers5Tests } from '../../components/Ethers/Ethers5Tests'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.EvmNetworks
 
 const ethers5Adapter = new Ethers5Adapter()
 
 const modal = createAppKit({
   adapters: [ethers5Adapter],
-  networks: [arbitrum, mainnet, optimism, polygon, zkSync, sepolia],
+  networks,
   defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {

diff --git a/apps/laboratory/src/pages/library/ethers5-no-socials.tsx b/apps/laboratory/src/pages/library/ethers5-no-socials.tsx
@@ -7,13 +7,15 @@ import { SiweData } from '../../components/Siwe/SiweData'
 import { Ethers5Tests } from '../../components/Ethers/Ethers5Tests'
 import { Ethers5ModalInfo } from '../../components/Ethers/Ethers5ModalInfo'
 import { Ethers5Adapter } from '@reown/appkit-adapter-ethers5'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.EvmNetworks
 
 const ethersAdapter = new Ethers5Adapter()
 
 const modal = createAppKit({
   adapters: [ethersAdapter],
-  networks: [arbitrum, mainnet, optimism, polygon, zkSync, sepolia],
+  networks,
   defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {

diff --git a/apps/laboratory/src/pages/library/ethers5-siwe.tsx b/apps/laboratory/src/pages/library/ethers5-siwe.tsx
@@ -6,14 +6,16 @@ import { ConstantsUtil } from '../../utils/ConstantsUtil'
 import { siweConfig } from '../../utils/SiweUtils'
 import { Ethers5Tests } from '../../components/Ethers/Ethers5Tests'
 import { Ethers5ModalInfo } from '../../components/Ethers/Ethers5ModalInfo'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
 import { Ethers5Adapter } from '@reown/appkit-adapter-ethers5'
 
+const networks = ConstantsUtil.EvmNetworks
+
 const ethers5Adapter = new Ethers5Adapter()
 
 const modal = createAppKit({
   adapters: [ethers5Adapter],
-  networks: [arbitrum, mainnet, optimism, polygon, zkSync, sepolia],
+  networks,
   defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {

diff --git a/apps/laboratory/src/pages/library/ethers5.tsx b/apps/laboratory/src/pages/library/ethers5.tsx
@@ -5,13 +5,16 @@ import { ConstantsUtil } from '../../utils/ConstantsUtil'
 import { Ethers5ModalInfo } from '../../components/Ethers/Ethers5ModalInfo'
 import { Ethers5Tests } from '../../components/Ethers/Ethers5Tests'
 import { Ethers5Adapter } from '@reown/appkit-adapter-ethers5'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.EvmNetworks
 
 const ethers5Adapter = new Ethers5Adapter()
 
 const modal = createAppKit({
   adapters: [ethers5Adapter],
-  networks: [mainnet, optimism, polygon, zkSync, arbitrum, sepolia],
+  networks,
+  defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {
     analytics: true,

diff --git a/apps/laboratory/src/pages/library/external.tsx b/apps/laboratory/src/pages/library/external.tsx
@@ -7,13 +7,13 @@ import { ThemeStore } from '../../utils/StoreUtil'
 import { ConstantsUtil } from '../../utils/ConstantsUtil'
 import { WagmiModalInfo } from '../../components/Wagmi/WagmiModalInfo'
 import { WagmiAdapter } from '@reown/appkit-adapter-wagmi'
-import { arbitrum, mainnet, optimism, polygon, zkSync, sepolia } from '@reown/appkit/networks'
 import { externalTestConnector } from '../../utils/ConnectorUtil'
+import { mainnet } from '@reown/appkit/networks'
 
 const queryClient = new QueryClient()
 
 const connectors = [externalTestConnector()]
-const networks = [mainnet, optimism, polygon, zkSync, arbitrum, sepolia]
+const networks = ConstantsUtil.EvmNetworks
 
 const wagmiAdapter = new WagmiAdapter({
   ssr: true,
@@ -25,6 +25,7 @@ const wagmiAdapter = new WagmiAdapter({
 const modal = createAppKit({
   adapters: [wagmiAdapter],
   networks,
+  defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   features: {
     analytics: true

diff --git a/apps/laboratory/src/pages/library/multichain-basic.tsx b/apps/laboratory/src/pages/library/multichain-basic.tsx
@@ -2,13 +2,15 @@ import { createAppKit } from '@reown/appkit/react'
 import { ThemeStore } from '../../utils/StoreUtil'
 import { ConstantsUtil } from '../../utils/ConstantsUtil'
 import { AppKitButtons } from '../../components/AppKitButtons'
-import { mainnet, optimism, arbitrum, solana } from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
 import { MultiChainInfo } from '../../components/MultiChainInfo'
-
 import { UpaTests } from '../../components/UPA/UpaTests'
 
+const networks = ConstantsUtil.AllNetworks
+
 const modal = createAppKit({
-  networks: [mainnet, optimism, arbitrum, solana],
+  networks,
+  defaultNetwork: mainnet,
   projectId: ConstantsUtil.ProjectId,
   metadata: ConstantsUtil.Metadata
 })

diff --git a/apps/laboratory/src/pages/library/multichain-ethers-solana-siwe.tsx b/apps/laboratory/src/pages/library/multichain-ethers-solana-siwe.tsx
@@ -3,20 +3,14 @@ import { EthersAdapter } from '@reown/appkit-adapter-ethers'
 import { SolanaAdapter } from '@reown/appkit-adapter-solana'
 import { ThemeStore } from '../../utils/StoreUtil'
 import { ConstantsUtil } from '../../utils/ConstantsUtil'
-import {
-  mainnet,
-  polygon,
-  solana,
-  arbitrum,
-  optimism,
-  solanaTestnet,
-  solanaDevnet
-} from '@reown/appkit/networks'
 import { AppKitButtons } from '../../components/AppKitButtons'
 import { HuobiWalletAdapter, SolflareWalletAdapter } from '@solana/wallet-adapter-wallets'
 import { MultiChainTestsEthersSolana } from '../../components/MultiChainTestsEthersSolana'
 import { siweConfig } from '../../utils/SiweUtils'
 import { SiweData } from '../../components/Siwe/SiweData'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.AllNetworks
 
 const etherAdapter = new EthersAdapter()
 
@@ -27,7 +21,7 @@ const solanaWeb3JsAdapter = new SolanaAdapter({
 const modal = createAppKit({
   adapters: [etherAdapter, solanaWeb3JsAdapter],
   projectId: ConstantsUtil.ProjectId,
-  networks: [mainnet, arbitrum, polygon, optimism, solana, solanaTestnet, solanaDevnet],
+  networks,
   defaultNetwork: mainnet,
   features: {
     analytics: true

diff --git a/apps/laboratory/src/pages/library/multichain-ethers-solana.tsx b/apps/laboratory/src/pages/library/multichain-ethers-solana.tsx
@@ -3,18 +3,12 @@ import { EthersAdapter } from '@reown/appkit-adapter-ethers'
 import { SolanaAdapter } from '@reown/appkit-adapter-solana'
 import { ThemeStore } from '../../utils/StoreUtil'
 import { ConstantsUtil } from '../../utils/ConstantsUtil'
-import {
-  mainnet,
-  polygon,
-  solana,
-  arbitrum,
-  optimism,
-  solanaTestnet,
-  solanaDevnet
-} from '@reown/appkit/networks'
+
 import { AppKitButtons } from '../../components/AppKitButtons'
 import { HuobiWalletAdapter, SolflareWalletAdapter } from '@solana/wallet-adapter-wallets'
 import { MultiChainTestsEthersSolana } from '../../components/MultiChainTestsEthersSolana'
+import { mainnet } from '@reown/appkit/networks'
+const networks = ConstantsUtil.AllNetworks
 
 const etherAdapter = new EthersAdapter()
 
@@ -25,7 +19,7 @@ const solanaWeb3JsAdapter = new SolanaAdapter({
 const modal = createAppKit({
   adapters: [etherAdapter, solanaWeb3JsAdapter],
   projectId: ConstantsUtil.ProjectId,
-  networks: [mainnet, arbitrum, polygon, optimism, solana, solanaTestnet, solanaDevnet],
+  networks,
   defaultNetwork: mainnet,
   features: {
     analytics: true

diff --git a/apps/laboratory/src/pages/library/multichain-ethers5-solana-siwe.tsx b/apps/laboratory/src/pages/library/multichain-ethers5-solana-siwe.tsx
@@ -3,20 +3,14 @@ import { EthersAdapter } from '@reown/appkit-adapter-ethers'
 import { SolanaAdapter } from '@reown/appkit-adapter-solana'
 import { ThemeStore } from '../../utils/StoreUtil'
 import { ConstantsUtil } from '../../utils/ConstantsUtil'
-import {
-  mainnet,
-  polygon,
-  solana,
-  arbitrum,
-  optimism,
-  solanaTestnet,
-  solanaDevnet
-} from '@reown/appkit/networks'
 import { AppKitButtons } from '../../components/AppKitButtons'
 import { HuobiWalletAdapter, SolflareWalletAdapter } from '@solana/wallet-adapter-wallets'
 import { MultiChainTestsEthersSolana } from '../../components/MultiChainTestsEthersSolana'
 import { siweConfig } from '../../utils/SiweUtils'
 import { SiweData } from '../../components/Siwe/SiweData'
+import { mainnet } from '@reown/appkit/networks'
+
+const networks = ConstantsUtil.AllNetworks
 
 const etherAdapter = new EthersAdapter()
 
@@ -27,7 +21,8 @@ const solanaWeb3JsAdapter = new SolanaAdapter({
 const modal = createAppKit({
   adapters: [etherAdapter, solanaWeb3JsAdapter],
   projectId: ConstantsUtil.ProjectId,
-  networks: [mainnet, arbitrum, polygon, optimism, solana, solanaTestnet, solanaDevnet],
+  networks,
+  defaultNetwork: mainnet,
   features: {
     analytics: true
   },

diff --git a/apps/laboratory/src/pages/library/multichain-ethers5-solana.tsx b/apps/laboratory/src/pages/library/multichain-ethers5-solana.tsx
@@ -3,19 +3,13 @@ import { EthersAdapter } from '@reown/appkit-adapter-ethers'
 import { SolanaAdapter } from '@reown/appkit-adapter-solana'
 import { ThemeStore } from '../../utils/StoreUtil'
 import { ConstantsUtil } from '../../utils/ConstantsUtil'
-import {
-  mainnet,
-  polygon,
-  solana,
-  arbitrum,
-  optimism,
-  solanaTestnet,
-  solanaDevnet
-} from '@reown/appkit/networks'
+import { mainnet } from '@reown/appkit/networks'
 import { AppKitButtons } from '../../components/AppKitButtons'
 import { HuobiWalletAdapter, SolflareWalletAdapter } from '@solana/wallet-adapter-wallets'
 import { MultiChainTestsEthersSolana } from '../../components/MultiChainTestsEthersSolana'
 
+const networks = ConstantsUtil.AllNetworks
+
 const etherAdapter = new EthersAdapter()
 
 const solanaWeb3JsAdapter = new SolanaAdapter({
@@ -25,7 +19,8 @@ const solanaWeb3JsAdapter = new SolanaAdapter({
 const modal = createAppKit({
   adapters: [etherAdapter, solanaWeb3JsAdapter],
   projectId: ConstantsUtil.ProjectId,
-  networks: [mainnet, arbitrum, polygon, optimism, solana, solanaTestnet, solanaDevnet],
+  networks,
+  defaultNetwork: mainnet,
   features: {
     analytics: true
   },