Skip to content

Commit 89263ea

Browse files
committed
Type fixes for confirm-transaction slice selectors
1 parent 689dc40 commit 89263ea

File tree

4 files changed

+240
-183
lines changed

4 files changed

+240
-183
lines changed

shared/modules/Numeric.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,8 @@ export class Numeric {
420420
* @param invert - if true, inverts the rate
421421
* @returns New Numeric value with conversion rate applied.
422422
*/
423-
applyConversionRate(rate?: number | BigNumber, invert?: boolean) {
424-
if (typeof rate === 'undefined') {
423+
applyConversionRate(rate?: number | BigNumber | null, invert?: boolean) {
424+
if (typeof rate === 'undefined' || rate === null) {
425425
return this;
426426
}
427427

shared/modules/conversion.utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function getWeiHexFromDecimalValue({
6868
invertConversionRate = false,
6969
}: {
7070
value: NumericValue;
71-
conversionRate?: number;
71+
conversionRate?: number | null;
7272
fromDenomination?: EtherDenomination;
7373
fromCurrency?: string;
7474
invertConversionRate?: boolean;
@@ -97,7 +97,7 @@ export function getEthConversionFromWeiHex({
9797
numberOfDecimals = 6,
9898
}: {
9999
value: NumericValue;
100-
conversionRate?: number;
100+
conversionRate?: number | null;
101101
fromCurrency?: EtherDenomination | string;
102102
numberOfDecimals?: number;
103103
}) {
@@ -139,7 +139,7 @@ export function getValueFromWeiHex({
139139
value: NumericValue;
140140
fromCurrency?: EtherDenomination | string;
141141
toCurrency?: EtherDenomination | string;
142-
conversionRate?: number;
142+
conversionRate?: number | null;
143143
numberOfDecimals?: number;
144144
toDenomination?: EtherDenomination;
145145
}) {

ui/helpers/utils/confirm-tx.util.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export function getTransactionFee({
3636
numberOfDecimals,
3737
}: {
3838
value: string;
39-
fromCurrency: EtherDenomination;
39+
fromCurrency: EtherDenomination | string;
4040
toCurrency: string;
41-
conversionRate: number;
41+
conversionRate: number | null;
4242
numberOfDecimals: number;
4343
}): string {
4444
let fee = new Numeric(value, 16, EtherDenomination.WEI)

0 commit comments

Comments
 (0)