diff --git a/test/e2e/tests/edit-gas-fee.spec.js b/test/e2e/tests/edit-gas-fee.spec.js index 368cc712b..ced967300 100644 --- a/test/e2e/tests/edit-gas-fee.spec.js +++ b/test/e2e/tests/edit-gas-fee.spec.js @@ -123,10 +123,10 @@ describe('Editing Confirm Transaction', function () { await driver.clickElement('[data-testid="edit-gas-fee-item-custom"]'); // enter max fee - await driver.fill('[data-testid="base-fee-input"]', '8'); + await driver.fill('[data-testid="base-fee-input"]', '8.5'); // enter priority fee - await driver.fill('[data-testid="priority-fee-input"]', '8'); + await driver.fill('[data-testid="priority-fee-input"]', '8.5'); // save default values await driver.clickElement('input[type="checkbox"]'); @@ -141,11 +141,11 @@ describe('Editing Confirm Transaction', function () { // has correct updated value on the confirm screen the transaction await driver.waitForSelector({ css: '.transaction-detail-item:nth-of-type(1) h6:nth-of-type(2)', - text: '0.0008 ETH', + text: '0.00085 ETH', }); await driver.waitForSelector({ css: '.transaction-detail-item:nth-of-type(2) h6:nth-of-type(2)', - text: '2.2008 ETH', + text: '2.20085 ETH', }); // confirms the transaction diff --git a/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js b/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js index ce7d4463f..f045c33af 100644 --- a/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js +++ b/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js @@ -71,6 +71,7 @@ export default function AdvancedGasControls({ value={maxPriorityFee} detailText={maxPriorityFeeFiat} numeric + allowDecimals error={ gasErrors?.maxPriorityFee ? getGasFormErrorText(gasErrors.maxPriorityFee, t) @@ -87,6 +88,7 @@ export default function AdvancedGasControls({ }} value={maxFee} numeric + allowDecimals detailText={maxFeeFiat} error={ gasErrors?.maxFee @@ -107,6 +109,7 @@ export default function AdvancedGasControls({ tooltipText={t('editGasPriceTooltip')} value={gasPrice} numeric + allowDecimals error={ gasErrors?.gasPrice ? getGasFormErrorText(gasErrors.gasPrice, t) diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js index 40963467a..de6b2f4a4 100644 --- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js +++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js @@ -51,6 +51,7 @@ const AdvancedGasFeeGasLimit = () => { onChange={updateGasLimit} titleText={t('gasLimitV2')} value={gasLimit} + allowDecimals={false} numeric /> ); diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js index 3b897d737..d7a7a282e 100644 --- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js +++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js @@ -118,6 +118,7 @@ const BaseFeeInput = () => { tooltipText={t('advancedBaseGasFeeToolTip')} value={baseFee} detailText={`≈ ${baseFeeInPrimaryCurrency}`} + allowDecimals numeric /> { tooltipText={t('advancedPriorityFeeToolTip')} value={priorityFee} detailText={`≈ ${priorityFeeInPrimaryCurrency}`} + allowDecimals numeric /> } titleDetailWrapperProps={{ marginBottom: 2, marginRight: 0 }} + allowDecimals />