1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00

more fixes

This commit is contained in:
Matthias Kretschmann 2020-09-21 17:50:45 +00:00
parent 83d791cf1b
commit eb8221d104
Signed by: m
GPG Key ID: 606EEEF3C479A91F
6 changed files with 23 additions and 17 deletions

View File

@ -1,13 +1,13 @@
import React, { ReactElement } from 'react' import React, { ReactElement } from 'react'
import stylesIndex from './index.module.css' import stylesIndex from './index.module.css'
import styles from './Coin.module.css' import styles from './Coin.module.css'
import stylesInput from '../../../atoms/Input/index.module.css'
import InputElement from '../../../atoms/Input/InputElement' import InputElement from '../../../atoms/Input/InputElement'
import { ReactComponent as Logo } from '../../../../images/logo.svg' import { ReactComponent as Logo } from '../../../../images/logo.svg'
import Conversion from '../../../atoms/Price/Conversion' import Conversion from '../../../atoms/Price/Conversion'
import { DataTokenOptions } from '@oceanprotocol/react' import { DataTokenOptions } from '@oceanprotocol/react'
import RefreshName from './RefreshName' import RefreshName from './RefreshName'
import { useField } from 'formik' import { useField } from 'formik'
import Error from './Error'
export default function Coin({ export default function Coin({
datatokenOptions, datatokenOptions,
@ -51,9 +51,7 @@ export default function Coin({
{datatokenOptions?.symbol === 'OCEAN' && ( {datatokenOptions?.symbol === 'OCEAN' && (
<Conversion price={field.value} className={stylesIndex.conversion} /> <Conversion price={field.value} className={stylesIndex.conversion} />
)} )}
{meta.error && meta.touched && ( <Error meta={meta} />
<div className={stylesInput.error}>{meta.error}</div>
)}
</div> </div>
</div> </div>
) )

View File

@ -0,0 +1,13 @@
import { FieldMetaProps } from 'formik'
import React, { ReactElement } from 'react'
import stylesInput from '../../../atoms/Input/index.module.css'
export default function Error({
meta
}: {
meta: FieldMetaProps<any>
}): ReactElement {
return meta.error ? (
<div className={stylesInput.error}>{meta.error}</div>
) : null
}

View File

@ -1,10 +1,10 @@
import React, { ReactElement } from 'react' import React, { ReactElement } from 'react'
import Tooltip from '../../../atoms/Tooltip' import Tooltip from '../../../atoms/Tooltip'
import styles from './Fees.module.css' import styles from './Fees.module.css'
import stylesInput from '../../../atoms/Input/index.module.css'
import { useSiteMetadata } from '../../../../hooks/useSiteMetadata' import { useSiteMetadata } from '../../../../hooks/useSiteMetadata'
import { useField } from 'formik' import { useField } from 'formik'
import Input from '../../../atoms/Input' import Input from '../../../atoms/Input'
import Error from './Error'
export default function Fees({ export default function Fees({
tooltips tooltips
@ -31,12 +31,7 @@ export default function Fees({
step="0.1" step="0.1"
small small
{...field} {...field}
additionalComponent={ additionalComponent={<Error meta={meta} />}
meta.error &&
meta.touched && (
<div className={stylesInput.error}>{meta.error}</div>
)
}
/> />
<Input <Input

View File

@ -1,13 +1,13 @@
import React, { ReactElement } from 'react' import React, { ReactElement } from 'react'
import stylesIndex from './index.module.css' import stylesIndex from './index.module.css'
import styles from './Fixed.module.css' import styles from './Fixed.module.css'
import stylesInput from '../../../atoms/Input/index.module.css'
import FormHelp from '../../../atoms/Input/Help' import FormHelp from '../../../atoms/Input/Help'
import Conversion from '../../../atoms/Price/Conversion' import Conversion from '../../../atoms/Price/Conversion'
import { DataTokenOptions } from '@oceanprotocol/react' import { DataTokenOptions } from '@oceanprotocol/react'
import RefreshName from './RefreshName' import RefreshName from './RefreshName'
import { useField } from 'formik' import { useField } from 'formik'
import Input from '../../../atoms/Input' import Input from '../../../atoms/Input'
import Error from './Error'
export default function Fixed({ export default function Fixed({
datatokenOptions, datatokenOptions,
@ -40,9 +40,7 @@ export default function Fixed({
/> />
} }
/> />
{meta.error && meta.touched && ( <Error meta={meta} />
<div className={stylesInput.error}>{meta.error}</div>
)}
</div> </div>
{datatokenOptions && ( {datatokenOptions && (

View File

@ -7,7 +7,7 @@ import Fixed from './Fixed'
import Dynamic from './Dynamic' import Dynamic from './Dynamic'
import { useField } from 'formik' import { useField } from 'formik'
import { useUserPreferences } from '../../../../providers/UserPreferences' import { useUserPreferences } from '../../../../providers/UserPreferences'
import { DataTokenOptions, PriceOptions, useOcean } from '@oceanprotocol/react' import { DataTokenOptions, useOcean } from '@oceanprotocol/react'
import { PriceOptionsMarket } from '../../../../@types/MetaData' import { PriceOptionsMarket } from '../../../../@types/MetaData'
const query = graphql` const query = graphql`

View File

@ -9,7 +9,9 @@ export const validationSchema = Yup.object().shape<MetadataPublishForm>({
price: Yup.object() price: Yup.object()
.shape({ .shape({
price: Yup.number().min(1, 'Must be greater than 0').required('Required'), price: Yup.number().min(1, 'Must be greater than 0').required('Required'),
tokensToMint: Yup.number().positive().required('Required'), tokensToMint: Yup.number()
.min(1, 'Must be greater than 0')
.required('Required'),
type: Yup.string() type: Yup.string()
.matches(/fixed|dynamic/g) .matches(/fixed|dynamic/g)
.required('Required'), .required('Required'),