Merge remote-tracking branch 'upstream/develop' into minimal

ui/pages/swaps/import-token/import-token.js

@@ -5,10 +5,10 @@ import UrlIcon from '../../../components/ui/url-icon';
 import Popover from '../../../components/ui/popover';
 import Button from '../../../components/ui/button';
 import Box from '../../../components/ui/box';
-import Typography from '../../../components/ui/typography';
+import { Text } from '../../../components/component-library';
 import ActionableMessage from '../../../components/ui/actionable-message/actionable-message';
 import {
-  TypographyVariant,
+  TextVariant,
   FONT_WEIGHT,
   AlignItems,
   DISPLAY,
@@ -62,21 +62,26 @@ export default function ImportToken({
           fallbackClassName="import-token__token-icon"
           name={tokenForImport.symbol}
         />
-        <Typography
-          ariant={TypographyVariant.H4}
+        <Text
+          variant={TextVariant.headingSm}
+          as="h4"
           fontWeight={FONT_WEIGHT.BOLD}
-          boxProps={{ marginTop: 2, marginBottom: 3 }}
+          marginTop={2}
+          marginBottom={3}
         >
           {tokenForImport.name || ''}
-        </Typography>
-        <Typography variant={TypographyVariant.H6}>{t('contract')}:</Typography>
-        <Typography
+        </Text>
+        <Text variant={TextVariant.bodySm} as="h6">
+          {t('contract')}:
+        </Text>
+        <Text
+          variant={TextVariant.bodySm}
           className="import-token__contract-address"
-          variant={TypographyVariant.H7}
-          boxProps={{ marginBottom: 6 }}
+          as="h6"
+          marginBottom={6}
         >
           {tokenForImport.address || ''}
-        </Typography>
+        </Text>
       </Box>
     </Popover>
   );

ui/pages/swaps/import-token/index.scss

@@ -14,6 +14,7 @@
     border-radius: 8px;
     background-color: var(--color-background-alternative);
     padding: 5px 10px;
+    font-size: 0.75rem;
   }
 
   &__token-icon {

yarn.lock

@@ -34616,14 +34616,14 @@ __metadata:
   linkType: hard
 
 "vm2@npm:^3.9.3":
-  version: 3.9.11
-  resolution: "vm2@npm:3.9.11"
+  version: 3.9.15
+  resolution: "vm2@npm:3.9.15"
   dependencies:
     acorn: ^8.7.0
     acorn-walk: ^8.2.0
   bin:
     vm2: bin/vm2
-  checksum: aab39e6e4b59146d24abacd79f490e854a6e058a8b23d93d2be5aca7720778e2605d2cc028ccc4a5f50d3d91b0c38be9a6247a80d2da1a6de09425cc437770b4
+  checksum: 1df70d5a88173651c0062901aba67e5edfeeb3f699fe6c305f5efb6a5a7391e5724cbf98a6516600b65016c6824dc07cc79947ea4222f8537ae1d9ce0b730ad7
   languageName: node
   linkType: hard