From 0e663d46ff6a28e57172cc869159cb1880de43a1 Mon Sep 17 00:00:00 2001
From: bogdan-rosianu <bogdan.rosianu@yahoo.com>
Date: Thu, 26 Feb 2026 16:43:54 +0200
Subject: [PATCH 1/2] override dapp config chain id from network config

---
 .../dapp-config/dapp.config.service.ts          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/endpoints/dapp-config/dapp.config.service.ts b/src/endpoints/dapp-config/dapp.config.service.ts
index 1e6a00712..85337f017 100644
--- a/src/endpoints/dapp-config/dapp.config.service.ts
+++ b/src/endpoints/dapp-config/dapp.config.service.ts
@@ -22,15 +22,20 @@ export class DappConfigService {
 
     const networkConfig = await this.gatewayService.getNetworkConfig();
     const refreshRate = networkConfig.erd_round_duration;
+    const chainId = networkConfig.erd_chain_id;
 
-    if (refreshRate) {
-      return {
-        ...this.dappConfig,
-        refreshRate,
-      };
+    const overrides: Partial<DappConfig> = {};
+    if (refreshRate !== undefined && refreshRate !== null) {
+      overrides.refreshRate = refreshRate;
+    }
+    if (chainId) {
+      overrides.chainId = chainId;
     }
 
-    return this.dappConfig;
+    return {
+      ...this.dappConfig,
+      ...overrides,
+    };
   }
 
   getDappConfigurationRaw(): DappConfig | undefined {

From 6ae86f157a74d0a7d393b4ec4689e5b81e87832c Mon Sep 17 00:00:00 2001
From: bogdan-rosianu <bogdan.rosianu@yahoo.com>
Date: Thu, 26 Feb 2026 16:56:48 +0200
Subject: [PATCH 2/2] fix after review

---
 src/endpoints/dapp-config/dapp.config.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/endpoints/dapp-config/dapp.config.service.ts b/src/endpoints/dapp-config/dapp.config.service.ts
index 85337f017..88db605cf 100644
--- a/src/endpoints/dapp-config/dapp.config.service.ts
+++ b/src/endpoints/dapp-config/dapp.config.service.ts
@@ -25,10 +25,10 @@ export class DappConfigService {
     const chainId = networkConfig.erd_chain_id;
 
     const overrides: Partial<DappConfig> = {};
-    if (refreshRate !== undefined && refreshRate !== null) {
+    if (refreshRate != null) {
       overrides.refreshRate = refreshRate;
     }
-    if (chainId) {
+    if (chainId != null) {
       overrides.chainId = chainId;
     }