Merge branch 'main' into refactor/core-metametrics-library-profile-sync

Author: fabiobozzo

app/component-library/components-temp/ListItemMultiSelectButton/ListItemMultiSelectButton.stories.tsx

@@ -65,7 +65,7 @@ export const ListItemWithButtonSelect = {
         <Icon name={IconName.Clock} />
       </ListItemColumn>
       <ListItemColumn widthType={WidthType.Fill}>
-        <Text numberOfLines={1} variant={TextVariant.HeadingSMRegular}>
+        <Text numberOfLines={1} variant={TextVariant.BodyMD}>
           {'Sample Title'}
         </Text>
         <Text variant={TextVariant.BodyMD}>{'Sample Description'}</Text>

app/component-library/components/Avatars/Avatar/Avatar.constants.ts

@@ -1,7 +1,6 @@
 /* eslint-disable import/prefer-default-export */
 // External dependencies.
 import { IconSize } from '../../Icons/Icon';
-import { TextVariant } from '../../Texts/Text';
 import { SAMPLE_AVATARACCOUNT_PROPS } from './variants/AvatarAccount/AvatarAccount.constants';
 
 // Internal dependencies.
@@ -10,7 +9,6 @@ import {
   AvatarSize,
   AvatarVariant,
   IconSizeByAvatarSize,
-  TextVariantByAvatarSize,
   BorderWidthByAvatarSize,
 } from './Avatar.types';
 
@@ -22,13 +20,6 @@ export const ICONSIZE_BY_AVATARSIZE: IconSizeByAvatarSize = {
   [AvatarSize.Lg]: IconSize.Lg,
   [AvatarSize.Xl]: IconSize.Xl,
 };
-export const TEXTVARIANT_BY_AVATARSIZE: TextVariantByAvatarSize = {
-  [AvatarSize.Xs]: TextVariant.BodyMD,
-  [AvatarSize.Sm]: TextVariant.BodyMD,
-  [AvatarSize.Md]: TextVariant.HeadingSMRegular,
-  [AvatarSize.Lg]: TextVariant.HeadingSMRegular,
-  [AvatarSize.Xl]: TextVariant.HeadingSMRegular,
-};
 
 export const BORDERWIDTH_BY_AVATARSIZE: BorderWidthByAvatarSize = {
   [AvatarSize.Xs]: 1.5,

app/component-library/components/Avatars/Avatar/Avatar.types.ts

@@ -1,6 +1,5 @@
 // External dependencies.
 import { IconSize } from '../../Icons/Icon';
-import { TextVariant } from '../../Texts/Text';
 
 // Internal dependencies.
 import { AvatarAccountProps } from './variants/AvatarAccount/AvatarAccount.types';
@@ -47,13 +46,6 @@ export type IconSizeByAvatarSize = {
   [key in AvatarSize]: IconSize;
 };
 
-/**
- * Mapping of TextVariant by AvatarSize.
- */
-export type TextVariantByAvatarSize = {
-  [key in AvatarSize]: TextVariant;
-};
-
 /**
  * Mapping of borderWidth by AvatarSize.
  */

app/component-library/components/Avatars/Avatar/variants/AvatarNetwork/AvatarNetwork.tsx

@@ -8,7 +8,6 @@ import { Image, ImageSourcePropType } from 'react-native';
 import AvatarBase from '../../foundation/AvatarBase';
 import Text from '../../../../Texts/Text';
 import { useStyles } from '../../../../../hooks';
-import { TEXTVARIANT_BY_AVATARSIZE } from '../../Avatar.constants';
 
 // Internal dependencies.
 import { AvatarNetworkProps } from './AvatarNetwork.types';
@@ -39,9 +38,7 @@ const AvatarNetwork = ({
   return (
     <AvatarBase size={size} style={styles.base} {...props}>
       {showFallback ? (
-        <Text style={styles.label} variant={TEXTVARIANT_BY_AVATARSIZE[size]}>
-          {chainNameFirstLetter}
-        </Text>
+        <Text style={styles.label}>{chainNameFirstLetter}</Text>
       ) : (
         <Image
           source={imageSource as ImageSourcePropType}

app/component-library/components/Avatars/Avatar/variants/AvatarToken/AvatarToken.tsx

@@ -9,7 +9,6 @@ import { isIPFSUri } from '../../../../../../util/general';
 import AvatarBase from '../../foundation/AvatarBase';
 import Text from '../../../../Texts/Text';
 import { useStyles } from '../../../../../hooks';
-import { TEXTVARIANT_BY_AVATARSIZE } from '../../Avatar.constants';
 
 // Internal dependencies.
 import { AvatarTokenProps } from './AvatarToken.types';
@@ -57,9 +56,7 @@ const AvatarToken = ({
   const tokenImage = () => (
     <AvatarBase size={size} style={styles.base} {...props}>
       {showFallback || isIpfsDisabledAndUriIsIpfs ? (
-        <Text style={styles.label} variant={TEXTVARIANT_BY_AVATARSIZE[size]}>
-          {tokenNameFirstLetter}
-        </Text>
+        <Text style={styles.label}>{tokenNameFirstLetter}</Text>
       ) : (
         <Image
           source={imageSource as ImageSourcePropType}

app/component-library/components/Cells/Cell/foundation/CellBase/CellBase.constants.ts

@@ -9,8 +9,7 @@ import { TextVariant } from '../../../../Texts/Text';
 
 // Defaults
 export const DEFAULT_CELLBASE_AVATAR_SIZE = AvatarSize.Md;
-export const DEFAULT_CELLBASE_AVATAR_TITLE_TEXTVARIANT =
-  TextVariant.HeadingSMRegular;
+export const DEFAULT_CELLBASE_AVATAR_TITLE_TEXTVARIANT = TextVariant.BodyMD;
 export const DEFAULT_CELLBASE_AVATAR_SECONDARYTEXT_TEXTVARIANT =
   TextVariant.BodyMD;
 export const DEFAULT_CELLBASE_AVATAR_TERTIARYTEXT_TEXTVARIANT =

app/component-library/components/List/ListItem/ListItem.stories.tsx

@@ -70,7 +70,7 @@ export const ListItem = {
         <Icon name={IconName.Clock} />
       </ListItemColumn>
       <ListItemColumn widthType={WidthType.Fill}>
-        <Text numberOfLines={1} variant={TextVariant.HeadingSMRegular}>
+        <Text numberOfLines={1} variant={TextVariant.BodyMD}>
           {'Sample Title'}
         </Text>
         <Text variant={TextVariant.BodyMD}>{'Sample Description'}</Text>

app/component-library/components/List/ListItemMultiSelect/ListItemMultiSelect.stories.tsx

@@ -35,7 +35,7 @@ export const ListItemMultiSelect = {
         <Icon name={IconName.Clock} />
       </ListItemColumn>
       <ListItemColumn widthType={WidthType.Fill}>
-        <Text numberOfLines={1} variant={TextVariant.HeadingSMRegular}>
+        <Text numberOfLines={1} variant={TextVariant.BodyMD}>
           {'Sample Title'}
         </Text>
         <Text variant={TextVariant.BodyMD}>{'Sample Description'}</Text>

app/component-library/components/List/ListItemSelect/ListItemSelect.stories.tsx

@@ -35,7 +35,7 @@ export const ListItemSelect = {
         <Icon name={IconName.Clock} />
       </ListItemColumn>
       <ListItemColumn widthType={WidthType.Fill}>
-        <Text numberOfLines={1} variant={TextVariant.HeadingSMRegular}>
+        <Text numberOfLines={1} variant={TextVariant.BodyMD}>
           {'Sample Title'}
         </Text>
         <Text variant={TextVariant.BodyMD}>{'Sample Description'}</Text>

app/component-library/components/Texts/Text/Text.types.ts

@@ -9,7 +9,6 @@ export enum TextVariant {
   DisplayMD = 'sDisplayMD',
   HeadingLG = 'sHeadingLG',
   HeadingMD = 'sHeadingMD',
-  HeadingSMRegular = 'sHeadingSMRegular',
   HeadingSM = 'sHeadingSM',
   BodyLGMedium = 'sBodyLGMedium',
   BodyMD = 'sBodyMD',