Type fixes for confirm-transaction slice selectors

MetaMask · Jan 7, 2025 · 89263ea · 89263ea
1 parent 689dc40
commit 89263ea
Show file tree

Hide file tree

Showing 4 changed files with 240 additions and 183 deletions.
diff --git a/shared/modules/Numeric.ts b/shared/modules/Numeric.ts
@@ -420,8 +420,8 @@ export class Numeric {
    * @param invert - if true, inverts the rate
    * @returns New Numeric value with conversion rate applied.
    */
-  applyConversionRate(rate?: number | BigNumber, invert?: boolean) {
-    if (typeof rate === 'undefined') {
+  applyConversionRate(rate?: number | BigNumber | null, invert?: boolean) {
+    if (typeof rate === 'undefined' || rate === null) {
       return this;
     }
 

diff --git a/shared/modules/conversion.utils.ts b/shared/modules/conversion.utils.ts
@@ -68,7 +68,7 @@ export function getWeiHexFromDecimalValue({
   invertConversionRate = false,
 }: {
   value: NumericValue;
-  conversionRate?: number;
+  conversionRate?: number | null;
   fromDenomination?: EtherDenomination;
   fromCurrency?: string;
   invertConversionRate?: boolean;
@@ -97,7 +97,7 @@ export function getEthConversionFromWeiHex({
   numberOfDecimals = 6,
 }: {
   value: NumericValue;
-  conversionRate?: number;
+  conversionRate?: number | null;
   fromCurrency?: EtherDenomination | string;
   numberOfDecimals?: number;
 }) {
@@ -139,7 +139,7 @@ export function getValueFromWeiHex({
   value: NumericValue;
   fromCurrency?: EtherDenomination | string;
   toCurrency?: EtherDenomination | string;
-  conversionRate?: number;
+  conversionRate?: number | null;
   numberOfDecimals?: number;
   toDenomination?: EtherDenomination;
 }) {

diff --git a/ui/helpers/utils/confirm-tx.util.ts b/ui/helpers/utils/confirm-tx.util.ts
@@ -36,9 +36,9 @@ export function getTransactionFee({
   numberOfDecimals,
 }: {
   value: string;
-  fromCurrency: EtherDenomination;
+  fromCurrency: EtherDenomination | string;
   toCurrency: string;
-  conversionRate: number;
+  conversionRate: number | null;
   numberOfDecimals: number;
 }): string {
   let fee = new Numeric(value, 16, EtherDenomination.WEI)