Skip to content

Commit 77c4c44

Browse files
n3psn3ps
authored
Merge branch 'main' into n3ps/fix-edit-account
2 parents 6fea4e7 + dcecb08 commit 77c4c44

File tree

141 files changed

+6222
-1215
lines changed

Some content is hidden

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

141 files changed

+6222
-1215
lines changed

‎.github/CODEOWNERS‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,35 @@ ui/components/multichain/account-list-item-menu/ @MetaMask/accounts-engineers @M
118118
# Web3Auth / Onboarding
119119
ui/pages/onboarding-flow @MetaMask/web3auth
120120

121+
# Web3Auth / Shield
122+
app/scripts/controller-init/claims @MetaMask/web3auth
123+
app/scripts/controller-init/shield @MetaMask/web3auth
124+
app/scripts/controller-init/subscription @MetaMask/web3auth
125+
shared/lib/shield.ts @MetaMask/web3auth
126+
ui/components/app/modals/add-funds-modal @MetaMask/web3auth
127+
ui/components/app/shield-entry-modal @MetaMask/web3auth
128+
ui/contexts/claims @MetaMask/web3auth
129+
ui/contexts/shield @MetaMask/web3auth
130+
ui/hooks/claims @MetaMask/web3auth
131+
ui/hooks/subscription @MetaMask/web3auth
132+
ui/pages/shield-plan @MetaMask/web3auth
133+
ui/pages/settings/transaction-shield-tab @MetaMask/web3auth
134+
121135
# Confirmations team to own code for confirmations on UI.
122-
app/scripts/controller-init/confirmations @MetaMask/confirmations
123-
app/scripts/lib/ppom @MetaMask/confirmations
124-
app/scripts/lib/signature @MetaMask/confirmations
125-
app/scripts/lib/transaction/decode @MetaMask/confirmations
126-
app/scripts/lib/transaction/metrics.* @MetaMask/confirmations
127-
app/scripts/lib/transaction/util.* @MetaMask/confirmations
128-
ui/pages/confirmations @MetaMask/confirmations
129-
ui/components/multichain/pages/send @MetaMask/confirmations
136+
app/scripts/controller-init/confirmations @MetaMask/confirmations
137+
app/scripts/lib/ppom @MetaMask/confirmations
138+
app/scripts/lib/signature @MetaMask/confirmations
139+
app/scripts/lib/transaction/decode @MetaMask/confirmations
140+
app/scripts/lib/transaction/metrics.* @MetaMask/confirmations
141+
app/scripts/lib/transaction/util.* @MetaMask/confirmations
142+
ui/pages/confirmations @MetaMask/confirmations
143+
ui/components/multichain/pages/send @MetaMask/confirmations
144+
ui/pages/confirmations/components/confirm/footer @MetaMask/confirmations @MetaMask/web3auth
145+
ui/pages/confirmations/hooks/alerts/useShieldCoverageAlert.test.ts @MetaMask/confirmations @MetaMask/web3auth
146+
ui/pages/confirmations/hooks/alerts/useShieldCoverageAlert.ts @MetaMask/confirmations @MetaMask/web3auth
147+
ui/pages/confirmations/hooks/alerts/transactions/ShieldCoverageAlertMessage.tsx @MetaMask/confirmations @MetaMask/web3auth
148+
ui/pages/confirmations/hooks/transactions/useEnableShieldCoverageChecks.ts @MetaMask/confirmations @MetaMask/web3auth
149+
ui/pages/confirmations/hooks/transactions/useEnableShieldCoverageChecks.test.ts @MetaMask/confirmations @MetaMask/web3auth
130150

131151
# Assets
132152
ui/components/app/detected-token @MetaMask/metamask-assets

‎.github/scripts/identify-builds-from-run.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
# If the string `[builds-from-run: <run-id>]` is contained in the last commit message
4+
if [[ "$(git log -1 --pretty=%B)" =~ \[builds-from-run:[[:space:]]*([0-9]+)\] ]]; then
5+
# Extract the <run-id> value from the commit message
6+
builds_from_run="${BASH_REMATCH[1]}"
7+
echo "Found builds-from-run directive in commit message: $builds_from_run"
8+
echo "builds-from-run=$builds_from_run" >> "$GITHUB_OUTPUT"
9+
else
10+
echo "No builds-from-run directive found in commit message."
11+
# Default to the current run ID
12+
echo "builds-from-run=${RUN_ID}" >> "$GITHUB_OUTPUT"
13+
fi

‎.github/workflows/create-release-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
shell: bash
7070
env:
7171
SEMVER: ${{ inputs.semver-version }}
72-
GITHUB_TOKEN: ${{ github.token }}
72+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7373
run: |
7474
.github/scripts/resolve-previous-ref.sh
7575

‎.github/workflows/e2e-chrome.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ name: E2E Chrome
55

66
on:
77
workflow_call:
8+
inputs:
9+
builds-from-run:
10+
required: true
11+
type: string
12+
description: The run ID to get builds from
813
secrets:
914
PR_COMMENT_TOKEN:
1015
required: true
@@ -26,6 +31,7 @@ jobs:
2631
build-artifact: build-test-browserify
2732
build-command: yarn build:test
2833
test-command: yarn test:e2e:chrome
34+
builds-from-run: ${{ inputs.builds-from-run }}
2935
matrix-index: ${{ matrix.index }}
3036
matrix-total: ${{ strategy.job-total }}
3137

@@ -44,6 +50,7 @@ jobs:
4450
build-artifact: build-test-webpack
4551
build-command: yarn build:test:webpack
4652
test-command: yarn test:e2e:chrome
53+
builds-from-run: ${{ inputs.builds-from-run }}
4754
matrix-index: ${{ matrix.index }}
4855
matrix-total: ${{ strategy.job-total }}
4956

@@ -54,6 +61,7 @@ jobs:
5461
build-artifact: build-test-browserify
5562
build-command: yarn build:test
5663
test-command: yarn test:e2e:chrome:multi-provider
64+
builds-from-run: ${{ inputs.builds-from-run }}
5765

5866
test-e2e-chrome-rpc:
5967
uses: ./.github/workflows/run-e2e.yml
@@ -62,6 +70,7 @@ jobs:
6270
build-artifact: build-test-browserify
6371
build-command: yarn build:test
6472
test-command: yarn test:e2e:chrome:rpc
73+
builds-from-run: ${{ inputs.builds-from-run }}
6574

6675
test-e2e-chrome-flask:
6776
uses: ./.github/workflows/run-e2e.yml
@@ -74,6 +83,7 @@ jobs:
7483
build-artifact: build-test-flask-browserify
7584
build-command: yarn build:test:flask
7685
test-command: yarn test:e2e:chrome:flask
86+
builds-from-run: ${{ inputs.builds-from-run }}
7787
matrix-index: ${{ matrix.index }}
7888
matrix-total: ${{ strategy.job-total }}
7989

@@ -85,6 +95,7 @@ jobs:
8595
test-suite-name: test-e2e-chrome-vault-decryption
8696
build-artifact: build-dist-browserify
8797
test-command: yarn test:e2e:single test/e2e/vault-decryption-chrome.spec.ts --browser chrome
98+
builds-from-run: ${{ inputs.builds-from-run }}
8899

89100
test-e2e-chrome-api-specs:
90101
uses: ./.github/workflows/run-e2e.yml
@@ -94,6 +105,7 @@ jobs:
94105
build-command: yarn build:test
95106
test-command: yarn test:api-specs
96107
test-artifacts-path: html-report
108+
builds-from-run: ${{ inputs.builds-from-run }}
97109

98110
test-e2e-chrome-api-specs-alert-on-failure:
99111
needs:
@@ -135,6 +147,7 @@ jobs:
135147
build-command: yarn build:test:flask
136148
test-command: yarn test:api-specs-multichain
137149
test-artifacts-path: html-report-multichain
150+
builds-from-run: ${{ inputs.builds-from-run }}
138151

139152
test-e2e-chrome-api-specs-multichain-alert-on-failure:
140153
needs:

‎.github/workflows/e2e-firefox.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ name: E2E Firefox
55

66
on:
77
workflow_call:
8+
inputs:
9+
builds-from-run:
10+
required: true
11+
type: string
12+
description: The run ID to get builds from
813
secrets:
914
INFURA_PROJECT_ID:
1015
required: false
@@ -24,6 +29,7 @@ jobs:
2429
build-artifact: build-test-mv2-browserify
2530
build-command: yarn build:test:mv2
2631
test-command: yarn test:e2e:firefox
32+
builds-from-run: ${{ inputs.builds-from-run }}
2733
matrix-index: ${{ matrix.index }}
2834
matrix-total: ${{ strategy.job-total }}
2935

@@ -42,6 +48,7 @@ jobs:
4248
build-artifact: build-test-webpack
4349
build-command: yarn build:test:webpack
4450
test-command: yarn test:e2e:firefox
51+
builds-from-run: ${{ inputs.builds-from-run }}
4552
matrix-index: ${{ matrix.index }}
4653
matrix-total: ${{ strategy.job-total }}
4754

@@ -56,6 +63,7 @@ jobs:
5663
build-artifact: build-test-flask-mv2-browserify
5764
build-command: yarn build:test:flask:mv2
5865
test-command: yarn test:e2e:firefox:flask
66+
builds-from-run: ${{ inputs.builds-from-run }}
5967
matrix-index: ${{ matrix.index }}
6068
matrix-total: ${{ strategy.job-total }}
6169

0 commit comments

Comments
 (0)