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.

Sign up for GitHub

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

Part of #17670: Replace Typography with Text component in cancel-speedup-popover.js #18948

Merged
merged 4 commits into from
May 3, 2023
Merged

Part of #17670: Replace Typography with Text component in cancel-speedup-popover.js #18948

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
651c44b
Fixes the cancel-speedup-popover.js
dhruvv173 May 2, 2023
5356c73
Merge branch 'develop' of github.com:dhruvv173/metamask-extension int…
dhruvv173 May 2, 2023
0c58889
Merge branch 'MetaMask:develop' into develop
dhruvv173 May 2, 2023
4537084
Merge branch 'develop' into develop
DDDDDanica May 3, 2023
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
15 changes: 8 additions & 7 deletions ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { useSelector } from 'react-redux';
import React, { useEffect } from 'react';

import { Text } from '../../component-library';
import { EditGasModes, PriorityLevels } from '../../../../shared/constants/gas';
import {
AlignItems,
DISPLAY,
FLEX_DIRECTION,
TypographyVariant,
TextVariant,
} from '../../../helpers/constants/design-system';
import { getAppIsLoading } from '../../../selectors';
import { gasEstimateGreaterThanGasUsedPlusTenPercent } from '../../../helpers/utils/gas';
Expand All @@ -19,7 +19,6 @@ import Box from '../../ui/box';
import Button from '../../ui/button';
import InfoTooltip from '../../ui/info-tooltip';
import Popover from '../../ui/popover';
import Typography from '../../ui/typography';
import AppLoadingSpinner from '../app-loading-spinner';

const CancelSpeedupPopover = () => {
Expand Down Expand Up @@ -97,9 +96,11 @@ const CancelSpeedupPopover = () => {
>
<AppLoadingSpinner className="cancel-speedup-popover__spinner" />
<div className="cancel-speedup-popover__wrapper">
<Typography
boxProps={{ alignItems: AlignItems.center, display: DISPLAY.FLEX }}
variant={TypographyVariant.H6}
<Text
alignItems={AlignItems.center}
display={DISPLAY.FLEX}
variant={TextVariant.bodySm}
as="h6"
marginTop={0}
marginBottom={2}
>
Expand Down Expand Up @@ -127,7 +128,7 @@ const CancelSpeedupPopover = () => {
</Box>
}
/>
</Typography>
</Text>
<div className="cancel-speedup-popover__separator" />
<Box
display={DISPLAY.FLEX}
Expand Down