deriv-com · jim-deriv · Sep 27, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 7, 2023
@@ -4,11 +4,11 @@ import { useSwipeable } from 'react-swipeable';
 import ArrowButton from './arrow-button';
 
 type TCollapsible = {
-    as: React.ElementType;
+    as?: React.ElementType;
     is_collapsed?: boolean;
     position?: 'top' | 'bottom';
     onClick: (state: boolean) => void;
-    title: string;
+    title?: string;
 };
 
 const swipe_config = {

@@ -98,7 +98,7 @@ const Dialog = ({
         }
     };
 
-    const validateClickOutside = () => dismissable || !!(has_close_icon && is_visible && is_closed_on_cancel);
+    const validateClickOutside = () => !!(dismissable || (has_close_icon && is_visible && is_closed_on_cancel));
 
     useOnClickOutside(wrapper_ref, handleClose, validateClickOutside);
 

@@ -1,9 +1,10 @@
+import { ContractsFor } from '@deriv/api-types';
 import { buildForwardStartingConfig } from '../start-date';
 
 describe('start_date', () => {
     describe('buildForwardStartingConfig', () => {
         it('Returns empty object when forward_starting_options and forward_starting_dates are both empties', () => {
-            const contract = {
+            const contract: ContractsFor['available'][number] = {
                 barrier_category: 'euro_atm',
                 barriers: 0,
                 contract_category: 'callput',
@@ -19,7 +20,8 @@ describe('start_date', () => {
                 start_type: 'spot',
                 submarket: 'major_pairs',
                 underlying_symbol: 'frxAUDJPY',
-                forward_starting_options: [],
+                forward_starting_options:
+                    [] as unknown as ContractsFor['available'][number]['forward_starting_options'],
             };
             /* eslint-disable no-unused-expressions */
             expect(buildForwardStartingConfig(contract, [])).toHaveLength(0);

@@ -1,16 +1,6 @@
 import moment from 'moment';
 import { toMoment } from '../date';
-
-type TForwardStartingDates = {
-    blackouts?: unknown[];
-    close?: string;
-    date: string;
-    open?: string;
-};
-
-type TContract = {
-    forward_starting_options: TForwardStartingDates[];
-};
+import { ContractsFor } from '@deriv/api-types';
 
 type TConfig = {
     text: string;
@@ -21,19 +11,22 @@ type TConfig = {
     }[];
 }[];
 
-export const buildForwardStartingConfig = (contract: TContract, forward_starting_dates: TForwardStartingDates[]) => {
+export const buildForwardStartingConfig = (
+    contract: ContractsFor['available'][number],
+    forward_starting_dates?: TConfig
+) => {
     const forward_starting_config: TConfig = [];
 
     if ((contract.forward_starting_options || []).length) {
-        contract.forward_starting_options.forEach(option => {
-            const duplicated_option = forward_starting_config.find(opt => opt.value === parseInt(option.date));
+        (contract.forward_starting_options ?? []).forEach(option => {
+            const duplicated_option = forward_starting_config.find(opt => opt.value === parseInt(option.date ?? ''));
             const current_session = { open: toMoment(option.open), close: toMoment(option.close) };
             if (duplicated_option) {
                 duplicated_option.sessions.push(current_session);
             } else {
                 forward_starting_config.push({
                     text: toMoment(option.date).format('ddd - DD MMM, YYYY'),
-                    value: parseInt(option.date),
+                    value: parseInt(option.date ?? ''),
                     sessions: [current_session],
                 });
             }

@@ -2,6 +2,19 @@ import merge from 'lodash.merge';
 import type { TStores } from '../types';
 
 const mock = (): TStores & { is_mock: boolean } => {
+    const common_store_error = {
+        app_routing_history: [],
+        header: '',
+        message: '',
+        type: '',
+        redirect_label: '',
+        redirect_to: '',
+        should_clear_error_on_click: false,
+        should_show_refresh: false,
+        redirectOnClick: jest.fn(),
+        setError: jest.fn(),
+    };
+    const services_error = { code: '', message: '', type: '' };
     return {
         is_mock: true,
         client: {
@@ -255,19 +268,7 @@ const mock = (): TStores & { is_mock: boolean } => {
             setPrevAccountType: jest.fn(),
         },
         common: {
-            error: {
-                app_routing_history: [],
-                header: '',
-                message: '',
-                type: '',
-                redirect_label: '',
-                redirect_to: '',
-                should_clear_error_on_click: false,
-                should_show_refresh: false,
-                redirectOnClick: jest.fn(),
-                setError: jest.fn(),
-            },
-            services_error: {},
+            error: common_store_error,
             current_language: 'EN',
             isCurrentLanguage: jest.fn(),
             is_from_derivgo: false,
@@ -280,6 +281,7 @@ const mock = (): TStores & { is_mock: boolean } => {
             is_network_online: false,
             server_time: undefined,
             is_language_changing: false,
+            services_error: {},
             is_socket_opened: false,
             setAppstorePlatform: jest.fn(),
             app_routing_history: [],
@@ -299,15 +301,14 @@ const mock = (): TStores & { is_mock: boolean } => {
             is_closing_create_real_account_modal: false,
             is_dark_mode_on: false,
             is_language_settings_modal_on: false,
-            is_unsupported_contract_modal_visible: false,
-            has_only_forward_starting_contracts: false,
             header_extension: null,
             is_link_expired_modal_visible: false,
             is_mobile: false,
             is_positions_drawer_on: false,
             is_reports_visible: false,
             is_route_modal_on: false,
             is_services_error_visible: false,
+            is_unsupported_contract_modal_visible: false,
             disableApp: jest.fn(),
             enableApp: jest.fn(),
             setCurrentFocus: jest.fn(),
@@ -317,18 +318,19 @@ const mock = (): TStores & { is_mock: boolean } => {
             togglePositionsDrawer: jest.fn(),
             setDarkMode: jest.fn(),
             setReportsTabIndex: jest.fn(),
+            has_only_forward_starting_contracts: false,
             has_real_account_signup_ended: false,
             notification_messages_ui: jest.fn(),
             openRealAccountSignup: jest.fn(),
+            setHasOnlyForwardingContracts: jest.fn(),
             setIsClosingCreateRealAccountModal: jest.fn(),
             setRealAccountSignupEnd: jest.fn(),
             setPurchaseState: jest.fn(),
-            setHasOnlyForwardingContracts: jest.fn(),
             shouldNavigateAfterChooseCrypto: jest.fn(),
             toggleLanguageSettingsModal: jest.fn(),
+            toggleServicesErrorModal: jest.fn(),
             toggleLinkExpiredModal: jest.fn(),
             toggleSetCurrencyModal: jest.fn(),
-            toggleServicesErrorModal: jest.fn(),
             addToast: jest.fn(),
             removeToast: jest.fn(),
             reports_route_tab_index: 1,
@@ -510,6 +512,10 @@ const mock = (): TStores & { is_mock: boolean } => {
             eventHandler: jest.fn(),
             setLoginFlag: jest.fn(),
         },
+        pushwoosh: {},
+        contract_replay: {},
+        chart_barrier_store: {},
+        active_symbols: {},
     };
 };
 

@@ -438,11 +438,15 @@ type TCommonStoreError = {
     should_show_refresh: boolean;
     type?: string;
 };
+type TCommonStoreServicesError = {
+    code?: string;
+    message?: string;
+    type?: string;
+};
 
 type TCommonStore = {
     isCurrentLanguage(language_code: string): boolean;
     error: TCommonStoreError;
-    services_error: { code: string; message: string; type: string } | Record<string, never>;
     has_error: boolean;
     is_from_derivgo: boolean;
     is_network_online: boolean;
@@ -454,6 +458,7 @@ type TCommonStore = {
     changeSelectedLanguage: (key: string) => void;
     current_language: string;
     is_language_changing: boolean;
+    services_error: TCommonStoreServicesError;
     is_socket_opened: boolean;
     setAppstorePlatform: (value: string) => void;
     app_routing_history: TAppRoutingHistory[];
@@ -468,13 +473,12 @@ type TUiStore = {
     current_focus: string | null;
     disableApp: () => void;
     enableApp: () => void;
+    has_only_forward_starting_contracts: boolean;
     has_real_account_signup_ended: boolean;
     is_account_settings_visible: boolean;
     is_loading: boolean;
     is_cashier_visible: boolean;
     is_closing_create_real_account_modal: boolean;
-    is_unsupported_contract_modal_visible: boolean;
-    has_only_forward_starting_contracts: boolean;
     header_extension: JSX.Element | null;
     is_dark_mode_on: boolean;
     is_reports_visible: boolean;
@@ -485,6 +489,7 @@ type TUiStore = {
     is_mobile: boolean;
     is_positions_drawer_on: boolean;
     is_services_error_visible: boolean;
+    is_unsupported_contract_modal_visible: boolean;
     openRealAccountSignup: (
         value: 'maltainvest' | 'svg' | 'add_crypto' | 'choose' | 'add_fiat' | 'set_currency' | 'manage'
     ) => void;
@@ -506,9 +511,9 @@ type TUiStore = {
     toggleLinkExpiredModal: (state_change: boolean) => void;
     togglePositionsDrawer: () => void;
     toggleReadyToDepositModal: () => void;
+    toggleServicesErrorModal: (is_visible: boolean) => void;
     toggleSetCurrencyModal: () => void;
     toggleShouldShowRealAccountsList: (value: boolean) => void;
-    toggleServicesErrorModal: () => void;
     is_tablet: boolean;
     removeToast: (key: string) => void;
     is_ready_to_deposit_modal_visible: boolean;
@@ -712,6 +717,10 @@ export type TCoreStores = {
     notifications: TNotificationStore;
     traders_hub: TTradersHubStore;
     gtm: TGtmStore;
+    pushwoosh: Record<string, unknown>;
+    contract_replay: Record<string, unknown>;
+    chart_barrier_store: Record<string, unknown>;
+    active_symbols: Record<string, unknown>;
 };
 
 export type TStores = TCoreStores & {

@@ -0,0 +1,3 @@
+import MarketUnavailableModal from './market-unavailable';
+
+export default MarketUnavailableModal;
@@ -1,13 +1,18 @@
-import PropTypes from 'prop-types';
 import React from 'react';
 import { Dialog } from '@deriv/components';
 import { getPlatformSettings } from '@deriv/shared';
 import { localize, Localize } from '@deriv/translations';
 import { observer, useStore } from '@deriv/stores';
 
-const MarketUnavailableModal = observer(({ onCancel, onConfirm }) => {
+type TMarketUnavailableModalProps = {
+    is_loading?: boolean;
+    onCancel: () => void;
+    onConfirm: () => void;
+};
+
+const MarketUnavailableModal = observer(({ is_loading, onCancel, onConfirm }: TMarketUnavailableModalProps) => {
     const { ui } = useStore();
-    const { disableApp, enableApp, is_loading, has_only_forward_starting_contracts: is_visible } = ui;
+    const { disableApp, enableApp, has_only_forward_starting_contracts: is_visible } = ui;
 
     return (
         <Dialog
@@ -38,9 +43,4 @@ const MarketUnavailableModal = observer(({ onCancel, onConfirm }) => {
     );
 });
 
-MarketUnavailableModal.propTypes = {
-    onCancel: PropTypes.func,
-    onConfirm: PropTypes.func,
-};
-
 export default MarketUnavailableModal;
@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 
-export const getTitle = (type: string) => {
+export const getTitle = (type?: string) => {
     switch (type) {
         case 'buy':
             return localize('Purchase Error');

@@ -8,9 +8,9 @@ import CompanyWideLimitExceededModal from './company-wide-limit-exceeded-modal';
 import AccountVerificationRequiredModal from './account-verification-required-modal';
 
 type TServicesError = {
-    code: string;
-    message: string;
-    type: string;
+    code?: string;
+    message?: string;
+    type?: string;
 };
 
 type TPropServicesErrorModel = {

@@ -1,3 +1,3 @@
-import UnsupportedContractModal from './unsupported-contract-modal.jsx';
+import UnsupportedContractModal from './unsupported-contract-modal';
 
 export default UnsupportedContractModal;