feat: implement BalanceStore for managing user balances and integrate billing history with enhanced transaction details

Author: mois-ilya

scripts/swagger.yaml

@@ -3460,8 +3460,7 @@ components:
         - type
         - amount
         - currency
-        - reason
-        - additional_info
+        - info
         - created_at
       properties:
         id:
@@ -3480,14 +3479,140 @@ components:
           example: "123000000000"
         currency:
           $ref: '#/components/schemas/CryptoCurrency'
-        reason:
-          type: string
-        additional_info:
-          type: string
+        info:
+          $ref: '#/components/schemas/BillingTxInfo'
         created_at:
           type: integer
           format: int64
           example: 1690889913000
+    BillingTxInfo:
+      type: object
+      required:
+        - reason
+#        - meta
+#      additionalProperties: false
+      properties:
+        reason:
+          type: string
+          enum:
+            - tonapi_monthly_payment
+            - tonapi_instant_payment
+            - tonapi_change_tier
+            - liteproxy_monthly_payment
+            - liteproxy_change_tier
+            - testnet_tons_purchase
+            - cnft_indexing_payment
+            - message_package_purchase
+            - promo_code_activation
+            - chatgpt_request_payment
+            - streaming_api_payment
+            - replenishment_of_deposit
+            - analytics_request_payment
+            - other
+#        meta:
+#          oneOf:
+#            - $ref: '#/components/schemas/TonapiMonthlyPaymentMeta'
+#            - $ref: '#/components/schemas/TonapiInstantPaymentMeta'
+#            - $ref: '#/components/schemas/TonapiChangeTierMeta'
+#            - $ref: '#/components/schemas/LiteproxyMonthlyPaymentMeta'
+#            - $ref: '#/components/schemas/LiteproxyChangeTierMeta'
+#            - $ref: '#/components/schemas/TestnetTonsPurchaseMeta'
+#            - $ref: '#/components/schemas/CnftIndexingPaymentMeta'
+#            - $ref: '#/components/schemas/MessagePackagePurchaseMeta'
+#            - $ref: '#/components/schemas/PromoCodeActivationMeta'
+#            - $ref: '#/components/schemas/StreamingApiPaymentMeta'
+#            - $ref: '#/components/schemas/ReplenishmentOfDepositMeta'
+#            - $ref: '#/components/schemas/AnalyticsRequestPaymentMeta'
+#            - type: object
+#              additionalProperties: true
+    TonapiMonthlyPaymentMeta:
+      type: object
+      required:
+        - tier
+      properties:
+        tier:
+          $ref: '#/components/schemas/Tier'
+    TonapiInstantPaymentMeta:
+      type: object
+      required:
+        - tier
+      properties:
+        tier:
+          $ref: '#/components/schemas/Tier'
+    TonapiChangeTierMeta:
+      type: object
+      required:
+        - new_tier
+      properties:
+        new_tier:
+          $ref: '#/components/schemas/Tier'
+    LiteproxyMonthlyPaymentMeta:
+      type: object
+      required:
+        - tier
+      properties:
+        tier:
+          $ref: '#/components/schemas/LiteproxyTier'
+    LiteproxyChangeTierMeta:
+      type: object
+      required:
+        - new_tier
+      properties:
+        new_tier:
+          $ref: '#/components/schemas/LiteproxyTier'
+    TestnetTonsPurchaseMeta:
+      type: object
+      required:
+        - testnet_coins
+      properties:
+        testnet_coins:
+          type: string
+          x-js-format: bigint
+    CnftIndexingPaymentMeta:
+      type: object
+      required:
+        - collection
+        - count
+      properties:
+        collection:
+          type: string
+        count:
+          type: integer
+    MessagePackagePurchaseMeta:
+      type: object
+      required:
+        - count
+      properties:
+        count:
+          type: integer
+    PromoCodeActivationMeta:
+      type: object
+      required:
+        - id
+      properties:
+        id:
+          type: string
+    StreamingApiPaymentMeta:
+      type: object
+      required:
+        - period
+      properties:
+        period:
+          type: integer
+    ReplenishmentOfDepositMeta:
+      type: object
+      required:
+        - tx_hash
+      properties:
+        tx_hash:
+          type: string
+    AnalyticsRequestPaymentMeta:
+      type: object
+      required:
+        - time
+      properties:
+        time:
+          type: integer
     Balance:
       type: object
       required:
@@ -4684,6 +4809,7 @@ components:
           schema:
             type: object
             required:
+              - history
               - usdt_balance
             properties:
               usdt_balance:
@@ -5509,4 +5635,3 @@ components:
                 type: integer
                 format: int64
                 example: 1000000000
-

…/entities/balance/model/balance.store.ts src/entities/balance/balance.store.tssrc/entities/balance/model/balance.store.ts renamed to src/entities/balance/balance.store.ts src/entities/balance/model/balance.store.ts renamed to src/entities/balance/balance.store.ts

@@ -9,7 +9,7 @@ import {
     tonapiMainnet,
     toDecimals
 } from 'src/shared';
-import { ProjectsStore } from '../../project/model/projects.store';
+import { ProjectsStore } from '../project/model/projects.store';
 import { createStandaloneToast } from '@chakra-ui/react';
 
 const USDT_DECIMALS = 6;
@@ -117,27 +117,27 @@ export class BalanceStore {
                 amount: BigInt(usdt_balance.amount),
                 promo_amount: BigInt(usdt_balance.promo_amount)
             },
-            ...(ton_balance && { ton: {
-                amount: BigInt(ton_balance.amount),
-                promo_amount: BigInt(ton_balance.promo_amount)
-            } })
+            ...(ton_balance && {
+                ton: {
+                    amount: BigInt(ton_balance.amount),
+                    promo_amount: BigInt(ton_balance.promo_amount)
+                }
+            })
         };
     });
 
-    fetchTonRate = this.tonRate$.createAsyncAction(async () => {
-        const data = await tonapiMainnet.rates.getRates({
-            tokens: ['ton'],
-            currencies: ['usd']
-        });
-
-        return data.rates['TON'].prices?.USD;
-    });
+    fetchTonRate = this.tonRate$.createAsyncAction(
+        (): Promise<number | undefined> =>
+            tonapiMainnet.rates
+                .getRates({ tokens: ['ton'], currencies: ['usd'] })
+                .then(data => data.rates['TON'].prices?.USD)
+    );
 
     fetchDepositAddress = this.depositAddress$.createAsyncAction(
         async (): Promise<RefillAddresses> =>
             await apiClient.api
                 .getDepositAddress(this.projectsStore.selectedProject!.id)
-                .then(response => response.data as RefillAddresses)
+                .then(response => response.data)
     );
 
     applyPromoCode = createAsyncAction(async (promoCode: string) => {

src/entities/balance/index.ts

@@ -1,2 +1,2 @@
 export * from './ui';
-export * from './model';
+export * from './balance.store';

src/entities/balance/model/index.ts

@@ -3,16 +3,26 @@ import {
     apiClient,
     createAsyncAction,
     createImmediateReaction,
+    CRYPTO_CURRENCY,
     DTOBillingTransaction,
     DTOBillingTransactionTypeEnum,
+    DTOBillingTxInfoReasonEnum,
     DTOCryptoCurrency,
     Loadable,
+    TokenCurrencyAmount,
     TonCurrencyAmount,
     UsdCurrencyAmount
 } from 'src/shared';
-import { BillingHistory, BillingHistoryPaymentItem, BillingHistoryRefillItem } from './interfaces';
 import { projectsStore, balanceStore } from 'src/shared/stores';
 
+export type BillingHistoryItem = {
+    id: string;
+    date: Date;
+    amount: TonCurrencyAmount | UsdCurrencyAmount;
+    type: DTOBillingTransactionTypeEnum;
+    reason: DTOBillingTxInfoReasonEnum;
+};
+
 export class BillingStore {
     billingHistory$ = new Loadable<DTOBillingTransaction[]>([]);
 
@@ -30,9 +40,9 @@ export class BillingStore {
         return this.billingHistory.length;
     }
 
-    get billingHistory(): BillingHistory {
+    get billingHistory(): BillingHistoryItem[] {
         return (this.billingHistory$.value || []).map(dtoTx =>
-            mapDTOTransactionToHistoryItem(dtoTx)
+            mapDTOTransactionToBillingHistoryItem(dtoTx)
         );
     }
 
@@ -105,38 +115,28 @@ export class BillingStore {
     }
 }
 
-function mapDTOTransactionToHistoryItem(
+function mapDTOTransactionToBillingHistoryItem(
     dtoTx: DTOBillingTransaction
-): BillingHistoryRefillItem | BillingHistoryPaymentItem {
+): BillingHistoryItem {
     const date = new Date(dtoTx.created_at);
-    const id = date.getTime();
     const amount = mapDTOCurrencyToAmount(dtoTx.currency, dtoTx.amount);
 
-    if (dtoTx.type === DTOBillingTransactionTypeEnum.DTODeposit) {
-        return {
-            id,
-            date,
-            amount,
-            type: 'deposit' as const,
-            action: 'refill' as const
-        };
-    } else {
-        return {
-            id,
-            date,
-            amount,
-            action: 'payment' as const,
-            name: dtoTx.reason
-        };
-    }
+    return {
+        id: dtoTx.id,
+        date,
+        amount,
+        type: dtoTx.type,
+        reason: dtoTx.info.reason,
+        // meta: dtoTx.info.meta,
+    };
 }
 
 function mapDTOCurrencyToAmount(currency: DTOCryptoCurrency, amount: string) {
     switch (currency) {
         case DTOCryptoCurrency.DTO_TON:
             return new TonCurrencyAmount(amount);
         case DTOCryptoCurrency.DTO_USDT:
-            return new UsdCurrencyAmount(amount);
+            return new TokenCurrencyAmount({ weiAmount: amount, currency: CRYPTO_CURRENCY.USDT, decimals: 6 });
         default:
             throw new Error(`Unknown currency: ${currency}`);
     }

src/entities/balance/model/interfaces/index.ts

@@ -1,8 +1 @@
-export type { Payment } from './payment';
-export type {
-    BillingHistory,
-    BillingHistoryItem,
-    BillingHistoryPaymentItem,
-    BillingHistoryRefillItem
-} from './billing-history';
 export type { Subscription } from './subscription';