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 #18714: Replacing deprecated constants #19858

Merged
merged 2 commits into from
Jul 12, 2023
Merged

Part of #18714: Replacing deprecated constants #19858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74b2f5c
Replacing deprecated constants
dhruvv173 Jul 1, 2023
69f09f1
Merge branch 'develop' into replacing-constants
dhruvv173 Jul 4, 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
13 changes: 5 additions & 8 deletions ui/components/app/detected-token/detected-token-aggregators/detected-token-aggregators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ import PropTypes from 'prop-types';

import { useI18nContext } from '../../../../hooks/useI18nContext';

import Box from '../../../ui/box';
import Button from '../../../ui/button';
import {
DISPLAY,
Display,
FontWeight,
TextVariant,
} from '../../../../helpers/constants/design-system';
import { Text } from '../../../component-library';
import { Text, Box, ButtonLink } from '../../../component-library';

const NUMBER_OF_AGGREGATORS_TO_DISPLAY = 2;

Expand All @@ -21,7 +19,7 @@ const DetectedTokenAggregators = ({ aggregators }) => {
const [displayMore, setDisplayMore] = useState(false);

return (
<Box display={DISPLAY.INLINE_FLEX} className="detected-token-aggregators">
<Box display={Display.InlineFlex} className="detected-token-aggregators">
<Text variant={TextVariant.bodySm} as="h6" fontWeight={FontWeight.Normal}>
{t('fromTokenLists', [
numOfHiddenAggregators > 0 && !displayMore ? (
Expand All @@ -34,14 +32,13 @@ const DetectedTokenAggregators = ({ aggregators }) => {
{`${aggregators
.slice(0, NUMBER_OF_AGGREGATORS_TO_DISPLAY)
.join(', ')}`}
<Button
type="link"
<ButtonLink
className="detected-token-aggregators__link"
onClick={() => setDisplayMore(true)}
key="detected-token-aggrgators-link"
>
{t('plusXMore', [numOfHiddenAggregators])}
</Button>
</ButtonLink>
</Text>
) : (
<Text
Expand Down
6 changes: 3 additions & 3 deletions ...nents/app/detected-token/detected-token-aggregators/detected-token-aggregators.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { DISPLAY } from '../../../../helpers/constants/design-system';
import { Display } from '../../../../helpers/constants/design-system';

import Box from '../../../ui/box';
import { Box } from '../../../component-library';
import DetectedTokenAggregators from './detected-token-aggregators';

export default {
Expand Down Expand Up @@ -31,7 +31,7 @@ export default {

const Template = (args) => {
return (
<Box display={DISPLAY.GRID}>
<Box display={Display.Grid}>
<DetectedTokenAggregators aggregators={args.aggregators1} />
<DetectedTokenAggregators aggregators={args.aggregators2} />
</Box>
Expand Down
8 changes: 4 additions & 4 deletions ui/components/app/detected-token/detected-token-details/detected-token-details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import React from 'react';
import PropTypes from 'prop-types';
import { useSelector } from 'react-redux';

import Box from '../../../ui/box';
import { Box } from '../../../component-library';
import Identicon from '../../../ui/identicon';
import DetectedTokenValues from '../detected-token-values/detected-token-values';
import DetectedTokenAddress from '../detected-token-address/detected-token-address';
import DetectedTokenAggregators from '../detected-token-aggregators/detected-token-aggregators';
import { DISPLAY } from '../../../../helpers/constants/design-system';
import { Display } from '../../../../helpers/constants/design-system';
import { getTokenList } from '../../../../selectors';

const DetectedTokenDetails = ({
Expand All @@ -20,7 +20,7 @@ const DetectedTokenDetails = ({

return (
<Box
display={DISPLAY.FLEX}
display={Display.Flex}
className="detected-token-details"
marginBottom={4}
>
Expand All @@ -30,7 +30,7 @@ const DetectedTokenDetails = ({
diameter={40}
/>
<Box
display={DISPLAY.GRID}
display={Display.Grid}
marginLeft={2}
className="detected-token-details__data"
>
Expand Down
2 changes: 1 addition & 1 deletion ui/components/app/detected-token/detected-token-details/detected-token-details.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default {

argTypes: {
token: { control: 'object' },
handleTokenSelection: { control: 'func' },
handleTokenSelection: { action: 'handleTokenSelection' },
tokensListDetected: { control: 'array' },
},
args: {
Expand Down
7 changes: 3 additions & 4 deletions ui/components/app/detected-token/detected-token-values/detected-token-values.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@ import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import { useSelector } from 'react-redux';

import Box from '../../../ui/box';
import CheckBox from '../../../ui/check-box';

import {
DISPLAY,
Display,
TextColor,
TextVariant,
} from '../../../../helpers/constants/design-system';
import { useTokenTracker } from '../../../../hooks/useTokenTracker';
import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount';
import { getUseCurrencyRateCheck } from '../../../../selectors';
import { Text } from '../../../component-library';
import { Text, Box } from '../../../component-library';

const DetectedTokenValues = ({
token,
Expand Down Expand Up @@ -44,7 +43,7 @@ const DetectedTokenValues = ({
};

return (
<Box display={DISPLAY.INLINE_FLEX} className="detected-token-values">
<Box display={Display.InlineFlex} className="detected-token-values">
<Box marginBottom={1}>
<Text variant={TextVariant.bodyLgMedium} as="h4">
{`${balanceString || '0'} ${token.symbol}`}
Expand Down