Merge in docs

Author: Adamj1232

docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md

@@ -16,6 +16,10 @@ Web3 Onboard supports all [EIP-6963](https://eips.ethereum.org/EIPS/eip-6963) co
 
 Web3-Onboard supports all [EIP-6963](https://eips.ethereum.org/EIPS/eip-6963) compatible wallets out of the box and will automatically recognizes any wallet which has integrated 6963 support.
 
+### Support all EIP-6963 Wallets out of the box
+
+Web3-Onboard supports all [EIP-6963](https://eips.ethereum.org/EIPS/eip-6963) compatible wallets out of the box and will automatically recognizes any wallet which has integrated 6963 support.
+
 ## Install
 
 <Tabs values={['yarn', 'npm']}>

docs/yarn.lock

@@ -5184,16 +5184,22 @@
     "@web3-onboard/common" "^2.3.1"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> docs
 "@web3-onboard/capsule@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@web3-onboard/capsule/-/capsule-2.0.2.tgz#da13e0d5b63d29e58027b5c9f6339952db07a7ea"
   integrity sha512-U5PSZZg742OB+qKNyPlumsCehpSSqnT+jxnn6NC2vUGcWR1pTnuudJ351s3GAykaCJ1i3uwGsPoz1ZLJm4yK+Q==
+<<<<<<< HEAD
 =======
 "@web3-onboard/capsule@^2.0.2-alpha.1":
   version "2.0.2-alpha.1"
   resolved "https://registry.yarnpkg.com/@web3-onboard/capsule/-/capsule-2.0.2-alpha.1.tgz#afb47364766b7e42787a025b75ef3063dc279f65"
   integrity sha512-hbgCTTiPjWkckNTEA3gbaSA6WWIbzSedsl7cxEQzO1fW1eMjQO6XXXmDGwDSfsrOqfcYwiFkuL6M4PxPMGRZRg==
 >>>>>>> main
+=======
+>>>>>>> docs
   dependencies:
     "@tanstack/react-query" "^5.29.0"
     "@usecapsule/react-sdk" "^2.3.1"
@@ -5388,16 +5394,22 @@
     rxjs "^7.5.2"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> docs
 "@web3-onboard/metamask@^2.0.6":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@web3-onboard/metamask/-/metamask-2.0.6.tgz#9dd59a88e16fa27754f29b54b4656b31ab6e3159"
   integrity sha512-hxOdsqEtvohkYSisXqq7CizECmT7o+Qt6Z4zFfB7fgxcKa80mMmN0sgS3kAa3jl7nQ/JuJbhpNZsInbNN5HFnA==
+<<<<<<< HEAD
 =======
 "@web3-onboard/metamask@^2.0.6-alpha.1":
   version "2.0.6-alpha.1"
   resolved "https://registry.yarnpkg.com/@web3-onboard/metamask/-/metamask-2.0.6-alpha.1.tgz#f874f73e41a0b9a92ca84613ff2e2400cd48eba2"
   integrity sha512-QGS4d4i9FpwBpkNYXGpvvXnVmnLsA+zyGu2oZ4qZdls0TM/XsDHt5pudI6RPZR9gPEWPtXqOxmzm6Ce1OxE+ng==
 >>>>>>> main
+=======
+>>>>>>> docs
   dependencies:
     "@metamask/sdk" "^0.18.6"
     "@web3-onboard/common" "^2.3.3"

packages/metamask/src/index.ts

@@ -57,7 +57,14 @@ function metamask({
         const appLogoUrl = `data:image/svg+xml;base64,${base64}`
         const imports = await importPromise
 
+<<<<<<< HEAD
         if (!imports?.MetaMaskSDKConstructor) {
+=======
+        if (
+          !imports?.MetaMaskSDKConstructor ||
+          !imports?.createEIP1193Provider
+        ) {
+>>>>>>> docs
           throw new Error('Error importing and initializing MetaMask SDK')
         }
 
@@ -72,13 +79,24 @@ function metamask({
           },
           _source: 'web3-onboard'
         })
+<<<<<<< HEAD
 
         await sdk.init()
         const provider = sdk.getProvider()
 
         if (provider) {
           ;(provider as any).disconnect = () => {
             sdk?.terminate()
+=======
+
+        await sdk.init();
+        const provider = sdk.getProvider();
+
+        const _disconnect = sdk.disconnect
+        if(provider) {
+          (provider as any).disconnect = () => {
+            sdk?.terminate();
+>>>>>>> docs
           }
         }