refactor: update currency handling to use UsdCurrencyAmount across analytics models

mois-ilya · mois-ilya · commit c64dfdd5eaae · 2025-11-02T21:59:01.000+04:00
- Replaced instances of TonCurrencyAmount with UsdCurrencyAmount in various analytics models and interfaces to standardize currency handling.
- Updated related mapping functions and interfaces to ensure compatibility with the new currency type.
- Removed deprecated analytics-payment interface as it is no longer needed.

These changes enhance consistency in currency representation throughout the analytics feature set.
diff --git a/src/features/analytics/model/analytics-gpt-generation.store.ts b/src/features/analytics/model/analytics-gpt-generation.store.ts
@@ -1,5 +1,5 @@
 import { makeAutoObservable } from 'mobx';
-import { Loadable, TonCurrencyAmount } from 'src/shared';
+import { Loadable, UsdCurrencyAmount } from 'src/shared';
 import {
     getStatsChatGptPrice,
     statsChatGptRequest,
@@ -65,9 +65,6 @@ function mapStatsChatGptPriceToGptGenerationPricing(
     return {
         freeRequestsNumber: value.free_requests,
         usedFreeRequest: value.used,
-        // TODO: PRICES remove this after backend will be updated
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        requestPrice: value.price ? new TonCurrencyAmount(value.price) : value.usd_price
+        requestPrice: new UsdCurrencyAmount(value.usd_price)
     };
 }
diff --git a/src/features/analytics/model/analytics-graph-query.store.ts b/src/features/analytics/model/analytics-graph-query.store.ts
@@ -1,15 +1,6 @@
 import { makeAutoObservable } from 'mobx';
-import {
-    createReaction,
-    Loadable,
-    TonAddress,
-    TonCurrencyAmount
-} from 'src/shared';
-import {
-    getGraphFromStats,
-    getSqlResultFromStats,
-    DTOStatsQueryResult
-} from 'src/shared/api';
+import { createReaction, Loadable, TonAddress, UsdCurrencyAmount } from 'src/shared';
+import { getGraphFromStats, getSqlResultFromStats, DTOStatsQueryResult } from 'src/shared/api';
 import { AnalyticsGraphQuery, AnalyticsGraphQueryBasic } from './interfaces';
 import { Project } from 'src/entities/project';
 
@@ -104,10 +95,7 @@ export function mapDTOStatsGraphResultToAnalyticsGraphQuery(
                 value.url!
             )}&meta=${encodeURIComponent(value.meta_url!)}`,
             spentTimeMS: value.spent_time!,
-            // TODO: PRICES remove this after backend will be updated
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            cost: new TonCurrencyAmount(value.cost!)
+            cost: value.usd_cost ? new UsdCurrencyAmount(value.usd_cost) : new UsdCurrencyAmount(0)
         };
     }
 
@@ -123,9 +111,6 @@ export function mapDTOStatsGraphResultToAnalyticsGraphQuery(
         status: 'error',
         errorReason: value.error!,
         spentTimeMS: value.spent_time!,
-        // TODO: PRICES remove this after backend will be updated
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        cost: new TonCurrencyAmount(value.cost!)
+        cost: value.usd_cost ? new UsdCurrencyAmount(value.usd_cost) : undefined
     };
 }
diff --git a/src/features/analytics/model/analytics-history-table.store.ts b/src/features/analytics/model/analytics-history-table.store.ts
@@ -1,5 +1,5 @@
 import { makeAutoObservable, reaction } from 'mobx';
-import { Loadable, TonCurrencyAmount } from 'src/shared';
+import { Loadable, UsdCurrencyAmount } from 'src/shared';
 import { getSqlHistoryFromStats, DTOStatsQueryResult, DTOStatsQueryType } from 'src/shared/api';
 import {
     AnalyticsGraphQuery,
@@ -143,10 +143,9 @@ function mapDTOStatsQueryResultToAnalyticsQueryAggregated(
         lastQuery: mapDTOStatsSqlResultToAnalyticsQuery(value),
         lastQueryDate: new Date(value.last_repeat_date!),
         repeatFrequencyMs: value.query!.repeat_interval! * 1000,
-        // TODO: PRICES remove this after backend will be updated
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        totalCost: new TonCurrencyAmount(value.total_cost!),
+        totalCost: value.total_usd_cost
+            ? new UsdCurrencyAmount(value.total_usd_cost)
+            : new UsdCurrencyAmount(0),
         totalRepetitions: value.total_repetitions!
     };
 }
diff --git a/src/features/analytics/model/analytics-query-request.store.ts b/src/features/analytics/model/analytics-query-request.store.ts
@@ -1,5 +1,5 @@
 import { makeAutoObservable } from 'mobx';
-import { createReaction, Loadable, Network, TonCurrencyAmount } from 'src/shared';
+import { createReaction, Loadable, Network, UsdCurrencyAmount } from 'src/shared';
 import { estimateStatsQuery, DTOChain, DTOStatsEstimateQuery } from 'src/shared/api';
 import { AnalyticsQueryTemplate } from './interfaces';
 import { DTOChainNetworkMap } from 'src/shared/lib/blockchain/network';
@@ -110,14 +110,13 @@ function mapDTOStatsEstimateSQLToAnalyticsQuery(
     network: DTOChain,
     value: DTOStatsEstimateQuery
 ): AnalyticsQueryTemplate {
+    console.log(value.approximate_usd_cost);
     return {
         request,
         network: DTOChainNetworkMap[network],
         estimatedTimeMS: value.approximate_time,
-        // TODO: PRICES remove this after backend will be updated
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        estimatedCost: new TonCurrencyAmount(value.approximate_cost),
+
+        estimatedCost: new UsdCurrencyAmount(value.approximate_usd_cost),
         explanation: value.explain!
     };
 }
diff --git a/src/features/analytics/model/analytics-query.store.ts b/src/features/analytics/model/analytics-query.store.ts
@@ -1,5 +1,5 @@
 import { makeAutoObservable } from 'mobx';
-import { createReaction, Loadable, Network, TonCurrencyAmount } from 'src/shared';
+import { createReaction, Loadable, Network, UsdCurrencyAmount } from 'src/shared';
 import {
     getStatsDdl,
     sendQueryToStats,
@@ -36,7 +36,10 @@ export class AnalyticsQueryStore {
         return this.setRepeatOnQuery.isLoading || this.removeRepeatOnQuery.isLoading;
     }
 
-    constructor(analyticsGPTGenerationStore: AnalyticsGPTGenerationStore, private readonly project: Project) {
+    constructor(
+        analyticsGPTGenerationStore: AnalyticsGPTGenerationStore,
+        private readonly project: Project
+    ) {
         this.analyticsGPTGenerationStore = analyticsGPTGenerationStore;
         makeAutoObservable(this);
 
@@ -247,17 +250,18 @@ export class AnalyticsQueryStore {
 }
 
 export function mapDTOStatsSqlResultToAnalyticsQuery(value: DTOStatsQueryResult): AnalyticsQuery {
+    if (!value.estimate) {
+        throw new Error('Estimate is required');
+    }
+
     const basicQuery = {
         type: 'query',
         id: value.id,
         creationDate: new Date(value.date_create),
         gptPrompt: value.query?.gpt_message,
         request: value.query!.sql!,
         estimatedTimeMS: value.estimate!.approximate_time,
-        // TODO: PRICES remove this after backend will be updated
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        estimatedCost: new TonCurrencyAmount(value.estimate!.approximate_cost),
+        estimatedCost: new UsdCurrencyAmount(value.estimate.approximate_usd_cost),
         explanation: value.estimate!.explain!,
         name: value.name,
         ...(value.query?.repeat_interval && {
@@ -277,10 +281,7 @@ export function mapDTOStatsSqlResultToAnalyticsQuery(value: DTOStatsQueryResult)
         return {
             ...basicQuery,
             status: 'success',
-            // TODO: PRICES remove this after backend will be updated
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            cost: new TonCurrencyAmount(value.cost!),
+            cost: new UsdCurrencyAmount(value.usd_cost!),
             spentTimeMS: value.spent_time!,
             csvUrl: value.url!,
             preview: parsePreview(value.preview!, !!value.all_data_in_preview),
@@ -290,11 +291,8 @@ export function mapDTOStatsSqlResultToAnalyticsQuery(value: DTOStatsQueryResult)
 
     return {
         ...basicQuery,
-        status: 'error',
-        // TODO: PRICES remove this after backend will be updated
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        cost: new TonCurrencyAmount(value.cost!),
+        status: 'error',    
+        cost: new UsdCurrencyAmount(value.usd_cost!),
         spentTimeMS: value.spent_time!,
         errorReason: value.error!
     };
diff --git a/src/features/analytics/model/interfaces/analytics-graph-query.ts b/src/features/analytics/model/interfaces/analytics-graph-query.ts
@@ -1,4 +1,4 @@
-import { TonAddress, TonCurrencyAmount } from 'src/shared';
+import { TonAddress, UsdCurrencyAmount } from 'src/shared';
 
 export interface AnalyticsGraphQueryBasic {
     type: 'graph';
@@ -12,7 +12,7 @@ export interface AnalyticsGraphQuerySuccess extends AnalyticsGraphQueryBasic {
     status: 'success';
     resultUrl: string;
     spentTimeMS: number;
-    cost: TonCurrencyAmount;
+    cost: UsdCurrencyAmount;
 }
 
 export interface AnalyticsGraphQueryPending extends AnalyticsGraphQueryBasic {
@@ -23,7 +23,7 @@ export interface AnalyticsGraphQueryError extends AnalyticsGraphQueryBasic {
     status: 'error';
     errorReason: string;
     spentTimeMS: number;
-    cost: TonCurrencyAmount;
+    cost?: UsdCurrencyAmount;
 }
 
 export type AnalyticsGraphQuery =
diff --git a/src/features/analytics/model/interfaces/analytics-payment.ts b/src/features/analytics/model/interfaces/analytics-payment.ts
diff --git a/src/features/analytics/model/interfaces/analytics-query.ts b/src/features/analytics/model/interfaces/analytics-query.ts
@@ -1,4 +1,4 @@
-import { Network, TonCurrencyAmount } from 'src/shared';
+import { Network, UsdCurrencyAmount } from 'src/shared';
 import { AnalyticsChartsConfig } from './charts';
 import { AnalyticsGraphQuery } from './analytics-graph-query';
 
@@ -11,7 +11,7 @@ export interface AnalyticsTableSource {
 export interface AnalyticsQueryTemplate {
     request: string;
     estimatedTimeMS: number;
-    estimatedCost: TonCurrencyAmount;
+    estimatedCost: UsdCurrencyAmount;
     explanation: string;
     network: Network;
 }
@@ -29,7 +29,7 @@ export interface AnalyticsQueryBasic extends AnalyticsQueryTemplate {
 export interface AnalyticsQueryCompleted extends AnalyticsQueryBasic {
     status: 'success' | 'error';
     spentTimeMS: number;
-    cost: TonCurrencyAmount;
+    cost: UsdCurrencyAmount;
 }
 
 export interface AnalyticsQuerySuccessful extends AnalyticsQueryCompleted {
@@ -76,5 +76,5 @@ export type AnalyticsRepeatingQueryAggregated = {
     lastQueryDate: Date;
     repeatFrequencyMs: number;
     totalRepetitions: number;
-    totalCost: TonCurrencyAmount;
+    totalCost: UsdCurrencyAmount;
 };
diff --git a/src/features/analytics/model/interfaces/gpt-generation-pricing.ts b/src/features/analytics/model/interfaces/gpt-generation-pricing.ts
@@ -1,7 +1,7 @@
-import { TonCurrencyAmount } from 'src/shared';
+import { UsdCurrencyAmount } from 'src/shared';
 
 export interface GptGenerationPricing {
     freeRequestsNumber: number;
     usedFreeRequest: number;
-    requestPrice: TonCurrencyAmount;
+    requestPrice: UsdCurrencyAmount;
 }
diff --git a/src/features/analytics/model/interfaces/index.ts b/src/features/analytics/model/interfaces/index.ts
@@ -1,6 +1,5 @@
 export * from './analytics-query';
 export * from './analytics-graph-query';
-export * from './analytics-payment';
 export * from './analytics-tables-schema';
 export * from './gpt-generation-pricing';
 export * from './charts';
diff --git a/src/features/analytics/ui/AnalyticsQueryControlPanel.tsx b/src/features/analytics/ui/AnalyticsQueryControlPanel.tsx
@@ -1,11 +1,17 @@
 import { FC, useEffect } from 'react';
-import { BoxProps, Button, Center, Flex, Skeleton, Spacer, useDisclosure } from '@chakra-ui/react';
+import {
+    Box,
+    BoxProps,
+    Button,
+    Center,
+    Flex,
+    Skeleton,
+    Spacer,
+    useDisclosure
+} from '@chakra-ui/react';
 import { observer } from 'mobx-react-lite';
 import { InfoIcon16, Span, TooltipHoverable, toTimeLeft } from 'src/shared';
-import {
-    AnalyticsQueryStore,
-    AnalyticsQueryRequestStore
-} from 'src/features';
+import { AnalyticsQueryStore, AnalyticsQueryRequestStore } from 'src/features';
 import { useSearchParams } from 'react-router-dom';
 import { computed } from 'mobx';
 import ExplainSQLModal from './ExplainSQLModal';
@@ -152,11 +158,13 @@ const AnalyticsQueryControlPanel: FC<AnalyticsQueryControlPanelProps> = ({
                                     minutes of execution.
                                 </Span>
                             </TooltipHoverable>
-                            <Span opacity="0.6" fontFamily="mono">
+                            <Span
+                                opacity="0.6"
+                                fontFamily="mono"
+                                title={request.estimatedCost.amount.toString()}
+                            >
                                 &nbsp;·&nbsp;
-                                {request.estimatedCost.toStringCurrencyAmount({
-                                    decimalPlaces: null
-                                })}
+                                {request.estimatedCost.toStringCurrencyAmount()}
                             </Span>
                         </Span>
                     )
diff --git a/src/features/analytics/ui/history/AnalyticsHistoryTableRow.tsx b/src/features/analytics/ui/history/AnalyticsHistoryTableRow.tsx
@@ -118,7 +118,7 @@ const DurationValueCell: FC<{
     ) : query.status === 'success' || query.status === 'error' ? (
         <Flex align="center" wrap="wrap" color="text.secondary">
             {query.spentTimeMS < 1000 ? '≈1s' : <Span>{toTimeLeft(query.spentTimeMS)}</Span>}
-            &nbsp;· {query.cost.stringCurrencyAmount}
+            {query.cost && <>&nbsp;· {query.cost.stringCurrencyAmount}</>}
         </Flex>
     ) : (
         formattedDuration
diff --git a/src/features/analytics/ui/query-results/AnalyticsQueryResultsCountdown.tsx b/src/features/analytics/ui/query-results/AnalyticsQueryResultsCountdown.tsx
@@ -27,7 +27,7 @@ export const AnalyticsQueryResultsCountdown: FC<BoxProps & { query: AnalyticsQue
                 '< 1s'
             )}
             &nbsp;·&nbsp;
-            {query.estimatedCost.toStringCurrencyAmount({ decimalPlaces: null })}
+            {query.estimatedCost.toStringCurrencyAmount()}
         </Flex>
     );
 };

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-import { TonCurrencyAmount } from 'src/shared';`
	`1`	`+import { UsdCurrencyAmount } from 'src/shared';`
`2`	`2`
`3`	`3`	`export interface GptGenerationPricing {`
`4`	`4`	`freeRequestsNumber: number;`
`5`	`5`	`usedFreeRequest: number;`
`6`		`- requestPrice: TonCurrencyAmount;`
	`6`	`+ requestPrice: UsdCurrencyAmount;`
`7`	`7`	`}`