Merge remote-tracking branch 'upstream/master' into ahmed/DAPI-774/ch…

…ore--update-error-handling-app-register

config/v3/partner_accounts/receive.json

@@ -49,7 +49,7 @@
                                 "description": "Defines the provider platform.",
                                 "type": "string",
                                 "enum": [
-                                    "myaffiliates",
+                                    "myaffiliate",
                                     "dynamicworks"
                                 ]
                             },

config/v3/partner_settings/receive.json

@@ -42,7 +42,7 @@
                     "description": "Defines the provider platform.",
                     "type": "string",
                     "enum": [
-                        "myaffiliates",
+                        "myaffiliate",
                         "dynamicworks"
                     ]
                 },

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 {

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 = ({
               )}
               <div>
                 <div
-                  className={`${styles.helperMargin} ${styles.customTextInput} ${
-                    error_border_active ? styles.errorAppname : ''
-                  }`}
+                  className={`${styles.helperMargin} ${styles.customTextInput} ${error_border_active ? styles.errorAppname : ''
+                    }`}
                   id='custom-text-input'
                   onChange={(e) => {
                     setInputValue((e.target as HTMLInputElement).value);
@@ -407,17 +407,15 @@ const AppForm = ({
             </div>
             <div className={styles.termsOfConditionRegister}>
               <span>
-                {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` })} {' '}
               </span>
-              <a
+              <Link
                 href='https://deriv.com/tnc/business-partners-api-user.pdf'
                 target='_blank'
                 rel='noreferrer'
               >
-                <span>
-                  <Translate>terms and conditions</Translate>
-                </span>
-              </a>
+                <Translate>terms and conditions</Translate>
+              </Link>
             </div>
             {renderButtons && <div className={styles.submit_container}>{renderButtons()}</div>}
           </div>

src/features/dashboard/components/app-register/app-register.scss

@@ -72,6 +72,10 @@
         top: -4px;
       }
     }
+
+    &__link:hover {
+      color: var(--component-textIcon-normal-prominent);
+    }
   }
 }
 

src/features/dashboard/components/app-register/app-register.tsx

@@ -1,8 +1,8 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import Translate, { translate } from '@docusaurus/Translate';
-import { Button, Text } from '@deriv-com/quill-ui';
 import { ApplicationObject } from '@deriv/api-types';
+import { Button, Link, Text } from '@deriv-com/quill-ui';
 import { yupResolver } from '@hookform/resolvers/yup';
 import CustomCheckbox from '@site/src/components/CustomCheckbox';
 import useDeviceType from '@site/src/hooks/useDeviceType';
@@ -26,14 +26,15 @@ const TermsAndConditions: React.FC<TTermsAndConditionsProps> = ({ register }) =>
       <CustomCheckbox id='tnc_approval' name='tnc_approval' register={register}>
         <label htmlFor='tnc_approval' className='app-register-container__tnc__label'>
           <Text>
-            {translate({ message: `By registering your application, you acknowledge that you‘ve read and accepted the Deriv API` })} {' '}
-            <a
+            {translate({ message: `By registering your application, you acknowledge that you‘ve read and accepted the Deriv API`})} {' '}
+            <Link
               href='https://deriv.com/tnc/business-partners-api-user.pdf'
               target='_blank'
               rel='noreferrer'
+              className='app-register-container__tnc__link'
             >
-              <span><Translate>terms and conditions</Translate></span>
-            </a>
+              <Translate>terms and conditions</Translate>
+            </Link>
           </Text>
         </label>
       </CustomCheckbox>

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;
+  }
 }