Part of #17670: Replace Typography with Text component #17766
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -6,7 +6,7 @@ import { | |||||||
| AlignItems, | ||||||||
| DISPLAY, | ||||||||
| FLEX_DIRECTION, | ||||||||
| TextVariant, | ||||||||
| } from '../../../helpers/constants/design-system'; | ||||||||
| import { getAppIsLoading } from '../../../selectors'; | ||||||||
| import { gasEstimateGreaterThanGasUsedPlusTenPercent } from '../../../helpers/utils/gas'; | ||||||||
|
|
@@ -19,8 +19,8 @@ import Box from '../../ui/box'; | |||||||
| import Button from '../../ui/button'; | ||||||||
| import InfoTooltip from '../../ui/info-tooltip'; | ||||||||
| import Popover from '../../ui/popover'; | ||||||||
| import AppLoadingSpinner from '../app-loading-spinner'; | ||||||||
| import { Text } from 'ui/components/component-library'; | ||||||||
|
|
||||||||
| const CancelSpeedupPopover = () => { | ||||||||
| const { | ||||||||
|
|
@@ -97,9 +97,9 @@ const CancelSpeedupPopover = () => { | |||||||
| > | ||||||||
| <AppLoadingSpinner className="cancel-speedup-popover__spinner" /> | ||||||||
| <div className="cancel-speedup-popover__wrapper"> | ||||||||
| <Text | ||||||||
| boxProps={{ alignItems: AlignItems.center, display: DISPLAY.FLEX }} | ||||||||
| variant={TextVariant.bodySm} | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
| marginTop={0} | ||||||||
| marginBottom={2} | ||||||||
| > | ||||||||
|
|
@@ -127,7 +127,7 @@ const CancelSpeedupPopover = () => { | |||||||
| </Box> | ||||||||
| } | ||||||||
| /> | ||||||||
| </Text> | ||||||||
| <div className="cancel-speedup-popover__separator" /> | ||||||||
| <Box | ||||||||
| display={DISPLAY.FLEX} | ||||||||
|
|
||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -7,11 +7,11 @@ import ActionableMessage from '../../../ui/actionable-message/actionable-message | |||||
| import { PageContainerFooter } from '../../../ui/page-container'; | ||||||
| import ErrorMessage from '../../../ui/error-message'; | ||||||
| import { INSUFFICIENT_FUNDS_ERROR_KEY } from '../../../../helpers/constants/error-keys'; | ||||||
| import { TextVariant} from '../../../../helpers/constants/design-system'; | ||||||
| import DepositPopover from '../../deposit-popover/deposit-popover'; | ||||||
|
|
||||||
| import { ConfirmPageContainerSummary, ConfirmPageContainerWarning } from '.'; | ||||||
| import { Text } from 'ui/components/component-library'; | ||||||
|
|
||||||
| export default class ConfirmPageContainerContent extends Component { | ||||||
| static contextTypes = { | ||||||
|
|
@@ -217,7 +217,7 @@ export default class ConfirmPageContainerContent extends Component { | |||||
| className="actionable-message--warning" | ||||||
| message={ | ||||||
| isBuyableChain ? ( | ||||||
| <Text variant={TextVariant.bodySm} align="left"> | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| {t('insufficientCurrencyBuyOrDeposit', [ | ||||||
| nativeCurrency, | ||||||
| networkName, | ||||||
|
|
@@ -232,14 +232,14 @@ export default class ConfirmPageContainerContent extends Component { | |||||
| {t('buyAsset', [nativeCurrency])} | ||||||
| </Button>, | ||||||
| ])} | ||||||
| </Text> | ||||||
| ) : ( | ||||||
| <Text variant={TextVariant.bodySm} align="left"> | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| {t('insufficientCurrencyDeposit', [ | ||||||
| nativeCurrency, | ||||||
| networkName, | ||||||
| ])} | ||||||
| </Text> | ||||||
| ) | ||||||
| } | ||||||
| useIcon | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,8 +20,7 @@ import EditGasFeePopover from '../edit-gas-fee-popover/edit-gas-fee-popover'; | |
| import EditGasPopover from '../edit-gas-popover'; | ||
| import ErrorMessage from '../../ui/error-message'; | ||
| import { INSUFFICIENT_FUNDS_ERROR_KEY } from '../../../helpers/constants/error-keys'; | ||
| import { TextVariant } from '../../../helpers/constants/design-system'; | ||
|
|
||
| import NetworkAccountBalanceHeader from '../network-account-balance-header/network-account-balance-header'; | ||
| import DepositPopover from '../deposit-popover/deposit-popover'; | ||
|
|
@@ -45,6 +44,7 @@ import { | |
| ConfirmPageContainerContent, | ||
| ConfirmPageContainerNavigation, | ||
| } from '.'; | ||
| import { Text } from 'ui/components/component-library'; | ||
|
|
||
| const ConfirmPageContainer = (props) => { | ||
| const { | ||
|
|
@@ -230,7 +230,7 @@ const ConfirmPageContainer = (props) => { | |
| <ActionableMessage | ||
| message={ | ||
| isBuyableChain ? ( | ||
| <Text variant={TextVariant.bodySm} align="left"> | ||
SawanKumarBhagat marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| {t('insufficientCurrencyBuyOrDeposit', [ | ||
| nativeCurrency, | ||
| networkName, | ||
|
|
@@ -243,14 +243,14 @@ const ConfirmPageContainer = (props) => { | |
| {t('buyAsset', [nativeCurrency])} | ||
| </Button>, | ||
| ])} | ||
| </Text> | ||
| ) : ( | ||
| <Text variant={TextVariant.bodySm} align="left"> | ||
SawanKumarBhagat marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| {t('insufficientCurrencyDeposit', [ | ||
| nativeCurrency, | ||
| networkName, | ||
| ])} | ||
| </Text> | ||
| ) | ||
| } | ||
| useIcon | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah oversight on my part we need to add html tags here so that some e2e tests pass. I've updated the description of the issue if you'd like to look.