@web3auth/modal 10.0.0-beta.7 → 10.0.0-beta.9

package/dist/lib.cjs/packages/modal/src/config.js

@@ -2,7 +2,7 @@
 
 var noModal = require('@web3auth/no-modal');
 
-const version = "10.0.0-beta.7";
+const version = "10.0.0-beta.9";
 const defaultConnectorsModalConfig = {
   hideWalletDiscovery: false,
   connectors: {

package/dist/lib.cjs/packages/modal/src/modalManager.js

@@ -251,7 +251,9 @@ class Web3Auth extends noModal.Web3AuthNoModal {
     this.options.uiConfig = deepmerge(noModal.cloneDeep(projectConfig.whitelabel || {}), this.options.uiConfig || {});
     if (!this.options.uiConfig.defaultLanguage) this.options.uiConfig.defaultLanguage = utils.getUserLanguage(this.options.uiConfig.defaultLanguage);
     if (!this.options.uiConfig.mode) this.options.uiConfig.mode = "light";
-    this.options.uiConfig = deepmerge(projectConfig.loginModal || {}, this.options.uiConfig);
+    this.options.uiConfig = deepmerge(projectConfig.loginModal || {}, this.options.uiConfig, {
+      arrayMerge: (_, sourceArray) => sourceArray
+    });
     // merge login methods order from project config and user config, with user config taking precedence
     const defaultAuthConnections = projectConfig.embeddedWalletAuth.filter(x => x.isDefault).map(x => x.authConnection);
     const mergedAuthConnections = [...(this.options.uiConfig.loginMethodsOrder || []), ...defaultAuthConnections];

package/dist/lib.cjs/packages/modal/src/react/solana/hooks/useSolanaWallet.js

@@ -21,6 +21,10 @@ const useSolanaWallet = () => {
   }, [web3Auth, provider]);
   react.useEffect(() => {
     const init = async () => {
+      var _web3Auth$currentChai;
+      if (!(web3Auth !== null && web3Auth !== void 0 && (_web3Auth$currentChai = web3Auth.currentChain) !== null && _web3Auth$currentChai !== void 0 && _web3Auth$currentChai.chainNamespace) || web3Auth.currentChain.chainNamespace !== noModal.CHAIN_NAMESPACES.SOLANA) {
+        return;
+      }
       if (!solanaWallet) return;
       const accounts = await solanaWallet.requestAccounts();
       if ((accounts === null || accounts === void 0 ? void 0 : accounts.length) > 0) {

package/dist/lib.cjs/packages/modal/src/react/wagmi/provider.js

@@ -170,7 +170,7 @@ function WagmiProvider(_ref) {
         } else {
           wagmiChains.push(wagmiChain);
         }
-        finalConfig.transports[wagmiChain.id] = viem.http(chain.rpcTarget);
+        finalConfig.transports[wagmiChain.id] = chain.wsTarget ? viem.webSocket(chain.wsTarget) : viem.http(chain.rpcTarget);
       });
       finalConfig.chains = [wagmiChains[0], ...wagmiChains.slice(1)];
     }
@@ -183,9 +183,8 @@ function WagmiProvider(_ref) {
   return /*#__PURE__*/react.createElement(wagmi.WagmiProvider, // typecast to WagmiProviderPropsBase to avoid type error
   // as we are omitting the config prop from WagmiProviderProps
   // and creating a new config object with the finalConfig
-  _objectSpread(_objectSpread({
-    config: finalConfig
-  }, props), {}, {
+  _objectSpread(_objectSpread({}, props), {}, {
+    config: finalConfig,
     reconnectOnMount: false
   }), /*#__PURE__*/react.createElement(Web3AuthWagmiProvider, null, children));
 }

package/dist/lib.cjs/packages/modal/src/ui/components/ConnectWallet/ConnectWalletQrCode/ConnectWalletQrCode.js

@@ -28,6 +28,7 @@ function ConnectWalletQrCode(props) {
     primaryColor
   } = props;
   const isDesktop = react.useMemo(() => {
+    if (typeof window === "undefined") return false;
     const browser = Bowser.getParser(window.navigator.userAgent);
     return browser.getPlatformType() === "desktop";
   }, []);

package/dist/lib.cjs/packages/modal/src/ui/components/Root/Root.js

@@ -94,6 +94,11 @@ function Root(props) {
   };
   // Wallet Details
   const deviceDetails = react.useMemo(() => {
+    if (typeof window === "undefined") return {
+      platform: "mobile",
+      browser: "chrome",
+      os: "ios"
+    };
     const browserData = Bowser.getParser(window.navigator.userAgent);
     return {
       platform: browserData.getPlatformType(),

package/dist/lib.cjs/packages/modal/src/vue/solana/composables/useSolanaWallet.js

@@ -15,7 +15,10 @@ const useSolanaWallet = () => {
   const solanaWallet = vue.shallowRef(null);
   const connection = vue.shallowRef(null);
   vue.watch(provider, async newVal => {
-    var _accounts$value;
+    var _web3Auth$value, _accounts$value;
+    if (!((_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.currentChain) !== null && _web3Auth$value !== void 0 && _web3Auth$value.chainNamespace) || web3Auth.value.currentChain.chainNamespace !== noModal.CHAIN_NAMESPACES.SOLANA) {
+      return;
+    }
     if (!newVal && solanaWallet.value) {
       solanaWallet.value = null;
       accounts.value = null;
@@ -32,8 +35,8 @@ const useSolanaWallet = () => {
       }
     }
     if (solanaWallet.value && !connection.value) {
-      var _web3Auth$value;
-      connection.value = new web3_js.Connection((_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 || (_web3Auth$value = _web3Auth$value.currentChain) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.rpcTarget);
+      var _web3Auth$value2;
+      connection.value = new web3_js.Connection((_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 || (_web3Auth$value2 = _web3Auth$value2.currentChain) === null || _web3Auth$value2 === void 0 ? void 0 : _web3Auth$value2.rpcTarget);
     }
   });
   return {

package/dist/lib.cjs/packages/modal/src/vue/wagmi/provider.js

@@ -179,7 +179,7 @@ const WagmiProvider = vue.defineComponent({
           } else {
             wagmiChains.push(wagmiChain);
           }
-          configParams.transports[wagmiChain.id] = viem.http(chain.rpcTarget);
+          configParams.transports[wagmiChain.id] = chain.wsTarget ? viem.webSocket(chain.wsTarget) : viem.http(chain.rpcTarget);
         });
         configParams.chains = [wagmiChains[0], ...wagmiChains.slice(1)];
       }

package/dist/lib.cjs/types/react/wagmi/provider.d.ts

@@ -1,4 +1,3 @@
 import { PropsWithChildren } from "react";
-import { WagmiProviderProps as WagmiProviderPropsBase } from "wagmi";
 import { WagmiProviderProps } from "./interface";
-export declare function WagmiProvider({ children, ...props }: PropsWithChildren<WagmiProviderProps>): import("react").FunctionComponentElement<PropsWithChildren<WagmiProviderPropsBase>>;
+export declare function WagmiProvider({ children, ...props }: PropsWithChildren<WagmiProviderProps>): import("react").FunctionComponentElement<PropsWithChildren<import("wagmi").WagmiProviderProps>>;

package/dist/lib.esm/packages/modal/src/config.js

@@ -1,6 +1,6 @@
 import { EVM_CONNECTORS } from '@web3auth/no-modal';
 
-const version = "10.0.0-beta.7";
+const version = "10.0.0-beta.9";
 const defaultConnectorsModalConfig = {
   hideWalletDiscovery: false,
   connectors: {

package/dist/lib.esm/packages/modal/src/modalManager.js

@@ -262,7 +262,9 @@ class Web3Auth extends Web3AuthNoModal {
     this.options.uiConfig = deepmerge(cloneDeep(projectConfig.whitelabel || {}), this.options.uiConfig || {});
     if (!this.options.uiConfig.defaultLanguage) this.options.uiConfig.defaultLanguage = getUserLanguage(this.options.uiConfig.defaultLanguage);
     if (!this.options.uiConfig.mode) this.options.uiConfig.mode = "light";
-    this.options.uiConfig = deepmerge(projectConfig.loginModal || {}, this.options.uiConfig);
+    this.options.uiConfig = deepmerge(projectConfig.loginModal || {}, this.options.uiConfig, {
+      arrayMerge: (_, sourceArray) => sourceArray
+    });
 
     // merge login methods order from project config and user config, with user config taking precedence
     const defaultAuthConnections = projectConfig.embeddedWalletAuth.filter(x => x.isDefault).map(x => x.authConnection);

package/dist/lib.esm/packages/modal/src/react/solana/hooks/useSolanaWallet.js

@@ -1,5 +1,5 @@
 import { Connection } from '@solana/web3.js';
-import { SolanaWallet } from '@web3auth/no-modal';
+import { SolanaWallet, CHAIN_NAMESPACES } from '@web3auth/no-modal';
 import { useState, useMemo, useEffect } from 'react';
 import { useWeb3Auth } from '../../hooks/useWeb3Auth.js';
 
@@ -19,6 +19,10 @@ const useSolanaWallet = () => {
   }, [web3Auth, provider]);
   useEffect(() => {
     const init = async () => {
+      var _web3Auth$currentChai;
+      if (!(web3Auth !== null && web3Auth !== void 0 && (_web3Auth$currentChai = web3Auth.currentChain) !== null && _web3Auth$currentChai !== void 0 && _web3Auth$currentChai.chainNamespace) || web3Auth.currentChain.chainNamespace !== CHAIN_NAMESPACES.SOLANA) {
+        return;
+      }
       if (!solanaWallet) return;
       const accounts = await solanaWallet.requestAccounts();
       if ((accounts === null || accounts === void 0 ? void 0 : accounts.length) > 0) {

package/dist/lib.esm/packages/modal/src/react/wagmi/provider.js

@@ -2,7 +2,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { log } from '@web3auth/no-modal';
 import { useMemo, createElement, useEffect, Fragment } from 'react';
-import { defineChain, http } from 'viem';
+import { defineChain, webSocket, http } from 'viem';
 import { createConfig, WagmiProvider as WagmiProvider$1, useConfig, useAccountEffect } from 'wagmi';
 import { injected } from 'wagmi/connectors';
 import '@babel/runtime/helpers/defineProperty';
@@ -169,7 +169,7 @@ function WagmiProvider(_ref) {
         } else {
           wagmiChains.push(wagmiChain);
         }
-        finalConfig.transports[wagmiChain.id] = http(chain.rpcTarget);
+        finalConfig.transports[wagmiChain.id] = chain.wsTarget ? webSocket(chain.wsTarget) : http(chain.rpcTarget);
       });
       finalConfig.chains = [wagmiChains[0], ...wagmiChains.slice(1)];
     }
@@ -183,9 +183,8 @@ function WagmiProvider(_ref) {
   return /*#__PURE__*/createElement(WagmiProvider$1, // typecast to WagmiProviderPropsBase to avoid type error
   // as we are omitting the config prop from WagmiProviderProps
   // and creating a new config object with the finalConfig
-  _objectSpread(_objectSpread({
-    config: finalConfig
-  }, props), {}, {
+  _objectSpread(_objectSpread({}, props), {}, {
+    config: finalConfig,
     reconnectOnMount: false
   }), /*#__PURE__*/createElement(Web3AuthWagmiProvider, null, children));
 }

package/dist/lib.esm/packages/modal/src/ui/components/ConnectWallet/ConnectWalletQrCode/ConnectWalletQrCode.js

@@ -26,6 +26,7 @@ function ConnectWalletQrCode(props) {
     primaryColor
   } = props;
   const isDesktop = useMemo(() => {
+    if (typeof window === "undefined") return false;
     const browser = Bowser.getParser(window.navigator.userAgent);
     return browser.getPlatformType() === "desktop";
   }, []);

package/dist/lib.esm/packages/modal/src/ui/components/Root/Root.js

@@ -93,6 +93,11 @@ function Root(props) {
 
   // Wallet Details
   const deviceDetails = useMemo(() => {
+    if (typeof window === "undefined") return {
+      platform: "mobile",
+      browser: "chrome",
+      os: "ios"
+    };
     const browserData = Bowser.getParser(window.navigator.userAgent);
     return {
       platform: browserData.getPlatformType(),

package/dist/lib.esm/packages/modal/src/vue/solana/composables/useSolanaWallet.js

@@ -1,5 +1,5 @@
 import { Connection } from '@solana/web3.js';
-import { SolanaWallet } from '@web3auth/no-modal';
+import { CHAIN_NAMESPACES, SolanaWallet } from '@web3auth/no-modal';
 import { ref, shallowRef, watch } from 'vue';
 import '@web3auth/no-modal/vue';
 import { useWeb3Auth } from '../../composables/useWeb3Auth.js';
@@ -13,7 +13,10 @@ const useSolanaWallet = () => {
   const solanaWallet = shallowRef(null);
   const connection = shallowRef(null);
   watch(provider, async newVal => {
-    var _accounts$value;
+    var _web3Auth$value, _accounts$value;
+    if (!((_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.currentChain) !== null && _web3Auth$value !== void 0 && _web3Auth$value.chainNamespace) || web3Auth.value.currentChain.chainNamespace !== CHAIN_NAMESPACES.SOLANA) {
+      return;
+    }
     if (!newVal && solanaWallet.value) {
       solanaWallet.value = null;
       accounts.value = null;
@@ -30,8 +33,8 @@ const useSolanaWallet = () => {
       }
     }
     if (solanaWallet.value && !connection.value) {
-      var _web3Auth$value;
-      connection.value = new Connection((_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 || (_web3Auth$value = _web3Auth$value.currentChain) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.rpcTarget);
+      var _web3Auth$value2;
+      connection.value = new Connection((_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 || (_web3Auth$value2 = _web3Auth$value2.currentChain) === null || _web3Auth$value2 === void 0 ? void 0 : _web3Auth$value2.rpcTarget);
     }
   });
   return {

package/dist/lib.esm/packages/modal/src/vue/wagmi/provider.js

@@ -3,7 +3,7 @@ import { hydrate } from '@wagmi/core';
 import { useConfig, useAccountEffect, configKey, createConfig } from '@wagmi/vue';
 import { injected } from '@wagmi/vue/connectors';
 import { log } from '@web3auth/no-modal';
-import { defineChain, http } from 'viem';
+import { defineChain, webSocket, http } from 'viem';
 import { defineComponent, h, watch, provide, shallowRef } from 'vue';
 import '@web3auth/no-modal/vue';
 import { useWeb3Auth } from '../composables/useWeb3Auth.js';
@@ -180,7 +180,7 @@ const WagmiProvider = defineComponent({
           } else {
             wagmiChains.push(wagmiChain);
           }
-          configParams.transports[wagmiChain.id] = http(chain.rpcTarget);
+          configParams.transports[wagmiChain.id] = chain.wsTarget ? webSocket(chain.wsTarget) : http(chain.rpcTarget);
         });
         configParams.chains = [wagmiChains[0], ...wagmiChains.slice(1)];
       }