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 - Only show advanced form toggle when radio buttons are present (#11713)

Browse Source
This commit is contained in:
David Walsh 2021-08-01 08:09:53 -05:00 committed by GitHub
parent 219b0f9bd6
commit 81f274303e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,11 @@ export default function EditGasDisplay({
const networkSupports1559 = useSelector(isEIP1559Network); const networkSupports1559 = useSelector(isEIP1559Network);
const showTopError = balanceError; const showTopError = balanceError;
const showRadioButtons =
networkSupports1559 &&
!requireDappAcknowledgement &&
![EDIT_GAS_MODES.SPEED_UP, EDIT_GAS_MODES.CANCEL].includes(mode);
let errorKey; let errorKey;
if (balanceError) { if (balanceError) {
errorKey = 'insufficientFunds'; errorKey = 'insufficientFunds';
@ -163,35 +168,32 @@ export default function EditGasDisplay({
{t('gasDisplayAcknowledgeDappButtonText')} {t('gasDisplayAcknowledgeDappButtonText')}
</Button> </Button>
)} )}
{networkSupports1559 && {showRadioButtons && (
!requireDappAcknowledgement && <RadioGroup
![EDIT_GAS_MODES.SPEED_UP, EDIT_GAS_MODES.CANCEL].includes(mode) && ( name="gas-recommendation"
<RadioGroup options={[
name="gas-recommendation" {
options={[ value: GAS_RECOMMENDATIONS.LOW,
{ label: t('editGasLow'),
value: GAS_RECOMMENDATIONS.LOW, recommended: defaultEstimateToUse === GAS_RECOMMENDATIONS.LOW,
label: t('editGasLow'), },
recommended: defaultEstimateToUse === GAS_RECOMMENDATIONS.LOW, {
}, value: GAS_RECOMMENDATIONS.MEDIUM,
{ label: t('editGasMedium'),
value: GAS_RECOMMENDATIONS.MEDIUM, recommended:
label: t('editGasMedium'), defaultEstimateToUse === GAS_RECOMMENDATIONS.MEDIUM,
recommended: },
defaultEstimateToUse === GAS_RECOMMENDATIONS.MEDIUM, {
}, value: GAS_RECOMMENDATIONS.HIGH,
{ label: t('editGasHigh'),
value: GAS_RECOMMENDATIONS.HIGH, recommended: defaultEstimateToUse === GAS_RECOMMENDATIONS.HIGH,
label: t('editGasHigh'), },
recommended: ]}
defaultEstimateToUse === GAS_RECOMMENDATIONS.HIGH, selectedValue={estimateToUse}
}, onChange={setEstimateToUse}
]} />
selectedValue={estimateToUse} )}
onChange={setEstimateToUse} {!requireDappAcknowledgement && showRadioButtons && (
/>
)}
{!requireDappAcknowledgement && (
<button <button
className="edit-gas-display__advanced-button" className="edit-gas-display__advanced-button"
onClick={() => setShowAdvancedForm(!showAdvancedForm)} onClick={() => setShowAdvancedForm(!showAdvancedForm)}