fixed errors

JoinColony · Jan 27, 2023 · 0058097 · 0058097
1 parent c9aa8d7
commit 0058097
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 17 deletions.
diff --git a/src/modules/dashboard/components/Incorporation/IncorporationForm/Protectors/Protectors.css b/src/modules/dashboard/components/Incorporation/IncorporationForm/Protectors/Protectors.css
@@ -1,5 +1,5 @@
 .wrapper {
-  margin: 18px 0 14px;
+  margin: 8px 0 16px;
 }
 
 .labelWrapper {
@@ -42,27 +42,36 @@
 .mainContactWrapper {
   display: flex;
   justify-content: space-between;
-  padding: 11px 0 14px;
-  padding-bottom: 0;
-  font-size: var(--size-smallish);
-  font-weight: var(--weight-bold);
-  color: color-mod(var(--temp-grey-blue-7) alpha(85%));
+  font-size: var(--size-tiny);
+  white-space: nowrap;
+  color: var(--danger);
+  letter-spacing: var(--spacing-medium);
 }
 
 .mainContactWrapper label {
   margin-right: 0;
 }
 
+.selectWrapper {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.error {
+  font-size: var(--size-tiny);
+  font-weight: var(--weight-bold);
+  white-space: nowrap;
+  color: var(--danger);
+  letter-spacing: var(--spacing-medium);
+}
+
 .deleteIcon {
   height: 20px;
   width: 20px;
   fill: var(--pink);
 }
 
-.deleteIcon:hover {
-  cursor: pointer;
-}
-
 .circlePlusIcon {
   display: flex;
   height: 30px;

diff --git a/...dules/dashboard/components/Incorporation/IncorporationForm/Protectors/Protectors.css.d.ts b/...dules/dashboard/components/Incorporation/IncorporationForm/Protectors/Protectors.css.d.ts
@@ -4,6 +4,8 @@ export const additionalPaddign: string;
 export const protectorsLabelWrapper: string;
 export const label: string;
 export const mainContactWrapper: string;
+export const selectWrapper: string;
+export const error: string;
 export const deleteIcon: string;
 export const circlePlusIcon: string;
 export const signOptionWrapper: string;

diff --git a/src/modules/dashboard/components/Incorporation/IncorporationForm/Protectors/Protectors.tsx b/src/modules/dashboard/components/Incorporation/IncorporationForm/Protectors/Protectors.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo } from 'react';
-import { defineMessages, FormattedMessage } from 'react-intl';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { FieldArray, useField } from 'formik';
 import classNames from 'classnames';
 import { isEmpty } from 'lodash';
@@ -14,10 +14,8 @@ import { filterUserSelection } from '~core/SingleUserPicker';
 import { supRenderAvatar } from '~dashboard/ExpenditurePage/Recipient/Recipient';
 import { Protector } from '~pages/IncorporationPage/types';
 import Button from '~core/Button';
-import { Protector } from '~pages/IncorporationPage/types';
 
 import Radio from '../Radio';
-import { SignOption } from '../types';
 import SingleUserPicker from '../SingleUserPicker';
 import { SignOption } from '../constants';
 
@@ -72,9 +70,12 @@ export interface Props {
 const Protectors = ({ colony, sidebarRef }: Props) => {
   const [, { value: protectors }] = useField<Protector[]>('protectors');
   const [, { value: signOption }] = useField('signOption');
-  const [, { value: mainContact }, { setValue: setMainContact }] = useField(
-    'mainContact',
-  );
+  const [
+    ,
+    { value: mainContact, error, touched },
+    { setValue: setMainContact },
+  ] = useField('mainContact');
+  const { formatMessage } = useIntl();
 
   const { data: colonyMembers, loading } = useMembersSubscription({
     variables: { colonyAddress: colony.colonyAddress || '' },

diff --git a/src/modules/pages/components/IncorporationPage/IncorporationPage.css b/src/modules/pages/components/IncorporationPage/IncorporationPage.css
@@ -47,3 +47,26 @@
   padding: 76px 100px 70px 25px;
   min-height: calc(100vh - navBarHeight);
 }
+
+.tagWrapper {
+  margin-bottom: -30px;
+  padding: 34px 54px 0;
+}
+
+.tagWrapper > span {
+  height: 21px;
+  width: 100%;
+  border-radius: 12px;
+  background-color: var(--temp-grey-blue-7);
+  text-align: center;
+  color: white;
+  letter-spacing: var(--spacing-medium);
+}
+
+.titleCommentsContainer {
+  min-width: 458px;
+  font-size: var(--size-medium-l);
+  font-weight: var(--weight-bold);
+  color: var(--dark);
+  letter-spacing: var(--spacing-medium);
+}
diff --git a/src/modules/pages/components/IncorporationPage/IncorporationPage.css.d.ts b/src/modules/pages/components/IncorporationPage/IncorporationPage.css.d.ts
@@ -6,3 +6,5 @@ export const wrapper: string;
 export const spinnerContainer: string;
 export const mainContainer: string;
 export const mainContent: string;
+export const tagWrapper: string;
+export const titleCommentsContainer: string;
diff --git a/src/modules/pages/components/IncorporationPage/IncorporationPage.tsx b/src/modules/pages/components/IncorporationPage/IncorporationPage.tsx
@@ -8,7 +8,6 @@ import { getMainClasses } from '~utils/css';
 import { SpinnerLoader } from '~core/Preloaders';
 import Stages, { FormStages } from '~dashboard/Incorporation/Stages';
 import IncorporationForm from '~dashboard/Incorporation/IncorporationForm';
-import Stages, { FormStages } from '~dashboard/Incorporation/Stages';
 import LockedIncorporationForm from '~dashboard/Incorporation/IncorporationForm/LockedIncorporationForm';
 import { useDialog } from '~core/Dialog';
 import EditButtons from '~dashboard/ExpenditurePage/EditButtons/EditButtons';