Merge pull request #10 from Chia-Network/develop

Release: 1.2.7
Chia-Network · Sep 7, 2023 · ab312bc · ab312bc
2 parents 26879f7 + faadf88
commit ab312bc
Show file tree

Hide file tree

Showing 20 changed files with 173 additions and 220 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "core-registry-cadt-ui",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "private": true,
   "author": "Chia Network Inc. <[email protected]>",
   "homepage": "./",

diff --git a/src/components/blocks/APIDataTable.js b/src/components/blocks/APIDataTable.js
@@ -170,7 +170,7 @@ const APIDataTable = withTheme(
         let fullRecord = null;
 
         if (actions === 'Projects') {
-          fullRecord = projects.filter(
+          fullRecord = projects?.filter(
             project =>
               project.warehouseProjectId === partialRecord.warehouseProjectId,
           )[0];

diff --git a/src/components/blocks/UnitsDetails.js b/src/components/blocks/UnitsDetails.js
@@ -102,8 +102,7 @@ const UnitsDetails = ({ data, stagingData, changeColor }) => {
             <Body size="Bold" width="100%">
               <FormattedMessage id="unit-block-start" />
             </Body>
-            {data &&
-              detailsViewData('data', data, 'unitBlockStart', changeColor)}
+            {data && detailsViewData('data', data, 'unitBlockStart', false)}
             {stagingData &&
               detailsViewData(
                 'stagingData',

diff --git a/src/components/forms/OrgCreateFormModal.js b/src/components/forms/OrgCreateFormModal.js
@@ -40,11 +40,13 @@ const OrgCreateFormModal = ({ onClose }) => {
   const [formData, setFormData] = useState({
     name: '',
     png: null,
+    prefix: '',
   });
   const [importedOrgUid, setImportedOrgUid] = useState('');
   const [tabValue, setTabValue] = useState(0);
 
   const nameIsValid = formData?.name?.length > 0;
+  const prefixIsValid = formData?.prefix?.length > 0;
   const isOrgUidValid = importedOrgUid?.length > 4;
 
   const handleTabChange = (event, newValue) => {
@@ -113,6 +115,33 @@ const OrgCreateFormModal = ({ onClose }) => {
                   </Body>
                 )}
               </StyledFieldContainer>
+              <StyledFieldContainer>
+                <StyledLabelContainer>
+                  <Body>
+                    *<FormattedMessage id="organization-prefix" />
+                  </Body>
+                </StyledLabelContainer>
+                <InputContainer>
+                  <StandardInput
+                    size={InputSizeEnum.large}
+                    variant={InputVariantEnum.default}
+                    value={formData.prefix}
+                    onChange={value =>
+                      setFormData(prevState => ({
+                        ...prevState,
+                        prefix: value,
+                      }))
+                    }
+                  />
+                </InputContainer>
+                {!prefixIsValid && (
+                  <Body size="Small" color="red">
+                    {intl.formatMessage({
+                      id: 'add-valid-organization-prefix',
+                    })}
+                  </Body>
+                )}
+              </StyledFieldContainer>
               <StyledFieldContainer>
                 <StyledLabelContainer>
                   <Body>

diff --git a/src/components/forms/OrgEditFormModal.js b/src/components/forms/OrgEditFormModal.js
@@ -17,12 +17,13 @@ import {
 } from '..';
 import { editExistingOrg } from '../../store/actions/climateWarehouseActions';
 
-const OrgEditFormModal = ({ onClose, name, icon }) => {
+const OrgEditFormModal = ({ onClose, name, prefix, icon }) => {
   const intl = useIntl();
   const dispatch = useDispatch();
   const { notification } = useSelector(state => state.app);
   const [formData, setFormData] = useState({
     name,
+    prefix,
     png: icon,
   });
 
@@ -81,6 +82,33 @@ const OrgEditFormModal = ({ onClose, name, icon }) => {
                 </Body>
               )}
             </StyledFieldContainer>
+            <StyledFieldContainer>
+              <StyledLabelContainer>
+                <Body>
+                  *<FormattedMessage id="organization-prefix" />
+                </Body>
+              </StyledLabelContainer>
+              <InputContainer>
+                <StandardInput
+                  size={InputSizeEnum.large}
+                  variant={InputVariantEnum.default}
+                  value={formData.prefix}
+                  onChange={value =>
+                    setFormData(prevState => ({
+                      ...prevState,
+                      prefix: value,
+                    }))
+                  }
+                />
+              </InputContainer>
+              {!nameIsValid && (
+                <Body size="Small" color="red">
+                  {intl.formatMessage({
+                    id: 'add-valid-organization-prefix',
+                  })}
+                </Body>
+              )}
+            </StyledFieldContainer>
             <StyledFieldContainer>
               <StyledLabelContainer>
                 <Body>

diff --git a/src/components/forms/ProjectEditModal.js b/src/components/forms/ProjectEditModal.js
@@ -42,7 +42,7 @@ const ProjectEditModal = ({
 }) => {
   const projectToBeEdited = useSelector(
     state =>
-      state.climateWarehouse.projects.filter(
+      state?.climateWarehouse?.projects?.filter(
         project => project.warehouseProjectId === record.warehouseProjectId,
       )[0],
   );

diff --git a/src/components/forms/ProjectTransferModal.js b/src/components/forms/ProjectTransferModal.js
@@ -42,7 +42,7 @@ const ProjectTransferModal = ({
 }) => {
   const projectToBeTransferred = useSelector(
     state =>
-      state.climateWarehouse.projects.filter(
+      state?.climateWarehouse?.projects?.filter(
         project => project.warehouseProjectId === record.warehouseProjectId,
       )[0],
   );

diff --git a/src/components/forms/UnitCreateModal.js b/src/components/forms/UnitCreateModal.js
@@ -38,8 +38,6 @@ const emptyUnit = {
   countryJurisdictionOfOwner: '',
   inCountryJurisdictionOfOwner: '',
   unitCount: 0,
-  unitBlockEnd: '',
-  unitBlockStart: '',
   marketplace: '',
   marketplaceLink: '',
   marketplaceIdentifier: '',