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

fixing merge issues

Browse Source
This commit is contained in:
Alex 2021-09-17 09:19:20 -05:00
parent 6fb6a8e35a
commit 4e08c24552
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
View File

@ -36,10 +36,10 @@ import InfoTooltip from '../../components/ui/info-tooltip/info-tooltip';
import LoadingHeartBeat from '../../components/ui/loading-heartbeat'; import LoadingHeartBeat from '../../components/ui/loading-heartbeat';
import GasTiming from '../../components/app/gas-timing/gas-timing.component'; import GasTiming from '../../components/app/gas-timing/gas-timing.component';
import Dialog from '../../components/ui/dialog'; import Dialog from '../../components/ui/dialog';
import Typography from '../../components/ui/typography/typography';
import { import {
COLORS, COLORS,
FONT_STYLE,
FONT_WEIGHT, FONT_WEIGHT,
TYPOGRAPHY, TYPOGRAPHY,
} from '../../helpers/constants/design-system'; } from '../../helpers/constants/design-system';
@ -303,7 +303,6 @@ export default class ConfirmTransactionBase extends Component {
primaryTotalTextOverrideMaxAmount, primaryTotalTextOverrideMaxAmount,
maxFeePerGas, maxFeePerGas,
maxPriorityFeePerGas, maxPriorityFeePerGas,
isMainnet,
isLedgerAccount, isLedgerAccount,
isFirefox, isFirefox,
} = this.props; } = this.props;