Skip to content

Commit

Permalink
Merge branch 'develop' into navigation-and-reject-all-signature-requests
Browse files Browse the repository at this point in the history
  • Loading branch information
VSaric authored Jan 26, 2023
2 parents b3845ff + 3e3abca commit 6fa54d2
Show file tree
Hide file tree
Showing 68 changed files with 722 additions and 497 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ jobs:
at: .
- run:
name: Install Playwright browsers
command: yarn dlx playwright install
command: yarn exec playwright install
- run:
name: Test Storybook
command: yarn test-storybook:ci
Expand Down
6 changes: 3 additions & 3 deletions .storybook/2.DOCUMENTATION.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Some general documentation best practices to follow:
- Use the [controls](https://storybook.js.org/addons/@storybook/addon-controls/) over [knobs](https://storybook.js.org/addons/@storybook/addon-knobs)(deprecated)
- Use the [action argType annotation](https://storybook.js.org/docs/react/essentials/actions#action-argtype-annotation) over importing the actions plugin directly

See the [Button](https://metamask.github.io/metamask-storybook/index.html?path=/story/ui-components-ui-button-button-stories-js--default-story)(`ui/components/ui/button/button.stories.js`) component for reference
See the [Button](https://metamask.github.io/metamask-storybook/index.html?path=/story/components-ui-button--default-story)(`ui/components/ui/button/button.stories.js`) component for reference

## Creating a Story

Expand Down Expand Up @@ -163,7 +163,7 @@ Buttons communicate actions that users can take.
<!-- Embed the DefaultStory using the storybook url -->

<Canvas>
<Story id="ui-components-ui-button-button-stories-js--default-story" />
<Story id="components-ui-button--default-story" />
</Canvas>

## Props
Expand Down Expand Up @@ -196,7 +196,7 @@ By changing the `type` prop you can use different styles of the button.
<!-- Embed other stories to further illustrate component usage -->

<Canvas>
<Story id="ui-components-ui-button-button-stories-js--types" />
<Story id="components-ui-button--type" />
</Canvas>
```

Expand Down
16 changes: 0 additions & 16 deletions app/_locales/de/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions app/_locales/el/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions app/_locales/en/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions app/_locales/es/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions app/_locales/fr/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions app/_locales/hi/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions app/_locales/id/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions app/_locales/ja/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6fa54d2

Please sign in to comment.