Skip to content

[WEBREL] Jim/WEBREL-3164/ terms and conditions issue #16830

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

Merged
rupato-deriv merged 1 commit into from
Sep 13, 2024
Merged

[WEBREL] Jim/WEBREL-3164/ terms and conditions issue #16830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion packages/wallets/src/features/cfd/modals/MT5PasswordModal/MT5PasswordModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ const MT5PasswordModal: React.FC<TProps> = ({ isVirtual, marketType, platform, p
!password ||
createMT5AccountLoading ||
tradingPlatformPasswordChangeLoading ||
!validPasswordMT5(password)
!validPasswordMT5(password) ||
!isTncChecked
}
isFullWidth
isLoading={tradingPlatformPasswordChangeLoading || createMT5AccountLoading}
Expand Down Expand Up @@ -250,9 +251,13 @@ const MT5PasswordModal: React.FC<TProps> = ({ isVirtual, marketType, platform, p
return (
<CreatePasswordMT5
isLoading={tradingPlatformPasswordChangeLoading || createMT5AccountLoading}
isTncChecked={isTncChecked}
isVirtual={isVirtual}
onPasswordChange={e => setPassword(e.target.value)}
onPrimaryClick={onSubmit}
onTncChange={() => {
setIsTncChecked(prev => !prev);
}}
password={password}
platform={mt5Platform}
product={product}
Expand Down
13 changes: 8 additions & 5 deletions packages/wallets/src/features/cfd/screens/CreatePasswordMT5/CreatePasswordMT5.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React from 'react';
import { DerivLightDmt5PasswordIcon } from '@deriv/quill-icons';
import { Localize } from '@deriv-com/translations';
import { Button, Text, useDevice } from '@deriv-com/ui';
Expand All @@ -11,19 +11,23 @@ import './CreatePasswordMT5.scss';

type TProps = {
isLoading?: boolean;
isTncChecked: boolean;
isVirtual?: boolean;
onPasswordChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
onPrimaryClick: () => void;
onTncChange: () => void;
password: string;
platform: TPlatforms.All;
product?: THooks.AvailableMT5Accounts['product'];
};

const CreatePasswordMT5: React.FC<TProps> = ({
isLoading,
isTncChecked,
isVirtual,
onPasswordChange,
onPrimaryClick,
onTncChange,
password,
platform,
product,
Expand All @@ -32,7 +36,6 @@ const CreatePasswordMT5: React.FC<TProps> = ({
const { title } = PlatformDetails[platform as keyof typeof PlatformDetails];
const isMT5 = platform === CFD_PLATFORMS.MT5;
const disableButton = isMT5 ? !validPasswordMT5(password) : !validPassword(password);
const [checked, setChecked] = useState(!(product === PRODUCT.ZEROSPREAD && !isVirtual));

return (
<div className='wallets-create-password-mt5'>
Expand All @@ -59,8 +62,8 @@ const CreatePasswordMT5: React.FC<TProps> = ({
/>
{product === PRODUCT.ZEROSPREAD && !isVirtual && (
<CFDPasswordModalTnc
checked={checked}
onChange={() => setChecked(prev => !prev)}
checked={isTncChecked}
onChange={onTncChange}
platform={platform}
product={product}
/>
Expand All @@ -70,7 +73,7 @@ const CreatePasswordMT5: React.FC<TProps> = ({
{isDesktop && (
<div className='wallets-create-password-mt5__footer'>
<Button
disabled={!password || isLoading || disableButton || !checked}
disabled={!password || isLoading || disableButton || !isTncChecked}
isLoading={isLoading}
onClick={onPrimaryClick}
size='lg'
Expand Down
8 changes: 4 additions & 4 deletions packages/wallets/src/features/cfd/screens/EnterPassword/EnterPassword.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import './EnterPassword.scss';
type TProps = {
isForgotPasswordLoading?: boolean;
isLoading?: boolean;
isTncChecked: boolean;
isTncChecked?: boolean;
isVirtual?: boolean;
marketType: TMarketTypes.CreateOtherCFDAccount;
modalTitle?: string;
onPasswordChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
onPrimaryClick?: () => void;
onSecondaryClick?: () => void;
onTncChange: () => void;
onTncChange?: () => void;
password: string;
passwordError?: boolean;
platform: TPlatforms.All;
Expand All @@ -30,7 +30,7 @@ type TProps = {
const EnterPassword: React.FC<TProps> = ({
isForgotPasswordLoading,
isLoading,
isTncChecked,
isTncChecked = true,
isVirtual,
marketType,
modalTitle,
Expand Down Expand Up @@ -95,7 +95,7 @@ const EnterPassword: React.FC<TProps> = ({
{product === PRODUCT.ZEROSPREAD && !isVirtual && (
<CFDPasswordModalTnc
checked={isTncChecked}
onChange={onTncChange}
onChange={() => onTncChange?.()}
platform={platform}
product={product}
/>
Expand Down