Skip to content

Commit 060a6cd

Browse files
authored
Merge branch 'main' into jl/mmp-3814/fix-grant-permissions-add-ethereum-chain
2 parents 4579d6a + 33ffbc5 commit 060a6cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+976
-414
lines changed

.github/workflows/build-storybook.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: Build storybook
22

33
on:
44
workflow_call:
5+
secrets:
6+
STORYBOOK_TOKEN:
7+
required: true
58

69
jobs:
710
build-storybook:
@@ -30,5 +33,5 @@ jobs:
3033
# For a `push` event, the branch is `github.ref_name`.
3134
if: ${{ (github.head_ref || github.ref_name) == 'main' }}
3235
run: |
33-
git remote add storybook git@github.com:MetaMask/metamask-storybook.git
36+
git remote add storybook https://${{ secrets.STORYBOOK_TOKEN }}@github.com/MetaMask/metamask-storybook.git
3437
yarn storybook:deploy

.github/workflows/main.yml

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ jobs:
8282
build-storybook:
8383
name: Build storybook
8484
uses: ./.github/workflows/build-storybook.yml
85+
secrets:
86+
STORYBOOK_TOKEN: ${{ secrets.STORYBOOK_TOKEN }}
8587
permissions:
8688
contents: read
8789
# id-token permission is required for uploading to s3

app/_locales/de/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/el/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/en/messages.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/es/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/fr/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/hi/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/id/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/ja/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/ko/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/pt/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/ru/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/tl/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/tr/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/vi/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/_locales/zh_CN/messages.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)