diff --git a/packages/reports/src/Components/account-statistics.tsx b/packages/reports/src/Components/account-statistics.tsx index aba01b328e91..2a1b605c4e51 100644 --- a/packages/reports/src/Components/account-statistics.tsx +++ b/packages/reports/src/Components/account-statistics.tsx @@ -3,7 +3,7 @@ import { MobileWrapper, Money, Text } from '@deriv/components'; import { localize } from '@deriv/translations'; import { connect } from 'Stores/connect'; -export type TAccountStatistics = { +type TAccountStatistics = { account_statistics: { total_withdrawals: number; total_deposits: number; diff --git a/packages/reports/src/Components/market-symbol-icon-row.tsx b/packages/reports/src/Components/market-symbol-icon-row.tsx index 01906ecf11ed..662844cf84ca 100644 --- a/packages/reports/src/Components/market-symbol-icon-row.tsx +++ b/packages/reports/src/Components/market-symbol-icon-row.tsx @@ -4,14 +4,14 @@ import { Icon, Popover, IconTradeTypes } from '@deriv/components'; import { getMarketName, getTradeTypeName } from '../Helpers/market-underlying'; type TMarketSymbolIconRow = { - icon: string; + icon?: string; payload: { shortcode: string; display_name: string; action_type: string; }; - show_description: boolean; - should_show_multiplier: boolean; + show_description?: boolean; + should_show_multiplier?: boolean; }; const MarketSymbolIconRow = ({ diff --git a/packages/reports/src/Components/placeholder-component.tsx b/packages/reports/src/Components/placeholder-component.tsx index c7c4c170b794..234dbcc25ec1 100644 --- a/packages/reports/src/Components/placeholder-component.tsx +++ b/packages/reports/src/Components/placeholder-component.tsx @@ -2,13 +2,13 @@ import React from 'react'; import Loading from '_common/components/loading'; type TPlaceholderComponent = { - component_icon: string; - empty_message_component: React.ElementType; - has_selected_date: boolean; - is_empty: boolean; + component_icon?: string; + empty_message_component?: React.ElementType; + has_selected_date?: boolean; + is_empty?: boolean; is_loading: boolean; - localized_message: string; - localized_period_message: string; + localized_message?: string; + localized_period_message?: string; }; const PlaceholderComponent = ({ diff --git a/packages/reports/src/Constants/data-table-constants.tsx b/packages/reports/src/Constants/data-table-constants.tsx index 0ea840c7de14..80bb83287a5a 100644 --- a/packages/reports/src/Constants/data-table-constants.tsx +++ b/packages/reports/src/Constants/data-table-constants.tsx @@ -46,6 +46,13 @@ type TColumnTemplateType = { col_index?: string; renderCellContent?: (props: TCellContentProps) => React.ReactNode; renderHeader?: (props: THeaderProps) => React.ReactNode; + icon?: string; + action_type?: string; + refid?: string; + date?: string; + balance?: string; + item?: any; + map?: any; }; type TMultiplierOpenPositionstemplateProps = { @@ -131,7 +138,7 @@ export const getProfitTableColumnsTemplate = (currency: string, items_count: num if (is_footer) { return localize('Profit/loss on the last {{item_count}} contracts', { item_count: items_count }); } - return ; + return ; }, }, { @@ -196,7 +203,7 @@ export const getOpenPositionsColumnsTemplate = (currency: string): TColumnTempla renderCellContent: ({ cell_value, row_obj, is_footer }: TCellContentProps) => { if (is_footer) return localize('Total'); - return ; + return ; }, }, { @@ -279,12 +286,7 @@ export const getMultiplierOpenPositionsColumnsTemplate = ({ if (is_footer) return localize('Total'); return ( - + ); }, }, diff --git a/packages/reports/src/Containers/statement.tsx b/packages/reports/src/Containers/statement.tsx index bdeb41e90ad2..94ce32bafe56 100644 --- a/packages/reports/src/Containers/statement.tsx +++ b/packages/reports/src/Containers/statement.tsx @@ -47,14 +47,14 @@ type TGetSupportedContractsReturn = ReturnType; type TStatement = { action_type: string; - account_statistics: Pick; + account_statistics: React.ComponentProps['account_statistics']; component_icon: string; currency: string; data: TFormatStatementTransaction[]; date_from: number | null; date_to: number | null; error: string; - filtered_date_range: Record; + filtered_date_range: React.ComponentProps['filtered_date_range']; handleDateChange: () => void; handleFilterChange: () => void; handleScroll: () => void; @@ -122,6 +122,7 @@ const getRowAction = (row_obj: TFormatStatementTransaction) => { ] && !isForwardStarting(row_obj.shortcode, row_obj.purchase_time || row_obj.transaction_time) ? getContractPath(row_obj.id) : { + message: '', component: ( ); - // export type instead of any from 'DataList' component when it migrates to tsx + // TODO: Export type instead of any from 'DataList' component when it migrates to tsx const mobileRowRenderer = ({ row, passthrough }: any) => (