Merge branch 'develop' into feat/mmassets-432_network-filter-extension

Author: gambinish

app/scripts/metamask-controller.js

@@ -156,7 +156,6 @@ import {
   NotificationServicesPushController,
   NotificationServicesController,
 } from '@metamask/notification-services-controller';
-import { isProduction } from '../../shared/modules/environment';
 import { methodsRequiringNetworkSwitch } from '../../shared/constants/methods-tags';
 
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
@@ -1559,7 +1558,7 @@ export default class MetamaskController extends EventEmitter {
         },
       },
       env: {
-        isAccountSyncingEnabled: !isProduction() && isManifestV3,
+        isAccountSyncingEnabled: isManifestV3,
       },
       messenger: this.controllerMessenger.getRestricted({
         name: 'UserStorageController',

ui/components/component-library/sensitive-text/README.md

@@ -0,0 +1,81 @@
+import { Controls, Canvas } from '@storybook/blocks';
+
+import * as SensitiveTextStories from './sensitive-text.stories';
+
+# SensitiveText
+
+SensitiveText is a component that extends the Text component to handle sensitive information. It provides the ability to hide or show the text content, replacing it with dots when hidden.
+
+<Canvas of={SensitiveTextStories.DefaultStory} />
+
+## Props
+
+The `SensitiveText` component extends the `Text` component. See the `Text` component for an extended list of props.
+
+<Controls of={SensitiveTextStories.DefaultStory} />
+
+### Children
+
+The text content to be displayed or hidden.
+
+<Canvas of={SensitiveTextStories.Children} />
+
+```jsx
+import { SensitiveText } from '../../component-library';
+
+<SensitiveText>
+  Sensitive Information
+</SensitiveText>
+```
+
+
+### IsHidden
+
+Use the `isHidden` prop to determine whether the text should be hidden or visible. When `isHidden` is `true`, the component will display dots instead of the actual text.
+
+<Canvas of={SensitiveTextStories.IsHidden} />
+
+```jsx
+import { SensitiveText } from '../../component-library';
+
+<SensitiveText isHidden>
+  Sensitive Information
+</SensitiveText>
+```
+
+### Length
+
+Use the `length` prop to determine the length of the hidden text (number of dots). Can be a predefined `SensitiveTextLength` or a custom string number.
+
+The following predefined length options are available:
+
+- `SensitiveTextLength.Short`: `6`
+- `SensitiveTextLength.Medium`: `9`
+- `SensitiveTextLength.Long`: `12`
+- `SensitiveTextLength.ExtraLong`: `20`
+
+- The number of dots displayed is determined by the `length` prop.
+- If an invalid `length` is provided, the component will fall back to `SensitiveTextLength.Short` and log a warning.
+- Custom length values can be provided as strings, e.g. `15`.
+
+<Canvas of={SensitiveTextStories.Length} />
+
+```jsx
+import { SensitiveText, SensitiveTextLength } from '../../component-library';
+
+<SensitiveText length={SensitiveTextLength.Short}>
+  Length "short" (6 characters)
+</SensitiveText>
+<SensitiveText length={SensitiveTextLength.Medium}>
+  Length "medium" (9 characters)
+</SensitiveText>
+<SensitiveText length={SensitiveTextLength.Long}>
+  Length "long" (12 characters)
+</SensitiveText>
+<SensitiveText length={SensitiveTextLength.ExtraLong}>
+  Length "extra long" (20 characters)
+</SensitiveText>
+<SensitiveText length="15">
+  Length "15" (15 characters)
+</SensitiveText>
+```

ui/components/component-library/sensitive-text/README.mdx

@@ -1,39 +1,58 @@
-import { StoryFn, Meta } from '@storybook/react';
+import type { Meta, StoryObj } from '@storybook/react';
 import React from 'react';
 import { SensitiveText } from '.';
 import { SensitiveTextLength } from './sensitive-text.types';
+import README from './README.mdx';
 import { Box } from '../box';
 import {
   Display,
   FlexDirection,
 } from '../../../helpers/constants/design-system';
 
-export default {
+const meta: Meta<typeof SensitiveText> = {
   title: 'Components/ComponentLibrary/SensitiveText',
   component: SensitiveText,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
   args: {
     children: 'Sensitive information',
     isHidden: false,
     length: SensitiveTextLength.Short,
   },
 } as Meta<typeof SensitiveText>;
 
-const Template: StoryFn<typeof SensitiveText> = (args) => {
-  return <SensitiveText {...args} />;
-};
+export default meta;
+type Story = StoryObj<typeof SensitiveText>;
 
-export const DefaultStory = Template.bind({});
+export const DefaultStory: Story = {};
 DefaultStory.storyName = 'Default';
 
-export const HiddenText: StoryFn<typeof SensitiveText> = (args) => {
-  return <SensitiveText {...args} />;
+export const Children: Story = {
+  args: {
+    children: 'Sensitive information',
+  },
+  render: (args) => (
+    <SensitiveText {...args} />
+  ),
 };
-HiddenText.args = {
-  isHidden: true,
+
+export const IsHidden: Story = {
+  args: {
+    isHidden: true,
+  },
+  render: (args) => (
+    <SensitiveText {...args} />
+  ),
 };
 
-export const LengthVariants: StoryFn<typeof SensitiveText> = (args) => {
-  return (
+export const Length: Story = {
+  args: {
+    isHidden: true,
+  },
+  render: (args) => (
     <Box display={Display.Flex} flexDirection={FlexDirection.Column} gap={2}>
       <SensitiveText {...args} length={SensitiveTextLength.Short}>
         Length "short" (6 characters)
@@ -47,9 +66,9 @@ export const LengthVariants: StoryFn<typeof SensitiveText> = (args) => {
       <SensitiveText {...args} length={SensitiveTextLength.ExtraLong}>
         Length "extra long" (20 characters)
       </SensitiveText>
+      <SensitiveText {...args} length="15">
+        Length "15" (15 characters)
+      </SensitiveText>
     </Box>
-  );
-};
-LengthVariants.args = {
-  isHidden: true,
+  ),
 };