Merge pull request #241 from hubert-deriv/cannot_set_markup_demo

Author: hubert-deriv

src/features/dashboard/components/Dialogs/UpdateAppDialog/index.tsx

@@ -8,7 +8,6 @@ import { ApplicationObject } from '@deriv/api-types';
 import { RegisterAppDialogError } from '../RegisterAppDialogError';
 import { scopesArrayToObject, scopesObjectToArray } from '@site/src/utils';
 import styles from './update-app-dialog.module.scss';
-import useAuthContext from '@site/src/hooks/useAuthContext';
 
 interface IUpdateAppDialog {
   app: ApplicationObject;
@@ -17,7 +16,6 @@ interface IUpdateAppDialog {
 
 const UpdateAppDialog = ({ app, onClose }: IUpdateAppDialog) => {
   const { send: updateApp, data, error, clear } = useWS('app_update');
-  const { currentLoginAccount } = useAuthContext();
   const { getApps } = useAppManager();
 
   const scopes = scopesArrayToObject(app.scopes);
@@ -46,11 +44,10 @@ const UpdateAppDialog = ({ app, onClose }: IUpdateAppDialog) => {
   const onSubmit = useCallback(
     (data: IRegisterAppForm) => {
       const { name, redirect_uri, verification_uri, app_markup_percentage } = data;
-      const is_demo_account = currentLoginAccount.name.includes('VRTC');
 
       const has_redirect_uri = redirect_uri !== '' && { redirect_uri };
       const has_verification_uri = verification_uri !== '' && { verification_uri };
-      const can_have_markup = !is_demo_account && {
+      const markup = {
         app_markup_percentage: Number(app_markup_percentage),
       };
 
@@ -66,7 +63,7 @@ const UpdateAppDialog = ({ app, onClose }: IUpdateAppDialog) => {
         name,
         ...has_redirect_uri,
         ...has_verification_uri,
-        ...can_have_markup,
+        ...markup,
         scopes: selectedScopes,
       });
     },

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

@@ -5,21 +5,18 @@ import { scopesObjectToArray } from '@site/src/utils';
 import { RegisterAppDialogError } from '../components/Dialogs/RegisterAppDialogError';
 import { RegisterAppDialogSuccess } from '../components/Dialogs/RegisterAppDialogSuccess';
 import { IRegisterAppForm } from '../types';
-import useAuthContext from '@site/src/hooks/useAuthContext';
 
 const AppRegistration = () => {
   const { send: registerApp, error, clear, data } = useWS('app_register');
-  const { currentLoginAccount } = useAuthContext();
   const [form_is_cleared, setFormIsCleared] = useState(false);
 
   const onSubmit = useCallback(
     (data: IRegisterAppForm) => {
       const { name, redirect_uri, verification_uri, app_markup_percentage } = data;
-      const is_demo_account = currentLoginAccount.name.includes('VRTC');
 
       const has_redirect_uri = redirect_uri !== '' && { redirect_uri };
       const has_verification_uri = verification_uri !== '' && { verification_uri };
-      const can_have_markup = !is_demo_account && {
+      const markup = {
         app_markup_percentage: Number(app_markup_percentage),
       };
 
@@ -34,7 +31,7 @@ const AppRegistration = () => {
         name,
         ...has_redirect_uri,
         ...has_verification_uri,
-        ...can_have_markup,
+        ...markup,
         scopes: selectedScopes,
       });
       setFormIsCleared(true);