Merge branch 'master' into feat/sdk-v10-wallet-discovery

Author: chaitanyapotti

demo/vue-app-new/package.json

@@ -21,7 +21,7 @@
     "@web3auth/modal": "file:../../packages/modal",
     "@web3auth/no-modal": "file:../../packages/no-modal",
     "@web3auth/sign-in-with-ethereum": "^4.2.2",
-    "@web3auth/ws-embed": "^4.0.7",
+    "@web3auth/ws-embed": "^4.0.14",
     "bs58": "^6.0.0",
     "ethers": "^6.13.5",
     "petite-vue-i18n": "^11.1.2",

demo/vue-app-new/src/MainView.vue

@@ -95,10 +95,11 @@ const options = computed((): Web3AuthOptions => {
     useAAWithExternalWallet: formData.useAAWithExternalWallet,
     // TODO: Add more options
     // enableLogging?: boolean;
-    // storageKey?: "session" | "local";
+    // storageType?: "session" | "local";
     // sessionTime?: number;
     // useCoreKitKey?: boolean;
     chains,
+    defaultChainId: formData.defaultChainId,
     enableLogging: true,
     connectors: externalConnectors.value,
     plugins,

demo/vue-app-new/src/components/AppSettings.vue

@@ -37,6 +37,10 @@ const chainOptions = computed(() => {
   return allChains;
 });
 
+const defaultChainOptions = computed(() => {
+  return formData.chains.map((chain) => ({ name: chain, value: chain }));
+});
+
 const adapterOptions = computed(() =>
   formData.chainNamespaces.includes(CHAIN_NAMESPACES.EIP155)
     ? [
@@ -90,6 +94,7 @@ const isActiveTab = (index: number) => activeTab.value === index;
 const onChainNamespaceChange = (value: string[]) => {
   log.info("onChainNamespaceChange", value);
   formData.chains = value.map((namespace) => chainConfigs[namespace as ChainNamespaceType][0]);
+  formData.defaultChainId = formData.chains[0];
   formData.connectors = [];
 };
 </script>
@@ -155,6 +160,14 @@ const onChainNamespaceChange = (value: string[]) => {
           :multiple="true"
           :options="chainOptions"
         />
+        <Select
+          v-model="formData.defaultChainId"
+          data-testid="selectDefaultChainId"
+          :label="$t('app.defaultChainId')"
+          :aria-label="$t('app.defaultChainId')"
+          :placeholder="$t('app.defaultChainId')"
+          :options="defaultChainOptions"
+        />
         <Select
           v-model="formData.connectors"
           data-testid="selectAdapters"

demo/vue-app-new/src/config.ts

@@ -102,6 +102,7 @@ export type FormData = {
   network: WEB3AUTH_NETWORK_TYPE;
   chainNamespaces: ChainNamespaceType[];
   chains: string[];
+  defaultChainId: string;
   whiteLabel: {
     enable: boolean;
     config: WhiteLabelData;

demo/vue-app-new/src/store/form.ts

@@ -9,6 +9,7 @@ export const formDataStore = reactive<FormData>({
   network: WEB3AUTH_NETWORK.TESTNET,
   chainNamespaces: [CHAIN_NAMESPACES.EIP155],
   chains: [chainConfigs[CHAIN_NAMESPACES.EIP155][0], chainConfigs[CHAIN_NAMESPACES.EIP155][1]],
+  defaultChainId: chainConfigs[CHAIN_NAMESPACES.EIP155][0],
   whiteLabel: {
     enable: false,
     config: initWhiteLabel,

demo/vue-app-new/src/translations/en.json

@@ -6,6 +6,7 @@
     "documentation": "Documentation",
     "network": "Network",
     "chains": "Chains",
+    "defaultChainId": "Default Chain ID",
     "loginProviders": "Login provider",
     "adapters": "Adapters",
     "showWalletDiscovery": "Show Wallet Discovery",

lerna.json

@@ -1,4 +1,4 @@
 {
-  "version": "10.0.0-alpha.0",
+  "version": "10.0.0-alpha.1",
   "npmClient": "npm"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/modal",
-  "version": "10.0.0-alpha.0",
+  "version": "10.0.0-alpha.1",
   "description": "Multi chain wallet aggregator for web3Auth",
   "keywords": [
     "web3Auth/ui",
@@ -74,7 +74,7 @@
   "dependencies": {
     "@toruslabs/http-helpers": "^7.0.0",
     "@web3auth/auth": "^9.6.4",
-    "@web3auth/no-modal": "^10.0.0-alpha.0",
+    "@web3auth/no-modal": "^10.0.0-alpha.1",
     "bowser": "^2.11.0",
     "classnames": "^2.5.1",
     "copy-to-clipboard": "^3.3.3",

packages/modal/package.json

@@ -62,7 +62,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
 
   public async initModal(params?: ModalConfigParams): Promise<void> {
     super.checkInitRequirements();
-
+    super.initCachedConnectorAndChainId();
     // get project config and wallet registry
     const { projectConfig, walletRegistry } = await this.getProjectAndWalletConfig(params);
     this.options.uiConfig = deepmerge(cloneDeep(projectConfig.whitelabel || {}), this.options.uiConfig || {});
@@ -80,10 +80,12 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     await this.loginModal.initModal();
 
     // setup common JRPC provider
-    await this.setupCommonJRPCProvider(projectConfig);
+    await this.setupCommonJRPCProvider();
 
     // initialize connectors
-    this.on(CONNECTOR_EVENTS.CONNECTORS_UPDATED, ({ connectors }) => this.initConnectors({ connectors, projectConfig, modalConfig: params }));
+    this.on(CONNECTOR_EVENTS.CONNECTORS_UPDATED, ({ connectors: newConnectors }) =>
+      this.initConnectors({ connectors: newConnectors, projectConfig, modalConfig: params })
+    );
     await this.loadConnectors({ projectConfig });
 
     // initialize plugins
@@ -171,6 +173,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     // update auth connector config
     const { sms_otp_enabled: smsOtpEnabled } = projectConfig;
     if (smsOtpEnabled !== undefined) {
+      // TODO: use the new login config method
       const connectorConfig: Record<WALLET_CONNECTOR_TYPE, ModalConfig> = {
         [WALLET_CONNECTORS.AUTH]: {
           label: WALLET_CONNECTORS.AUTH,