binary-com · vinu-deriv · Oct 4, 2023 · Jul 25, 2023 · Jul 25, 2023 · Jul 25, 2023
diff --git a/package-lock.json b/package-lock.json
@@ -1 +1,2 @@
 export { default as RudderStack } from './rudderstack';
+export type { TEvents } from './rudderstack';
@@ -133,7 +133,7 @@ type IdentifyAction = {
     language: string;
 };
 
-type TEvents = {
+export type TEvents = {
     ce_chart_types_form: ChartTypesFormAction;
     ce_indicators_types_form: IndicatorsTypesFormAction;
     ce_market_types_form: MarketTypesFormAction;

@@ -27,7 +27,6 @@ describe('<ErrorComponent/>', () => {
         redirect_label: 'test_label',
         should_clear_error_on_click: true,
         should_show_refresh: true,
-        app_routing_history: [{ pathname: '/cashier' }],
         redirectOnClick: jest.fn(),
         setError: jest.fn(),
     };

@@ -2,8 +2,12 @@ import React from 'react';
 import { useHistory } from 'react-router-dom';
 import { PageErrorContainer } from '@deriv/components';
 import { routes } from '@deriv/shared';
-import { TRootStore } from '../../../types';
 import { localize, Localize } from '@deriv/translations';
+import { TCoreStores } from '@deriv/stores/types';
+
+type TErrorComponentProps = TCoreStores['common']['error'] & {
+    setError?: (has_error: boolean, error: React.ReactNode | null) => void;
+};
 
 const ErrorComponent = ({
     header,
@@ -14,7 +18,7 @@ const ErrorComponent = ({
     setError,
     should_clear_error_on_click,
     should_show_refresh = true,
-}: TRootStore['common']['error']) => {
+}: TErrorComponentProps) => {
     const history = useHistory();
 
     React.useEffect(() => {

@@ -13,7 +13,7 @@ type TArrowButton = {
     is_open?: boolean;
     onClick: () => void;
     title?: string;
-    position: 'top' | 'bottom';
+    position?: 'top' | 'bottom';
 };
 
 const IconArrow = ({ className }: { className?: string }) => (

@@ -24,7 +24,7 @@ type TAccumulatorCardBody = {
     getContractById: React.ComponentProps<typeof ToggleCardDialog>['getContractById'];
     indicative?: number;
     is_sold: boolean;
-    onMouseLeave: () => void;
+    onMouseLeave?: () => void;
     removeToast: (toast_id: string) => void;
     setCurrentFocus: (value: string) => void;
     status?: string;

@@ -31,11 +31,11 @@ export type TGeneralContractCardBodyProps = {
     has_progress_slider: boolean;
     is_mobile: boolean;
     is_sold: boolean;
-    onMouseLeave: () => void;
+    onMouseLeave?: () => void;
     removeToast: (toast_id: string) => void;
     setCurrentFocus: (name: string) => void;
     status?: string;
-    toggleCancellationWarning: () => void;
+    toggleCancellationWarning: (state_change?: boolean) => void;
     progress_slider?: React.ReactNode;
     is_positions?: boolean;
 };

@@ -11,13 +11,13 @@ export type TCardFooterPropTypes = {
     contract_info: TContractInfo;
     getCardLabels: TGetCardLables;
     is_multiplier?: boolean;
-    is_positions: boolean;
+    is_positions?: boolean;
     is_sell_requested: boolean;
     onClickCancel: (contract_id?: number) => void;
     onClickSell: (contract_id?: number) => void;
     onFooterEntered?: () => void;
     server_time: moment.Moment;
-    should_show_transition: boolean;
+    should_show_transition?: boolean;
 };
 
 const CardFooter = ({
@@ -32,7 +32,7 @@ const CardFooter = ({
     server_time,
     should_show_transition,
 }: TCardFooterPropTypes) => {
-    const { in_prop } = useNewRowTransition(should_show_transition);
+    const { in_prop } = useNewRowTransition(!!should_show_transition);
 
     const is_valid_to_cancel = isValidToCancel(contract_info);
 

@@ -1,17 +1,16 @@
 import React from 'react';
 import classNames from 'classnames';
 import { CSSTransition } from 'react-transition-group';
-import { localize } from '@deriv/translations';
 import {
     isHighLow,
     getCurrentTick,
     getGrowthRatePercentage,
-    getContractSubtype,
     isAccumulatorContract,
     isSmartTraderContract,
     isBot,
     isMobile,
     isTurbosContract,
+    getLocalizedTurbosSubtype,
 } from '@deriv/shared';
 import ContractTypeCell from './contract-type-cell';
 import Button from '../../button';
@@ -83,8 +82,7 @@ const ContractCardHeader = ({
             },
             {
                 is_param_displayed: is_turbos,
-                displayed_param:
-                    getContractSubtype(contract_type || '') === 'Long' ? localize('Long') : localize('Short'),
+                displayed_param: getLocalizedTurbosSubtype(contract_type),
             },
         ],
         [multiplier, growth_rate, is_accumulator, is_turbos, contract_type]

@@ -9,7 +9,7 @@ export type TContractTypeCellProps = {
     is_high_low: boolean;
     multiplier?: number;
     type?: string;
-    displayed_trade_param?: string;
+    displayed_trade_param?: React.ReactNode;
 };
 
 const ContractTypeCell = ({

@@ -33,7 +33,7 @@ export type TContractUpdateFormProps = Pick<
     contract: TContractStore;
     error_message_alignment?: string;
     getCardLabels: TGetCardLables;
-    onMouseLeave: () => void;
+    onMouseLeave?: () => void;
     removeToast: (toast_id: string) => void;
     setCurrentFocus: (name: string | null) => void;
     status: string;

@@ -14,15 +14,15 @@ import { TGetCardLables, TGetContractPath } from '../types';
 type TContractCardProps = {
     contract_info: TContractInfo;
     getCardLabels: TGetCardLables;
-    getContractPath: TGetContractPath;
+    getContractPath?: TGetContractPath;
     is_multiplier: boolean;
-    is_positions: boolean;
-    is_unsupported: boolean;
-    onClickRemove: (contract_id: number) => void;
+    is_positions?: boolean;
+    is_unsupported?: boolean;
+    onClickRemove?: (contract_id?: number) => void;
     profit_loss: number;
-    result: string;
+    result?: string;
     should_show_result_overlay: boolean;
-    toggleUnsupportedContractModal: (is_unsupported_contract_modal_visible: boolean) => void;
+    toggleUnsupportedContractModal?: (is_unsupported_contract_modal_visible: boolean) => void;
 };
 
 const ContractCard = ({
@@ -53,7 +53,7 @@ const ContractCard = ({
                         is_multiplier={is_multiplier}
                         is_visible={!!contract_info.is_sold}
                         onClickRemove={onClickRemove}
-                        onClick={() => toggleUnsupportedContractModal(true)}
+                        onClick={() => toggleUnsupportedContractModal?.(true)}
                         result={result || fallback_result}
                         is_positions={is_positions}
                     />

@@ -8,13 +8,13 @@ import { TGetCardLables, TGetContractPath } from '../../types';
 type TResultOverlayProps = {
     contract_id?: number;
     getCardLabels: TGetCardLables;
-    getContractPath: TGetContractPath;
+    getContractPath?: TGetContractPath;
     is_multiplier?: boolean;
-    is_positions: boolean;
-    is_unsupported: boolean;
+    is_positions?: boolean;
+    is_unsupported?: boolean;
     is_visible: boolean;
     onClick: () => void;
-    onClickRemove: (contract_id: number) => void;
+    onClickRemove?: (contract_id?: number) => void;
     result: string;
 };
 
@@ -88,7 +88,7 @@ const ResultOverlay = ({
                         <span
                             id={`dc_contract_card_${contract_id}_result_close_icon`}
                             className='dc-result__close-btn'
-                            onClick={() => onClickRemove(Number(contract_id))}
+                            onClick={() => onClickRemove?.(contract_id)}
                         />
                     )}
                     {getContractPath && (