Merge pull request #3073 from LiteFarmOrg/integration

Patch 3.6.1
LiteFarmOrg · Jan 10, 2024 · 86f73e0 · 86f73e0
2 parents ed619e7 + 91f812a
commit 86f73e0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 43 deletions.
diff --git a/packages/api/package-lock.json b/packages/api/package-lock.json
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "litefarm-api",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "LiteFarm API server",
   "main": "./api/src/server.js",
   "type": "module",

diff --git a/packages/api/src/server.js b/packages/api/src/server.js
@@ -39,7 +39,7 @@ if (process.env.SENTRY_DSN && environment !== 'development') {
       // Automatically instrument Node.js libraries and frameworks
       ...Sentry.autoDiscoverNodePerformanceMonitoringIntegrations(),
     ],
-    release: '3.5.2',
+    release: '3.6.1',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production

diff --git a/packages/webapp/package.json b/packages/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "litefarm-webapp",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "LiteFarm Web application",
   "type": "module",
   "scripts": {

diff --git a/packages/webapp/src/containers/Navigation/index.jsx b/packages/webapp/src/containers/Navigation/index.jsx
@@ -18,19 +18,23 @@ import PureNavigation from '../../components/Navigation';
 import { showedSpotlightSelector } from '../showedSpotlightSlice';
 import { setSpotlightToShown } from '../Map/saga';
 import useIsFarmSelected from '../../hooks/useIsFarmSelected';
-import { CUSTOM_SIGN_UP } from '../CustomSignUp/constants';
-import useHistoryLocation from '../hooks/useHistoryLocation';
+import {
+  CREATE_USER_ACCOUNT,
+  CUSTOM_SIGN_UP,
+  ENTER_PASSWORD_PAGE,
+} from '../CustomSignUp/constants';
 import ReleaseBadgeHandler from '../ReleaseBadgeHandler';
 
 const Navigation = ({ history, children, ...props }) => {
   const dispatch = useDispatch();
-  const historyLocation = useHistoryLocation(history);
-  const isCustomSignupPage = historyLocation.state?.component === CUSTOM_SIGN_UP;
   const isFarmSelected = useIsFarmSelected();
   const { navigation, notification } = useSelector(showedSpotlightSelector);
   const resetSpotlight = () => {
     dispatch(setSpotlightToShown(['notification', 'navigation']));
   };
+  const hideNavBar = [CUSTOM_SIGN_UP, ENTER_PASSWORD_PAGE, CREATE_USER_ACCOUNT].includes(
+    history.location?.state?.component,
+  );
 
   return (
     <>
@@ -40,7 +44,7 @@ const Navigation = ({ history, children, ...props }) => {
         resetSpotlight={resetSpotlight}
         history={history}
         isFarmSelected={isFarmSelected}
-        hidden={isCustomSignupPage}
+        hidden={hideNavBar}
         {...props}
       >
         {children}

diff --git a/packages/webapp/src/containers/hooks/useHistoryLocation.js b/packages/webapp/src/containers/hooks/useHistoryLocation.js
diff --git a/packages/webapp/src/main.jsx b/packages/webapp/src/main.jsx
@@ -86,7 +86,7 @@ if (import.meta.env.VITE_SENTRY_DSN) {
   Sentry.init({
     dsn: import.meta.env.VITE_SENTRY_DSN,
     integrations: [new Integrations.BrowserTracing()],
-    release: '3.6.0',
+    release: '3.6.1',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production