minor fixes

Author: chaitanyapotti

packages/modal/src/react/Web3AuthProvider.ts

@@ -5,5 +5,6 @@ import { Web3AuthInnerContext, Web3AuthInnerProvider } from "./context/Web3AuthI
 import { Web3AuthProviderProps } from "./interfaces";
 
 export function Web3AuthProvider({ config, children }: PropsWithChildren<Web3AuthProviderProps>) {
-  return createElement(Web3AuthInnerProvider, { config }, createElement(WalletServicesContextProvider, { context: Web3AuthInnerContext }, children));
+  const pluginChild = createElement(WalletServicesContextProvider, { context: Web3AuthInnerContext }, children);
+  return createElement(Web3AuthInnerProvider, { config }, pluginChild);
 }

packages/modal/src/react/context/WalletServicesInnerContext.ts

@@ -24,7 +24,7 @@ export function WalletServicesContextProvider({ children, context }: PropsWithCh
   useEffect(() => {
     if (isConnected) {
       const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES) as WalletServicesPluginType;
-      if (!walletServicesPlugin) setWalletServicesPlugin(plugin);
+      setWalletServicesPlugin(plugin);
       // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
       if (plugin?.status === CONNECTOR_STATUS.CONNECTED) setReady(true);
     }

packages/modal/src/react/hooks/useCheckout.ts

@@ -17,12 +17,12 @@ export const useCheckout = (): IUseCheckout => {
 
   const showCheckout = useCallback(
     async (showCheckoutParams?: BaseEmbedControllerState["showCheckout"]) => {
-      if (!plugin) throw WalletServicesPluginError.notInitialized();
-      if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
-
       setLoading(true);
       setError(null);
       try {
+        if (!plugin) throw WalletServicesPluginError.notInitialized();
+        if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
+
         await plugin.showCheckout(showCheckoutParams);
       } catch (error) {
         setError(error as Web3AuthError);

packages/modal/src/react/hooks/useSwap.ts

@@ -17,12 +17,12 @@ export const useSwap = (): IUseSwap => {
 
   const showSwap = useCallback(
     async (showSwapParams?: BaseEmbedControllerState["showSwap"]) => {
-      if (!plugin) throw WalletServicesPluginError.notInitialized();
-      if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
-
       setLoading(true);
       setError(null);
       try {
+        if (!plugin) throw WalletServicesPluginError.notInitialized();
+        if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
+
         await plugin.showSwap(showSwapParams);
       } catch (error) {
         setError(error as Web3AuthError);

packages/modal/src/react/hooks/useWalletConnectScanner.ts

@@ -17,12 +17,12 @@ export const useWalletConnectScanner = (): IUseWalletConnectScanner => {
 
   const showWalletConnectScanner = useCallback(
     async (showWalletConnectScannerParams?: BaseEmbedControllerState["showWalletConnect"]) => {
-      if (!plugin) throw WalletServicesPluginError.notInitialized();
-      if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
-
       setLoading(true);
       setError(null);
       try {
+        if (!plugin) throw WalletServicesPluginError.notInitialized();
+        if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
+
         await plugin.showWalletConnectScanner(showWalletConnectScannerParams);
       } catch (error) {
         setError(error as Web3AuthError);

packages/modal/src/react/hooks/useWalletUI.ts

@@ -17,12 +17,12 @@ export const useWalletUI = (): IUseWalletUI => {
 
   const showWalletUI = useCallback(
     async (showWalletUiParams?: BaseEmbedControllerState["showWalletUi"]) => {
-      if (!plugin) throw WalletServicesPluginError.notInitialized();
-      if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
-
       setLoading(true);
       setError(null);
       try {
+        if (!plugin) throw WalletServicesPluginError.notInitialized();
+        if (!ready) throw WalletServicesPluginError.walletPluginNotConnected();
+
         await plugin.showWalletUi(showWalletUiParams);
       } catch (error) {
         setError(error as Web3AuthError);

packages/modal/src/react/wagmi/provider.ts

@@ -132,7 +132,7 @@ export function WagmiProvider({ children, ...props }: PropsWithChildren<WagmiPro
 
     const wagmiChains: Chain[] = [];
     if (web3Auth?.coreOptions?.chains) {
-      const defaultChainId = web3Auth.coreOptions.defaultChainId;
+      const defaultChainId = web3Auth.currentChain?.chainId;
       const chains = web3Auth.coreOptions.chains;
       chains.forEach((chain) => {
         const wagmiChain = defineChain({

packages/modal/src/ui/components/ConnectWallet/ConnectWallet.tsx

@@ -87,12 +87,12 @@ function ConnectWallet(props: ConnectWalletProps) {
 
   const installedWalletButtons = useMemo(() => {
     const visibilityMap = connectorVisibilityMap;
-    return Object.keys(config).reduce((acc, adapter) => {
-      if (adapter !== WALLET_CONNECTORS.WALLET_CONNECT_V2 && visibilityMap[adapter]) {
+    return Object.keys(config).reduce((acc, localConnector) => {
+      if (localConnector !== WALLET_CONNECTORS.WALLET_CONNECT_V2 && visibilityMap[localConnector]) {
         acc.push({
-          name: adapter,
-          displayName: config[adapter as WALLET_CONNECTOR_TYPE].label || adapter,
-          hasInjectedWallet: config[adapter as WALLET_CONNECTOR_TYPE].isInjected,
+          name: localConnector,
+          displayName: config[localConnector as WALLET_CONNECTOR_TYPE].label || localConnector,
+          hasInjectedWallet: config[localConnector as WALLET_CONNECTOR_TYPE].isInjected,
           hasWalletConnect: false,
           hasInstallLinks: false,
         });

packages/no-modal/src/react/no-modal/Web3AuthProvider.ts

@@ -5,5 +5,6 @@ import { Web3AuthInnerContext, Web3AuthInnerProvider } from "./context/Web3AuthI
 import { Web3AuthProviderProps } from "./interfaces";
 
 export function Web3AuthProvider({ config, children }: PropsWithChildren<Web3AuthProviderProps>) {
-  return createElement(Web3AuthInnerProvider, { config }, createElement(WalletServicesContextProvider, { context: Web3AuthInnerContext }, children));
+  const pluginChild = createElement(WalletServicesContextProvider, { context: Web3AuthInnerContext }, children);
+  return createElement(Web3AuthInnerProvider, { config }, pluginChild);
 }

packages/no-modal/src/react/no-modal/context/WalletServicesInnerContext.ts

@@ -25,7 +25,7 @@ export function WalletServicesContextProvider({ children, context }: PropsWithCh
   useEffect(() => {
     if (isConnected) {
       const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES) as WalletServicesPluginType;
-      if (!walletServicesPlugin) setWalletServicesPlugin(plugin);
+      setWalletServicesPlugin(plugin);
       // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
       if (plugin?.status === CONNECTOR_STATUS.CONNECTED) setReady(true);
     }