Skip to content

Commit

Permalink
Merge branch 'integration' into main v3.2.1
Browse files Browse the repository at this point in the history
smattingly committed Jun 13, 2022
2 parents 1bf544d + bd58259 commit a34ade2
Showing 5 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions packages/api/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "litefarm-api",
"version": "3.2.0",
"version": "3.2.1",
"description": "LiteFarm API server",
"main": "./api/src/server.js",
"scripts": {
2 changes: 1 addition & 1 deletion packages/webapp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "litefarm-webapp",
"version": "3.2.0",
"version": "3.2.1",
"description": "LiteFarm Web application",
"scripts": {
"dev": "CYPRESS_COVERAGE=TRUE vite",
4 changes: 3 additions & 1 deletion packages/webapp/src/components/Form/Unit/index.jsx
Original file line number Diff line number Diff line change
@@ -226,7 +226,9 @@ const Unit = ({
}, [hookFormUnit]);

useEffect(() => {
if (!hookFormGetValue(displayUnitName)) {
!hookFormGetValue(displayUnitName) &&
hookFormSetValue(displayUnitName, getUnitOptionMap()[displayUnit]);
if (hookFormGetValue(displayUnitName)) {
hookFormSetValue(displayUnitName, getUnitOptionMap()[displayUnit]);
}
}, []);
2 changes: 1 addition & 1 deletion packages/webapp/src/util/constants.js
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@ export const DO_ORIGIN_URL = `https://${
export const DO_CDN_URL = `https://${
import.meta.env.VITE_DO_BUCKET_NAME
}.nyc3.cdn.digitaloceanspaces.com`;
export const APP_VERSION = '3.2.0';
export const APP_VERSION = '3.2.1';

0 comments on commit a34ade2

Please sign in to comment.