From 4ce58aaf05291df022d1ac604aaf3ddcf90dcfbe Mon Sep 17 00:00:00 2001
From: fatmaebrahim <fatmaebrahim3131@gmail.com>
Date: Mon, 14 Jul 2025 20:28:37 +0300
Subject: [PATCH 1/4] fix: used contract cost function instead of consumption
 for contracts billing rate

---
 packages/grid_client/src/modules/contracts.ts | 24 +++++++++++++++++++
 .../contracts_list/contracts_table.vue        | 11 ++++-----
 packages/playground/src/utils/contracts.ts    | 12 ++++++++++
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/packages/grid_client/src/modules/contracts.ts b/packages/grid_client/src/modules/contracts.ts
index 2728b55e7b..ba53c00c0d 100644
--- a/packages/grid_client/src/modules/contracts.ts
+++ b/packages/grid_client/src/modules/contracts.ts
@@ -29,6 +29,7 @@ import { expose } from "../helpers/expose";
 import { validateInput } from "../helpers/validator";
 import { Nodes } from "../primitives/nodes";
 import { BaseModule } from "./base";
+import { currency } from "./currency";
 import {
   BatchCancelContractsModel,
   ContractCancelModel,
@@ -555,6 +556,29 @@ class Contracts {
     return this.client.contracts.getConsumption({ id: options.id, graphqlURL: this.config.graphqlURL });
   }
 
+  /**
+   * Get the contract cost details per hour in TFT.
+   *
+   * @param  {number} contractId - The contract cost parameters.
+   * @returns {Promise<number>} A promise resolving to the cost details,
+   * @decorators
+   * - `@expose`: Exposes the method for external use.
+   */
+  @expose
+  async getContractCost(contractId: number): Promise<number> {
+    const HOURS_ONE_MONTH = 24 * 30;
+    const proxy = new GridProxyClient(this.config.proxyURL);
+    const contractInfo = (await proxy.contracts.list({ contractId })).data[0];
+    /** Cost in USD */
+    const contractMonthlyCost = await this.client.contracts.getContractCost(contractInfo, proxy);
+    /** Cost in TFT */
+    const tftPrice = (await this.client.tftPrice.get()) ?? 0;
+    const contractMonthlyCostTFT = Number(new currency(tftPrice, 15).convertUSDtoTFT({ amount: contractMonthlyCost }));
+    /** contract cost per hour in TFT */
+    const contractCost = contractMonthlyCostTFT / HOURS_ONE_MONTH;
+    return contractCost;
+  }
+
   /**
    * Retrieves the deletion time of a contract based on the provided options.
    *
diff --git a/packages/playground/src/components/contracts_list/contracts_table.vue b/packages/playground/src/components/contracts_list/contracts_table.vue
index 5b0971d163..206ecd4b5b 100644
--- a/packages/playground/src/components/contracts_list/contracts_table.vue
+++ b/packages/playground/src/components/contracts_list/contracts_table.vue
@@ -36,19 +36,16 @@
       </template>
 
       <template #[`item.consumption`]="{ item }">
-        <div
-          v-if="item?.consumption !== 0 && item?.consumption !== undefined"
-          class="d-flex justify-center align-center"
-        >
-          <p class="mr-2 text-no-wrap" cols="8">{{ item.consumption.toFixed(3) }} TFT/hour</p>
+        <div v-if="item?.contractCost !== undefined" class="d-flex justify-center align-center">
+          <p class="mr-2 text-no-wrap" cols="8">{{ item.contractCost.toFixed(3) }} TFT/hour</p>
 
-          <v-tooltip v-if="item.discountPackage" bottom color="primary" close-delay="100" cols="2">
+          <v-tooltip v-if="item.discountPackage !== 'None'" bottom color="primary" close-delay="100" cols="2">
             <template #activator="{ props: discountProps }">
               <v-icon class="scale_beat" color="warning" v-bind="discountProps"> mdi-brightness-percent </v-icon>
             </template>
 
             <a
-              v-if="item.discountPackage === 'None'"
+              v-if="item.discountPackage === undefined"
               class="app-link"
               target="_blank"
               :href="manual.discount_levels"
diff --git a/packages/playground/src/utils/contracts.ts b/packages/playground/src/utils/contracts.ts
index a4e473bf26..f601fb3fce 100644
--- a/packages/playground/src/utils/contracts.ts
+++ b/packages/playground/src/utils/contracts.ts
@@ -60,6 +60,16 @@ export async function normalizeContract(
     consumption = { amountBilled: 0, discountReceived: "None" };
   }
 
+  let contractCost: number;
+  try {
+    contractCost = await grid.contracts.getContractCost(id);
+  } catch {
+    console.log("Error fetching contract cost");
+    contractCost = 0;
+  }
+
+  console.log("contractCost", contractCost, id);
+
   return {
     contract_id: id,
     twin_id: c.twin_id,
@@ -77,6 +87,7 @@ export async function normalizeContract(
     expiration,
     consumption: consumption.amountBilled,
     discountPackage: consumption.discountReceived,
+    contractCost: contractCost,
   };
 }
 
@@ -197,6 +208,7 @@ export interface NormalizedContract {
   deploymentType?: string;
   expiration?: string;
   discountPackage?: DiscountLevel;
+  contractCost?: number;
 }
 
 export enum ContractType {

From 32c59702ed207da84c5cbb48d8fb3cd2cac2ead5 Mon Sep 17 00:00:00 2001
From: fatmaebrahim <fatmaebrahim3131@gmail.com>
Date: Thu, 17 Jul 2025 16:13:20 +0300
Subject: [PATCH 2/4] fix: used contract cost inside getconsumption to use it
 in the first billing cycle only

---
 .../src/clients/tf-grid/contracts.ts          | 13 +++++++--
 packages/grid_client/src/modules/contracts.ts | 29 ++++---------------
 .../contracts_list/contracts_table.vue        |  4 +--
 packages/playground/src/utils/contracts.ts    | 12 --------
 4 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/packages/grid_client/src/clients/tf-grid/contracts.ts b/packages/grid_client/src/clients/tf-grid/contracts.ts
index be5084abd1..fa9e9e3131 100644
--- a/packages/grid_client/src/clients/tf-grid/contracts.ts
+++ b/packages/grid_client/src/clients/tf-grid/contracts.ts
@@ -282,7 +282,11 @@ class TFContracts extends Contracts {
    * @returns {Promise<Consumption>} A promise resolving to the consumption details,
    * including the amount billed and the discount received.
    */
-  async getConsumption(options: GetConsumptionOptions): Promise<Consumption> {
+  async getConsumption(
+    options: GetConsumptionOptions,
+    contract: Contract,
+    proxy: GridProxyClient,
+  ): Promise<Consumption> {
     const gqlClient = new Graphql(options.graphqlURL);
     const body = `query getConsumption($contractId: BigInt!){
             contractBillReports(where: {contractID_eq: $contractId}, limit: 2 , orderBy: timestamp_DESC) {
@@ -304,9 +308,13 @@ class TFContracts extends Contracts {
       const response = await gqlClient.query(body, { contractId: options.id });
       const gqlConsumption: GqlConsumption = response["data"] as GqlConsumption;
       const billReports = gqlConsumption.contractBillReports;
+      const contractCostUSD = await this.getContractCost(contract, proxy);
+      // USD per month
+      const contractCostTFT = await this.convertToTFT(Decimal(contractCostUSD));
+
       if (billReports.length === 0) {
         return {
-          amountBilled: 0,
+          amountBilled: contractCostTFT.div(HOURS_ONE_MONTH).toNumber(),
           discountReceived: "None",
         };
       } else {
@@ -328,6 +336,7 @@ class TFContracts extends Contracts {
             }
           }
         }
+
         return {
           amountBilled: amountBilled
             .div(duration || 1)
diff --git a/packages/grid_client/src/modules/contracts.ts b/packages/grid_client/src/modules/contracts.ts
index ba53c00c0d..d221072cef 100644
--- a/packages/grid_client/src/modules/contracts.ts
+++ b/packages/grid_client/src/modules/contracts.ts
@@ -29,7 +29,6 @@ import { expose } from "../helpers/expose";
 import { validateInput } from "../helpers/validator";
 import { Nodes } from "../primitives/nodes";
 import { BaseModule } from "./base";
-import { currency } from "./currency";
 import {
   BatchCancelContractsModel,
   ContractCancelModel,
@@ -553,30 +552,14 @@ class Contracts {
   @expose
   @validateInput
   async getConsumption(options: ContractConsumption): Promise<Consumption> {
-    return this.client.contracts.getConsumption({ id: options.id, graphqlURL: this.config.graphqlURL });
-  }
-
-  /**
-   * Get the contract cost details per hour in TFT.
-   *
-   * @param  {number} contractId - The contract cost parameters.
-   * @returns {Promise<number>} A promise resolving to the cost details,
-   * @decorators
-   * - `@expose`: Exposes the method for external use.
-   */
-  @expose
-  async getContractCost(contractId: number): Promise<number> {
-    const HOURS_ONE_MONTH = 24 * 30;
     const proxy = new GridProxyClient(this.config.proxyURL);
+    const contractId = options.id;
     const contractInfo = (await proxy.contracts.list({ contractId })).data[0];
-    /** Cost in USD */
-    const contractMonthlyCost = await this.client.contracts.getContractCost(contractInfo, proxy);
-    /** Cost in TFT */
-    const tftPrice = (await this.client.tftPrice.get()) ?? 0;
-    const contractMonthlyCostTFT = Number(new currency(tftPrice, 15).convertUSDtoTFT({ amount: contractMonthlyCost }));
-    /** contract cost per hour in TFT */
-    const contractCost = contractMonthlyCostTFT / HOURS_ONE_MONTH;
-    return contractCost;
+    return this.client.contracts.getConsumption(
+      { id: options.id, graphqlURL: this.config.graphqlURL },
+      contractInfo,
+      proxy,
+    );
   }
 
   /**
diff --git a/packages/playground/src/components/contracts_list/contracts_table.vue b/packages/playground/src/components/contracts_list/contracts_table.vue
index 206ecd4b5b..4234adafcc 100644
--- a/packages/playground/src/components/contracts_list/contracts_table.vue
+++ b/packages/playground/src/components/contracts_list/contracts_table.vue
@@ -36,8 +36,8 @@
       </template>
 
       <template #[`item.consumption`]="{ item }">
-        <div v-if="item?.contractCost !== undefined" class="d-flex justify-center align-center">
-          <p class="mr-2 text-no-wrap" cols="8">{{ item.contractCost.toFixed(3) }} TFT/hour</p>
+        <div v-if="item?.consumption !== undefined" class="d-flex justify-center align-center">
+          <p class="mr-2 text-no-wrap" cols="8">{{ item.consumption?.toFixed(3) }} TFT/hour</p>
 
           <v-tooltip v-if="item.discountPackage !== 'None'" bottom color="primary" close-delay="100" cols="2">
             <template #activator="{ props: discountProps }">
diff --git a/packages/playground/src/utils/contracts.ts b/packages/playground/src/utils/contracts.ts
index f601fb3fce..a4e473bf26 100644
--- a/packages/playground/src/utils/contracts.ts
+++ b/packages/playground/src/utils/contracts.ts
@@ -60,16 +60,6 @@ export async function normalizeContract(
     consumption = { amountBilled: 0, discountReceived: "None" };
   }
 
-  let contractCost: number;
-  try {
-    contractCost = await grid.contracts.getContractCost(id);
-  } catch {
-    console.log("Error fetching contract cost");
-    contractCost = 0;
-  }
-
-  console.log("contractCost", contractCost, id);
-
   return {
     contract_id: id,
     twin_id: c.twin_id,
@@ -87,7 +77,6 @@ export async function normalizeContract(
     expiration,
     consumption: consumption.amountBilled,
     discountPackage: consumption.discountReceived,
-    contractCost: contractCost,
   };
 }
 
@@ -208,7 +197,6 @@ export interface NormalizedContract {
   deploymentType?: string;
   expiration?: string;
   discountPackage?: DiscountLevel;
-  contractCost?: number;
 }
 
 export enum ContractType {

From b43a00f23af4d1e5db91758a56311c46dbac8758 Mon Sep 17 00:00:00 2001
From: fatmaebrahim <fatmaebrahim3131@gmail.com>
Date: Thu, 17 Jul 2025 17:56:04 +0300
Subject: [PATCH 3/4] fix: kept '0 TFT' for zero consumptions

---
 packages/grid_client/src/clients/tf-grid/contracts.ts       | 6 ++----
 .../src/components/contracts_list/contracts_table.vue       | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/grid_client/src/clients/tf-grid/contracts.ts b/packages/grid_client/src/clients/tf-grid/contracts.ts
index fa9e9e3131..2399e317c6 100644
--- a/packages/grid_client/src/clients/tf-grid/contracts.ts
+++ b/packages/grid_client/src/clients/tf-grid/contracts.ts
@@ -308,11 +308,9 @@ class TFContracts extends Contracts {
       const response = await gqlClient.query(body, { contractId: options.id });
       const gqlConsumption: GqlConsumption = response["data"] as GqlConsumption;
       const billReports = gqlConsumption.contractBillReports;
-      const contractCostUSD = await this.getContractCost(contract, proxy);
-      // USD per month
-      const contractCostTFT = await this.convertToTFT(Decimal(contractCostUSD));
-
       if (billReports.length === 0) {
+        const contractCostUSD = await this.getContractCost(contract, proxy);
+        const contractCostTFT = await this.convertToTFT(Decimal(contractCostUSD));
         return {
           amountBilled: contractCostTFT.div(HOURS_ONE_MONTH).toNumber(),
           discountReceived: "None",
diff --git a/packages/playground/src/components/contracts_list/contracts_table.vue b/packages/playground/src/components/contracts_list/contracts_table.vue
index 4234adafcc..a14b0b9e0b 100644
--- a/packages/playground/src/components/contracts_list/contracts_table.vue
+++ b/packages/playground/src/components/contracts_list/contracts_table.vue
@@ -37,7 +37,9 @@
 
       <template #[`item.consumption`]="{ item }">
         <div v-if="item?.consumption !== undefined" class="d-flex justify-center align-center">
-          <p class="mr-2 text-no-wrap" cols="8">{{ item.consumption?.toFixed(3) }} TFT/hour</p>
+          <p class="mr-2 text-no-wrap" cols="8">
+            {{ item.consumption === 0 ? item.consumption : item.consumption.toFixed(3) }} TFT/hour
+          </p>
 
           <v-tooltip v-if="item.discountPackage !== 'None'" bottom color="primary" close-delay="100" cols="2">
             <template #activator="{ props: discountProps }">

From 5d3903115724e6c386f734b0b4438e0dded6591e Mon Sep 17 00:00:00 2001
From: fatmaebrahim <fatmaebrahim3131@gmail.com>
Date: Mon, 21 Jul 2025 13:50:25 +0300
Subject: [PATCH 4/4] refactor: used getcontractcostwithestimation function
 instead of getcontractcost

---
 .../src/clients/tf-grid/contracts.ts          | 41 +++++++++++++++----
 packages/grid_client/src/modules/contracts.ts | 21 ++++++++--
 packages/playground/src/utils/contracts.ts    |  4 +-
 3 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/packages/grid_client/src/clients/tf-grid/contracts.ts b/packages/grid_client/src/clients/tf-grid/contracts.ts
index 2399e317c6..fb40d29caa 100644
--- a/packages/grid_client/src/clients/tf-grid/contracts.ts
+++ b/packages/grid_client/src/clients/tf-grid/contracts.ts
@@ -110,6 +110,7 @@ export interface GetConsumptionOptions {
 export interface Consumption {
   amountBilled: number;
   discountReceived: DiscountLevel;
+  inFirstBillingCycle: boolean;
 }
 
 export interface GetDiscountPackageOptions {
@@ -282,11 +283,7 @@ class TFContracts extends Contracts {
    * @returns {Promise<Consumption>} A promise resolving to the consumption details,
    * including the amount billed and the discount received.
    */
-  async getConsumption(
-    options: GetConsumptionOptions,
-    contract: Contract,
-    proxy: GridProxyClient,
-  ): Promise<Consumption> {
+  async getConsumption(options: GetConsumptionOptions): Promise<Consumption> {
     const gqlClient = new Graphql(options.graphqlURL);
     const body = `query getConsumption($contractId: BigInt!){
             contractBillReports(where: {contractID_eq: $contractId}, limit: 2 , orderBy: timestamp_DESC) {
@@ -309,11 +306,10 @@ class TFContracts extends Contracts {
       const gqlConsumption: GqlConsumption = response["data"] as GqlConsumption;
       const billReports = gqlConsumption.contractBillReports;
       if (billReports.length === 0) {
-        const contractCostUSD = await this.getContractCost(contract, proxy);
-        const contractCostTFT = await this.convertToTFT(Decimal(contractCostUSD));
         return {
-          amountBilled: contractCostTFT.div(HOURS_ONE_MONTH).toNumber(),
+          amountBilled: 0,
           discountReceived: "None",
+          inFirstBillingCycle: true,
         };
       } else {
         let duration = 1;
@@ -334,15 +330,42 @@ class TFContracts extends Contracts {
             }
           }
         }
-
         return {
           amountBilled: amountBilled
             .div(duration || 1)
             .div(10 ** 7)
             .toNumber(),
           discountReceived: billReports[0].discountReceived,
+          inFirstBillingCycle: false,
+        };
+      }
+    } catch (err) {
+      (err as Error).message = formatErrorMessage(`Error getting consumption for contract ${options.id}.`, err);
+      throw err;
+    }
+  }
+
+  /**
+   *  Get the estimated contract consumption details per hour in TFT.
+   *
+   * @param  {GetConsumptionOptions} options
+   * @returns {Promise<Consumption>} A promise resolving to the consumption details,
+   * including the amount billed and the discount received.
+   */
+  async getConsumptionWithEstimation(options: GetConsumptionOptions, proxy: GridProxyClient): Promise<Consumption> {
+    try {
+      const consumption = await this.getConsumption(options);
+      if (consumption.inFirstBillingCycle) {
+        const contract = (await proxy.contracts.list({ contractId: options.id }))[0];
+        const contractCostUSD = await this.getContractCost(contract, proxy);
+        const contractCostTFT = await this.convertToTFT(Decimal(contractCostUSD));
+        return {
+          amountBilled: contractCostTFT.div(HOURS_ONE_MONTH).toNumber(),
+          discountReceived: "None",
+          inFirstBillingCycle: true,
         };
       }
+      return consumption;
     } catch (err) {
       (err as Error).message = formatErrorMessage(`Error getting consumption for contract ${options.id}.`, err);
       throw err;
diff --git a/packages/grid_client/src/modules/contracts.ts b/packages/grid_client/src/modules/contracts.ts
index d221072cef..cfdc8996cd 100644
--- a/packages/grid_client/src/modules/contracts.ts
+++ b/packages/grid_client/src/modules/contracts.ts
@@ -552,12 +552,25 @@ class Contracts {
   @expose
   @validateInput
   async getConsumption(options: ContractConsumption): Promise<Consumption> {
+    return this.client.contracts.getConsumption({ id: options.id, graphqlURL: this.config.graphqlURL });
+  }
+
+  /**
+   * Get the estimated contract consumption details per hour in TFT.
+   *
+   * @param  {ContractConsumption} options - The contract consumption parameters.
+   * @returns {Promise<Consumption>} A promise resolving to the consumption details,
+   * including the amount billed and the discount received.
+   * @decorators
+   * - `@expose`: Exposes the method for external use.
+   * - `@validateInput`: Validates the input options.
+   */
+  @expose
+  @validateInput
+  async getConsumptionWithEstimation(options: ContractConsumption): Promise<Consumption> {
     const proxy = new GridProxyClient(this.config.proxyURL);
-    const contractId = options.id;
-    const contractInfo = (await proxy.contracts.list({ contractId })).data[0];
-    return this.client.contracts.getConsumption(
+    return this.client.contracts.getConsumptionWithEstimation(
       { id: options.id, graphqlURL: this.config.graphqlURL },
-      contractInfo,
       proxy,
     );
   }
diff --git a/packages/playground/src/utils/contracts.ts b/packages/playground/src/utils/contracts.ts
index a4e473bf26..5cbe60b076 100644
--- a/packages/playground/src/utils/contracts.ts
+++ b/packages/playground/src/utils/contracts.ts
@@ -55,9 +55,9 @@ export async function normalizeContract(
 
   let consumption: Consumption;
   try {
-    consumption = await grid.contracts.getConsumption({ id });
+    consumption = await grid.contracts.getConsumptionWithEstimation({ id });
   } catch {
-    consumption = { amountBilled: 0, discountReceived: "None" };
+    consumption = { amountBilled: 0, discountReceived: "None", inFirstBillingCycle: false };
   }
 
   return {