From 19c0f41ac83ba84afd2f559cdc4b23d36346477c Mon Sep 17 00:00:00 2001
From: johnsoncherian <johnsonc.dev@gmail.com>
Date: Mon, 28 Oct 2024 17:04:05 +0530
Subject: [PATCH] fix: fixed api call for globals

---
 frontend/src/AppBuilder/_hooks/useAppData.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/AppBuilder/_hooks/useAppData.js b/frontend/src/AppBuilder/_hooks/useAppData.js
index ff2b77f28a..26d847ae14 100644
--- a/frontend/src/AppBuilder/_hooks/useAppData.js
+++ b/frontend/src/AppBuilder/_hooks/useAppData.js
@@ -163,7 +163,7 @@ const useAppData = (appId, moduleId, mode = 'edit', { environmentId, versionId }
       }
       const constantsResp = isPublicAccess
         ? await orgEnvironmentConstantService.getConstantsFromPublicApp(slug)
-        : await orgEnvironmentConstantService.getConstantsFromEnvironment(editorEnvironmentId);
+        : await orgEnvironmentConstantService.getConstantsFromApp();
 
       const pages = appData.pages.map((page) => {
         return page;
@@ -190,7 +190,7 @@ const useAppData = (appId, moduleId, mode = 'edit', { environmentId, versionId }
       );
 
       setPages(pages, moduleId);
-      setPageSettings(deepCamelCase(appData?.editing_version?.page_settings || appData?.page_settings));
+      setPageSettings(deepCamelCase(appData?.editing_version?.page_settings));
 
       // set starting page as homepage initially
       let startingPage = appData.pages.find((page) => page.id === homePageId);
@@ -236,11 +236,13 @@ const useAppData = (appId, moduleId, mode = 'edit', { environmentId, versionId }
         const orgSecrets = {};
         constants.map((constant) => {
           if (constant.type !== 'Secret') {
-            orgConstants[constant.name] = constant.value;
+            orgConstants[constant.name] =
+              constant.value || constant.values?.find((v) => v.environmentName === 'production').value;
           } else {
             orgSecrets[constant.name] = constant.value;
           }
         });
+
         setResolvedConstants(orgConstants);
         setSecrets(orgSecrets);
       }