Skip to content

Commit a01df8c

Browse files
gambinishgambinish
committed
chore: Rebase develop, address conflicts
2 parents 93fb977 + c272b25 commit a01df8c

File tree

287 files changed

+17142
-4410
lines changed

Some content is hidden

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

287 files changed

+17142
-4410
lines changed

‎.circleci/config.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,11 @@ workflows:
103103
test_and_release:
104104
when:
105105
not:
106-
matches:
107-
pattern: /^l10n_crowdin_action$/
108-
value: << pipeline.git.branch >>
106+
or:
107+
- matches:
108+
pattern: /^l10n_crowdin_action$/
109+
value: << pipeline.git.branch >>
110+
- equal: [rerun-from-failed, << pipeline.schedule.name >>]
109111
jobs:
110112
- create_release_pull_request:
111113
<<: *rc_branch_only
@@ -176,6 +178,7 @@ workflows:
176178
- prep-build-test-mmi:
177179
requires:
178180
- prep-deps
181+
- check-mmi-trigger
179182
- prep-build-test-mmi-playwright:
180183
requires:
181184
- prep-deps
@@ -358,8 +361,7 @@ workflows:
358361

359362
rerun-from-failed:
360363
when:
361-
condition:
362-
equal: ["<< pipeline.schedule.name >>", "rerun-from-failed"]
364+
equal: [rerun-from-failed, << pipeline.schedule.name >>]
363365
jobs:
364366
- prep-deps
365367
- rerun-workflows-from-failed:
@@ -802,6 +804,7 @@ jobs:
802804
- run: corepack enable
803805
- attach_workspace:
804806
at: .
807+
- run: *check-mmi-trigger
805808
- run:
806809
name: Build extension for testing
807810
command: yarn build:test:mmi
@@ -1196,6 +1199,7 @@ jobs:
11961199
- run: sudo corepack enable
11971200
- attach_workspace:
11981201
at: .
1202+
- run: *check-mmi-trigger
11991203
- run:
12001204
name: Move test build to dist
12011205
command: mv ./dist-test-mmi ./dist
@@ -1285,6 +1289,7 @@ jobs:
12851289
- run: sudo corepack enable
12861290
- attach_workspace:
12871291
at: .
1292+
- run: *check-mmi-trigger
12881293
- run:
12891294
name: Move test build to dist
12901295
command: mv ./dist-test-mmi ./dist

‎.github/workflows/sonarcloud.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: SonarCloud
88
on:
99
workflow_run:
1010
workflows:
11-
- Run tests
11+
- Main
1212
types:
1313
- completed
1414

.yarn/patches/@metamask-assets-controllers-npm-45.0.0-31810ece32.patch renamed to .yarn/patches/@metamask-assets-controllers-npm-45.1.0-d914c453f0.patch

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,3 @@
1-
diff --git a/dist/TokenDetectionController.cjs b/dist/TokenDetectionController.cjs
2-
index 8fd5efde7a3c24080f8a43f79d10300e8c271245..66f656d9a55f1154024a8c18a9fe27b4ed39a21d 100644
3-
--- a/dist/TokenDetectionController.cjs
4-
+++ b/dist/TokenDetectionController.cjs
5-
@@ -250,17 +250,20 @@ _TokenDetectionController_intervalId = new WeakMap(), _TokenDetectionController_
6-
}
7-
});
8-
this.messagingSystem.subscribe('AccountsController:selectedEvmAccountChange',
9-
- // TODO: Either fix this lint violation or explain why it's necessary to ignore.
10-
- // eslint-disable-next-line @typescript-eslint/no-misused-promises
11-
- async (selectedAccount) => {
12-
- const isSelectedAccountIdChanged = __classPrivateFieldGet(this, _TokenDetectionController_selectedAccountId, "f") !== selectedAccount.id;
13-
- if (isSelectedAccountIdChanged) {
14-
- __classPrivateFieldSet(this, _TokenDetectionController_selectedAccountId, selectedAccount.id, "f");
15-
- await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this, {
16-
- selectedAddress: selectedAccount.address,
17-
- });
18-
- }
19-
- });
20-
+ // TODO: Either fix this lint violation or explain why it's necessary to ignore.
21-
+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
22-
+ async (selectedAccount) => {
23-
+ const { networkConfigurationsByChainId } = this.messagingSystem.call('NetworkController:getState');
24-
+ const chainIds = Object.keys(networkConfigurationsByChainId);
25-
+ const isSelectedAccountIdChanged = __classPrivateFieldGet(this, _TokenDetectionController_selectedAccountId, "f") !== selectedAccount.id;
26-
+ if (isSelectedAccountIdChanged) {
27-
+ __classPrivateFieldSet(this, _TokenDetectionController_selectedAccountId, selectedAccount.id, "f");
28-
+ await __classPrivateFieldGet(this, _TokenDetectionController_instances, "m", _TokenDetectionController_restartTokenDetection).call(this, {
29-
+ selectedAddress: selectedAccount.address,
30-
+ chainIds,
31-
+ });
32-
+ }
33-
+ });
34-
}, _TokenDetectionController_stopPolling = function _TokenDetectionController_stopPolling() {
35-
if (__classPrivateFieldGet(this, _TokenDetectionController_intervalId, "f")) {
36-
clearInterval(__classPrivateFieldGet(this, _TokenDetectionController_intervalId, "f"));
371
diff --git a/dist/assetsUtil.cjs b/dist/assetsUtil.cjs
382
index 48571b8c1b78e94d88e1837e986b5f8735ac651b..61246f51500c8cab48f18296a73629fb73454caa 100644
393
--- a/dist/assetsUtil.cjs
@@ -56,7 +20,7 @@ index 48571b8c1b78e94d88e1837e986b5f8735ac651b..61246f51500c8cab48f18296a73629fb
5620
// because most cid v0s appear to be incompatible with IPFS subdomains
5721
return {
5822
diff --git a/dist/token-prices-service/codefi-v2.mjs b/dist/token-prices-service/codefi-v2.mjs
59-
index e7eaad2cfa8b233c4fd42a51f745233a1cc5c387..bf8ec7819f678c2f185d6a85d7e3ea81f055a309 100644
23+
index a13403446a2376d4d905a9ef733941798da89c88..3c8229f9ea40f4c1ee760a22884e1066dac82ec7 100644
6024
--- a/dist/token-prices-service/codefi-v2.mjs
6125
+++ b/dist/token-prices-service/codefi-v2.mjs
6226
@@ -12,8 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
@@ -65,7 +29,31 @@ index e7eaad2cfa8b233c4fd42a51f745233a1cc5c387..bf8ec7819f678c2f185d6a85d7e3ea81
6529
import { hexToNumber } from "@metamask/utils";
6630
-import $cockatiel from "cockatiel";
6731
-const { circuitBreaker, ConsecutiveBreaker, ExponentialBackoff, handleAll, retry, wrap, CircuitState } = $cockatiel;
68-
+import { circuitBreaker, ConsecutiveBreaker, ExponentialBackoff, handleAll, retry, wrap, CircuitState } from "cockatiel"
32+
+import { circuitBreaker, ConsecutiveBreaker, ExponentialBackoff, handleAll, retry, wrap, CircuitState } from "cockatiel";
6933
/**
7034
* The list of currencies that can be supplied as the `vsCurrency` parameter to
7135
* the `/spot-prices` endpoint, in lowercase form.
36+
diff --git a/dist/TokensController.cjs b/dist/TokensController.cjs
37+
index 343b343b8300136756d96acac77aab8140efc95a..69d8e2ea84d6303a3af02bd95458ef3060c76f2b 100644
38+
--- a/dist/TokensController.cjs
39+
+++ b/dist/TokensController.cjs
40+
@@ -270,13 +270,16 @@ class TokensController extends base_controller_1.BaseController {
41+
* @param networkClientId - Optional network client ID used to determine interacting chain ID.
42+
*/
43+
ignoreTokens(tokenAddressesToIgnore, networkClientId) {
44+
- const { ignoredTokens, detectedTokens, tokens } = this.state;
45+
- const ignoredTokensMap = {};
46+
- let newIgnoredTokens = [...ignoredTokens];
47+
let interactingChainId;
48+
if (networkClientId) {
49+
interactingChainId = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId;
50+
}
51+
+ const { allTokens, allDetectedTokens, allIgnoredTokens } = this.state;
52+
+ const ignoredTokensMap = {};
53+
+ const ignoredTokens = allIgnoredTokens[interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || [];
54+
+ let newIgnoredTokens = [...ignoredTokens];
55+
+ const tokens = allTokens[interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || [];
56+
+ const detectedTokens = allDetectedTokens[interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || [];
57+
const checksummedTokenAddresses = tokenAddressesToIgnore.map((address) => {
58+
const checksumAddress = (0, controller_utils_1.toChecksumHexAddress)(address);
59+
ignoredTokensMap[address.toLowerCase()] = true;

‎.yarn/patches/@metamask-assets-controllers-patch-9e00573eb4.patch‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎app/_locales/de/messages.json‎

Lines changed: 0 additions & 3 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 & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/_locales/en/messages.json‎

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

‎app/_locales/es/messages.json‎

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

‎app/_locales/fr/messages.json‎

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

‎app/_locales/hi/messages.json‎

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

0 commit comments

Comments
 (0)