Merge pull request #3231 from LiteFarmOrg/patch/3.6.4

Patch 3.6.4

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "litefarm-api",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "description": "LiteFarm API server",
   "main": "./api/src/server.js",
   "type": "module",

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.6.3',
+    release: '3.6.4',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production

packages/webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "litefarm-webapp",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "description": "LiteFarm Web application",
   "type": "module",
   "scripts": {

packages/webapp/src/containers/Consent/index.jsx

@@ -1,5 +1,4 @@
 import { useForm } from 'react-hook-form';
-import React, { useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import PureConsent from '../../components/Consent';
 import { userFarmSelector } from '../userFarmSlice';
@@ -15,6 +14,7 @@ import PortugueseWorkerConsent from './locales/pt/Worker.Consent.md';
 import SpanishOwnerConsent from './locales/es/Owner.Consent.md';
 import SpanishWorkerConsent from './locales/es/Worker.Consent.md';
 import { getLanguageFromLocalStorage } from '../../util/getLanguageFromLocalStorage';
+import { CONSENT_VERSION } from '../../util/constants';
 
 const languageConsent = {
   en: { worker: <EnglishWorkerConsent />, owner: <EnglishOwnerConsent /> },
@@ -42,7 +42,6 @@ function ConsentForm({
 
     formState: { errors },
   } = useForm();
-  const [consentVersion] = useState('5.0');
   const consent =
     role.role_id === 3 ? getLanguageConsent(language).worker : getLanguageConsent(language).owner;
   const checkboxName = 'consentCheckbox';
@@ -58,7 +57,7 @@ function ConsentForm({
   };
 
   const updateConsent = (data) => {
-    dispatch(patchConsent({ has_consent: true, consent_version: consentVersion, goForwardTo }));
+    dispatch(patchConsent({ has_consent: true, consent_version: CONSENT_VERSION, goForwardTo }));
   };
 
   return (

packages/webapp/src/containers/userFarmSlice.js

@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { createSelector } from 'reselect';
+import { CONSENT_VERSION } from '../util/constants';
 
 export function onLoadingStart(state) {
   state.loading = true;
@@ -218,6 +219,9 @@ export const userFarmSelector = createSelector(
       ? {
           is_admin: adminRoles.includes(byFarmIdUserId[farm_id][user_id].role_id),
           ...byFarmIdUserId[farm_id][user_id],
+          has_consent:
+            byFarmIdUserId[farm_id][user_id].has_consent &&
+            byFarmIdUserId[farm_id][user_id].consent_version === CONSENT_VERSION,
         }
       : {};
   },

packages/webapp/src/main.jsx

@@ -85,7 +85,7 @@ if (import.meta.env.VITE_SENTRY_DSN) {
   Sentry.init({
     dsn: import.meta.env.VITE_SENTRY_DSN,
     integrations: [new Integrations.BrowserTracing()],
-    release: '3.6.3',
+    release: '3.6.4',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production

packages/webapp/src/util/constants.js

@@ -9,3 +9,5 @@ export const DO_CDN_URL = `https://${
 // Changing this forces logout and updates the new release card
 export const APP_VERSION = '3.6.0';
 export const VERSION_RELEASE_NOTES_LINK = 'https://www.litefarm.org/post/a-new-look-for-a-new-year';
+
+export const CONSENT_VERSION = '6.0';