Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

george / rm73888 / fix Transfer button enabling when amount field is empty #6252

Merged
merged 6 commits into from
Sep 14, 2022
Merged

george / rm73888 / fix Transfer button enabling when amount field is empty #6252

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68153f7
fix(account transfer): fix Transfer button enabling when amount field…
heorhi-deriv Aug 22, 2022
64a7ee6
fix(account transfer): fix Transfer button enabling between account w…
heorhi-deriv Aug 22, 2022
8062040
refactor(account transfer): refactor condition into function
heorhi-deriv Aug 23, 2022
2ca43d3
fix(account transfer): disable Transfer button when amount is not valid
heorhi-deriv Aug 23, 2022
e7c8cf2
fix(account transfer): fix validation error visibility
heorhi-deriv Aug 24, 2022
be09f9c
Merge branch 'master' of https://github.com/binary-com/deriv-app into…
heorhi-deriv Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classNames from 'classnames';
import React from 'react';
import { Field, FieldProps, Formik, Form } from 'formik';
import { Button, Dropdown, Icon, Input, Loading, Money, MobileWrapper, Text } from '@deriv/components';
import { Button, Dropdown, Icon, Input, Loading, Money, Text } from '@deriv/components';
import {
getDecimalPlaces,
getCurrencyDisplayCode,
Expand Down Expand Up @@ -202,6 +202,10 @@ const AccountTransferForm = ({
return undefined;
};

const shouldShowTransferButton = (amount: string) => {
return selected_from.currency === selected_to.currency ? !amount : !converter_from_amount;
};

const getAccounts = (type: string, { is_mt, is_dxtrade }: TAccount) => {
if (type === 'from') {
if (is_mt) return mt_accounts_from;
Expand Down Expand Up @@ -376,7 +380,7 @@ const AccountTransferForm = ({
validateOnBlur={false}
enableReinitialize
>
{({ errors, handleChange, isSubmitting, touched, setFieldValue, setFieldTouched, setFieldError }) => (
{({ errors, handleChange, isSubmitting, setFieldValue, setFieldError, values }) => (
<React.Fragment>
{isSubmitting || accounts_list.length === 0 ? (
<div className='cashier__loader-wrapper' data-testid='dt_cashier_loader_wrapper'>
Expand Down Expand Up @@ -406,8 +410,7 @@ const AccountTransferForm = ({
onChangeTransferFrom(e);
handleChange(e);
setFieldValue('amount', '');
setFieldError('amount', '');
setFieldTouched('amount', false);
setTimeout(() => setFieldError('amount', ''));
}}
error={selected_from.error}
/>
Expand All @@ -429,8 +432,7 @@ const AccountTransferForm = ({
onChange={(e: TReactChangeEvent) => {
onChangeTransferTo(e);
setFieldValue('amount', '');
setFieldError('amount', '');
setFieldTouched('amount', false);
setTimeout(() => setFieldError('amount', ''));
}}
hint={transfer_to_hint}
error={selected_to.error}
Expand All @@ -445,15 +447,14 @@ const AccountTransferForm = ({
setErrorMessage('');
handleChange(e);
setAccountTransferAmount(e.target.value);
setFieldTouched('amount', true, false);
}}
className='cashier__input dc-input--no-placeholder account-transfer-form__input'
classNameHint='account-transfer-form__hint'
data-testid='dt_account_transfer_form_input'
name='amount'
type='text'
label={localize('Amount')}
error={touched.amount && errors.amount ? errors.amount : ''}
error={errors.amount ? errors.amount : ''}
required
trailing_icon={
selected_from.currency ? (
Expand Down Expand Up @@ -556,7 +557,9 @@ const AccountTransferForm = ({
!!selected_to.error ||
!+selected_from.balance ||
!!converter_from_error ||
!!converter_to_error
!!converter_to_error ||
!!errors.amount ||
shouldShowTransferButton(values.amount)
}
primary
large
Expand Down