Merge pull request #1349 from massenergize/canary

CANARY => Master (Preference page fix)
massenergize · Jun 12, 2024 · 8c6cbaa · 8c6cbaa
2 parents be63239 + 9460e0c
commit 8c6cbaa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/src/App.js b/src/App.js
@@ -81,13 +81,6 @@ function App() {
                 window.location.href
               );
 
-              console.log(
-                "All details ",
-                userIsNotAlreadyOnCustomDomain,
-                customDomain,
-                window.location.href, 
-                changeToProperURL(customDomain)
-              );
               // Only redirect to custom domain if a community has one, and the user is not already on the custom domain
               //   if (userIsNotAlreadyOnCustomDomain && !IS_LOCAL)
               //     window.location.href = changeToProperURL(customDomain);

diff --git a/src/components/Pages/Settings/Settings.js b/src/components/Pages/Settings/Settings.js
@@ -131,7 +131,7 @@ function Settings({
       );
   };
 
-  var TABS = Object.entries(settings)?.map(([key, { name, live, options }]) => {
+  var TABS = Object.entries(settings ||{})?.map(([key, { name, live, options }]) => {
     if (live)
       return {
         key,

diff --git a/src/components/Utils.js b/src/components/Utils.js
@@ -24,8 +24,6 @@ export function domainsAreTheSame(url1, url2) {
     let domain1 = parsedUrl1.hostname.replace(/^www\./, "");
     let domain2 = parsedUrl2.hostname.replace(/^www\./, "");
 
-    console.log("Track domain1, domain2", domain1, domain2)
-
     return domain1 === domain2;
   } catch (e) {
     console.log(e, url1, url2);

diff --git a/src/config/config.json b/src/config/config.json
@@ -1,6 +1,6 @@
 {
   "IS_LOCAL": false,
-  "IS_PROD": true,
-  "IS_CANARY": false,
-  "BUILD_VERSION": "4.13.13"
+  "IS_PROD": false,
+  "IS_CANARY": true,
+  "BUILD_VERSION": "4.13.17"
 }