From 9f89d71c6f71d93e63e4aedc7287ff73db351d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Thu, 30 Mar 2023 11:40:37 +0100 Subject: [PATCH] [MMI] compliance settings component (#18274) * MMI-2657 adds the compliance settings screen * MMI-2657 adds stories file * review fixes * review fixes * lint fix * clean up * Update ui/components/institutional/compliance-settings/compliance-settings.stories.js Co-authored-by: Nidhi Kumari * lint fix * snaps update * Button update --------- Co-authored-by: Nidhi Kumari --- .../compliance-settings.test.js.snap | 32 +++--- .../compliance-settings.js | 102 ++++++++++-------- .../compliance-settings.stories.js | 7 +- .../compliance-settings/index.scss | 8 -- 4 files changed, 75 insertions(+), 74 deletions(-) diff --git a/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap b/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap index 946a5a7f5..a8e345f24 100644 --- a/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap +++ b/ui/components/institutional/compliance-settings/__snapshots__/compliance-settings.test.js.snap @@ -5,31 +5,27 @@ exports[`Compliance Settings shows disconnect when Compliance is activated 1`] =
-
Change your settings or view reports by opening up Codefi Compliance or disconnect below. -
-
+
+
`; @@ -42,6 +38,7 @@ exports[`Compliance Settings shows start btn when Compliance its not activated 1 >

-

-
+
diff --git a/ui/components/institutional/compliance-settings/compliance-settings.js b/ui/components/institutional/compliance-settings/compliance-settings.js index aca08e198..4289250c8 100644 --- a/ui/components/institutional/compliance-settings/compliance-settings.js +++ b/ui/components/institutional/compliance-settings/compliance-settings.js @@ -5,12 +5,19 @@ import { DISPLAY, TextColor, FLEX_DIRECTION, + TextVariant, + BorderStyle, + BorderColor, } from '../../../helpers/constants/design-system'; import { I18nContext } from '../../../contexts/i18n'; import { mmiActionsFactory } from '../../../store/institutional/institution-background'; -import { Text } from '../../component-library'; +import { + Text, + Button, + BUTTON_TYPES, + BUTTON_SIZES, +} from '../../component-library'; import Box from '../../ui/box'; -import Button from '../../ui/button'; const ComplianceSettings = () => { const t = useContext(I18nContext); @@ -21,48 +28,48 @@ const ComplianceSettings = () => { Boolean(state.metamask.institutionalFeatures?.complianceProjectId), ); - const disconnectFromCompliance = async () => { - await dispatch(mmiActions.deleteComplianceAuthData()); - }; - - const renderDisconnect = () => { - return ( - - ); - }; - - const renderLinkButton = () => { - return ( - - ); - }; + const linkButton = ( + + ); return complianceActivated ? ( - + {t('complianceSettingsExplanation')} + + + + {linkButton} -
- {renderDisconnect()} - {renderLinkButton()} -
) : ( { color={TextColor.textAlternative} data-testid="institutional-content" > - + {t('complianceBlurb0')} {t('complianceBlurb1')} {t('complianceBlurpStep0')} @@ -87,9 +97,15 @@ const ComplianceSettings = () => { flexDirection={FLEX_DIRECTION.ROW} justifyContent={JustifyContent.center} > -
- {renderLinkButton()} -
+ + {linkButton} +
); diff --git a/ui/components/institutional/compliance-settings/compliance-settings.stories.js b/ui/components/institutional/compliance-settings/compliance-settings.stories.js index c3f73a8a3..cfcef8689 100644 --- a/ui/components/institutional/compliance-settings/compliance-settings.stories.js +++ b/ui/components/institutional/compliance-settings/compliance-settings.stories.js @@ -1,6 +1,5 @@ import React from 'react'; import { Provider } from 'react-redux'; -import { action } from '@storybook/addon-actions'; import configureStore from '../../../store/store'; import testData from '../../../../.storybook/test-data'; import ComplianceSettings from '.'; @@ -23,9 +22,9 @@ export default { title: 'Components/Institutional/ComplianceSettings', decorators: [(story) => {story()}], component: ComplianceSettings, - args: { - onClick: () => { - action('onClick'); + argTypes: { + onClick: { + action: 'onClick', }, }, }; diff --git a/ui/components/institutional/compliance-settings/index.scss b/ui/components/institutional/compliance-settings/index.scss index df59c0c06..cb9c22a12 100644 --- a/ui/components/institutional/compliance-settings/index.scss +++ b/ui/components/institutional/compliance-settings/index.scss @@ -1,9 +1,5 @@ .institutional-feature { &__footer { - border-top: 1px solid var(--color-text-muted); - padding: 16px 30px; - flex: 0 0 auto; - button { min-width: 0; margin-right: 16px; @@ -15,10 +11,6 @@ } &__content { - @include H6; - - line-height: 22px; - ol { list-style: decimal; list-style-position: inside;