Merge branch 'creating/story/account-mismatch-warning' of github.com:…

…dhruvv173/metamask-extension into creating/story/account-mismatch-warning
MetaMask · Jun 6, 2023 · 20b878b · 20b878b
2 parents e884d30 + bfdd05f
commit 20b878b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/ui/components/app/add-network/add-network.js b/ui/components/app/add-network/add-network.js
@@ -6,8 +6,8 @@ import { I18nContext } from '../../../contexts/i18n';
 import Box from '../../ui/box';
 import {
   AlignItems,
-  DISPLAY,
-  FLEX_DIRECTION,
+  Display,
+  FlexDirection,
   TextVariant,
   JustifyContent,
   BorderRadius,
@@ -88,8 +88,8 @@ const AddNetwork = () => {
           marginTop={4}
           marginRight={6}
           marginLeft={6}
-          display={DISPLAY.FLEX}
-          flexDirection={FLEX_DIRECTION.ROW}
+          display={Display.Flex}
+          flexDirection={FlexDirection.Row}
           backgroundColor={BackgroundColor.backgroundAlternative}
         >
           <Box marginRight={4}>
@@ -135,9 +135,9 @@ const AddNetwork = () => {
         <Box className="add-network__networks-container">
           {getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN && (
             <Box
-              display={DISPLAY.FLEX}
+              display={Display.Flex}
               alignItems={AlignItems.center}
-              flexDirection={FLEX_DIRECTION.ROW}
+              flexDirection={FlexDirection.Row}
               marginTop={7}
               marginBottom={4}
               paddingBottom={2}
@@ -186,13 +186,13 @@ const AddNetwork = () => {
             {notExistingNetworkConfigurations.map((item, index) => (
               <Box
                 key={index}
-                display={DISPLAY.FLEX}
+                display={Display.Flex}
                 alignItems={AlignItems.center}
                 justifyContent={JustifyContent.spaceBetween}
                 marginBottom={6}
                 className="add-network__list-of-networks"
               >
-                <Box display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+                <Box display={Display.Flex} alignItems={AlignItems.center}>
                   <Box>
                     <IconBorder size={24}>
                       <IconWithFallback
@@ -213,7 +213,7 @@ const AddNetwork = () => {
                   </Box>
                 </Box>
                 <Box
-                  display={DISPLAY.FLEX}
+                  display={Display.Flex}
                   alignItems={AlignItems.center}
                   marginLeft={1}
                 >

diff --git a/ui/components/app/approve-content-card/approve-content-card.js b/ui/components/app/approve-content-card/approve-content-card.js
@@ -9,9 +9,9 @@ import EditGasFeeButton from '../edit-gas-fee-button/edit-gas-fee-button';
 import { Text } from '../../component-library';
 import {
   AlignItems,
-  BLOCK_SIZES,
-  DISPLAY,
-  FLEX_DIRECTION,
+  BlockSize,
+  Display,
+  FlexDirection,
   FontWeight,
   JustifyContent,
   TextAlign,
@@ -66,8 +66,8 @@ export default function ApproveContentCard({
     >
       {showHeader && (
         <Box
-          display={DISPLAY.FLEX}
-          flexDirection={FLEX_DIRECTION.ROW}
+          display={Display.Flex}
+          flexDirection={FlexDirection.Row}
           alignItems={AlignItems.center}
           justifyContent={JustifyContent.flexEnd}
           className="approve-content-card-container__card-header"
@@ -88,7 +88,7 @@ export default function ApproveContentCard({
             </>
           )}
           {showEdit && (!showAdvanceGasFeeOptions || !supportsEIP1559) && (
-            <Box width={BLOCK_SIZES.ONE_SIXTH}>
+            <Box width={BlockSize.OneSixth}>
               <Button type="link" onClick={() => onEditClick()}>
                 <Text
                   variant={TextVariant.bodySm}
@@ -124,14 +124,14 @@ export default function ApproveContentCard({
             />
           ) : (
             <Box
-              display={DISPLAY.FLEX}
-              flexDirection={FLEX_DIRECTION.ROW}
+              display={Display.Flex}
+              flexDirection={FlexDirection.Row}
               justifyContent={JustifyContent.spaceBetween}
             >
               {isMultiLayerFeeNetwork ? (
                 <Box
-                  display={DISPLAY.FLEX}
-                  flexDirection={FLEX_DIRECTION.COLUMN}
+                  display={Display.Flex}
+                  flexDirection={FlexDirection.Column}
                   className="approve-content-card-container__transaction-details-extra-content"
                 >
                   <TransactionDetailItem
@@ -174,8 +174,8 @@ export default function ApproveContentCard({
                     </Text>
                   </Box>
                   <Box
-                    display={DISPLAY.FLEX}
-                    flexDirection={FLEX_DIRECTION.COLUMN}
+                    display={Display.Flex}
+                    flexDirection={FlexDirection.Column}
                     alignItems={AlignItems.flexEnd}
                     textAlign={TextAlign.Right}
                   >
@@ -210,7 +210,7 @@ export default function ApproveContentCard({
             </Box>
           ))}
         {renderDataContent && (
-          <Box display={DISPLAY.FLEX} flexDirection={FLEX_DIRECTION.COLUMN}>
+          <Box display={Display.Flex} flexDirection={FlexDirection.Column}>
             <Box>
               <Text
                 variant={TextVariant.bodySm}