Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Allow editing gas fees for spending limit transactions #1373

Merged
merged 1 commit into from
Dec 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/components/tx/AdvancedParams/AdvancedParamsForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,13 @@ const AdvancedParamsForm = ({ params, ...props }: AdvancedParamsFormProps) => {
<form onSubmit={onFormSubmit}>
<DialogContent>
<Grid container spacing={2}>
<Grid item xs={12}>
<Typography variant="body1" fontWeight={700}>
Safe transaction
</Typography>
</Grid>
{(params.nonce !== undefined || !!params.safeTxGas) && (
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added this condition so that the title is only shown if there is either a nonce or safeTxGas field

<Grid item xs={12}>
<Typography variant="body1" fontWeight={700}>
Safe transaction
</Typography>
</Grid>
)}

{/* Safe nonce */}
{params.nonce !== undefined && (
Expand Down
2 changes: 1 addition & 1 deletion src/components/tx/GasParams/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const GasParams = ({ params, isExecution, isEIP1559, onEdit, gasLimitError }: Ga
}

return (
<Accordion elevation={0} onChange={onChangeExpand} sx={nonce === undefined ? { pointerEvents: 'none' } : undefined}>
<Accordion elevation={0} onChange={onChangeExpand}>
<AccordionSummary>
{isExecution ? (
<Typography display="flex" alignItems="center" justifyContent="space-between" width={1}>
Expand Down