diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 0a02fdd2b6..39dd1033c0 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -2515,9 +2515,8 @@
"transactionCreated": {
"message": "Transaction created with a value of $1 at $2."
},
- "transactionDetailDappGasHeading": {
- "message": "$1 suggested gas fee",
- "description": "$1 represents a dapp origin"
+ "transactionDetailDappGasMoreInfo": {
+ "message": "Site suggested"
},
"transactionDetailDappGasTooltip": {
"message": "Edit to use MetaMask's recommended gas fee based on the latest block."
diff --git a/ui/components/ui/typography/typography.js b/ui/components/ui/typography/typography.js
index ab3203dddf..0b528d1917 100644
--- a/ui/components/ui/typography/typography.js
+++ b/ui/components/ui/typography/typography.js
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
import {
COLORS,
FONT_WEIGHT,
+ FONT_STYLE,
TEXT_ALIGN,
TYPOGRAPHY,
} from '../../../helpers/constants/design-system';
@@ -18,6 +19,7 @@ export default function Typography({
tag,
children,
fontWeight = 'normal',
+ fontStyle = 'normal',
align,
boxProps = {},
}) {
@@ -26,6 +28,7 @@ export default function Typography({
className,
`typography--${variant}`,
`typography--weight-${fontWeight}`,
+ `typography--style-${fontStyle}`,
{
[`typography--align-${align}`]: Boolean(align),
[`typography--color-${color}`]: Boolean(color),
@@ -61,6 +64,7 @@ Typography.propTypes = {
...Box.propTypes,
}),
fontWeight: PropTypes.oneOf(Object.values(FONT_WEIGHT)),
+ fontStyle: PropTypes.oneOf(Object.values(FONT_STYLE)),
tag: PropTypes.oneOf([
'p',
'h1',
@@ -73,5 +77,6 @@ Typography.propTypes = {
'div',
'dt',
'dd',
+ 'i',
]),
};
diff --git a/ui/components/ui/typography/typography.scss b/ui/components/ui/typography/typography.scss
index 50a2ec622a..612bfc1cc1 100644
--- a/ui/components/ui/typography/typography.scss
+++ b/ui/components/ui/typography/typography.scss
@@ -26,6 +26,12 @@
}
}
+ @each $style in design-system.$font-style {
+ &--style-#{$style} {
+ font-style: $style;
+ }
+ }
+
@each $alignment in design-system.$text-align {
&--align-#{$alignment} {
text-align: $alignment;
diff --git a/ui/css/design-system/attributes.scss b/ui/css/design-system/attributes.scss
index 72fdcb51fd..d2836769bc 100644
--- a/ui/css/design-system/attributes.scss
+++ b/ui/css/design-system/attributes.scss
@@ -70,3 +70,4 @@ $directions: top, right, bottom, left;
$display: block, grid, flex, inline-block, inline-grid, inline-flex, list-item;
$text-align: left, right, center, justify, end;
$font-weight: bold, normal, 100, 200, 300, 400, 500, 600, 700, 800, 900;
+$font-style: normal, italic, oblique;
diff --git a/ui/helpers/constants/design-system.js b/ui/helpers/constants/design-system.js
index 38e85f779d..9716b55676 100644
--- a/ui/helpers/constants/design-system.js
+++ b/ui/helpers/constants/design-system.js
@@ -10,6 +10,7 @@ export const COLORS = {
UI3: 'ui-3',
UI4: 'ui-4',
BLACK: 'black',
+ GRAY: 'gray',
WHITE: 'white',
PRIMARY1: 'primary-1',
PRIMARY2: 'primary-2',
@@ -156,6 +157,12 @@ export const FONT_WEIGHT = {
900: 900,
};
+export const FONT_STYLE = {
+ ITALIC: 'italic',
+ NORMAL: 'normal',
+ OBLIQUE: 'oblique',
+};
+
export const SEVERITIES = {
DANGER: 'danger',
WARNING: 'warning',
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
index 59de281d3c..8f6751c4af 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -9,7 +9,6 @@ import {
hexToDecimal,
hexWEIToDecGWEI,
} from '../../helpers/utils/conversions.util';
-import { getURLHostName } from '../../helpers/utils/util';
import {
CONFIRM_TRANSACTION_ROUTE,
DEFAULT_ROUTE,
@@ -37,7 +36,11 @@ import InfoTooltip from '../../components/ui/info-tooltip/info-tooltip';
import LoadingHeartBeat from '../../components/ui/loading-heartbeat';
import GasTiming from '../../components/app/gas-timing/gas-timing.component';
-import { COLORS } from '../../helpers/constants/design-system';
+import {
+ COLORS,
+ FONT_STYLE,
+ TYPOGRAPHY,
+} from '../../helpers/constants/design-system';
import {
disconnectGasFeeEstimatePoller,
getGasFeeEstimatesAndStartPolling,
@@ -45,6 +48,8 @@ import {
removePollingTokenFromAppState,
} from '../../store/actions';
+import Typography from '../../components/ui/typography/typography';
+
const renderHeartBeatIfNotInTest = () =>
process.env.IN_TEST === 'true' ? null :