Skip to content

Commit 97d418a

Browse files
NicolasMassartNicolasMassart
authored
Merge branch 'main' into refactor/MCWP-302_analytics_migration_batch_3-16_mobile-platform
2 parents 2c5949e + 48275cf commit 97d418a

277 files changed

Lines changed: 17811 additions & 7814 deletions

File tree

Some content is hidden

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

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

Lines changed: 174 additions & 151 deletions
Large diffs are not rendered by default.

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ jobs:
113113
- name: Apply build config
114114
run: |
115115
# Load env vars from builds.yml (this step only)
116-
eval "$(node scripts/apply-build-config.js "${{ inputs.build_name }}" --export)"
116+
eval "$(node scripts/apply-build-config.js ${{ inputs.build_name }} --export)"
117117
# Persist to GITHUB_ENV so later steps (e.g. Build) see CONFIGURATION, IS_SIM_BUILD, etc.
118-
node scripts/apply-build-config.js "${{ inputs.build_name }}" --export-github-env >> "$GITHUB_ENV"
118+
node scripts/apply-build-config.js ${{ inputs.build_name }} --export-github-env >> "$GITHUB_ENV"
119119
120120
- name: Validate secrets
121121
env:

‎.github/workflows/push-eas-update.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,9 @@ jobs:
312312
QUICKNODE_MONAD_URL: ${{ secrets.QUICKNODE_MONAD_URL }}
313313
QUICKNODE_OPTIMISM_URL: ${{ secrets.QUICKNODE_OPTIMISM_URL }}
314314
QUICKNODE_POLYGON_URL: ${{ secrets.QUICKNODE_POLYGON_URL }}
315+
QUICKNODE_BSC_URL: ${{ secrets.QUICKNODE_BSC_URL }}
316+
QUICKNODE_SEI_URL: ${{ secrets.QUICKNODE_SEI_URL }}
317+
QUICKNODE_HYPEREVM_URL: ${{ secrets.QUICKNODE_HYPEREVM_URL }}
315318
steps:
316319
- name: Checkout repository
317320
uses: actions/checkout@v4

‎.github/workflows/run-performance-e2e.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ jobs:
211211
name: Run Android Onboarding Tests
212212
uses: ./.github/workflows/performance-test-runner.yml
213213
needs: [read-device-matrix, trigger-android-dual-versions, set-build-names, determine-branch-name]
214-
if: always() && !failure() && !cancelled() && (needs.trigger-android-dual-versions.result == 'skipped' || needs.trigger-android-dual-versions.result == 'success') && (inputs.browserstack_app_url_android_onboarding || needs.trigger-android-dual-versions.result == 'success')
214+
if: always() && !failure() && !cancelled() && (needs.trigger-android-dual-versions.result == 'skipped' || needs.trigger-android-dual-versions.result == 'success') && (inputs.browserstack_app_url_android_onboarding != '' || needs.trigger-android-dual-versions.outputs.without-srp-browserstack-url != '')
215215
with:
216216
platform: android
217217
build_type: onboarding
@@ -226,7 +226,7 @@ jobs:
226226
name: Run iOS Onboarding Tests
227227
uses: ./.github/workflows/performance-test-runner.yml
228228
needs: [read-device-matrix, trigger-ios-dual-versions, set-build-names, determine-branch-name]
229-
if: always() && !failure() && !cancelled() && (needs.trigger-ios-dual-versions.result == 'skipped' || needs.trigger-ios-dual-versions.result == 'success') && (inputs.browserstack_app_url_ios_onboarding || needs.trigger-ios-dual-versions.result == 'success')
229+
if: always() && !failure() && !cancelled() && (needs.trigger-ios-dual-versions.result == 'skipped' || needs.trigger-ios-dual-versions.result == 'success') && (inputs.browserstack_app_url_ios_onboarding != '' || needs.trigger-ios-dual-versions.outputs.without-srp-browserstack-url != '')
230230
with:
231231
platform: ios
232232
build_type: onboarding
@@ -263,7 +263,7 @@ jobs:
263263
set-build-names,
264264
determine-branch-name,
265265
]
266-
if: always() && (needs.trigger-android-dual-versions.result == 'skipped' || needs.trigger-android-dual-versions.result == 'success') && (inputs.browserstack_app_url_android_imported_wallet || needs.trigger-android-dual-versions.result == 'success')
266+
if: always() && !cancelled() && (needs.trigger-android-dual-versions.result == 'skipped' || needs.trigger-android-dual-versions.result == 'success') && (inputs.browserstack_app_url_android_imported_wallet != '' || needs.trigger-android-dual-versions.outputs.with-srp-browserstack-url != '')
267267
with:
268268
platform: android
269269
build_type: imported-wallet
@@ -285,7 +285,7 @@ jobs:
285285
set-build-names,
286286
determine-branch-name,
287287
]
288-
if: always() && (needs.trigger-ios-dual-versions.result == 'skipped' || needs.trigger-ios-dual-versions.result == 'success') && (inputs.browserstack_app_url_ios_imported_wallet || needs.trigger-ios-dual-versions.result == 'success')
288+
if: always() && !cancelled() && (needs.trigger-ios-dual-versions.result == 'skipped' || needs.trigger-ios-dual-versions.result == 'success') && (inputs.browserstack_app_url_ios_imported_wallet != '' || needs.trigger-ios-dual-versions.outputs.with-srp-browserstack-url != '')
289289
with:
290290
platform: ios
291291
build_type: imported-wallet
@@ -307,7 +307,7 @@ jobs:
307307
set-build-names,
308308
determine-branch-name,
309309
]
310-
if: always() && (needs.trigger-android-dual-versions.result == 'skipped' || needs.trigger-android-dual-versions.result == 'success') && (inputs.browserstack_app_url_android_imported_wallet || needs.trigger-android-dual-versions.result == 'success')
310+
if: always() && !cancelled() && (needs.trigger-android-dual-versions.result == 'skipped' || needs.trigger-android-dual-versions.result == 'success') && (inputs.browserstack_app_url_android_imported_wallet != '' || needs.trigger-android-dual-versions.outputs.with-srp-browserstack-url != '')
311311
with:
312312
platform: android
313313
build_type: mm-connect

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ tests/artifacts
115115
# E2E Reports generated by tests
116116
tests/reports
117117
# Legacy e2e reports
118-
e2e/reports
118+
e2e/reports
119119

120120
# Unit Coverage Reports generated by tests
121121
tests/coverage
@@ -136,6 +136,7 @@ appwright/test-reports/
136136
test-results/
137137
test-reports/
138138
appwright/reporters/reports/*
139+
tests/reporters/reports/
139140
*.apk
140141

141142
# anvil binaries
@@ -180,4 +181,4 @@ temp/
180181

181182
tests/coverage-systems/
182183

183-
runway-artifacts/
184+
runway-artifacts/

‎.yarn/patches/@metamask-assets-controllers-npm-100.0.3-ea172b88c9.patch‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
diff --git a/dist/multi-chain-accounts-service/api-balance-fetcher.cjs b/dist/multi-chain-accounts-service/api-balance-fetcher.cjs
2+
index 6ae7034bd87dfdaa49324fd36a340689df45960e..4719739bf194f5fb8669f382b021b54952294508 100644
3+
--- a/dist/multi-chain-accounts-service/api-balance-fetcher.cjs
4+
+++ b/dist/multi-chain-accounts-service/api-balance-fetcher.cjs
5+
@@ -150,7 +150,10 @@ class AccountsApiBalanceFetcher {
6+
chains.forEach((chainId) => {
7+
const key = `${address}-${chainId}`;
8+
const existingBalance = nativeBalancesFromAPI.get(key);
9+
- if (!existingBalance) {
10+
+ const isChainIncludedInRequest = chainIds.includes(chainId);
11+
+ const isChainSupported = this.supports(chainId);
12+
+ const shouldZeroOutBalance = !existingBalance && isChainIncludedInRequest && isChainSupported;
13+
+ if (shouldZeroOutBalance) {
14+
// Add zero native balance entry if API succeeded but didn't return one
15+
results.push({
16+
success: true,
17+
@@ -172,7 +175,10 @@ class AccountsApiBalanceFetcher {
18+
const key = `${account.toLowerCase()}-${tokenLowerCase}-${chainId}`;
19+
const isERC = tokenAddress !== ZERO_ADDRESS;
20+
const existingBalance = nonNativeBalancesFromAPI.get(key);
21+
- if (isERC && !existingBalance) {
22+
+ const isChainIncludedInRequest = chainIds.includes(chainId);
23+
+ const isChainSupported = this.supports(chainId);
24+
+ const shouldZeroOutBalance = !existingBalance && isChainIncludedInRequest && isChainSupported;
25+
+ if (isERC && shouldZeroOutBalance) {
26+
results.push({
27+
success: true,
28+
value: new bn_js_1.default('0'),

‎.yarn/patches/@metamask-bridge-controller-npm-67.2.0-32d3aafe1f.patch‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/dist/utils/metrics/types.d.cts b/dist/utils/metrics/types.d.cts
2+
index b8f94476d4447cb5895a0f39e7beb1eb5e3b4e16..90cbc588e9ebbc84a761bbeaf3770572aad4d6f8 100644
3+
--- a/dist/utils/metrics/types.d.cts
4+
+++ b/dist/utils/metrics/types.d.cts
5+
@@ -153,6 +153,7 @@ type RequiredEventContextFromClientBase = {
6+
export type RequiredEventContextFromClient = {
7+
[K in keyof RequiredEventContextFromClientBase]: RequiredEventContextFromClientBase[K] & {
8+
location?: MetaMetricsSwapsEventSource;
9+
+ ab_tests?: Record<string, string>;
10+
};
11+
};
12+
/**
13+
@@ -198,6 +199,7 @@ export type EventPropertiesFromControllerState = {
14+
export type CrossChainSwapsEventProperties<T extends UnifiedSwapBridgeEventName> = {
15+
action_type: MetricsActionType;
16+
location: MetaMetricsSwapsEventSource;
17+
+ ab_tests?: Record<string, string>;
18+
} | Pick<EventPropertiesFromControllerState, T>[T] | Pick<RequiredEventContextFromClient, T>[T];
19+
export {};
20+
//# sourceMappingURL=types.d.cts.map

0 commit comments

Comments
 (0)