Fix Chainport tokens schema validation (#222)

* Fix chainport tokens schema

* Use formatCurrency for receiving amount formatting

* Save

* Simplify CurrencyUtils.render

* Remove added newline

* Wrap operands in BigInt for decimal calculation

Author: dgca

renderer/components/BridgeAssetsForm/BridgeConfirmationModal/BridgeConfirmationModal.tsx

@@ -162,19 +162,17 @@ export function BridgeConfirmationModal({
       BigInt(txDetails.bridge_output.amount) -
       BigInt(txDetails.bridge_fee.source_token_fee_amount ?? 0);
 
-    const convertedAmount = CurrencyUtils.render(
+    const convertedAmount = CurrencyUtils.formatCurrency(
       bridgeAmount,
-      selectedAsset.asset.id,
-      selectedAsset.asset.verification,
+      chainportToken.decimals,
     );
 
     return convertedAmount + " " + chainportToken.symbol;
   }, [
-    selectedAsset.asset.id,
-    selectedAsset.asset.verification,
+    isTransactionDetailsLoading,
     txDetails,
+    chainportToken.decimals,
     chainportToken.symbol,
-    isTransactionDetailsLoading,
   ]);
 
   const chainportGasFee = useMemo(() => {
@@ -191,12 +189,9 @@ export function BridgeConfirmationModal({
     }
 
     if (txDetails.bridge_fee.is_portx_fee_payment) {
-      const fee = CurrencyUtils.render(
-        BigInt(txDetails.bridge_fee.portx_fee_amount),
-        undefined,
-        {
-          decimals: 18,
-        },
+      const fee = CurrencyUtils.formatCurrency(
+        txDetails.bridge_fee.portx_fee_amount,
+        18,
       );
       return `${fee} PORTX`;
     }

renderer/utils/currency.ts

@@ -61,34 +61,6 @@ export class CurrencyUtils {
     }
   }
 
-  /**
-   * Renders a value in a minor denomination as the major denomination:
-   * - $IRON is always going to have 8 decimal places.
-   * - If a custom asset, and `decimals` is provided, it will give the value
-   * followed by a digit for each decimal place
-   * - If a custom asset, and `decimals` is not provided, it will assume the
-   * value is already in minor denomination with no decimal places
-   *
-   * Examples:
-   * 100000000 = 1 $IRON
-   * A custom asset with 2 decimal places: 100 = 1
-   * A custom asset with no decimal places: 1 = 1
-   */
-  static minorToMajor(
-    amount: bigint,
-    assetId?: string,
-    verifiedAssetMetadata?: {
-      decimals?: number;
-    },
-  ): { value: bigint; decimals: number } {
-    const { decimals } = this.assetMetadataWithDefaults(
-      assetId,
-      verifiedAssetMetadata,
-    );
-
-    return DecimalUtils.normalize({ value: amount, decimals: -decimals });
-  }
-
   /**
    * Renders values for human-readable purposes:
    * - Renders $IRON in the major denomination, with 8 decimal places
@@ -104,13 +76,46 @@ export class CurrencyUtils {
       decimals?: number;
     },
   ): string {
-    const { value: majorValue, decimals: majorDecimals } = this.minorToMajor(
-      BigInt(amount),
+    const { decimals } = this.assetMetadataWithDefaults(
       assetId,
       verifiedAssetMetadata,
     );
 
-    return DecimalUtils.render(majorValue, majorDecimals);
+    return this.formatCurrency(amount, decimals);
+  }
+
+  /**
+   * Formats a value in the minor denomination as a human-readable currency value with the
+   * specified number of decimal places.
+   *
+   * Min precision is the minimum number of decimal places to include.
+   */
+  static formatCurrency(
+    value: bigint | number | string,
+    decimals: number,
+    minPrecision: number = 0,
+  ): string {
+    const asBigInt = BigInt(value);
+
+    if (asBigInt < 0) {
+      return `-${this.formatCurrency(
+        asBigInt * BigInt(-1),
+        decimals,
+        minPrecision,
+      )}`;
+    }
+
+    const decimalsBigInt = BigInt(10) ** BigInt(decimals);
+
+    const major = asBigInt / decimalsBigInt;
+    const remainder = asBigInt % decimalsBigInt;
+    const remainderString = remainder
+      .toString()
+      .padStart(decimals, "0")
+      .replace(/0+$/, "")
+      .padEnd(minPrecision, "0");
+
+    return remainderString ? `${major}.${remainderString}` : major.toString();
   }
 
   static shortSymbol(

renderer/utils/decimalUtils.ts

@@ -3,52 +3,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 export class DecimalUtils {
-  /**
-   * Render `value * 10 ^ decimals` as a string. `minPrecision` tells how \
-   * many decimal places to pad the string with. \
-   * e.g. 1 * 10 ^ 0 => '1' \
-   *      1 * 10 ^ 0 with 2 min precision => '1.00' \
-   */
-  static render(
-    value: bigint | number,
-    decimals: number,
-    minPrecision: number = 0,
-  ): string {
-    const normalized = this.normalize({ value: BigInt(value), decimals });
-    value = normalized.value;
-    decimals = normalized.decimals;
-
-    if (value < 0) {
-      return `-${this.render(value * -1n, decimals, minPrecision)}`;
-    }
-
-    if (decimals < 0) {
-      let decimalPos = value.toString().length;
-      let stringValue = value.toString();
-      for (let i = 0; i < -decimals; i++) {
-        if (decimalPos === 0) {
-          stringValue = `0${stringValue}`;
-        } else {
-          decimalPos--;
-        }
-      }
-
-      if (decimalPos === 0) {
-        return `0.${stringValue.padEnd(minPrecision, "0")}`;
-      }
-
-      return `${stringValue.slice(0, decimalPos)}.${stringValue
-        .slice(decimalPos)
-        .padEnd(minPrecision, "0")}`;
-    }
-
-    const wholeString = (value * 10n ** BigInt(decimals)).toString();
-    const decimalString =
-      minPrecision > 0 ? `.${"".padEnd(minPrecision, "0")}` : "";
-
-    return `${wholeString}${decimalString}`;
-  }
-
   /**
    * Decode a string into a bigint and the number of decimal places \
    * e.g. '1' => { value: 1n, decimals: 0 } \

shared/chainport.ts

@@ -34,7 +34,7 @@ const MetadataApiResponseSchema = z.object({
       chainport_network_id: z.number(),
       shortname: z.string(),
       name: z.string(),
-      utils_contract: z.union([z.string(), z.null()]),
+      utils_contract: z.string().nullable(),
       chain_id: z.number().nullable(),
       label: z.string(),
       blockchain_type: z.string(),
@@ -95,7 +95,7 @@ const TokensApiResponseSchema = z.object({
       symbol: z.string(),
       token_image: z.string(),
       target_networks: z.array(z.number()),
-      chain_id: z.null(),
+      chain_id: z.number().nullable(),
       network_name: z.string(),
       network_id: z.number(),
       blockchain_type: z.string(),