Ahmad/trade type url param fix for reports

packages/account/src/Configs/user-profile-validation-config.ts

@@ -55,6 +55,7 @@ export const getEmploymentAndTaxValidationSchema = ({
     is_mf = false,
     is_real = false,
     is_tin_auto_set = false,
+    is_duplicate_account = false,
 }: TEmployeeDetailsTinValidationConfig) => {
     return Yup.object({
         employment_status: Yup.string().required(localize('Employment status is required.')),
@@ -66,7 +67,7 @@ export const getEmploymentAndTaxValidationSchema = ({
         tin_skipped: Yup.number().oneOf([0, 1]).default(0),
         tax_identification_confirm: Yup.bool().when(['tax_identification_number', 'tax_residence', 'tin_skipped'], {
             is: (tax_identification_number: string, tax_residence: string, tin_skipped: boolean) =>
-                tax_identification_number && tax_residence && !tin_skipped,
+                tax_identification_number && tax_residence && !tin_skipped && !is_duplicate_account,
             then: Yup.bool().required().oneOf([true]),
             otherwise: Yup.bool().notRequired(),
         }),

packages/account/src/Containers/employment-tax-details-container/employment-tax-details-container.tsx

@@ -132,11 +132,15 @@ const EmploymentTaxDetailsContainer = observer(
 
         const isFieldDisabled = (field_name: string) => isFieldImmutable(field_name, editable_fields);
 
+        // [TODO] - This should come from BE
+        const should_disable_employment_status =
+            isFieldDisabled('employment_status') || Boolean(is_virtual && client.account_settings.employment_status);
+
         return (
             <div id={'employment-tax-section'}>
                 <EmploymentStatusField
                     required
-                    is_disabled={isFieldDisabled('employment_status')}
+                    is_disabled={should_disable_employment_status}
                     fieldFocused={should_focus_fields && !account_settings.employment_status}
                 />
 

packages/account/src/Containers/employment-tax-info/employment-tax-info.tsx

@@ -62,6 +62,9 @@ const EmploymentTaxInfo = observer(
             tin_config: tin_validation_config,
             is_mf: is_eu,
             is_real: !client.is_virtual,
+            is_duplicate_account:
+                client.account_settings.immutable_fields?.includes('tax_identification_number') ||
+                client.account_settings.immutable_fields?.includes('tax_residence'),
         });
 
         const handleCancel = (values: FormikValues) => {

packages/account/src/Sections/Profile/PersonalDetails/personal-details-form.tsx

@@ -304,7 +304,8 @@ const PersonalDetailsForm = observer(() => {
         is_virtual,
         is_svg,
         tin_validation_config,
-        is_tin_auto_set
+        is_tin_auto_set,
+        account_settings?.immutable_fields
     );
     const displayErrorMessage = (status: { code: string; msg: string }) => {
         if (status?.code === 'PhoneNumberTaken') {

packages/account/src/Sections/Profile/PersonalDetails/validation.ts

@@ -132,7 +132,8 @@ export const getPersonalDetailsValidationSchema = (
     is_virtual?: boolean,
     is_svg?: boolean,
     tin_validation_config?: TinValidations,
-    is_tin_auto_set?: boolean
+    is_tin_auto_set?: boolean,
+    immutable_fields?: string[]
 ) => {
     if (is_virtual) return Yup.object();
 
@@ -151,6 +152,8 @@ export const getPersonalDetailsValidationSchema = (
         is_mf: !is_svg,
         is_real: !is_virtual,
         is_tin_auto_set,
+        is_duplicate_account:
+            immutable_fields?.includes('tax_identification_number') || immutable_fields?.includes('tax_residence'),
     });
 
     return personal_details_schema.concat(address_detail_schema).concat(employment_tin_schema);

packages/account/src/Types/common.type.ts

@@ -339,6 +339,7 @@ export type TEmployeeDetailsTinValidationConfig = {
     is_mf?: boolean;
     is_real?: boolean;
     is_tin_auto_set?: boolean;
+    is_duplicate_account?: boolean;
 };
 
 type ReqRule = ['req', React.ReactNode];

packages/core/src/sass/account-wizard.scss

@@ -826,4 +826,8 @@
             width: 100%;
         }
     }
+
+    .employment-status-field {
+        margin-top: 0.5rem;
+    }
 }

packages/trader/src/Stores/Modules/Trading/trade-store.ts

@@ -1848,13 +1848,21 @@ export default class TradeStore extends BaseStore {
             updateChartType(chartTypeParam);
         }
 
-        this.contract_type = contractType ?? '';
-
-        setTradeURLParams({
+        const urlParams: {
+            chartType: string;
+            granularity: number;
+            contractType?: string;
+        } = {
             chartType: chartTypeParam ?? chart_type,
             granularity: granularityParam ?? Number(granularity),
-            contractType: contractType ?? '',
-        });
+        };
+
+        if (contractType) {
+            this.contract_type = contractType ?? '';
+            urlParams.contractType = contractType;
+        }
+
+        setTradeURLParams(urlParams);
     }
 
     setChartStatus(status: boolean, isFromChart?: boolean) {