From 197242da2a6c82c925b4b8dd385eda144adc7429 Mon Sep 17 00:00:00 2001 From: ArmandoGraterol Date: Thu, 1 Jul 2021 12:03:25 -0300 Subject: [PATCH 1/7] Updated filled-circle-person icon --- src/img/icons/filled-circle-person.svg | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/img/icons/filled-circle-person.svg b/src/img/icons/filled-circle-person.svg index 69c789891b..8df7831cfa 100644 --- a/src/img/icons/filled-circle-person.svg +++ b/src/img/icons/filled-circle-person.svg @@ -1,9 +1,16 @@ + - - + + From 3b442edb4d97839f22f67a69612f44705c16c388 Mon Sep 17 00:00:00 2001 From: ArmandoGraterol Date: Thu, 1 Jul 2021 12:04:18 -0300 Subject: [PATCH 2/7] Updated size related styles of SingleUserPicker --- .../core/components/SingleUserPicker/SingleUserPicker.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/core/components/SingleUserPicker/SingleUserPicker.css b/src/modules/core/components/SingleUserPicker/SingleUserPicker.css index 1bfb086128..64c41f2ae5 100644 --- a/src/modules/core/components/SingleUserPicker/SingleUserPicker.css +++ b/src/modules/core/components/SingleUserPicker/SingleUserPicker.css @@ -62,6 +62,8 @@ .baseInput { flex: 1 1 0; margin-left: 10px; + padding: 5px 3px; + height: 32px; width: 100%; max-width: 305px; vertical-align: baseline; @@ -94,7 +96,6 @@ .input { composes: baseInput; - padding: 3px; width: 100%; &:focus { @@ -108,7 +109,6 @@ .recipientName { composes: baseInput; - padding: 5px 3px; overflow: hidden; font-weight: var(--weight-bold); text-overflow: ellipsis; From 7ff397f9d69b696ede033d663a7ffce69d16ac44 Mon Sep 17 00:00:00 2001 From: ArmandoGraterol Date: Thu, 1 Jul 2021 12:08:56 -0300 Subject: [PATCH 3/7] Updated CreatePayment and PermissionManagement form validation schema --- .../CreatePaymentDialog/CreatePaymentDialog.tsx | 14 +++++--------- .../PermissionManagementDialog.tsx | 14 +++++--------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/modules/dashboard/components/CreatePaymentDialog/CreatePaymentDialog.tsx b/src/modules/dashboard/components/CreatePaymentDialog/CreatePaymentDialog.tsx index 235cbf8bf0..7580d51c14 100644 --- a/src/modules/dashboard/components/CreatePaymentDialog/CreatePaymentDialog.tsx +++ b/src/modules/dashboard/components/CreatePaymentDialog/CreatePaymentDialog.tsx @@ -73,15 +73,11 @@ const CreatePaymentDialog = ({ const validationSchema = yup.object().shape({ domainId: yup.number().required(), - recipient: yup - .object() - .shape({ - profile: yup.object().shape({ - walletAddress: yup.string().address().required(), - }), - }) - .nullable() - .default(null), + recipient: yup.object().shape({ + profile: yup.object().shape({ + walletAddress: yup.string().address().required(), + }), + }), amount: yup .number() .required() diff --git a/src/modules/dashboard/components/PermissionManagementDialog/PermissionManagementDialog.tsx b/src/modules/dashboard/components/PermissionManagementDialog/PermissionManagementDialog.tsx index 6fe31c51a6..8c43cf3806 100644 --- a/src/modules/dashboard/components/PermissionManagementDialog/PermissionManagementDialog.tsx +++ b/src/modules/dashboard/components/PermissionManagementDialog/PermissionManagementDialog.tsx @@ -41,15 +41,11 @@ import styles from './PermissionManagementDialog.css'; const validationSchema = yup.object().shape({ domainId: yup.number().required(), - user: yup - .object() - .shape({ - profile: yup.object().shape({ - walletAddress: yup.string().address().required(), - }), - }) - .nullable() - .default(null), + user: yup.object().shape({ + profile: yup.object().shape({ + walletAddress: yup.string().address().required(), + }), + }), roles: yup.array().ensure(), annotation: yup.string().max(4000), forceAction: yup.boolean(), From 856dd5faf3ed07fc2f3d0c28f045ffe6f616885d Mon Sep 17 00:00:00 2001 From: ArmandoGraterol Date: Thu, 1 Jul 2021 12:09:43 -0300 Subject: [PATCH 4/7] Updated Input error state logic checks --- src/modules/core/components/Fields/Input/Input.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/core/components/Fields/Input/Input.tsx b/src/modules/core/components/Fields/Input/Input.tsx index 9ef781f320..42c5f63b90 100644 --- a/src/modules/core/components/Fields/Input/Input.tsx +++ b/src/modules/core/components/Fields/Input/Input.tsx @@ -112,7 +112,7 @@ const Input = ({ }: Props) => { const [id] = useState(idProp || nanoid()); const { formatMessage } = useIntl(); - const [inputFieldProps, { error }] = useField(name); + const [inputFieldProps, { error, touched }] = useField(name); const placeholder = typeof placeholderProp === 'object' @@ -122,7 +122,7 @@ const Input = ({ const inputProps: InputComponentProps = { ...inputFieldProps, appearance, - 'aria-invalid': !!error || !!forcedFieldError, + 'aria-invalid': (!!error || !!forcedFieldError) && touched, formattingOptions, id, innerRef, @@ -161,7 +161,7 @@ const Input = ({
{extensionStringText}
)} - {!elementOnly && ( + {!elementOnly && (((error || forcedFieldError) && touched) || status) && ( Date: Thu, 1 Jul 2021 12:43:03 -0300 Subject: [PATCH 5/7] Improved error logic check on Input component --- src/modules/core/components/Fields/Input/Input.tsx | 3 ++- .../core/components/Fields/InputStatus/InputStatus.tsx | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/core/components/Fields/Input/Input.tsx b/src/modules/core/components/Fields/Input/Input.tsx index 42c5f63b90..6768f339ef 100644 --- a/src/modules/core/components/Fields/Input/Input.tsx +++ b/src/modules/core/components/Fields/Input/Input.tsx @@ -161,12 +161,13 @@ const Input = ({
{extensionStringText}
)} - {!elementOnly && (((error || forcedFieldError) && touched) || status) && ( + {!elementOnly && ( )} diff --git a/src/modules/core/components/Fields/InputStatus/InputStatus.tsx b/src/modules/core/components/Fields/InputStatus/InputStatus.tsx index 80ab3e4cfe..2f371afe2d 100644 --- a/src/modules/core/components/Fields/InputStatus/InputStatus.tsx +++ b/src/modules/core/components/Fields/InputStatus/InputStatus.tsx @@ -1,6 +1,7 @@ import { MessageDescriptor, useIntl } from 'react-intl'; import React from 'react'; +import { isNil } from 'lodash'; import { SimpleMessageValues } from '~types/index'; import { getMainClasses } from '~utils/css'; @@ -26,6 +27,7 @@ interface Props { /** Values for status text (react-intl interpolation) (if applicable) */ statusValues?: SimpleMessageValues; + touched?: boolean; } const displayName = 'InputStatus'; @@ -35,18 +37,20 @@ const InputStatus = ({ error, status, statusValues, + touched, }: Props) => { const { formatMessage } = useIntl(); const errorText = typeof error === 'object' ? formatMessage(error) : error; const statusText = typeof status === 'object' ? formatMessage(status, statusValues) : status; + const showErrorText = !isNil(touched) && touched; const text = errorText || statusText; const Element = appearance.direction === 'horizontal' ? 'span' : 'p'; return ( {text} From 8a85b6a0841802070b7e0102a7f82aa96cc49462 Mon Sep 17 00:00:00 2001 From: ArmandoGraterol Date: Fri, 2 Jul 2021 13:54:57 -0300 Subject: [PATCH 6/7] Fixed conditional for showing errors on InputStatus --- src/modules/core/components/Fields/InputStatus/InputStatus.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/core/components/Fields/InputStatus/InputStatus.tsx b/src/modules/core/components/Fields/InputStatus/InputStatus.tsx index 2f371afe2d..6566c340bc 100644 --- a/src/modules/core/components/Fields/InputStatus/InputStatus.tsx +++ b/src/modules/core/components/Fields/InputStatus/InputStatus.tsx @@ -43,14 +43,13 @@ const InputStatus = ({ const errorText = typeof error === 'object' ? formatMessage(error) : error; const statusText = typeof status === 'object' ? formatMessage(status, statusValues) : status; - const showErrorText = !isNil(touched) && touched; const text = errorText || statusText; const Element = appearance.direction === 'horizontal' ? 'span' : 'p'; return ( {text} From 40d167d2754376dbac9eb03c209f8a467a078568 Mon Sep 17 00:00:00 2001 From: ArmandoGraterol Date: Mon, 5 Jul 2021 16:22:30 -0300 Subject: [PATCH 7/7] Updated isNil import on InputComponent --- src/modules/core/components/Fields/Input/InputComponent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/core/components/Fields/Input/InputComponent.tsx b/src/modules/core/components/Fields/Input/InputComponent.tsx index e0067e66b9..2b8a352ca6 100644 --- a/src/modules/core/components/Fields/Input/InputComponent.tsx +++ b/src/modules/core/components/Fields/Input/InputComponent.tsx @@ -10,7 +10,7 @@ import { defineMessages } from 'react-intl'; import Cleave from 'cleave.js/react'; import { CleaveOptions } from 'cleave.js/options'; import { ChangeEvent } from 'cleave.js/react/props'; -import { isNil } from 'lodash'; +import isNil from 'lodash/isNil'; import Decimal from 'decimal.js'; import Button from '~core/Button';