Skip to content

Commit 5771055

Browse files
OGPoyrazOGPoyraz
authored
Merge branch 'main' into ogp/36966
2 parents 10ea528 + 4fb8087 commit 5771055

File tree

73 files changed

+2350
-783
lines changed

Some content is hidden

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

73 files changed

+2350
-783
lines changed

‎.github/scripts/bundle.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# * The environment variables used by the `run-build` step in `.github/workflows/run-build.yml`.
55
# * The environment variables used by the `publish-release` step in `.github/workflows/publish-release.yml`.
66
export APPLE_BETA_CLIENT_ID=""
7+
export APPLE_EXPERIMENTAL_CLIENT_ID=""
78
export APPLE_FLASK_CLIENT_ID=""
89
export APPLE_PROD_CLIENT_ID=""
910
export CONTENTFUL_ACCESS_SPACE_ID=""
@@ -17,9 +18,11 @@ export FIREBASE_MESSAGING_SENDER_ID=""
1718
export FIREBASE_PROJECT_ID=""
1819
export FIREBASE_STORAGE_BUCKET=""
1920
export GOOGLE_BETA_CLIENT_ID=""
21+
export GOOGLE_EXPERIMENTAL_CLIENT_ID=""
2022
export GOOGLE_FLASK_CLIENT_ID=""
2123
export GOOGLE_PROD_CLIENT_ID=""
2224
export INFURA_BETA_PROJECT_ID=""
25+
export INFURA_EXPERIMENTAL_PROJECT_ID=""
2326
export INFURA_FLASK_PROJECT_ID=""
2427
export INFURA_PROD_PROJECT_ID=""
2528
export QUICKNODE_ARBITRUM_URL=""
@@ -30,6 +33,7 @@ export QUICKNODE_MAINNET_URL=""
3033
export QUICKNODE_OPTIMISM_URL=""
3134
export QUICKNODE_POLYGON_URL=""
3235
export SEGMENT_BETA_WRITE_KEY=""
36+
export SEGMENT_EXPERIMENTAL_WRITE_KEY=""
3337
export SEGMENT_FLASK_WRITE_KEY=""
3438
export SEGMENT_PROD_WRITE_KEY=""
3539
export ANALYTICS_DATA_DELETION_SOURCE_ID=""

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,8 @@ jobs:
341341
APPLE_PROD_CLIENT_ID: 00000000000
342342
GOOGLE_BETA_CLIENT_ID: 00000000000
343343
APPLE_BETA_CLIENT_ID: 00000000000
344+
GOOGLE_EXPERIMENTAL_CLIENT_ID: 00000000000
345+
APPLE_EXPERIMENTAL_CLIENT_ID: 00000000000
344346
GOOGLE_FLASK_CLIENT_ID: 00000000000
345347
APPLE_FLASK_CLIENT_ID: 00000000000
346348

‎.github/workflows/publish-release.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
# * The environment variables exported by `.github/scripts/bundle.sh`
1919
# * The environment variables used by the `run-build` step in `.github/workflows/run-build.yml`.
2020
APPLE_BETA_CLIENT_ID: ${{ secrets.APPLE_BETA_CLIENT_ID }}
21+
APPLE_EXPERIMENTAL_CLIENT_ID: ${{ secrets.APPLE_EXPERIMENTAL_CLIENT_ID }}
2122
APPLE_FLASK_CLIENT_ID: ${{ secrets.APPLE_FLASK_CLIENT_ID }}
2223
APPLE_PROD_CLIENT_ID: ${{ secrets.APPLE_PROD_CLIENT_ID }}
2324
CONTENTFUL_ACCESS_SPACE_ID: ${{ secrets.CONTENTFUL_ACCESS_SPACE_ID }}
@@ -31,9 +32,11 @@ jobs:
3132
FIREBASE_PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}
3233
FIREBASE_STORAGE_BUCKET: ${{ secrets.FIREBASE_STORAGE_BUCKET }}
3334
GOOGLE_BETA_CLIENT_ID: ${{ secrets.GOOGLE_BETA_CLIENT_ID }}
35+
GOOGLE_EXPERIMENTAL_CLIENT_ID: ${{ secrets.GOOGLE_EXPERIMENTAL_CLIENT_ID }}
3436
GOOGLE_FLASK_CLIENT_ID: ${{ secrets.GOOGLE_FLASK_CLIENT_ID }}
3537
GOOGLE_PROD_CLIENT_ID: ${{ secrets.GOOGLE_PROD_CLIENT_ID }}
3638
INFURA_BETA_PROJECT_ID: ${{ secrets.INFURA_BETA_PROJECT_ID }}
39+
INFURA_EXPERIMENTAL_PROJECT_ID: ${{ secrets.INFURA_EXPERIMENTAL_PROJECT_ID }}
3740
INFURA_FLASK_PROJECT_ID: ${{ secrets.INFURA_FLASK_PROJECT_ID }}
3841
INFURA_PROD_PROJECT_ID: ${{ secrets.INFURA_PROD_PROJECT_ID }}
3942
QUICKNODE_ARBITRUM_URL: ${{ secrets.QUICKNODE_ARBITRUM_URL }}
@@ -44,6 +47,7 @@ jobs:
4447
QUICKNODE_OPTIMISM_URL: ${{ secrets.QUICKNODE_OPTIMISM_URL }}
4548
QUICKNODE_POLYGON_URL: ${{ secrets.QUICKNODE_POLYGON_URL }}
4649
SEGMENT_BETA_WRITE_KEY: ${{ secrets.SEGMENT_BETA_WRITE_KEY }}
50+
SEGMENT_EXPERIMENTAL_WRITE_KEY: ${{ secrets.SEGMENT_EXPERIMENTAL_WRITE_KEY }}
4751
SEGMENT_FLASK_WRITE_KEY: ${{ secrets.SEGMENT_FLASK_WRITE_KEY }}
4852
SEGMENT_PROD_WRITE_KEY: ${{ secrets.SEGMENT_PROD_WRITE_KEY }}
4953
ANALYTICS_DATA_DELETION_SOURCE_ID: ${{ secrets.ANALYTICS_DATA_DELETION_SOURCE_ID }}

‎.github/workflows/run-build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
# * The environment variables exported by `.github/scripts/bundle.sh`
4545
# * The environment variables used by the `publish-release` step in `.github/workflows/publish-release.yml`.
4646
APPLE_BETA_CLIENT_ID: ${{ secrets.APPLE_BETA_CLIENT_ID }}
47+
APPLE_EXPERIMENTAL_CLIENT_ID: ${{ secrets.APPLE_EXPERIMENTAL_CLIENT_ID }}
4748
APPLE_FLASK_CLIENT_ID: ${{ secrets.APPLE_FLASK_CLIENT_ID }}
4849
APPLE_PROD_CLIENT_ID: ${{ secrets.APPLE_PROD_CLIENT_ID }}
4950
CONTENTFUL_ACCESS_SPACE_ID: ${{ secrets.CONTENTFUL_ACCESS_SPACE_ID }}
@@ -57,9 +58,11 @@ jobs:
5758
FIREBASE_PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}
5859
FIREBASE_STORAGE_BUCKET: ${{ secrets.FIREBASE_STORAGE_BUCKET }}
5960
GOOGLE_BETA_CLIENT_ID: ${{ secrets.GOOGLE_BETA_CLIENT_ID }}
61+
GOOGLE_EXPERIMENTAL_CLIENT_ID: ${{ secrets.GOOGLE_EXPERIMENTAL_CLIENT_ID }}
6062
GOOGLE_FLASK_CLIENT_ID: ${{ secrets.GOOGLE_FLASK_CLIENT_ID }}
6163
GOOGLE_PROD_CLIENT_ID: ${{ secrets.GOOGLE_PROD_CLIENT_ID }}
6264
INFURA_BETA_PROJECT_ID: ${{ secrets.INFURA_BETA_PROJECT_ID }}
65+
INFURA_EXPERIMENTAL_PROJECT_ID: ${{ secrets.INFURA_EXPERIMENTAL_PROJECT_ID }}
6366
INFURA_FLASK_PROJECT_ID: ${{ secrets.INFURA_FLASK_PROJECT_ID }}
6467
INFURA_PROD_PROJECT_ID: ${{ secrets.INFURA_PROD_PROJECT_ID }}
6568
QUICKNODE_ARBITRUM_URL: ${{ secrets.QUICKNODE_ARBITRUM_URL }}
@@ -70,6 +73,7 @@ jobs:
7073
QUICKNODE_OPTIMISM_URL: ${{ secrets.QUICKNODE_OPTIMISM_URL }}
7174
QUICKNODE_POLYGON_URL: ${{ secrets.QUICKNODE_POLYGON_URL }}
7275
SEGMENT_BETA_WRITE_KEY: ${{ secrets.SEGMENT_BETA_WRITE_KEY }}
76+
SEGMENT_EXPERIMENTAL_WRITE_KEY: ${{ secrets.SEGMENT_EXPERIMENTAL_WRITE_KEY }}
7377
SEGMENT_FLASK_WRITE_KEY: ${{ secrets.SEGMENT_FLASK_WRITE_KEY }}
7478
SEGMENT_PROD_WRITE_KEY: ${{ secrets.SEGMENT_PROD_WRITE_KEY }}
7579
ANALYTICS_DATA_DELETION_SOURCE_ID: ${{ secrets.ANALYTICS_DATA_DELETION_SOURCE_ID }}

‎.github/workflows/update-lavamoat-policies.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ jobs:
151151
APPLE_PROD_CLIENT_ID: 00000000000
152152
GOOGLE_BETA_CLIENT_ID: 00000000000
153153
APPLE_BETA_CLIENT_ID: 00000000000
154+
GOOGLE_EXPERIMENTAL_CLIENT_ID: 00000000000
155+
APPLE_EXPERIMENTAL_CLIENT_ID: 00000000000
154156
GOOGLE_FLASK_CLIENT_ID: 00000000000
155157
APPLE_FLASK_CLIENT_ID: 00000000000
156158

‎.github/workflows/update-release-changelog.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# On every push to a release branch (Version-v* or release/*), this workflow rebuilds the matching
2+
# changelog branch, re-runs the auto-changelog script, and either updates or recreates the changelog PR.
3+
name: Update Release Changelog PR
4+
5+
on:
6+
push:
7+
branches:
8+
- 'release/*'
9+
10+
concurrency:
11+
group: update-release-changelog-${{ github.ref }}
12+
cancel-in-progress: false
13+
14+
jobs:
15+
refresh-changelog:
16+
permissions:
17+
contents: write
18+
pull-requests: write
19+
uses: MetaMask/github-tools/.github/workflows/update-release-changelog.yml@36dc168896c1b496f35fc880ee8a3625b4b837ba
20+
with:
21+
release-branch: ${{ github.ref_name }}
22+
repository-url: ${{ github.server_url }}/${{ github.repository }}
23+
platform: extension
24+
github-tools-version: 36dc168896c1b496f35fc880ee8a3625b4b837ba
25+
previous-version-ref: null
26+
secrets:
27+
github-token: ${{ secrets.PR_TOKEN }}

‎.github/workflows/validate-lavamoat-policies.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
APPLE_PROD_CLIENT_ID: 00000000000
2525
GOOGLE_BETA_CLIENT_ID: 00000000000
2626
APPLE_BETA_CLIENT_ID: 00000000000
27+
GOOGLE_EXPERIMENTAL_CLIENT_ID: 00000000000
28+
APPLE_EXPERIMENTAL_CLIENT_ID: 00000000000
2729
GOOGLE_FLASK_CLIENT_ID: 00000000000
2830
APPLE_FLASK_CLIENT_ID: 00000000000
2931

@@ -57,6 +59,8 @@ jobs:
5759
APPLE_PROD_CLIENT_ID: 00000000000
5860
GOOGLE_BETA_CLIENT_ID: 00000000000
5961
APPLE_BETA_CLIENT_ID: 00000000000
62+
GOOGLE_EXPERIMENTAL_CLIENT_ID: 00000000000
63+
APPLE_EXPERIMENTAL_CLIENT_ID: 00000000000
6064
GOOGLE_FLASK_CLIENT_ID: 00000000000
6165
APPLE_FLASK_CLIENT_ID: 00000000000
6266

‎.yarn/patches/@microsoft-fetch-event-source-npm-2.0.1-679d34d9ba.patch‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/lib/esm/fetch.js b/lib/esm/fetch.js
2+
index 175b639f3da6754f01641fbf74df791b36520c4d..865fa883ec018e7420fad0310acccab2ecebe309 100644
3+
--- a/lib/esm/fetch.js
4+
+++ b/lib/esm/fetch.js
5+
@@ -37,9 +37,10 @@ export function fetchEventSource(input, _a) {
6+
window.clearTimeout(retryTimer);
7+
curRequestController.abort();
8+
}
9+
- inputSignal === null || inputSignal === void 0 ? void 0 : inputSignal.addEventListener('abort', () => {
10+
+ inputSignal === null || inputSignal === void 0 ? void 0 : inputSignal.addEventListener('abort', (error) => {
11+
dispose();
12+
- resolve();
13+
+ // This line is a workaround to fix the issue with the abort error not being properly propagated
14+
+ reject(Object.assign(new Error('Aborted'), { name: 'AbortError', message: error.target.reason }));
15+
});
16+
const fetch = inputFetch !== null && inputFetch !== void 0 ? inputFetch : window.fetch;
17+
const onopen = inputOnOpen !== null && inputOnOpen !== void 0 ? inputOnOpen : defaultOnOpen;

‎app/_locales/de/messages.json‎

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/_locales/el/messages.json‎

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)