fix uiConfig override bugs

should be specified config > whitelabel > unspecified config default values makes unspecified config > whitelabel
Web3Auth · Oct 23, 2023 · aa2a158 · aa2a158
1 parent f097222
commit aa2a158
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/modal/src/modalManager.ts b/packages/modal/src/modalManager.ts
@@ -92,15 +92,16 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     }
 
     if (!this.options.uiConfig) 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 = "auto";
   }
 
   public async initModal(params?: { modalConfig?: Record<WALLET_ADAPTER_TYPE, ModalConfig> }): Promise<void> {
     super.checkInitRequirements();
 
     const whitelabel = await fetchWhitelabel(this.options.clientId);
     this.options.uiConfig = cloneDeep(deepmerge(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 = "auto";
+
     this.loginModal = new LoginModal({
       ...this.options.uiConfig,
       adapterListener: this,