From 05aedbc8a6a5b2ceb00cd05ca9822ca3a5c21ccc Mon Sep 17 00:00:00 2001
From: Gandharv <gandharvkumargarg@gmail.com>
Date: Fri, 28 Oct 2022 19:41:18 +0700
Subject: [PATCH] fix: pick env from public_config for marketplace (#4648)

---
 frontend/src/App/App.jsx                  | 2 +-
 frontend/webpack.config.js                | 1 -
 server/src/services/app_config.service.ts | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/App/App.jsx b/frontend/src/App/App.jsx
index ac45af3bc8..99fbec3cc2 100644
--- a/frontend/src/App/App.jsx
+++ b/frontend/src/App/App.jsx
@@ -259,7 +259,7 @@ class App extends React.Component {
               switchDarkMode={this.switchDarkMode}
               darkMode={darkMode}
             />
-            {config.ENABLE_MARKETPLACE_FEATURE && (
+            {window.public_config?.ENABLE_MARKETPLACE_FEATURE && (
               <AdminRoute
                 exact
                 path="/integrations"
diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js
index 17d9585479..5be16d07eb 100644
--- a/frontend/webpack.config.js
+++ b/frontend/webpack.config.js
@@ -158,7 +158,6 @@ module.exports = {
       apiUrl: `${stripTrailingSlash(API_URL[environment]) || ''}/api`,
       SERVER_IP: process.env.SERVER_IP,
       COMMENT_FEATURE_ENABLE: process.env.COMMENT_FEATURE_ENABLE ?? true,
-      ENABLE_MARKETPLACE_FEATURE: process.env.ENABLE_MARKETPLACE_FEATURE ?? false,
       ENABLE_MULTIPLAYER_EDITING: true,
       TOOLJET_MARKETPLACE_URL:
         process.env.TOOLJET_MARKETPLACE_URL || 'https://tooljet-plugins-production.s3.us-east-2.amazonaws.com',
diff --git a/server/src/services/app_config.service.ts b/server/src/services/app_config.service.ts
index 12e9f9e7fb..668db25cfa 100644
--- a/server/src/services/app_config.service.ts
+++ b/server/src/services/app_config.service.ts
@@ -30,6 +30,7 @@ export class AppConfigService {
       'SSO_DISABLE_SIGNUPS',
       'TOOLJET_HOST',
       'SUB_PATH',
+      'ENABLE_MARKETPLACE_FEATURE',
     ];
   }