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

Jump to bottom

Part of #18714: Replacing deprecated constants with enums #19516

Merged
merged 3 commits into from
Jun 20, 2023
Merged

Part of #18714: Replacing deprecated constants with enums #19516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8ace5c
replacing deprecated constants with enums
dhruvv173 Jun 8, 2023
6068c64
Removing redundant properties
dhruvv173 Jun 8, 2023
f96f3e5
Merge branch 'develop' into issue/18714
dhruvv173 Jun 9, 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
9 changes: 4 additions & 5 deletions ...nents/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { EditGasModes } from '../../../../../shared/constants/gas';
import Box from '../../../ui/box';
import CheckBox from '../../../ui/check-box';
import {
DISPLAY,
FLEX_DIRECTION,
Display,
FlexDirection,
TextColor,
TextVariant,
} from '../../../../helpers/constants/design-system';
Expand Down Expand Up @@ -72,8 +72,8 @@ const AdvancedGasFeeDefaults = () => {

return (
<Box
display={DISPLAY.FLEX}
flexDirection={FLEX_DIRECTION.ROW}
display={Display.Flex}
flexDirection={FlexDirection.Row}
marginTop={4}
marginLeft={2}
marginRight={2}
Expand All @@ -90,7 +90,6 @@ const AdvancedGasFeeDefaults = () => {
variant={TextVariant.bodySm}
as="h6"
color={TextColor.textAlternative}
margin={0}
>
{isDefaultSettingsSelected
? t('advancedGasFeeDefaultOptOut')
Expand Down
33 changes: 15 additions & 18 deletions ui/components/app/modals/contract-details-modal/contract-details-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Popover from '../../../ui/popover';
import {
FontWeight,
TextVariant,
DISPLAY,
Display,
Size,
BorderStyle,
BorderColor,
Expand Down Expand Up @@ -65,17 +65,16 @@ export default function ContractDetailsModal({
fontWeight={FontWeight.Bold}
variant={TextVariant.bodyMd}
as="h5"
display={DISPLAY.FLEX}
boxProps={{ marginTop: 0, marginBottom: 0 }}
display={Display.Flex}
>
{t('contractTitle')}
</Text>
<Text
variant={TextVariant.bodySm}
as="h6"
display={DISPLAY.FLEX}
display={Display.Flex}
color={TextColor.textAlternative}
boxProps={{ marginTop: 2, marginBottom: 0 }}
marginTop={2}
>
{t('contractDescription')}
</Text>
Expand All @@ -84,14 +83,14 @@ export default function ContractDetailsModal({
<Text
variant={TextVariant.bodySm}
as="h6"
display={DISPLAY.FLEX}
display={Display.Flex}
marginTop={4}
marginBottom={2}
>
{nft ? t('contractNFT') : t('contractToken')}
</Text>
<Box
display={DISPLAY.FLEX}
display={Display.Flex}
borderRadius={Size.SM}
borderStyle={BorderStyle.solid}
borderColor={BorderColor.borderDefault}
Expand Down Expand Up @@ -124,9 +123,8 @@ export default function ContractDetailsModal({
<Text
variant={TextVariant.bodySm}
as="h6"
display={DISPLAY.FLEX}
display={Display.Flex}
color={TextColor.textAlternative}
marginTop={0}
marginBottom={4}
>
{ellipsify(tokenAddress)}
Expand All @@ -148,7 +146,7 @@ export default function ContractDetailsModal({
}
>
<ButtonIcon
display={DISPLAY.FLEX}
display={Display.Flex}
iconName={
copiedTokenAddress ? IconName.CopySuccess : IconName.Copy
}
Expand All @@ -163,7 +161,7 @@ export default function ContractDetailsModal({
</Tooltip>
<Tooltip position="top" title={t('openInBlockExplorer')}>
<ButtonIcon
display={DISPLAY.FLEX}
display={Display.Flex}
iconName={IconName.Export}
color={Color.iconMuted}
onClick={() => {
Expand All @@ -189,7 +187,7 @@ export default function ContractDetailsModal({
<Text
variant={TextVariant.bodySm}
as="h6"
display={DISPLAY.FLEX}
display={Display.Flex}
marginTop={4}
marginBottom={2}
>
Expand All @@ -200,7 +198,7 @@ export default function ContractDetailsModal({
t('contractRequestingSpendingCap')}
</Text>
<Box
display={DISPLAY.FLEX}
display={Display.Flex}
borderRadius={Size.SM}
borderStyle={BorderStyle.solid}
borderColor={BorderColor.borderDefault}
Expand All @@ -224,9 +222,8 @@ export default function ContractDetailsModal({
<Text
variant={TextVariant.bodySm}
as="h6"
display={DISPLAY.FLEX}
display={Display.Flex}
color={TextColor.textAlternative}
marginTop={0}
marginBottom={4}
>
{ellipsify(toAddress)}
Expand All @@ -246,7 +243,7 @@ export default function ContractDetailsModal({
}
>
<ButtonIcon
display={DISPLAY.FLEX}
display={Display.Flex}
iconName={
copiedToAddress ? IconName.CopySuccess : IconName.Copy
}
Expand All @@ -261,7 +258,7 @@ export default function ContractDetailsModal({
</Tooltip>
<Tooltip position="top" title={t('openInBlockExplorer')}>
<ButtonIcon
display={DISPLAY.FLEX}
display={Display.Flex}
iconName={IconName.Export}
color={Color.iconMuted}
onClick={() => {
Expand All @@ -284,7 +281,7 @@ export default function ContractDetailsModal({
</Box>
</Box>
<Box
display={DISPLAY.FLEX}
display={Display.Flex}
paddingTop={6}
paddingRight={4}
paddingBottom={6}
Expand Down
28 changes: 12 additions & 16 deletions ui/components/app/network-account-balance-header/network-account-balance-header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
import IconWithFallback from '../../ui/icon-with-fallback';
import Identicon from '../../ui/identicon';
import {
DISPLAY,
FLEX_DIRECTION,
Display,
FlexDirection,
TextVariant,
FontWeight,
AlignItems,
Expand Down Expand Up @@ -33,22 +33,22 @@ export default function NetworkAccountBalanceHeader({

return (
<Box
display={DISPLAY.FLEX}
flexDirection={FLEX_DIRECTION.ROW}
display={Display.Flex}
flexDirection={FlexDirection.Row}
padding={4}
className="network-account-balance-header"
alignItems={AlignItems.center}
justifyContent={JustifyContent.spaceBetween}
>
<Box
display={DISPLAY.FLEX}
flexDirection={FLEX_DIRECTION.ROW}
display={Display.Flex}
flexDirection={FlexDirection.Row}
alignItems={AlignItems.center}
gap={2}
>
<Box
display={DISPLAY.FLEX}
flexDirection={FLEX_DIRECTION.ROW}
display={Display.Flex}
flexDirection={FlexDirection.Row}
alignItems={AlignItems.center}
>
<Identicon address={accountAddress} diameter={32} />
Expand All @@ -60,15 +60,14 @@ export default function NetworkAccountBalanceHeader({
/>
</Box>
<Box
display={DISPLAY.FLEX}
display={Display.Flex}
alignItems={AlignItems.flexStart}
flexDirection={FLEX_DIRECTION.COLUMN}
flexDirection={FlexDirection.Column}
>
<Text
variant={TextVariant.bodySm}
as="h6"
color={TextColor.textAlternative}
marginBottom={0}
>
{networkName}
</Text>
Expand All @@ -78,22 +77,20 @@ export default function NetworkAccountBalanceHeader({
as="h6"
color={TextColor.textDefault}
fontWeight={FontWeight.Bold}
marginTop={0}
>
{accountName}
</Text>
</Box>
</Box>
<Box
display={DISPLAY.FLEX}
display={Display.Flex}
alignItems={AlignItems.flexEnd}
flexDirection={FLEX_DIRECTION.COLUMN}
flexDirection={FlexDirection.Column}
>
<Text
variant={TextVariant.bodySm}
as="h6"
color={TextColor.textAlternative}
marginBottom={0}
>
{t('balance')}
</Text>
Expand All @@ -103,7 +100,6 @@ export default function NetworkAccountBalanceHeader({
as="h6"
color={TextColor.textDefault}
fontWeight={FontWeight.Bold}
marginTop={0}
align={TextAlign.End}
>
{accountBalance} {tokenName}
Expand Down