From 7bac5ae822bc0422fa23a876521e70051066693e Mon Sep 17 00:00:00 2001 From: mmv Date: Tue, 21 May 2019 12:35:12 +0400 Subject: [PATCH] add amount field --- .../layout/Paragraph/{index.js => index.jsx} | 0 .../SendFunds/TokenSelectField/index.jsx | 4 ++-- .../SendModal/screens/SendFunds/index.jsx | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) rename src/components/layout/Paragraph/{index.js => index.jsx} (100%) diff --git a/src/components/layout/Paragraph/index.js b/src/components/layout/Paragraph/index.jsx similarity index 100% rename from src/components/layout/Paragraph/index.js rename to src/components/layout/Paragraph/index.jsx diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.jsx index d2198f14..ccced862 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.jsx +++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/index.jsx @@ -10,7 +10,7 @@ import Img from '~/components/layout/Img' import Paragraph from '~/components/layout/Paragraph' import SelectField from '~/components/forms/SelectField' import { setImageToPlaceholder } from '~/routes/safe/components/Balances/utils' -import { composeValidators, required } from '~/components/forms/validator' +import { required } from '~/components/forms/validator' import { type Token } from '~/logic/tokens/store/model/token' import { selectedTokenStyles, selectStyles } from './style' @@ -52,7 +52,7 @@ const TokenSelectField = ({ tokens, classes }: SelectFieldProps) => ( name="token" component={SelectField} classes={{ selectMenu: classes.selectMenu }} - validate={composeValidators(required)} + validate={required} renderValue={token => } initialValue="" displayEmpty diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx index 5d7fef63..35b2eb2b 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx +++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/index.jsx @@ -107,7 +107,7 @@ const SendFunds = ({ {ethBalance} {' '} - ETH +ETH @@ -142,6 +142,22 @@ const SendFunds = ({ + + + + Amount + + + + )}