fix: adjust edit and create unit forms/remove warehouse id/capitalize

Chia-Network · Jan 10, 2022 · f649c74 · f649c74
1 parent 34e521e
commit f649c74
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 52 deletions.
diff --git a/src/components/forms/CreateUnitsForm.js b/src/components/forms/CreateUnitsForm.js
@@ -46,7 +46,6 @@ const CreateUnitsForm = withRouter(({ onClose }) => {
   };
 
   const [newUnits, setNewUnits] = useState({
-    warehouseUnitId: '',
     unitBlockStart: '',
     unitBlockEnd: '',
     countryJuridictionOfOwner: '',
@@ -108,29 +107,6 @@ const CreateUnitsForm = withRouter(({ onClose }) => {
                 <ModalFormContainerStyle>
                   <FormContainerStyle>
                     <BodyContainer>
-                      <StyledFieldContainer>
-                        <StyledLabelContainer>
-                          <Body color={'#262626'}>
-                            <FormattedMessage id="warehouse-unit-id" />
-                          </Body>
-                        </StyledLabelContainer>
-                        <InputContainer>
-                          <StandardInput
-                            size={InputSizeEnum.large}
-                            placeholderText={intl.formatMessage({
-                              id: 'warehouse-unit-id',
-                            })}
-                            state={InputStateEnum.default}
-                            value={newUnits.warehouseUnitId}
-                            onChange={value =>
-                              setNewUnits(prev => ({
-                                ...prev,
-                                warehouseUnitId: value,
-                              }))
-                            }
-                          />
-                        </InputContainer>
-                      </StyledFieldContainer>
                       <StyledFieldContainer>
                         <StyledLabelContainer>
                           <Body color={'#262626'}>

diff --git a/src/components/forms/EditUnitsForm.js b/src/components/forms/EditUnitsForm.js
@@ -45,7 +45,6 @@ const EditUnitsForm = ({ data, onClose }) => {
 
   useEffect(() => {
     setEditUnits({
-      warehouseUnitId: data.warehouseUnitId,
       unitBlockStart: data.unitBlockStart,
       unitBlockEnd: data.unitBlockEnd,
       countryJuridictionOfOwner: data.countryJuridictionOfOwner,
@@ -110,29 +109,6 @@ const EditUnitsForm = ({ data, onClose }) => {
                 <ModalFormContainerStyle>
                   <FormContainerStyle>
                     <BodyContainer>
-                      <StyledFieldContainer>
-                        <StyledLabelContainer>
-                          <Body style={{ color: '#262626' }}>
-                            <FormattedMessage id="warehouse-unit-id" />
-                          </Body>
-                        </StyledLabelContainer>
-                        <InputContainer>
-                          <StandardInput
-                            size={InputSizeEnum.large}
-                            placeholderText={intl.formatMessage({
-                              id: 'warehouse-unit-id',
-                            })}
-                            state={InputStateEnum.default}
-                            value={editedUnits.warehouseUnitId}
-                            onChange={value =>
-                              setEditUnits(prev => ({
-                                ...prev,
-                                warehouseUnitId: value,
-                              }))
-                            }
-                          />
-                        </InputContainer>
-                      </StyledFieldContainer>
                       <StyledFieldContainer>
                         <StyledLabelContainer>
                           <Body style={{ color: '#262626' }}>
@@ -225,6 +201,8 @@ const EditUnitsForm = ({ data, onClose }) => {
                           />
                         </InputContainer>
                       </StyledFieldContainer>
+                    </BodyContainer>
+                    <div style={{ display: 'flex', flexDirection: 'column' }}>
                       <StyledFieldContainer>
                         <StyledLabelContainer>
                           <Body style={{ color: '#262626' }}>
@@ -271,8 +249,6 @@ const EditUnitsForm = ({ data, onClose }) => {
                           />
                         </InputContainer>
                       </StyledFieldContainer>
-                    </BodyContainer>
-                    <div style={{ display: 'flex', flexDirection: 'column' }}>
                       <StyledFieldContainer>
                         <StyledLabelContainer>
                           <Body style={{ color: '#262626' }}>

diff --git a/src/pages/Units/index.js b/src/pages/Units/index.js
@@ -33,7 +33,6 @@ import {
   StagingDataTable,
   NotificationCard,
   Alert,
-  DateSelect,
 } from '../../components';
 
 const headings = [

diff --git a/src/translations/tokens/en-US.json b/src/translations/tokens/en-US.json
@@ -32,7 +32,7 @@
   "unit-block-start": "Unit Block Start",
   "unit-block-end": "Unit Block End",
   "country-juridiction-of-owner": "Country Juridiction Of Owner",
-  "in-country-juridiction-of-owner": "in-Country Juridiction Of Owner",
+  "in-country-juridiction-of-owner": "In-Country Juridiction Of Owner",
   "intended-buyer-org-uid": "Intended Buyer Org UID",
   "tags": "Tags",
   "token-issuance-hash": "Token Issuance Hash",