Merge pull request #1824 from Web3Auth/feat/nomodal-events

Feat/nomodal-events
Web3Auth · May 9, 2024 · aa2a206 · aa2a206
2 parents 6bbab2a + 1049fe3
commit aa2a206
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 37 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/hooks/modal-react-hooks/package.json b/packages/hooks/modal-react-hooks/package.json
@@ -31,16 +31,14 @@
     "dist"
   ],
   "devDependencies": {
-    "@web3auth/modal": "^8.4.1",
     "@web3auth/openlogin-adapter": "^8.4.1"
   },
   "dependencies": {
-    "@web3auth/base": "^8.4.1"
+    "@web3auth/base": "^8.4.1",
+    "@web3auth/modal": "^8.4.1"
   },
   "peerDependencies": {
     "@babel/runtime": "^7.x",
-    "@web3auth/modal": "^8.x",
-    "@web3auth/openlogin-adapter": "^8.x",
     "react": "^18.x"
   },
   "lint-staged": {

diff --git a/packages/hooks/no-modal-react-hooks/package.json b/packages/hooks/no-modal-react-hooks/package.json
@@ -31,16 +31,14 @@
     "dist"
   ],
   "devDependencies": {
-    "@web3auth/no-modal": "^8.4.1",
     "@web3auth/openlogin-adapter": "^8.4.1"
   },
   "dependencies": {
-    "@web3auth/base": "^8.4.1"
+    "@web3auth/base": "^8.4.1",
+    "@web3auth/no-modal": "^8.4.1"
   },
   "peerDependencies": {
     "@babel/runtime": "^7.x",
-    "@web3auth/no-modal": "^8.x",
-    "@web3auth/openlogin-adapter": "^8.x",
     "react": "^18.x"
   },
   "lint-staged": {

diff --git a/packages/hooks/wallet-services-plugin-react-hooks/package.json b/packages/hooks/wallet-services-plugin-react-hooks/package.json
@@ -30,17 +30,12 @@
   "files": [
     "dist"
   ],
-  "devDependencies": {
-    "@web3auth/wallet-services-plugin": "^8.4.1",
-    "@web3auth/openlogin-adapter": "^8.4.1"
-  },
   "dependencies": {
-    "@web3auth/base": "^8.4.1"
+    "@web3auth/base": "^8.4.1",
+    "@web3auth/wallet-services-plugin": "^8.4.1"
   },
   "peerDependencies": {
     "@babel/runtime": "^7.x",
-    "@web3auth/openlogin-adapter": "^8.x",
-    "@web3auth/wallet-services-plugin": "^8.x",
     "react": "^18.x"
   },
   "lint-staged": {

diff --git a/packages/hooks/wallet-services-plugin-react-hooks/src/context/WalletServicesContext.ts b/packages/hooks/wallet-services-plugin-react-hooks/src/context/WalletServicesContext.ts
@@ -1,5 +1,5 @@
 import { IBaseWeb3AuthHookContext, PLUGIN_EVENTS, WalletServicesPluginError } from "@web3auth/base";
-import { WalletServicesPlugin } from "@web3auth/wallet-services-plugin";
+import { type WalletServicesPlugin } from "@web3auth/wallet-services-plugin";
 import { Context, createContext, createElement, PropsWithChildren, useCallback, useContext, useEffect, useMemo, useState } from "react";
 
 import { IWalletServicesContext } from "../interfaces";

diff --git a/packages/modal/src/modalManager.ts b/packages/modal/src/modalManager.ts
@@ -299,8 +299,11 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     });
 
     this.commonJRPCProvider = await CommonJRPCProvider.getProviderInstance({ chainConfig: this.coreOptions.chainConfig as CustomChainConfig });
-    this.status = ADAPTER_STATUS.READY;
     await Promise.all(initPromises);
+    if (this.status === ADAPTER_STATUS.NOT_READY) {
+      this.status = ADAPTER_STATUS.READY;
+      this.emit(ADAPTER_EVENTS.READY);
+    }
 
     const hasExternalWallets = allAdapters.some((adapterName) => {
       return this.walletAdapters[adapterName]?.type === ADAPTER_CATEGORY.EXTERNAL && this.modalConfig.adapters?.[adapterName].showOnModal;

diff --git a/packages/no-modal/src/noModal.ts b/packages/no-modal/src/noModal.ts
@@ -179,7 +179,10 @@ export class Web3AuthNoModal extends SafeEventEmitter implements IWeb3Auth {
       return this.walletAdapters[adapterName].init({ autoConnect: this.cachedAdapter === adapterName }).catch((e) => log.error(e));
     });
     await Promise.all(initPromises);
-    if (this.status === ADAPTER_STATUS.NOT_READY) this.status = ADAPTER_STATUS.READY;
+    if (this.status === ADAPTER_STATUS.NOT_READY) {
+      this.status = ADAPTER_STATUS.READY;
+      this.emit(ADAPTER_EVENTS.READY);
+    }
   }
 
   public getAdapter(adapterName: WALLET_ADAPTER_TYPE): IAdapter<unknown> | null {

diff --git a/packages/plugins/wallet-services-plugin/package.json b/packages/plugins/wallet-services-plugin/package.json
@@ -42,8 +42,7 @@
     "loglevel": "^1.9.1"
   },
   "peerDependencies": {
-    "@babel/runtime": "^7.x",
-    "@web3auth/openlogin-adapter": "^8.x"
+    "@babel/runtime": "^7.x"
   },
   "lint-staged": {
     "!(*d).ts": [

diff --git a/packages/ui/src/loginModal.tsx b/packages/ui/src/loginModal.tsx
@@ -59,7 +59,7 @@ class LoginModal extends SafeEventEmitter {
 
     if (!uiConfig.logoDark) this.uiConfig.logoDark = DEFAULT_LOGO_DARK;
     if (!uiConfig.logoLight) this.uiConfig.logoLight = DEFAULT_LOGO_LIGHT;
-    if (!uiConfig.mode) this.uiConfig.mode = "auto";
+    if (!uiConfig.mode) this.uiConfig.mode = "light";
     if (!uiConfig.modalZIndex) this.uiConfig.modalZIndex = "99998";
     if (typeof uiConfig.displayErrorsOnModal === "undefined") this.uiConfig.displayErrorsOnModal = true;
     if (!uiConfig.appName) this.uiConfig.appName = "Web3Auth";