Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

app/client/craco.build.config.js

@@ -8,21 +8,6 @@ const env = process.env.REACT_APP_ENVIRONMENT;
 
 const plugins = [];
 
-if (env === "PRODUCTION" || env === "STAGING") {
-  plugins.push(
-    new SentryWebpackPlugin({
-      include: "build",
-      ignore: ["node_modules", "webpack.config.js"],
-      setCommits: {
-        auto: true
-      },
-      release: process.env.REACT_APP_SENTRY_RELEASE,
-      deploy: {
-        env: process.env.REACT_APP_SENTRY_ENVIRONMENT
-      }
-    }),
-  );
-}
 plugins.push(
   new WorkboxPlugin.InjectManifest({
     swSrc: "./src/serviceWorker.js",
@@ -32,6 +17,21 @@ plugins.push(
   }),
 );
 
+if (env === "PRODUCTION" || env === "STAGING") {
+  plugins.push(
+    new SentryWebpackPlugin({
+      include: "build",
+      ignore: ["node_modules", "webpack.config.js"],
+      setCommits: {
+        auto: true
+      },
+      deploy: {
+        env: process.env.REACT_APP_SENTRY_ENVIRONMENT
+      }
+    }),
+  );
+}
+
 module.exports = merge(common, {
   webpack: {
     plugins: plugins,

app/client/src/configs/index.ts

@@ -136,8 +136,8 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
     APPSMITH_FEATURE_CONFIGS.sentry.release,
   );
   const sentryENV = getConfig(
-    APPSMITH_FEATURE_CONFIGS.sentry.environment,
     ENV_CONFIG.sentry.environment,
+    APPSMITH_FEATURE_CONFIGS.sentry.environment,
   );
   const segment = getConfig(
     ENV_CONFIG.segment,