Skip to content

Commit 13c67e9

Browse files
ffmcgee725ffmcgee725
committed
merge main fix conflicts
2 parents 776b3e5 + 664c260 commit 13c67e9

File tree

298 files changed

+82410
-48239
lines changed

Some content is hidden

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

298 files changed

+82410
-48239
lines changed

‎.depcheckrc.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ ignores:
5858
- 'eslint-plugin-prettier'
5959
- 'eslint-plugin-react-native'
6060
- 'execa'
61-
- 'fbjs-scripts'
62-
- 'improved-yarn-audit'
6361
- 'jetifier'
6462
- 'metro-react-native-babel-preset'
6563
- 'prettier-plugin-gherkin'

‎.github/scripts/.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.pnp.*
2+
.yarn/*
3+
!.yarn/patches
4+
!.yarn/plugins
5+
!.yarn/releases
6+
!.yarn/sdks
7+
!.yarn/versions

‎.github/scripts/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"ts-node": "^10.5.0",
2626
"typescript": "~5.4.5"
2727
},
28-
"packageManager": "yarn@1.22.22",
28+
"packageManager": "yarn@3.8.7",
2929
"lavamoat": {
3030
"allowScripts": {
3131
"@lavamoat/preinstall-always-fail": false,

‎.github/scripts/yarn.lock‎

Lines changed: 1769 additions & 1318 deletions
Large diffs are not rendered by default.

‎.github/workflows/build-android-e2e.yml‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
apk-uploaded: ${{ steps.upload-apk.outcome == 'success' }}
2727
aab-uploaded: ${{ steps.upload-aab.outcome == 'success' }}
2828
sourcemap-uploaded: ${{ steps.upload-sourcemap.outcome == 'success' }}
29-
29+
3030
steps:
3131
- name: Checkout repo
3232
uses: actions/checkout@v4
3333

3434
- name: Setup Android Build Environment
35-
uses: MetaMask/github-tools/.github/actions/setup-e2e-env@f932aba72712f44367f89f6e259ea0c8cfedcf68
35+
uses: MetaMask/github-tools/.github/actions/setup-e2e-env@2e4ce39610e441f28d50f30af8725ecf6bd540b8
3636
with:
3737
platform: android
3838
setup-simulator: false
@@ -72,20 +72,20 @@ jobs:
7272
METAMASK_ENVIRONMENT: qa
7373
METAMASK_BUILD_TYPE: main
7474
IS_TEST: true
75-
E2E: "true"
75+
E2E: 'true'
7676
IGNORE_BOXLOGS_DEVELOPMENT: true
77-
GITHUB_CI: "true"
78-
CI: "true"
79-
NODE_OPTIONS: "--max-old-space-size=8192"
80-
MM_UNIFIED_SWAPS_ENABLED: "true"
81-
MM_BRIDGE_ENABLED: "true"
82-
BRIDGE_USE_DEV_APIS: "true"
83-
RAMP_INTERNAL_BUILD: "true"
84-
SEEDLESS_ONBOARDING_ENABLED: "true"
85-
MM_NOTIFICATIONS_UI_ENABLED: "true"
86-
MM_SECURITY_ALERTS_API_ENABLED: "true"
87-
MM_REMOVE_GLOBAL_NETWORK_SELECTOR: "true"
88-
BLOCKAID_FILE_CDN: "static.cx.metamask.io/api/v1/confirmations/ppom"
77+
GITHUB_CI: 'true'
78+
CI: 'true'
79+
NODE_OPTIONS: '--max-old-space-size=8192'
80+
MM_UNIFIED_SWAPS_ENABLED: 'true'
81+
MM_BRIDGE_ENABLED: 'true'
82+
BRIDGE_USE_DEV_APIS: 'true'
83+
RAMP_INTERNAL_BUILD: 'true'
84+
SEEDLESS_ONBOARDING_ENABLED: 'true'
85+
MM_NOTIFICATIONS_UI_ENABLED: 'true'
86+
MM_SECURITY_ALERTS_API_ENABLED: 'true'
87+
MM_REMOVE_GLOBAL_NETWORK_SELECTOR: 'true'
88+
BLOCKAID_FILE_CDN: 'static.cx.metamask.io/api/v1/confirmations/ppom'
8989
FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN: ${{ secrets.FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN }}
9090
FEATURES_ANNOUNCEMENTS_SPACE_ID: ${{ secrets.FEATURES_ANNOUNCEMENTS_SPACE_ID }}
9191
SEGMENT_WRITE_KEY_QA: ${{ secrets.SEGMENT_WRITE_KEY_QA }}
@@ -103,7 +103,6 @@ jobs:
103103
GOOGLE_SERVICES_B64_ANDROID: ${{ secrets.GOOGLE_SERVICES_B64_ANDROID }}
104104
MM_INFURA_PROJECT_ID: ${{ secrets.MM_INFURA_PROJECT_ID }}
105105

106-
107106
- name: Upload Android APK
108107
id: upload-apk
109108
uses: actions/upload-artifact@v4

‎.github/workflows/build-android-upload-to-browserstack.yml‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
outputs:
5757
builds-needed: ${{ steps.check-builds.outputs.builds-needed }}
58-
58+
5959
steps:
6060
- name: Check if builds are needed
6161
id: check-builds
@@ -76,21 +76,20 @@ jobs:
7676
env:
7777
GRADLE_USER_HOME: /home/runner/_work/.gradle
7878
# No outputs - these will be provided by the collect-results job
79-
79+
8080
strategy:
8181
fail-fast: false
8282
matrix:
8383
build_type: [with-srp, without-srp]
84-
84+
8585
steps:
86-
8786
- name: Checkout repo
8887
if: needs.check-builds-needed.outputs.builds-needed == 'true'
8988
uses: actions/checkout@v4
9089

9190
- name: Setup Android Build Environment
9291
if: needs.check-builds-needed.outputs.builds-needed == 'true'
93-
uses: MetaMask/github-tools/.github/actions/setup-e2e-env@f932aba72712f44367f89f6e259ea0c8cfedcf68
92+
uses: MetaMask/github-tools/.github/actions/setup-e2e-env@2e4ce39610e441f28d50f30af8725ecf6bd540b8
9493
with:
9594
platform: android
9695
setup-simulator: false
@@ -115,7 +114,7 @@ jobs:
115114
run: |
116115
echo "🚀 Setting up project for ${{ matrix.build_type }} build..."
117116
yarn setup:github-ci --no-build-ios
118-
117+
119118
echo "🏗 Building Android E2E APK (${{ matrix.build_type }})..."
120119
export NODE_OPTIONS="--max-old-space-size=8192"
121120
# Use dedicated dual versions properties file for ARM architectures
@@ -127,20 +126,20 @@ jobs:
127126
METAMASK_ENVIRONMENT: qa
128127
METAMASK_BUILD_TYPE: main
129128
IS_TEST: false
130-
E2E: "true"
129+
E2E: 'true'
131130
IGNORE_BOXLOGS_DEVELOPMENT: true
132-
GITHUB_CI: "true"
133-
CI: "true"
134-
NODE_OPTIONS: "--max-old-space-size=8192"
135-
MM_UNIFIED_SWAPS_ENABLED: "true"
136-
MM_BRIDGE_ENABLED: "true"
137-
BRIDGE_USE_DEV_APIS: "true"
138-
RAMP_INTERNAL_BUILD: "true"
139-
SEEDLESS_ONBOARDING_ENABLED: "true"
140-
MM_NOTIFICATIONS_UI_ENABLED: "true"
141-
DISABLE_NOTIFICATION_PROMPT: "true"
142-
MM_SECURITY_ALERTS_API_ENABLED: "true"
143-
MM_REMOVE_GLOBAL_NETWORK_SELECTOR: "true"
131+
GITHUB_CI: 'true'
132+
CI: 'true'
133+
NODE_OPTIONS: '--max-old-space-size=8192'
134+
MM_UNIFIED_SWAPS_ENABLED: 'true'
135+
MM_BRIDGE_ENABLED: 'true'
136+
BRIDGE_USE_DEV_APIS: 'true'
137+
RAMP_INTERNAL_BUILD: 'true'
138+
SEEDLESS_ONBOARDING_ENABLED: 'true'
139+
MM_NOTIFICATIONS_UI_ENABLED: 'true'
140+
DISABLE_NOTIFICATION_PROMPT: 'true'
141+
MM_SECURITY_ALERTS_API_ENABLED: 'true'
142+
MM_REMOVE_GLOBAL_NETWORK_SELECTOR: 'true'
144143
# Conditionally set SRP and password based on build type
145144
ADDITIONAL_SRP_1: ${{ matrix.build_type == 'with-srp' && secrets.TEST_SRP_1 || '' }}
146145
PREDEFINED_PASSWORD: ${{ matrix.build_type == 'with-srp' && secrets.E2E_PASSWORD || '' }}
@@ -184,73 +183,73 @@ jobs:
184183
without-srp-app-id: ${{ steps.browserstack-upload.outputs.without-srp-app-id }}
185184
with-srp-version: ${{ steps.browserstack-upload.outputs.with-srp-version }}
186185
without-srp-version: ${{ steps.browserstack-upload.outputs.without-srp-version }}
187-
186+
188187
steps:
189188
- name: Checkout code
190189
if: needs.check-builds-needed.outputs.builds-needed == 'true'
191190
uses: actions/checkout@v4
192-
191+
193192
- name: Download APK Artifacts
194193
if: needs.check-builds-needed.outputs.builds-needed == 'true'
195194
uses: actions/download-artifact@v4
196195
with:
197196
path: ./artifacts
198197
continue-on-error: true
199-
198+
200199
- name: BrowserStack Env Setup
201200
if: needs.check-builds-needed.outputs.builds-needed == 'true'
202201
uses: browserstack/github-actions/setup-env@4478e16186f38e5be07721931642e65a028713c3
203202
with:
204203
username: ${{ env.BROWSERSTACK_USERNAME }}
205204
access-key: ${{ env.BROWSERSTACK_ACCESS_KEY }}
206205
project-name: ${{ github.repository }}
207-
206+
208207
- name: Upload APKs to BrowserStack
209208
if: needs.check-builds-needed.outputs.builds-needed == 'true'
210209
id: browserstack-upload
211210
run: |
212211
echo "Uploading APKs to BrowserStack..."
213-
212+
214213
# List artifacts directory structure for debugging
215214
echo "Artifacts directory structure:"
216215
find ./artifacts -type f -name "*.apk" | head -10
217216
echo "Full artifacts directory tree:"
218217
find ./artifacts -type d | head -20
219-
218+
220219
# Find the APK files in their subdirectories
221220
WITH_SRP_APK=$(find ./artifacts -path "*/app-prod-release-with-srp.apk/app-prod-release.apk" | head -1)
222221
WITHOUT_SRP_APK=$(find ./artifacts -path "*/app-prod-release-without-srp.apk/app-prod-release.apk" | head -1)
223-
222+
224223
# Fallback: if not found in subdirectories, try direct search
225224
if [ -z "$WITH_SRP_APK" ]; then
226225
echo "With-SRP APK not found in subdirectory, trying direct search..."
227226
WITH_SRP_APK=$(find ./artifacts -name "app-prod-release-with-srp.apk" | head -1)
228227
fi
229-
228+
230229
if [ -z "$WITHOUT_SRP_APK" ]; then
231230
echo "Without-SRP APK not found in subdirectory, trying direct search..."
232231
WITHOUT_SRP_APK=$(find ./artifacts -name "app-prod-release-without-srp.apk" | head -1)
233232
fi
234-
233+
235234
echo "Found APKs:"
236235
echo " With SRP: $WITH_SRP_APK"
237236
echo " Without SRP: $WITHOUT_SRP_APK"
238-
237+
239238
# Verify files exist and are readable
240239
if [ -n "$WITH_SRP_APK" ] && [ -f "$WITH_SRP_APK" ]; then
241240
echo "With-SRP APK file exists and is readable"
242241
ls -la "$WITH_SRP_APK"
243242
else
244243
echo "With-SRP APK file not found or not readable"
245244
fi
246-
245+
247246
if [ -n "$WITHOUT_SRP_APK" ] && [ -f "$WITHOUT_SRP_APK" ]; then
248247
echo "Without-SRP APK file exists and is readable"
249248
ls -la "$WITHOUT_SRP_APK"
250249
else
251250
echo "Without-SRP APK file not found or not readable"
252251
fi
253-
252+
254253
# Upload with-SRP APK
255254
if [ -f "$WITH_SRP_APK" ]; then
256255
echo "Uploading with-SRP APK to BrowserStack..."
@@ -279,7 +278,7 @@ jobs:
279278
echo "with-srp-version="
280279
} >> "$GITHUB_OUTPUT"
281280
fi
282-
281+
283282
# Upload without-SRP APK
284283
if [ -f "$WITHOUT_SRP_APK" ]; then
285284
echo "Uploading without-SRP APK to BrowserStack..."
@@ -308,7 +307,7 @@ jobs:
308307
echo "without-srp-version="
309308
} >> "$GITHUB_OUTPUT"
310309
fi
311-
310+
312311
echo "BrowserStack upload process completed!"
313312
echo "With-SRP URL: $WITH_SRP_APP_URL"
314-
echo "Without-SRP URL: $WITHOUT_SRP_APP_URL"
313+
echo "Without-SRP URL: $WITHOUT_SRP_APP_URL"

‎.github/workflows/build-ios-e2e.yml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ jobs:
1717
sourcemap-uploaded: ${{ steps.upload-sourcemap.outcome == 'success' }}
1818
env:
1919
RCT_NO_LAUNCH_PACKAGER: 1
20-
XCODE_BUILD_SETTINGS: "COMPILER_INDEX_STORE_ENABLE=NO"
21-
GITHUB_CI: "true" # This ensures it's available during pod install
20+
XCODE_BUILD_SETTINGS: 'COMPILER_INDEX_STORE_ENABLE=NO'
21+
GITHUB_CI: 'true' # This ensures it's available during pod install
2222
PLATFORM: ios
2323
METAMASK_ENVIRONMENT: qa
2424
METAMASK_BUILD_TYPE: main
2525
IS_TEST: true
26-
E2E: "true"
26+
E2E: 'true'
2727
IGNORE_BOXLOGS_DEVELOPMENT: true
28-
CI: "true"
29-
NODE_OPTIONS: "--max-old-space-size=8192"
30-
MM_UNIFIED_SWAPS_ENABLED: "true"
31-
MM_BRIDGE_ENABLED: "true"
32-
BRIDGE_USE_DEV_APIS: "true"
33-
RAMP_INTERNAL_BUILD: "true"
34-
SEEDLESS_ONBOARDING_ENABLED: "true"
35-
MM_REMOVE_GLOBAL_NETWORK_SELECTOR: "true"
36-
MM_NOTIFICATIONS_UI_ENABLED: "true"
37-
MM_SECURITY_ALERTS_API_ENABLED: "true"
38-
BLOCKAID_FILE_CDN: "static.cx.metamask.io/api/v1/confirmations/ppom"
28+
CI: 'true'
29+
NODE_OPTIONS: '--max-old-space-size=8192'
30+
MM_UNIFIED_SWAPS_ENABLED: 'true'
31+
MM_BRIDGE_ENABLED: 'true'
32+
BRIDGE_USE_DEV_APIS: 'true'
33+
RAMP_INTERNAL_BUILD: 'true'
34+
SEEDLESS_ONBOARDING_ENABLED: 'true'
35+
MM_REMOVE_GLOBAL_NETWORK_SELECTOR: 'true'
36+
MM_NOTIFICATIONS_UI_ENABLED: 'true'
37+
MM_SECURITY_ALERTS_API_ENABLED: 'true'
38+
BLOCKAID_FILE_CDN: 'static.cx.metamask.io/api/v1/confirmations/ppom'
3939
FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN: ${{ secrets.FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN }}
4040
FEATURES_ANNOUNCEMENTS_SPACE_ID: ${{ secrets.FEATURES_ANNOUNCEMENTS_SPACE_ID }}
4141
SEGMENT_WRITE_KEY_QA: ${{ secrets.SEGMENT_WRITE_KEY_QA }}
@@ -70,23 +70,23 @@ jobs:
7070
7171
# Install Node.js, Xcode tools, and other iOS development dependencies
7272
- name: Installing iOS Environment Setup
73-
uses: MetaMask/github-tools/.github/actions/setup-e2e-env@f932aba72712f44367f89f6e259ea0c8cfedcf68
73+
uses: MetaMask/github-tools/.github/actions/setup-e2e-env@2e4ce39610e441f28d50f30af8725ecf6bd540b8
7474
with:
7575
platform: ios
7676
setup-simulator: false
7777

7878
- name: Print iOS tool versions
7979
run: |
80-
echo "🔧 Node.js Version:"
81-
node -v || echo "Node not found"
82-
echo "🧶 Yarn Version:"
83-
yarn -v || echo "Yarn not found"
84-
echo "📦 CocoaPods Version:"
85-
pod --version || echo "CocoaPods not found"
86-
echo "🛠️ Xcode Path:"
87-
xcode-select -p || echo "Xcode not found"
88-
echo "📱 Booted iOS Simulators:"
89-
xcrun simctl list | grep Booted || echo "No booted simulators found"
80+
echo "🔧 Node.js Version:"
81+
node -v || echo "Node not found"
82+
echo "🧶 Yarn Version:"
83+
yarn -v || echo "Yarn not found"
84+
echo "📦 CocoaPods Version:"
85+
pod --version || echo "CocoaPods not found"
86+
echo "🛠️ Xcode Path:"
87+
xcode-select -p || echo "Xcode not found"
88+
echo "📱 Booted iOS Simulators:"
89+
xcrun simctl list | grep Booted || echo "No booted simulators found"
9090
shell: bash
9191

9292
# Clean iOS plist files to prevent extended attribute issues
@@ -103,7 +103,7 @@ jobs:
103103
command: |
104104
echo "🚀 Setting up project..."
105105
yarn setup:github-ci --build-ios --no-build-android
106-
106+
107107
# Build the iOS E2E app for simulator
108108
- name: Build iOS E2E App
109109
run: |
@@ -116,12 +116,12 @@ jobs:
116116
METAMASK_ENVIRONMENT: main
117117
METAMASK_BUILD_TYPE: main
118118
IS_TEST: true
119-
IS_SIM_BUILD: "true" # Ensures simulator build (.app) not device build (.ipa)
119+
IS_SIM_BUILD: 'true' # Ensures simulator build (.app) not device build (.ipa)
120120
IGNORE_BOXLOGS_DEVELOPMENT: true
121-
GITHUB_CI: "true"
122-
CI: "true"
121+
GITHUB_CI: 'true'
122+
CI: 'true'
123123

124-
NODE_OPTIONS: "--max_old_space_size=4096" # Increase memory limit for build
124+
NODE_OPTIONS: '--max_old_space_size=4096' # Increase memory limit for build
125125

126126
SEGMENT_WRITE_KEY_QA: ${{ secrets.SEGMENT_WRITE_KEY_QA }}
127127
SEGMENT_PROXY_URL_QA: ${{ secrets.SEGMENT_PROXY_URL_QA }}
@@ -174,5 +174,5 @@ jobs:
174174
echo "- Source Map: ${{ steps.upload-sourcemap.outcome }}"
175175
176176
env:
177-
GITHUB_REPOSITORY: "${{ github.repository }}"
178-
GITHUB_RUN_ID: "${{ github.run_id }}"
177+
GITHUB_REPOSITORY: '${{ github.repository }}'
178+
GITHUB_RUN_ID: '${{ github.run_id }}'

0 commit comments

Comments
 (0)