Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinistevam
vinistevam committed Feb 15, 2024
1 parent ef79d2a commit 4491d22
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 29 deletions.
13 changes: 11 additions & 2 deletions ...omponents/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,21 @@ import { useGasFeeContext } from '../../../../../contexts/gasFee';
import { useAdvancedGasFeePopoverContext } from '../context';
import { useI18nContext } from '../../../../../hooks/useI18nContext';
import { Checkbox, Box } from '../../../../../components/component-library';
import { Numeric } from '../../../../../../shared/modules/Numeric';

const AdvancedGasFeeDefaults = () => {
const t = useI18nContext();
const dispatch = useDispatch();
const { gasErrors, maxBaseFee, maxPriorityFeePerGas } =
useAdvancedGasFeePopoverContext();
const {
gasErrors,
maxBaseFee: maxBaseFeeNumber,
maxPriorityFeePerGas: maxPriorityFeePerGasNumber,
} = useAdvancedGasFeePopoverContext();
const maxBaseFee = new Numeric(maxBaseFeeNumber, 10).toString();
const maxPriorityFeePerGas = new Numeric(
maxPriorityFeePerGasNumber,
10,
).toString();
const advancedGasFeeValues = useSelector(getAdvancedGasFeeValues);
// This will need to use a different chainId in multinetwork
const chainId = useSelector(getCurrentChainId);
Expand Down
14 changes: 6 additions & 8 deletions ...ponents/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ import {
PriorityLevels,
} from '../../../../../../../shared/constants/gas';
import { PRIMARY } from '../../../../../../helpers/constants/common';
import {
bnGreaterThan,
bnLessThan,
} from '../../../../../../helpers/utils/util';
import { getAdvancedGasFeeValues } from '../../../../../../selectors';
import { useGasFeeContext } from '../../../../../../contexts/gasFee';
import { useI18nContext } from '../../../../../../hooks/useI18nContext';
Expand All @@ -22,22 +18,24 @@ import FormField from '../../../../../../components/ui/form-field';
import { useAdvancedGasFeePopoverContext } from '../../context';
import AdvancedGasFeeInputSubtext from '../../advanced-gas-fee-input-subtext';
import { decGWEIToHexWEI } from '../../../../../../../shared/modules/conversion.utils';
import { Numeric } from '../../../../../../../shared/modules/Numeric';

const validateBaseFee = (value, gasFeeEstimates, maxPriorityFeePerGas) => {
if (bnGreaterThan(maxPriorityFeePerGas, value)) {
const baseFeeValue = new Numeric(value, 10);
if (new Numeric(maxPriorityFeePerGas, 10).greaterThan(baseFeeValue)) {
return 'editGasMaxBaseFeeGWEIImbalance';
}
if (
gasFeeEstimates?.low &&
bnLessThan(value, gasFeeEstimates.low.suggestedMaxFeePerGas)
baseFeeValue.lessThan(gasFeeEstimates.low.suggestedMaxFeePerGas, 10)
) {
return 'editGasMaxBaseFeeLow';
}
if (
gasFeeEstimates?.high &&
bnGreaterThan(
value,
baseFeeValue.greaterThan(
gasFeeEstimates.high.suggestedMaxFeePerGas * HIGH_FEE_WARNING_MULTIPLIER,
10,
)
) {
return 'editGasMaxBaseFeeHigh';
Expand Down
35 changes: 32 additions & 3 deletions ...ts/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import { AdvancedGasFeePopoverContextProvider } from '../../context';
import AdvancedGasFeeGasLimit from '../../advanced-gas-fee-gas-limit';
import BaseFeeInput from './base-fee-input';

const LOW_BASE_FEE = 0.000000001;

jest.mock('../../../../../../store/actions', () => ({
disconnectGasFeeEstimatePoller: jest.fn(),
getGasFeeEstimatesAndStartPolling: jest
Expand Down Expand Up @@ -91,6 +93,32 @@ describe('BaseFeeInput', () => {
expect(document.getElementsByTagName('input')[0]).toHaveValue(200);
});

describe('renders baseFee if current estimate used is custom', () => {
const testCases = [
{
description: 'with a high value',
maxFeePerGas: '0x2E90EDD000',
expectedValue: 200,
},
{
description: 'with a low value',
maxFeePerGas: '0x1',
expectedValue: LOW_BASE_FEE,
},
];

it.each(testCases)('$description', ({ maxFeePerGas, expectedValue }) => {
render({
txParams: {
maxFeePerGas,
},
});
expect(document.getElementsByTagName('input')[0]).toHaveValue(
expectedValue,
);
});
});

it('should show current value of estimatedBaseFee in users primary currency in right side of input box', () => {
render({
txParams: {
Expand Down Expand Up @@ -157,13 +185,14 @@ describe('BaseFeeInput', () => {

expect(input.value).toBe('1');
});
it('handles small numbers', () => {

it('handles low numbers', () => {
const { getByTestId } = render(<BaseFeeInput />);
const input = getByTestId('base-fee-input');

fireEvent.change(input, { target: { value: 0.0000000001 } });
fireEvent.change(input, { target: { value: LOW_BASE_FEE } });

expect(input.value).toBe('0.0000000001');
expect(input.value).toBe('1e-9');
});
});
});
17 changes: 9 additions & 8 deletions ...advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,32 @@ import { useI18nContext } from '../../../../../../hooks/useI18nContext';
import { useUserPreferencedCurrency } from '../../../../../../hooks/useUserPreferencedCurrency';
import FormField from '../../../../../../components/ui/form-field';
import Box from '../../../../../../components/ui/box';
import {
bnGreaterThan,
bnLessThan,
} from '../../../../../../helpers/utils/util';

import { useAdvancedGasFeePopoverContext } from '../../context';
import AdvancedGasFeeInputSubtext from '../../advanced-gas-fee-input-subtext';
import { decGWEIToHexWEI } from '../../../../../../../shared/modules/conversion.utils';
import { Numeric } from '../../../../../../../shared/modules/Numeric';

const validatePriorityFee = (value, gasFeeEstimates) => {
if (value < 0) {
const priorityFeeValue = new Numeric(value, 10);
if (priorityFeeValue.lessThan(0, 10)) {
return 'editGasMaxPriorityFeeBelowMinimumV2';
}
if (
gasFeeEstimates?.low &&
bnLessThan(value, gasFeeEstimates.low.suggestedMaxPriorityFeePerGas)
priorityFeeValue.lessThan(
gasFeeEstimates.low.suggestedMaxPriorityFeePerGas,
10,
)
) {
return 'editGasMaxPriorityFeeLowV2';
}
if (
gasFeeEstimates?.high &&
bnGreaterThan(
value,
priorityFeeValue.greaterThan(
gasFeeEstimates.high.suggestedMaxPriorityFeePerGas *
HIGH_FEE_WARNING_MULTIPLIER,
10,
)
) {
return 'editGasMaxPriorityFeeHighV2';
Expand Down
39 changes: 31 additions & 8 deletions ...ced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import AdvancedGasFeeGasLimit from '../../advanced-gas-fee-gas-limit';
import { CHAIN_IDS } from '../../../../../../../shared/constants/network';
import PriorityfeeInput from './priority-fee-input';

const LOW_PRIORITY_FEE = 0.000000001;

jest.mock('../../../../../../store/actions', () => ({
disconnectGasFeeEstimatePoller: jest.fn(),
getGasFeeEstimatesAndStartPolling: jest
Expand Down Expand Up @@ -83,13 +85,33 @@ describe('PriorityfeeInput', () => {
);
});

it('should renders priorityfee value from transaction if current estimate used is custom', () => {
render({
txParams: {
describe('renders priorityFee if current estimate used is custom', () => {
const testCases = [
{
description: 'with a high value',
maxPriorityFeePerGas: '0x77359400',
expectedValue: 2,
},
});
expect(document.getElementsByTagName('input')[0]).toHaveValue(2);
{
description: 'with a low value',
maxPriorityFeePerGas: '0x1',
expectedValue: LOW_PRIORITY_FEE,
},
];

it.each(testCases)(
'$description',
({ maxPriorityFeePerGas, expectedValue }) => {
render({
txParams: {
maxPriorityFeePerGas,
},
});
expect(document.getElementsByTagName('input')[0]).toHaveValue(
expectedValue,
);
},
);
});

it('should show current priority fee range in subtext', () => {
Expand Down Expand Up @@ -149,13 +171,14 @@ describe('PriorityfeeInput', () => {

expect(input.value).toBe('1');
});
it('handles small numbers', () => {

it('handles low numbers', () => {
const { getByTestId } = render(<PriorityfeeInput />);
const input = getByTestId('priority-fee-input');

fireEvent.change(input, { target: { value: 0.0000000001 } });
fireEvent.change(input, { target: { value: LOW_PRIORITY_FEE } });

expect(input.value).toBe('0.0000000001');
expect(input.value).toBe('1e-9');
});
});
});

0 comments on commit 4491d22

Please sign in to comment.