From 0c3adb3f9be87bc4f783248007256cd7d1f83f14 Mon Sep 17 00:00:00 2001 From: muhammad-ahmed Date: Fri, 18 Oct 2024 12:52:02 +0800 Subject: [PATCH 1/2] ahmed/DAPI-777/fix--register-app-link-styling --- .../components/app-form/app-form.module.scss | 4 ++++ .../dashboard/components/app-form/app-form.tsx | 16 +++++++--------- .../components/app-register/app-register.scss | 4 ++++ .../components/app-register/app-register.tsx | 9 +++++---- .../manage-dashboard/manage-dashboard.scss | 4 ++++ 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/features/dashboard/components/app-form/app-form.module.scss b/src/features/dashboard/components/app-form/app-form.module.scss index 963e31723..4da8acfb2 100644 --- a/src/features/dashboard/components/app-form/app-form.module.scss +++ b/src/features/dashboard/components/app-form/app-form.module.scss @@ -191,6 +191,10 @@ fieldset .customTextInput:last-child { @media screen and (min-width: 992px) { font-size: rem(1.4); } + + a:hover { + color: var(--component-textIcon-normal-prominent); + } } .buttons { diff --git a/src/features/dashboard/components/app-form/app-form.tsx b/src/features/dashboard/components/app-form/app-form.tsx index 69b5d9736..0e829cd2d 100644 --- a/src/features/dashboard/components/app-form/app-form.tsx +++ b/src/features/dashboard/components/app-form/app-form.tsx @@ -17,6 +17,7 @@ import useAppManager from '@site/src/hooks/useAppManager'; import { appRegisterSchema, appEditSchema, IRegisterAppForm } from '../../types'; import RestrictionsAppname from '../restrictions-appname'; import styles from './app-form.module.scss'; +import { Link } from '@deriv-com/quill-ui'; type TAppFormProps = { @@ -175,9 +176,8 @@ const AppForm = ({ )}
{ setInputValue((e.target as HTMLInputElement).value); @@ -407,17 +407,15 @@ const AppForm = ({
- {translate({ message: `By registering your application, you acknowledge that you‘ve read and accepted the Deriv API`})} {' '} + {translate({ message: `By registering your application, you acknowledge that you‘ve read and accepted the Deriv API` })} {' '} - - - terms and conditions - - + terms and conditions +
{renderButtons &&
{renderButtons()}
}
diff --git a/src/features/dashboard/components/app-register/app-register.scss b/src/features/dashboard/components/app-register/app-register.scss index ac355eaf4..660192258 100644 --- a/src/features/dashboard/components/app-register/app-register.scss +++ b/src/features/dashboard/components/app-register/app-register.scss @@ -72,6 +72,10 @@ top: -4px; } } + + &__link:hover { + color: var(--component-textIcon-normal-prominent); + } } } diff --git a/src/features/dashboard/components/app-register/app-register.tsx b/src/features/dashboard/components/app-register/app-register.tsx index 9895c2790..8cf78472f 100644 --- a/src/features/dashboard/components/app-register/app-register.tsx +++ b/src/features/dashboard/components/app-register/app-register.tsx @@ -1,6 +1,6 @@ import React from 'react'; import Translate, { translate } from '@docusaurus/Translate'; -import { Button, Text } from '@deriv-com/quill-ui'; +import { Button, Link, Text } from '@deriv-com/quill-ui'; import { useForm } from 'react-hook-form'; import { yupResolver } from '@hookform/resolvers/yup'; import CustomCheckbox from '@site/src/components/CustomCheckbox'; @@ -22,13 +22,14 @@ const TermsAndConditions: React.FC = ({ register }) => diff --git a/src/features/dashboard/manage-dashboard/manage-dashboard.scss b/src/features/dashboard/manage-dashboard/manage-dashboard.scss index 9f47c63b1..6c439ba0b 100644 --- a/src/features/dashboard/manage-dashboard/manage-dashboard.scss +++ b/src/features/dashboard/manage-dashboard/manage-dashboard.scss @@ -4,4 +4,8 @@ .breadcrumbs-wrapper { padding: 1rem 0; + + a, a:active, a:visited { + text-decoration: none; + } } From 155a11137b53da4da9570f88310dfa1a38783aaa Mon Sep 17 00:00:00 2001 From: nobody Date: Fri, 18 Oct 2024 07:31:04 +0000 Subject: [PATCH 2/2] JSON Schema Update --- config/v3/partner_accounts/receive.json | 2 +- config/v3/partner_settings/receive.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/v3/partner_accounts/receive.json b/config/v3/partner_accounts/receive.json index 99b15f66d..65bb7bf06 100644 --- a/config/v3/partner_accounts/receive.json +++ b/config/v3/partner_accounts/receive.json @@ -49,7 +49,7 @@ "description": "Defines the provider platform.", "type": "string", "enum": [ - "myaffiliates", + "myaffiliate", "dynamicworks" ] }, diff --git a/config/v3/partner_settings/receive.json b/config/v3/partner_settings/receive.json index 03b658eb6..caa6c5601 100644 --- a/config/v3/partner_settings/receive.json +++ b/config/v3/partner_settings/receive.json @@ -42,7 +42,7 @@ "description": "Defines the provider platform.", "type": "string", "enum": [ - "myaffiliates", + "myaffiliate", "dynamicworks" ] },