Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix/BannerBase to TS #20421

Merged
merged 15 commits into from
Aug 18, 2023
Merged

fix/BannerBase to TS #20421

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4495eab
BannerBase to TS
dhruvv173 Aug 7, 2023
5a56d40
snapshot updates
dhruvv173 Aug 7, 2023
d2ff9fe
more snapshot updates
dhruvv173 Aug 7, 2023
ed4295e
addressing type definition error
dhruvv173 Aug 7, 2023
160fb7d
updating eth-sign-modal snapshot
dhruvv173 Aug 8, 2023
9c5e214
Updates to stories, types and adding data-testid
georgewrmarshall Aug 15, 2023
ad6e53b
Updating snapshots
georgewrmarshall Aug 15, 2023
1a070e2
Merge branch 'develop' into fix/19181
georgewrmarshall Aug 15, 2023
f6dcab1
Merge branch 'develop' into fix/19181
dhruvv173 Aug 15, 2023
c30aa29
updating snapshot of blockaid-banner-alert and adding unit test for c…
dhruvv173 Aug 16, 2023
e2ea36d
BannerBase updates to stories, adding locale for close button, removi…
georgewrmarshall Aug 17, 2023
c6d9be5
Merge branch 'develop' into fix/19181
georgewrmarshall Aug 17, 2023
5a606de
Removing incorrect arg from storybook file
georgewrmarshall Aug 17, 2023
35aa4d8
Updating html element in security provider e2e test to match BannerBa…
georgewrmarshall Aug 17, 2023
9c8e160
Fixing e2e tests
georgewrmarshall Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...mponents/app/ledger-instruction-field/__snapshots__/ledger-instruction-field.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`LedgerInstructionField Component rendering should render properly with
class="confirm-detail-row"
>
<div
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-info box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-primary-muted box--rounded-sm"
class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-info mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-primary-muted mm-box--rounded-sm"
>
<span
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-primary-default"
Expand Down
2 changes: 1 addition & 1 deletion ui/components/app/modals/eth-sign-modal/__snapshots__/eth-sign-modal.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ exports[`Eth Sign Modal should match snapshot 1`] = `
</a>
</p>
<div
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger box--margin-top-6 box--margin-bottom-6 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-error-muted box--rounded-sm"
class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger mm-box--margin-top-6 mm-box--margin-bottom-6 mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-error-muted mm-box--rounded-sm"
>
<span
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-error-default"
Expand Down
2 changes: 1 addition & 1 deletion ...s/app/modals/export-private-key-modal/__snapshots__/export-private-key-modal.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ exports[`Export PrivateKey Modal should match snapshot 1`] = `
class="mm-box mm-text mm-text--body-sm mm-box--color-error-default"
/>
<div
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger box--margin-top-4 box--margin-right-5 box--margin-left-5 box--padding-1 box--sm:padding-3 box--lg:padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-error-muted box--rounded-sm"
class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger mm-box--margin-top-4 mm-box--margin-right-5 mm-box--margin-left-5 mm-box--padding-1 mm-box--sm:padding-3 mm-box--md:padding-0 mm-box--lg:padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-error-muted mm-box--rounded-sm"
>
<span
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-error-default"
Expand Down
6 changes: 3 additions & 3 deletions .../security-provider-banner-alert/__snapshots__/security-provider-banner-alert.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
exports[`Security Provider Banner Alert should match snapshot 1`] = `
<div>
<div
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger box--margin-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-error-muted box--rounded-sm"
class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger mm-box--margin-4 mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-error-muted mm-box--rounded-sm"
>
<span
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-error-default"
style="mask-image: url('./images/icons/danger.svg');"
/>
<div>
<h5
<p
class="mm-box mm-text mm-banner-base__title mm-text--body-lg-medium mm-box--color-text-default"
data-testid="mm-banner-base-title"
>
Malicious third party detected
</h5>
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-top-2 mm-box--color-text-default"
>
Expand Down
18 changes: 9 additions & 9 deletions ...vider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertResponse.result_type is 'Malicious 1`] = `
<div
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger box--margin-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-error-muted box--rounded-sm"
class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger mm-box--margin-4 mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-error-muted mm-box--rounded-sm"
>
<span
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-error-default"
style="mask-image: url('./images/icons/danger.svg');"
/>
<div>
<h5
<p
class="mm-box mm-text mm-banner-base__title mm-text--body-lg-medium mm-box--color-text-default"
data-testid="mm-banner-base-title"
>
This is a deceptive request
</h5>
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-top-2 mm-box--color-text-default"
>
Expand Down Expand Up @@ -72,19 +72,19 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp

exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResponse.result_type is 'Warning 1`] = `
<div
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-warning box--margin-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-warning-muted box--rounded-sm"
class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-warning mm-box--margin-4 mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-warning-muted mm-box--rounded-sm"
>
<span
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-warning-default"
style="mask-image: url('./images/icons/danger.svg');"
/>
<div>
<h5
<p
class="mm-box mm-text mm-banner-base__title mm-text--body-lg-medium mm-box--color-text-default"
data-testid="mm-banner-base-title"
>
This is a deceptive request
</h5>
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-top-2 mm-box--color-text-default"
>
Expand Down Expand Up @@ -119,19 +119,19 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
exports[`Blockaid Banner Alert should render details when provided 1`] = `
<div>
<div
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-warning box--margin-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-warning-muted box--rounded-sm"
class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-warning mm-box--margin-4 mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-warning-muted mm-box--rounded-sm"
>
<span
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-warning-default"
style="mask-image: url('./images/icons/danger.svg');"
/>
<div>
<h5
<p
class="mm-box mm-text mm-banner-base__title mm-text--body-lg-medium mm-box--color-text-default"
data-testid="mm-banner-base-title"
>
This is a deceptive request
</h5>
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--margin-top-2 mm-box--color-text-default"
>
Expand Down
6 changes: 3 additions & 3 deletions ui/components/component-library/banner-alert/__snapshots__/banner-alert.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
exports[`BannerAlert should render BannerAlert element correctly 1`] = `
<div>
<div
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-info box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-primary-muted box--rounded-sm"
class="mm-box mm-banner-base mm-banner-alert mm-banner-alert--severity-info mm-box--padding-3 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--background-color-primary-muted mm-box--rounded-sm"
data-testid="bannerAlert"
>
<span
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-primary-default"
style="mask-image: url('./images/icons/info.svg');"
/>
<div>
<h5
<p
class="mm-box mm-text mm-banner-base__title mm-text--body-lg-medium mm-box--color-text-default"
data-testid="mm-banner-base-title"
>
BannerAlert test
</h5>
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
>
Expand Down
16 changes: 7 additions & 9 deletions ui/components/component-library/banner-base/README.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,19 @@ import { BannerBase } from './banner-base';

`BannerBase` serves as a base for all banner variants. It contains standard props such as information and related actions.

<Canvas style={{ background: 'var(--color-background-alternative)' }}>
<Canvas>
<Story id="components-componentlibrary-bannerbase--default-story" />
</Canvas>

## Props

The `BannerBase` accepts all props below as well as all [Box](/docs/components-ui-box--default-story#props) component props

<ArgsTable of={BannerBase} />

### Title

Use the `title` prop to pass a string that is sentence case no period. Use the `titleProps` prop to pass additional props to the `Text` component.

<Canvas style={{ background: 'var(--color-background-alternative)' }}>
<Canvas>
<Story id="components-componentlibrary-bannerbase--title" />
</Canvas>

Expand All @@ -39,7 +37,7 @@ The `description` is the content area of the `BannerBase` that must be a string.

If content requires more than a string, see `children` prop below.

<Canvas style={{ background: 'var(--color-background-alternative)' }}>
<Canvas>
<Story id="components-componentlibrary-bannerbase--description" />
</Canvas>

Expand All @@ -56,7 +54,7 @@ import { BannerBase } from '../../component-library';

The `children` prop is an alternative to `description` for `BannerBase` when more than a string is needed. Children content shouldn't repeat title and only 1-3 lines.

<Canvas style={{ background: 'var(--color-background-alternative)' }}>
<Canvas>
<Story id="components-componentlibrary-bannerbase--children" />
</Canvas>

Expand All @@ -76,7 +74,7 @@ import { BannerBase } from '../../component-library';

Use the `actionButtonLabel` prop to pass text, `actionButtonOnClick` prop to pass an onClick handler, and `actionButtonProps` prop to pass an object of [ButtonLink props](/docs/components-componentlibrary-buttonlink--default-story) for the action

<Canvas style={{ background: 'var(--color-background-alternative)' }}>
<Canvas>
<Story id="components-componentlibrary-bannerbase--action-button" />
</Canvas>

Expand All @@ -103,7 +101,7 @@ Use the `onClose` prop to pass a function to the close button. The close button

Additional props can be passed to the close button with `closeButtonProps`

<Canvas style={{ background: 'var(--color-background-alternative)' }}>
<Canvas>
<Story id="components-componentlibrary-bannerbase--on-close" />
</Canvas>

Expand All @@ -122,7 +120,7 @@ import { BannerBase } from '../../component-library';

Use the `startAccessory` prop to add components such as icons or fox image to the start (default: left) of the `BannerBase` content

<Canvas style={{ background: 'var(--color-background-alternative)' }}>
<Canvas>
<Story id="components-componentlibrary-bannerbase--start-accessory" />
</Canvas>

Expand Down
6 changes: 3 additions & 3 deletions ...se/__snapshots__/banner-base.test.js.snap → ...e/__snapshots__/banner-base.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
exports[`BannerBase should render bannerbase element correctly 1`] = `
<div>
<div
class="box mm-banner-base box--padding-3 box--display-flex box--gap-2 box--flex-direction-row box--background-color-background-default box--rounded-sm"
class="mm-box mm-banner-base mm-box--padding-3 mm-box--display-flex mm-box--gap-2 mm-box--background-color-background-default mm-box--rounded-sm"
data-testid="banner-base"
>
<div>
<h5
<p
class="mm-box mm-text mm-banner-base__title mm-text--body-lg-medium mm-box--color-text-default"
data-testid="mm-banner-base-title"
>
Bannerbase test
</h5>
</p>
<p
class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
>
Expand Down
141 changes: 0 additions & 141 deletions ui/components/component-library/banner-base/banner-base.js
View file
Open in desktop

This file was deleted.

Loading
Loading