m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

EIP-1559 - Don't hide advanced form when radio button is chosen (#11643)

Browse Source
This commit is contained in:
David Walsh 2021-07-29 10:14:48 -05:00 committed by GitHub
parent 6d1fb911dc
commit 0849738003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ui/components/app/edit-gas-display/edit-gas-display.component.js
View File

@ -60,8 +60,6 @@ export default function EditGasDisplay({
}) {
const t = useContext(I18nContext);
const alwaysShowForm = !estimateToUse || hasGasErrors || false;
const dappSuggestedAndTxParamGasFeesAreTheSame = areDappSuggestedAndTxParamGasFeesTheSame(
transaction,
);
@ -178,7 +176,7 @@ export default function EditGasDisplay({
onChange={setEstimateToUse}
/>
)}
{!alwaysShowForm && !requireDappAcknowledgement && (
{!requireDappAcknowledgement && (
<button
className="edit-gas-display__advanced-button"
onClick={() => setShowAdvancedForm(!showAdvancedForm)}
@ -191,27 +189,26 @@ export default function EditGasDisplay({
)}
</button>
)}
{!requireDappAcknowledgement &&
(alwaysShowForm || showAdvancedForm) && (
<AdvancedGasControls
gasFeeEstimates={gasFeeEstimates}
gasEstimateType={gasEstimateType}
estimateToUse={estimateToUse}
isGasEstimatesLoading={isGasEstimatesLoading}
gasLimit={gasLimit}
setGasLimit={setGasLimit}
maxPriorityFee={maxPriorityFeePerGas}
setMaxPriorityFee={setMaxPriorityFeePerGas}
maxFee={maxFeePerGas}
setMaxFee={setMaxFeePerGas}
gasPrice={gasPrice}
setGasPrice={setGasPrice}
maxPriorityFeeFiat={maxPriorityFeePerGasFiat}
maxFeeFiat={maxFeePerGasFiat}
gasErrors={gasErrors}
onManualChange={onManualChange}
/>
)}
{!requireDappAcknowledgement && showAdvancedForm && (
<AdvancedGasControls
gasFeeEstimates={gasFeeEstimates}
gasEstimateType={gasEstimateType}
estimateToUse={estimateToUse}
isGasEstimatesLoading={isGasEstimatesLoading}
gasLimit={gasLimit}
setGasLimit={setGasLimit}
maxPriorityFee={maxPriorityFeePerGas}
setMaxPriorityFee={setMaxPriorityFeePerGas}
maxFee={maxFeePerGas}
setMaxFee={setMaxFeePerGas}
gasPrice={gasPrice}
setGasPrice={setGasPrice}
maxPriorityFeeFiat={maxPriorityFeePerGasFiat}
maxFeeFiat={maxFeePerGasFiat}
gasErrors={gasErrors}
onManualChange={onManualChange}
/>
)}
</div>
{!requireDappAcknowledgement && showEducationButton && (
<div className="edit-gas-display__education">

5
ui/components/app/edit-gas-popover/edit-gas-popover.component.js
View File

@ -51,7 +51,6 @@ export default function EditGasPopover({
const [warning] = useState(null);
const [showAdvancedForm, setShowAdvancedForm] = useState(false);
const [
dappSuggestedGasFeeAcknowledged,
setDappSuggestedGasFeeAcknowledged,
@ -81,6 +80,10 @@ export default function EditGasPopover({
onManualChange,
} = useGasFeeInputs(defaultEstimateToUse, transaction);
const [showAdvancedForm, setShowAdvancedForm] = useState(
!estimateToUse || hasGasErrors,
);
/**
* Temporary placeholder, this should be managed by the parent component but
* we will be extracting this component from the hard to maintain modal/