From ed06926ac5baca77914c3088ac97f4ccfa1fd463 Mon Sep 17 00:00:00 2001 From: Howard Braham Date: Thu, 22 Jun 2023 21:00:40 -0700 Subject: [PATCH 01/52] chore(tools): update geckodriver to 4.0.4 (#19558) --- package.json | 2 +- yarn.lock | 319 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 246 insertions(+), 75 deletions(-) diff --git a/package.json b/package.json index fae1202fe..021cad8ac 100644 --- a/package.json +++ b/package.json @@ -466,7 +466,7 @@ "fast-glob": "^3.2.2", "fs-extra": "^8.1.0", "ganache": "^v7.0.4", - "geckodriver": "^3.2.0", + "geckodriver": "^4.0.4", "gh-pages": "^5.0.0", "globby": "^11.0.4", "gulp": "^4.0.2", diff --git a/yarn.lock b/yarn.lock index 7e19652e3..927c8c3d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8651,6 +8651,18 @@ __metadata: languageName: node linkType: hard +"@wdio/logger@npm:^8.6.6": + version: 8.11.0 + resolution: "@wdio/logger@npm:8.11.0" + dependencies: + chalk: ^5.1.2 + loglevel: ^1.6.0 + loglevel-plugin-prefix: ^0.8.4 + strip-ansi: ^7.1.0 + checksum: b62d0db074240a993c72d95793606d4fa7890fcbebdff5e344bf5c7be90f8189e94432056c1fbb5e636a74b0f036a8a1d88af6c04e4c01e436e9dfab7048f638 + languageName: node + linkType: hard + "@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5": version: 1.11.6 resolution: "@webassemblyjs/ast@npm:1.11.6" @@ -9209,13 +9221,6 @@ __metadata: languageName: node linkType: hard -"adm-zip@npm:0.5.9": - version: 0.5.9 - resolution: "adm-zip@npm:0.5.9" - checksum: 4909bc04119fdd5e8f8ba43826e50623e5c427cf0a939c809d4f9456a6a03c6aa0544e82088739de9ba16b7649f71b99ccbbddc7b2c38bd6143f9c4726cc7ed9 - languageName: node - linkType: hard - "aes-js@npm:3.0.0": version: 3.0.0 resolution: "aes-js@npm:3.0.0" @@ -9246,6 +9251,15 @@ __metadata: languageName: node linkType: hard +"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0": + version: 7.1.0 + resolution: "agent-base@npm:7.1.0" + dependencies: + debug: ^4.3.4 + checksum: f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f + languageName: node + linkType: hard + "agentkeepalive@npm:^4.2.1": version: 4.2.1 resolution: "agentkeepalive@npm:4.2.1" @@ -10617,7 +10631,7 @@ __metadata: languageName: node linkType: hard -"big-integer@npm:^1.6.44, big-integer@npm:^1.6.48": +"big-integer@npm:^1.6.17, big-integer@npm:^1.6.44, big-integer@npm:^1.6.48": version: 1.6.51 resolution: "big-integer@npm:1.6.51" checksum: 3d444173d1b2e20747e2c175568bedeebd8315b0637ea95d75fd27830d3b8e8ba36c6af40374f36bdaea7b5de376dcada1b07587cb2a79a928fccdb6e6e3c518 @@ -10666,6 +10680,16 @@ __metadata: languageName: node linkType: hard +"binary@npm:~0.3.0": + version: 0.3.0 + resolution: "binary@npm:0.3.0" + dependencies: + buffers: ~0.1.1 + chainsaw: ~0.1.0 + checksum: b4699fda9e2c2981e74a46b0115cf0d472eda9b68c0e9d229ef494e92f29ce81acf0a834415094cffcc340dfee7c4ef8ce5d048c65c18067a7ed850323f777af + languageName: node + linkType: hard + "bindings@npm:^1.3.0, bindings@npm:^1.5.0": version: 1.5.0 resolution: "bindings@npm:1.5.0" @@ -10738,13 +10762,20 @@ __metadata: languageName: node linkType: hard -"bluebird@npm:3.7.2, bluebird@npm:^3.5.2, bluebird@npm:^3.7.2": +"bluebird@npm:^3.5.2, bluebird@npm:^3.7.2": version: 3.7.2 resolution: "bluebird@npm:3.7.2" checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef languageName: node linkType: hard +"bluebird@npm:~3.4.1": + version: 3.4.7 + resolution: "bluebird@npm:3.4.7" + checksum: bffa9dee7d3a41ab15c4f3f24687b49959b4e64e55c058a062176feb8ccefc2163414fb4e1a0f3053bf187600936509660c3ebd168fd9f0e48c7eba23b019466 + languageName: node + linkType: hard + "bn.js@npm:4.11.6": version: 4.11.6 resolution: "bn.js@npm:4.11.6" @@ -11348,6 +11379,13 @@ __metadata: languageName: node linkType: hard +"buffer-indexof-polyfill@npm:~1.0.0": + version: 1.0.2 + resolution: "buffer-indexof-polyfill@npm:1.0.2" + checksum: fbfb2d69c6bb2df235683126f9dc140150c08ac3630da149913a9971947b667df816a913b6993bc48f4d611999cb99a1589914d34c02dccd2234afda5cb75bbc + languageName: node + linkType: hard + "buffer-xor@npm:^1.0.3": version: 1.0.3 resolution: "buffer-xor@npm:1.0.3" @@ -11395,6 +11433,13 @@ __metadata: languageName: node linkType: hard +"buffers@npm:~0.1.1": + version: 0.1.1 + resolution: "buffers@npm:0.1.1" + checksum: ad6f8e483efab39cefd92bdc04edbff6805e4211b002f4d1cfb70c6c472a61cc89fb18c37bcdfdd4ee416ca096e9ff606286698a7d41a18b539bac12fd76d4d5 + languageName: node + linkType: hard + "bufferutil@npm:4.0.5": version: 4.0.5 resolution: "bufferutil@npm:4.0.5" @@ -11781,6 +11826,15 @@ __metadata: languageName: node linkType: hard +"chainsaw@npm:~0.1.0": + version: 0.1.0 + resolution: "chainsaw@npm:0.1.0" + dependencies: + traverse: ">=0.3.0 <0.4" + checksum: 22a96b9fb0cd9fb20813607c0869e61817d1acc81b5d455cc6456b5e460ea1dd52630e0f76b291cf8294bfb6c1fc42e299afb52104af9096242699d6d3aa6d3e + languageName: node + linkType: hard + "chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2" @@ -11812,6 +11866,13 @@ __metadata: languageName: node linkType: hard +"chalk@npm:^5.1.2": + version: 5.2.0 + resolution: "chalk@npm:5.2.0" + checksum: 03d8060277de6cf2fd567dc25fcf770593eb5bb85f460ce443e49255a30ff1242edd0c90a06a03803b0466ff0687a939b41db1757bec987113e83de89a003caa + languageName: node + linkType: hard + "change-case@npm:3.0.2": version: 3.0.2 resolution: "change-case@npm:3.0.2" @@ -13368,6 +13429,13 @@ __metadata: languageName: node linkType: hard +"data-uri-to-buffer@npm:^4.0.0": + version: 4.0.1 + resolution: "data-uri-to-buffer@npm:4.0.1" + checksum: 0d0790b67ffec5302f204c2ccca4494f70b4e2d940fea3d36b09f0bb2b8539c2e86690429eb1f1dc4bcc9e4df0644193073e63d9ee48ac9fce79ec1506e4aa4c + languageName: node + linkType: hard + "data-urls@npm:^3.0.2": version: 3.0.2 resolution: "data-urls@npm:3.0.2" @@ -13513,6 +13581,13 @@ __metadata: languageName: node linkType: hard +"decamelize@npm:^6.0.0": + version: 6.0.0 + resolution: "decamelize@npm:6.0.0" + checksum: 0066bc30798ec11e01adf0c19ad975caef86545d4bb6f70cfb90b7eb8e3cbf7974cf774ac2e6ea2586e4e07b1f654bfecc4e772c42128a79a89f8584fc546753 + languageName: node + linkType: hard + "decimal.js@npm:^10.2.0, decimal.js@npm:^10.3.1": version: 10.4.0 resolution: "decimal.js@npm:10.4.0" @@ -17021,6 +17096,16 @@ __metadata: languageName: node linkType: hard +"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4": + version: 3.2.0 + resolution: "fetch-blob@npm:3.2.0" + dependencies: + node-domexception: ^1.0.0 + web-streams-polyfill: ^3.0.3 + checksum: f19bc28a2a0b9626e69fd7cf3a05798706db7f6c7548da657cbf5026a570945f5eeaedff52007ea35c8bcd3d237c58a20bf1543bc568ab2422411d762dd3d5bf + languageName: node + linkType: hard + "fetch-ponyfill@npm:^7.1.0": version: 7.1.0 resolution: "fetch-ponyfill@npm:7.1.0" @@ -17630,6 +17715,15 @@ __metadata: languageName: node linkType: hard +"formdata-polyfill@npm:^4.0.10": + version: 4.0.10 + resolution: "formdata-polyfill@npm:4.0.10" + dependencies: + fetch-blob: ^3.1.2 + checksum: 82a34df292afadd82b43d4a740ce387bc08541e0a534358425193017bf9fb3567875dc5f69564984b1da979979b70703aa73dee715a17b6c229752ae736dd9db + languageName: node + linkType: hard + "forwarded@npm:0.2.0": version: 0.2.0 resolution: "forwarded@npm:0.2.0" @@ -17816,6 +17910,18 @@ __metadata: languageName: node linkType: hard +"fstream@npm:^1.0.12": + version: 1.0.12 + resolution: "fstream@npm:1.0.12" + dependencies: + graceful-fs: ^4.1.2 + inherits: ~2.0.0 + mkdirp: ">=0.5 0" + rimraf: 2 + checksum: e6998651aeb85fd0f0a8a68cec4d05a3ada685ecc4e3f56e0d063d0564a4fc39ad11a856f9020f926daf869fc67f7a90e891def5d48e4cadab875dc313094536 + languageName: node + linkType: hard + "ftp@npm:^0.3.10": version: 0.3.10 resolution: "ftp@npm:0.3.10" @@ -17945,18 +18051,21 @@ __metadata: languageName: node linkType: hard -"geckodriver@npm:^3.2.0": - version: 3.2.0 - resolution: "geckodriver@npm:3.2.0" +"geckodriver@npm:^4.0.4": + version: 4.0.4 + resolution: "geckodriver@npm:4.0.4" dependencies: - adm-zip: 0.5.9 - bluebird: 3.7.2 - got: 11.8.5 - https-proxy-agent: 5.0.1 - tar: 6.1.11 + "@wdio/logger": ^8.6.6 + decamelize: ^6.0.0 + http-proxy-agent: ^7.0.0 + https-proxy-agent: ^7.0.0 + node-fetch: ^3.3.1 + tar-fs: ^2.1.1 + unzipper: ^0.10.14 + which: ^3.0.1 bin: - geckodriver: bin/geckodriver - checksum: fe196312c97927be943aa97f2343ba15a6fb612b51a1e8ea96c0c8c6e8d50c81d33517e604e3db3777ada28bb9f5b0dad7e822ca4e841f16375a8f1d77df08ae + geckodriver: bin/geckodriver.js + checksum: ac286037afaf87eec77804bf61a457f7f38d0e226134f514ad72fc07e85df12ae0a308053987e3495dbf57a0e7b19f33c42e55b10581dcfd7729055b2346efc2 languageName: node linkType: hard @@ -18547,25 +18656,6 @@ __metadata: languageName: node linkType: hard -"got@npm:11.8.5": - version: 11.8.5 - resolution: "got@npm:11.8.5" - dependencies: - "@sindresorhus/is": ^4.0.0 - "@szmarczak/http-timer": ^4.0.5 - "@types/cacheable-request": ^6.0.1 - "@types/responselike": ^1.0.0 - cacheable-lookup: ^5.0.3 - cacheable-request: ^7.0.2 - decompress-response: ^6.0.0 - http2-wrapper: ^1.0.0-beta.5.2 - lowercase-keys: ^2.0.0 - p-cancelable: ^2.0.0 - responselike: ^2.0.0 - checksum: 2de8a1bbda4e9b6b2b72b2d2100bc055a59adc1740529e631f61feb44a8b9a1f9f8590941ed9da9df0090b6d6d0ed8ffee94cd9ac086ec3409b392b33440f7d2 - languageName: node - linkType: hard - "got@npm:^11.8.5": version: 11.8.6 resolution: "got@npm:11.8.6" @@ -18604,7 +18694,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.3, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.3, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7 @@ -19471,6 +19561,16 @@ __metadata: languageName: node linkType: hard +"http-proxy-agent@npm:^7.0.0": + version: 7.0.0 + resolution: "http-proxy-agent@npm:7.0.0" + dependencies: + agent-base: ^7.1.0 + debug: ^4.3.4 + checksum: 48d4fac997917e15f45094852b63b62a46d0c8a4f0b9c6c23ca26d27b8df8d178bed88389e604745e748bd9a01f5023e25093722777f0593c3f052009ff438b6 + languageName: node + linkType: hard + "http-signature@npm:~1.2.0": version: 1.2.0 resolution: "http-signature@npm:1.2.0" @@ -19509,7 +19609,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:5, https-proxy-agent@npm:5.0.1, https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1": +"https-proxy-agent@npm:5, https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" dependencies: @@ -19529,6 +19629,16 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:^7.0.0": + version: 7.0.0 + resolution: "https-proxy-agent@npm:7.0.0" + dependencies: + agent-base: ^7.0.2 + debug: 4 + checksum: c1365f5202b6a9c5c5fb1e6718e941254c2782bc51e8c57b1a7cacdccf1017278224434c963dfcdbdd4a3147a29c97d782316fabeef4e099968a627049de3347 + languageName: node + linkType: hard + "human-signals@npm:^1.1.1": version: 1.1.1 resolution: "human-signals@npm:1.1.1" @@ -19781,7 +19891,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3, inherits@npm:~2.0.4": +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.0, inherits@npm:~2.0.1, inherits@npm:~2.0.3, inherits@npm:~2.0.4": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 @@ -23218,6 +23328,13 @@ __metadata: languageName: node linkType: hard +"listenercount@npm:~1.0.1": + version: 1.0.1 + resolution: "listenercount@npm:1.0.1" + checksum: 0f1c9077cdaf2ebc16473c7d72eb7de6d983898ca42500f03da63c3914b6b312dd5f7a90d2657691ea25adf3fe0ac5a43226e8b2c673fd73415ed038041f4757 + languageName: node + linkType: hard + "livereload-js@npm:^2.3.0": version: 2.4.0 resolution: "livereload-js@npm:2.4.0" @@ -23451,7 +23568,14 @@ __metadata: languageName: node linkType: hard -"loglevel@npm:^1.8.0, loglevel@npm:^1.8.1": +"loglevel-plugin-prefix@npm:^0.8.4": + version: 0.8.4 + resolution: "loglevel-plugin-prefix@npm:0.8.4" + checksum: 5fe0632fa04263e083f87204107a06aa53e40a3537e08752539f5c0fd9a0ef112fe9ba6bdaed791502156c67a4ff7993a2b2871404615f0163f4c49649c362e4 + languageName: node + linkType: hard + +"loglevel@npm:^1.6.0, loglevel@npm:^1.8.0, loglevel@npm:^1.8.1": version: 1.8.1 resolution: "loglevel@npm:1.8.1" checksum: a1a62db40291aaeaef2f612334c49e531bff71cc1d01a2acab689ab80d59e092f852ab164a5aedc1a752fdc46b7b162cb097d8a9eb2cf0b299511106c29af61d @@ -24478,7 +24602,7 @@ __metadata: fs-extra: ^8.1.0 fuse.js: ^3.2.0 ganache: ^v7.0.4 - geckodriver: ^3.2.0 + geckodriver: ^4.0.4 gh-pages: ^5.0.0 globalthis: ^1.0.1 globby: ^11.0.4 @@ -25327,7 +25451,7 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.4, mkdirp@npm:^0.5.5, mkdirp@npm:^0.5.6": +"mkdirp@npm:>=0.5 0, mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.4, mkdirp@npm:^0.5.5, mkdirp@npm:^0.5.6": version: 0.5.6 resolution: "mkdirp@npm:0.5.6" dependencies: @@ -25930,6 +26054,13 @@ __metadata: languageName: node linkType: hard +"node-domexception@npm:^1.0.0": + version: 1.0.0 + resolution: "node-domexception@npm:1.0.0" + checksum: ee1d37dd2a4eb26a8a92cd6b64dfc29caec72bff5e1ed9aba80c294f57a31ba4895a60fd48347cf17dd6e766da0ae87d75657dfd1f384ebfa60462c2283f5c7f + languageName: node + linkType: hard + "node-fetch-native@npm:^1.0.2": version: 1.1.1 resolution: "node-fetch-native@npm:1.1.1" @@ -25951,6 +26082,17 @@ __metadata: languageName: node linkType: hard +"node-fetch@npm:^3.3.1": + version: 3.3.1 + resolution: "node-fetch@npm:3.3.1" + dependencies: + data-uri-to-buffer: ^4.0.0 + fetch-blob: ^3.1.4 + formdata-polyfill: ^4.0.10 + checksum: 62145fd3ba4770a76110bc31fdc0054ab2f5442b5ce96e9c4b39fc9e94a3d305560eec76e1165d9259eab866e02a8eecf9301062bb5dfc9f08a4d08b69d223dd + languageName: node + linkType: hard + "node-forge@npm:^1.2.1": version: 1.3.0 resolution: "node-forge@npm:1.3.0" @@ -30379,6 +30521,17 @@ __metadata: languageName: node linkType: hard +"rimraf@npm:2, rimraf@npm:^2.2.8, rimraf@npm:^2.6.1": + version: 2.7.1 + resolution: "rimraf@npm:2.7.1" + dependencies: + glob: ^7.1.3 + bin: + rimraf: ./bin.js + checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd + languageName: node + linkType: hard + "rimraf@npm:2.6.3, rimraf@npm:~2.6.2": version: 2.6.3 resolution: "rimraf@npm:2.6.3" @@ -30390,17 +30543,6 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^2.2.8, rimraf@npm:^2.6.1": - version: 2.7.1 - resolution: "rimraf@npm:2.7.1" - dependencies: - glob: ^7.1.3 - bin: - rimraf: ./bin.js - checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd - languageName: node - linkType: hard - "rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": version: 3.0.2 resolution: "rimraf@npm:3.0.2" @@ -31161,7 +31303,7 @@ __metadata: languageName: node linkType: hard -"setimmediate@npm:^1.0.5": +"setimmediate@npm:^1.0.5, setimmediate@npm:~1.0.4": version: 1.0.5 resolution: "setimmediate@npm:1.0.5" checksum: c9a6f2c5b51a2dabdc0247db9c46460152ffc62ee139f3157440bd48e7c59425093f42719ac1d7931f054f153e2d26cf37dfeb8da17a794a58198a2705e527fd @@ -32284,12 +32426,12 @@ __metadata: languageName: node linkType: hard -"strip-ansi@npm:^7.0.1": - version: 7.0.1 - resolution: "strip-ansi@npm:7.0.1" +"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0": + version: 7.1.0 + resolution: "strip-ansi@npm:7.1.0" dependencies: ansi-regex: ^6.0.1 - checksum: 257f78fa433520e7f9897722731d78599cb3fce29ff26a20a5e12ba4957463b50a01136f37c43707f4951817a75e90820174853d6ccc240997adc5df8f966039 + checksum: 859c73fcf27869c22a4e4d8c6acfe690064659e84bef9458aa6d13719d09ca88dcfd40cbf31fd0be63518ea1a643fe070b4827d353e09533a5b0b9fd4553d64d languageName: node linkType: hard @@ -32790,20 +32932,6 @@ __metadata: languageName: node linkType: hard -"tar@npm:6.1.11": - version: 6.1.11 - resolution: "tar@npm:6.1.11" - dependencies: - chownr: ^2.0.0 - fs-minipass: ^2.0.0 - minipass: ^3.0.0 - minizlib: ^2.1.1 - mkdirp: ^1.0.3 - yallist: ^4.0.0 - checksum: a04c07bb9e2d8f46776517d4618f2406fb977a74d914ad98b264fc3db0fe8224da5bec11e5f8902c5b9bcb8ace22d95fbe3c7b36b8593b7dfc8391a25898f32f - languageName: node - linkType: hard - "tar@npm:^4": version: 4.4.19 resolution: "tar@npm:4.4.19" @@ -33280,6 +33408,13 @@ __metadata: languageName: node linkType: hard +"traverse@npm:>=0.3.0 <0.4": + version: 0.3.9 + resolution: "traverse@npm:0.3.9" + checksum: 982982e4e249e9bbf063732a41fe5595939892758524bbef5d547c67cdf371b13af72b5434c6a61d88d4bb4351d6dabc6e22d832e0d16bc1bc684ef97a1cc59e + languageName: node + linkType: hard + "tree-kill@npm:^1.2.2": version: 1.2.2 resolution: "tree-kill@npm:1.2.2" @@ -34183,6 +34318,24 @@ __metadata: languageName: node linkType: hard +"unzipper@npm:^0.10.14": + version: 0.10.14 + resolution: "unzipper@npm:0.10.14" + dependencies: + big-integer: ^1.6.17 + binary: ~0.3.0 + bluebird: ~3.4.1 + buffer-indexof-polyfill: ~1.0.0 + duplexer2: ~0.1.4 + fstream: ^1.0.12 + graceful-fs: ^4.2.2 + listenercount: ~1.0.1 + readable-stream: ~2.3.6 + setimmediate: ~1.0.4 + checksum: b46ae9a72e4b4c224be6a8f46447dd7cb3761a59450827e869747c4564a8f555f877fc19c7e3b5d146127a7dd3e2ffea186116682f6646e64479f99dd23565bc + languageName: node + linkType: hard + "upath@npm:2.0.1": version: 2.0.1 resolution: "upath@npm:2.0.1" @@ -34932,6 +35085,13 @@ __metadata: languageName: node linkType: hard +"web-streams-polyfill@npm:^3.0.3": + version: 3.2.1 + resolution: "web-streams-polyfill@npm:3.2.1" + checksum: b119c78574b6d65935e35098c2afdcd752b84268e18746606af149e3c424e15621b6f1ff0b42b2676dc012fc4f0d313f964b41a4b5031e525faa03997457da02 + languageName: node + linkType: hard + "web3-provider-engine@npm:^16.0.3": version: 16.0.5 resolution: "web3-provider-engine@npm:16.0.5" @@ -35269,6 +35429,17 @@ __metadata: languageName: node linkType: hard +"which@npm:^3.0.1": + version: 3.0.1 + resolution: "which@npm:3.0.1" + dependencies: + isexe: ^2.0.0 + bin: + node-which: bin/which.js + checksum: adf720fe9d84be2d9190458194f814b5e9015ae4b88711b150f30d0f4d0b646544794b86f02c7ebeec1db2029bc3e83a7ff156f542d7521447e5496543e26890 + languageName: node + linkType: hard + "wide-align@npm:^1.1.0, wide-align@npm:^1.1.2, wide-align@npm:^1.1.5": version: 1.1.5 resolution: "wide-align@npm:1.1.5" From ce3855f520c32f0f8b1524b5f4800863c40ff269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Fri, 23 Jun 2023 10:53:00 +0100 Subject: [PATCH 02/52] adds MMI name to the manifest name (#19617) --- development/build/manifest.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/development/build/manifest.js b/development/build/manifest.js index da0683e3b..b3079f806 100644 --- a/development/build/manifest.js +++ b/development/build/manifest.js @@ -135,9 +135,12 @@ function createManifestTasks({ .trim() .substring(0, 8); - manifest.name = `MetaMask ${capitalize( - buildType, - )}${mv3Str}${lavamoatStr}${snowStr}`; + const buildName = + buildType === 'mmi' + ? `MetaMask Institutional ${mv3Str}${lavamoatStr}${snowStr}` + : `MetaMask ${capitalize(buildType)}${mv3Str}${lavamoatStr}${snowStr}`; + + manifest.name = buildName; manifest.description = `${environment} build from git id: ${gitRevisionStr}`; } From adc02dd534e8176f8a8f306b0847c11b9684c55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Fri, 23 Jun 2023 10:54:04 +0100 Subject: [PATCH 03/52] adds MMI blue fox svg (#19632) --- .../ui/metafox-logo/horizontal-logo.js | 174 ++++++++++++++++++ 1 file changed, 174 insertions(+) diff --git a/ui/components/ui/metafox-logo/horizontal-logo.js b/ui/components/ui/metafox-logo/horizontal-logo.js index 2229bffb4..c76c63854 100644 --- a/ui/components/ui/metafox-logo/horizontal-logo.js +++ b/ui/components/ui/metafox-logo/horizontal-logo.js @@ -701,6 +701,180 @@ export default function MetaFoxHorizontalLogo({ className }) { ); + case 'mmi': + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); default: return ( Date: Fri, 23 Jun 2023 10:54:59 +0100 Subject: [PATCH 04/52] fixes the stake a portfolio icons not showing (#19633) --- app/build-types/mmi/images/icons/stake.svg | 17 +++-------------- .../app/wallet-overview/eth-overview.js | 4 ++-- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/app/build-types/mmi/images/icons/stake.svg b/app/build-types/mmi/images/icons/stake.svg index e6b1ce7c6..54c6762e3 100644 --- a/app/build-types/mmi/images/icons/stake.svg +++ b/app/build-types/mmi/images/icons/stake.svg @@ -1,14 +1,3 @@ - - - - - - - - - - \ No newline at end of file + + + diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js index 2d026a78c..d49e7ff83 100644 --- a/ui/components/app/wallet-overview/eth-overview.js +++ b/ui/components/app/wallet-overview/eth-overview.js @@ -96,7 +96,7 @@ const EthOverview = ({ className }) => { <> } + Icon={} label={t('stake')} onClick={() => { stakingEvent(); @@ -109,7 +109,7 @@ const EthOverview = ({ className }) => { + } label={t('portfolio')} onClick={() => { From 80bfb5b501a8a8d96a3e24e0ba28e1f093ca5482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Fri, 23 Jun 2023 10:55:31 +0100 Subject: [PATCH 05/52] [MMI] rearrange mmi account menu options (#19635) * adds the portfolio dashboard option and compliance to the global menu * undo change --- .../account-list-menu/account-list-menu.js | 107 +++++---------- .../multichain/global-menu/global-menu.js | 123 ++++++++++++++---- 2 files changed, 124 insertions(+), 106 deletions(-) diff --git a/ui/components/multichain/account-list-menu/account-list-menu.js b/ui/components/multichain/account-list-menu/account-list-menu.js index 1461c8a83..40d6b9df6 100644 --- a/ui/components/multichain/account-list-menu/account-list-menu.js +++ b/ui/components/multichain/account-list-menu/account-list-menu.js @@ -3,12 +3,12 @@ import PropTypes from 'prop-types'; import { useHistory } from 'react-router-dom'; import Fuse from 'fuse.js'; import { useDispatch, useSelector } from 'react-redux'; -import Box from '../../ui/box/box'; import { IconName, ButtonLink, TextFieldSearch, Text, + Box, } from '../../component-library'; import { AccountListItem, CreateAccount, ImportAccount } from '..'; import { @@ -19,12 +19,6 @@ import { import { useI18nContext } from '../../../hooks/useI18nContext'; import { MetaMetricsContext } from '../../../contexts/metametrics'; import Popover from '../../ui/popover'; -///: BEGIN:ONLY_INCLUDE_IN(build-mmi) -import { - getMmiPortfolioEnabled, - getMmiPortfolioUrl, -} from '../../../selectors/institutional/selectors'; -///: END:ONLY_INCLUDE_IN import { getSelectedAccount, getMetaMaskAccountsOrdered, @@ -41,7 +35,6 @@ import { CONNECT_HARDWARE_ROUTE, ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) CUSTODY_ACCOUNT_ROUTE, - COMPLIANCE_FEATURE_ROUTE, ///: END:ONLY_INCLUDE_IN } from '../../../helpers/constants/routes'; import { getEnvironmentType } from '../../../../app/scripts/lib/util'; @@ -58,11 +51,6 @@ export const AccountListMenu = ({ onClose }) => { const dispatch = useDispatch(); const inputRef = useRef(); - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - const mmiPortfolioUrl = useSelector(getMmiPortfolioUrl); - const mmiPortfolioEnabled = useSelector(getMmiPortfolioEnabled); - ///: END:ONLY_INCLUDE_IN - const [searchQuery, setSearchQuery] = useState(''); const [actionMode, setActionMode] = useState(''); @@ -233,7 +221,7 @@ export const AccountListMenu = ({ onClose }) => { {t('importAccount')} - + { > {t('hardwareWallet')} - { - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - <> - { - dispatch(toggleAccountMenu()); - trackEvent({ - category: MetaMetricsEventCategory.Navigation, - event: - MetaMetricsEventName.UserClickedConnectCustodialAccount, - }); - if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) { - global.platform.openExtensionInBrowser( - CUSTODY_ACCOUNT_ROUTE, - ); - } else { - history.push(CUSTODY_ACCOUNT_ROUTE); - } - }} - > - {t('connectCustodialAccountMenu')} - - {mmiPortfolioEnabled && ( - { - dispatch(toggleAccountMenu()); - trackEvent({ - category: MetaMetricsEventCategory.Navigation, - event: - MetaMetricsEventName.UserClickedPortfolioButton, - }); - window.open(mmiPortfolioUrl, '_blank'); - }} - > - {t('portfolioDashboard')} - - )} - { - dispatch(toggleAccountMenu()); - trackEvent({ - category: MetaMetricsEventCategory.Navigation, - event: MetaMetricsEventName.UserClickedCompliance, - }); - if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) { - global.platform.openExtensionInBrowser( - COMPLIANCE_FEATURE_ROUTE, - ); - } else { - history.push(COMPLIANCE_FEATURE_ROUTE); - } - }} - > - {t('compliance')} - - - ///: END:ONLY_INCLUDE_IN - } + { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + + { + dispatch(toggleAccountMenu()); + trackEvent({ + category: MetaMetricsEventCategory.Navigation, + event: + MetaMetricsEventName.UserClickedConnectCustodialAccount, + }); + if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) { + global.platform.openExtensionInBrowser( + CUSTODY_ACCOUNT_ROUTE, + ); + } else { + history.push(CUSTODY_ACCOUNT_ROUTE); + } + }} + > + {t('connectCustodialAccountMenu')} + + + ///: END:ONLY_INCLUDE_IN + } ) : null} diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js index 71d8dc6ae..6d813aa72 100644 --- a/ui/components/multichain/global-menu/global-menu.js +++ b/ui/components/multichain/global-menu/global-menu.js @@ -9,6 +9,9 @@ import { ///: BEGIN:ONLY_INCLUDE_IN(snaps) NOTIFICATIONS_ROUTE, ///: END:ONLY_INCLUDE_IN(snaps) + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + COMPLIANCE_FEATURE_ROUTE, + ///: END:ONLY_INCLUDE_IN } from '../../../helpers/constants/routes'; import { lockMetamask } from '../../../store/actions'; import { useI18nContext } from '../../../hooks/useI18nContext'; @@ -20,7 +23,12 @@ import { } from '../../component-library'; import { Menu, MenuItem } from '../../ui/menu'; import { getEnvironmentType } from '../../../../app/scripts/lib/util'; -import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app'; +import { + ENVIRONMENT_TYPE_FULLSCREEN, + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + ENVIRONMENT_TYPE_POPUP, + ///: END:ONLY_INCLUDE_IN +} from '../../../../shared/constants/app'; import { SUPPORT_LINK } from '../../../../shared/lib/ui-utils'; ///: BEGIN:ONLY_INCLUDE_IN(build-beta,build-flask) import { SUPPORT_REQUEST_LINK } from '../../../helpers/constants/common'; @@ -33,6 +41,12 @@ import { MetaMetricsContextProp, } from '../../../../shared/constants/metametrics'; import { getPortfolioUrl } from '../../../helpers/utils/portfolio'; +///: BEGIN:ONLY_INCLUDE_IN(build-mmi) +import { + getMmiPortfolioEnabled, + getMmiPortfolioUrl, +} from '../../../selectors/institutional/selectors'; +///: END:ONLY_INCLUDE_IN import { getMetaMetricsId, ///: BEGIN:ONLY_INCLUDE_IN(snaps) @@ -61,6 +75,10 @@ export const GlobalMenu = ({ closeMenu, anchorElement }) => { const hasUnapprovedTransactions = useSelector( (state) => Object.keys(state.metamask.unapprovedTxs).length > 0, ); + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + const mmiPortfolioUrl = useSelector(getMmiPortfolioUrl); + const mmiPortfolioEnabled = useSelector(getMmiPortfolioEnabled); + ///: END:ONLY_INCLUDE_IN ///: BEGIN:ONLY_INCLUDE_IN(snaps) const unreadNotificationsCount = useSelector(getUnreadNotificationsCount); @@ -93,34 +111,83 @@ export const GlobalMenu = ({ closeMenu, anchorElement }) => { > {t('connectedSites')} - { - const portfolioUrl = getPortfolioUrl('', 'ext', metaMetricsId); - global.platform.openTab({ - url: portfolioUrl, - }); - trackEvent( - { - category: MetaMetricsEventCategory.Home, - event: MetaMetricsEventName.PortfolioLinkClicked, - properties: { - url: portfolioUrl, - location: 'Global Menu', + + { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + <> + {mmiPortfolioEnabled && ( + { + trackEvent({ + category: MetaMetricsEventCategory.Navigation, + event: MetaMetricsEventName.UserClickedPortfolioButton, + }); + window.open(mmiPortfolioUrl, '_blank'); + closeMenu(); + }} + data-testid="global-menu-mmi-portfolio" + > + {t('portfolioDashboard')} + + )} + + { + trackEvent({ + category: MetaMetricsEventCategory.Navigation, + event: MetaMetricsEventName.UserClickedCompliance, + }); + if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) { + global.platform.openExtensionInBrowser( + COMPLIANCE_FEATURE_ROUTE, + ); + } else { + history.push(COMPLIANCE_FEATURE_ROUTE); + } + }} + data-testid="global-menu-mmi-compliance" + > + {t('compliance')} + + + ///: END:ONLY_INCLUDE_IN + } + + { + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) + { + const portfolioUrl = getPortfolioUrl('', 'ext', metaMetricsId); + global.platform.openTab({ + url: portfolioUrl, + }); + trackEvent( + { + category: MetaMetricsEventCategory.Home, + event: MetaMetricsEventName.PortfolioLinkClicked, + properties: { + url: portfolioUrl, + location: 'Global Menu', + }, }, - }, - { - contextPropsIntoEventProperties: [ - MetaMetricsContextProp.PageTitle, - ], - }, - ); - closeMenu(); - }} - data-testid="global-menu-portfolio" - > - {t('portfolioView')} - + { + contextPropsIntoEventProperties: [ + MetaMetricsContextProp.PageTitle, + ], + }, + ); + closeMenu(); + }} + data-testid="global-menu-portfolio" + > + {t('portfolioView')} + + ///: END:ONLY_INCLUDE_IN + } + {getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN ? null : ( Date: Fri, 23 Jun 2023 17:28:41 +0530 Subject: [PATCH 06/52] removed portfolio link from wallet view (#19716) * removed portfolio link from wallet view * removed unused code * updated test * updated spec file * updated test --- test/e2e/tests/portfolio-site.spec.js | 4 +- .../app/wallet-overview/eth-overview.js | 44 +------------------ .../app/wallet-overview/eth-overview.test.js | 2 +- 3 files changed, 4 insertions(+), 46 deletions(-) diff --git a/test/e2e/tests/portfolio-site.spec.js b/test/e2e/tests/portfolio-site.spec.js index 2bdb413d5..93e0d0877 100644 --- a/test/e2e/tests/portfolio-site.spec.js +++ b/test/e2e/tests/portfolio-site.spec.js @@ -26,7 +26,7 @@ describe('Portfolio site', function () { await driver.press('#password', driver.Key.ENTER); // Click Portfolio site - await driver.clickElement('[data-testid="home__portfolio-site"]'); + await driver.clickElement('[data-testid="eth-overview-portfolio"]'); await driver.waitUntilXWindowHandles(2); const windowHandles = await driver.getAllWindowHandles(); await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles); @@ -34,7 +34,7 @@ describe('Portfolio site', function () { // Verify site assert.equal( await driver.getCurrentUrl(), - 'http://127.0.0.1:8080/?metamaskEntry=ext&metametricsId=null', + 'http://127.0.0.1:8080/?metamaskEntry=ext_portfolio_button&metametricsId=null', ); }, ); diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js index d49e7ff83..e5726f2d8 100644 --- a/ui/components/app/wallet-overview/eth-overview.js +++ b/ui/components/app/wallet-overview/eth-overview.js @@ -36,7 +36,6 @@ import IconButton from '../../ui/icon-button'; import { isHardwareKeyring } from '../../../helpers/utils/hardware'; import { MetaMetricsContext } from '../../../contexts/metametrics'; import { - MetaMetricsContextProp, MetaMetricsEventCategory, MetaMetricsEventName, MetaMetricsSwapsEventSource, @@ -44,12 +43,7 @@ import { import Spinner from '../../ui/spinner'; import { startNewDraftTransaction } from '../../../ducks/send'; import { AssetType } from '../../../../shared/constants/transaction'; -import { - ButtonIcon, - ButtonIconSize, - Icon, - IconName, -} from '../../component-library'; +import { Icon, IconName } from '../../component-library'; import { IconColor } from '../../../helpers/constants/design-system'; import useRamps from '../../../hooks/experiences/useRamps'; import { getPortfolioUrl } from '../../../helpers/utils/portfolio'; @@ -156,42 +150,6 @@ const EthOverview = ({ className }) => { {balanceIsCached ? ( * ) : null} - { - ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) - { - const portfolioUrl = getPortfolioUrl( - '', - 'ext', - metaMetricsId, - ); - global.platform.openTab({ - url: portfolioUrl, - }); - trackEvent( - { - category: MetaMetricsEventCategory.Home, - event: MetaMetricsEventName.PortfolioLinkClicked, - properties: { - url: portfolioUrl, - }, - }, - { - contextPropsIntoEventProperties: [ - MetaMetricsContextProp.PageTitle, - ], - }, - ); - }} - /> - ///: END:ONLY_INCLUDE_IN - } {showFiat && balance && ( { const store = configureMockStore([thunk])(mockStore); const ETH_OVERVIEW_BUY = 'eth-overview-buy'; const ETH_OVERVIEW_BRIDGE = 'eth-overview-bridge'; - const ETH_OVERVIEW_PORTFOLIO = 'home__portfolio-site'; + const ETH_OVERVIEW_PORTFOLIO = 'eth-overview-portfolio'; const ETH_OVERVIEW_PRIMARY_CURRENCY = 'eth-overview__primary-currency'; const ETH_OVERVIEW_SECONDARY_CURRENCY = 'eth-overview__secondary-currency'; From 3b9fd435fbe5334b79b463c35f619a421c29ddee Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Fri, 23 Jun 2023 09:50:36 -0230 Subject: [PATCH 07/52] Validate LavaMoat policies on each PR (#19703) * Validate LavaMoat policies on each PR The LavaMoat policies are now validated on every PR. This makes it easier to validate policy changes, as they should always correspond with the changes made in the PR (unlike today, when they could be due to a change in platform or a previous PR). Closes #19680 * Update LavaMoat policies --------- Co-authored-by: MetaMask Bot --- .circleci/config.yml | 9 ---- lavamoat/build-system/policy.json | 71 ++++--------------------------- 2 files changed, 8 insertions(+), 72 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e26983022..9d2c27b46 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,12 +30,6 @@ rc_branch_only: &rc_branch_only only: - /^Version-v(\d+)[.](\d+)[.](\d+)/ -rc_or_master_branch_only: &rc_or_master_branch_only - filters: - branches: - only: - - /^Version-v(\d+)[.](\d+)[.](\d+)|master/ - workflows: test_and_release: jobs: @@ -57,15 +51,12 @@ workflows: requires: - prep-deps - validate-lavamoat-allow-scripts: - <<: *rc_or_master_branch_only requires: - prep-deps - validate-lavamoat-policy-build: - <<: *rc_or_master_branch_only requires: - prep-deps - validate-lavamoat-policy-webapp: - <<: *rc_or_master_branch_only matrix: parameters: build-type: [main, beta, flask, mmi, desktop] diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 89e2820e1..9ee988092 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -980,7 +980,6 @@ "packages": { "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>are-we-there-yet": true, "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge": true, - "@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>console-control-strings": true, "@storybook/react>@storybook/node-logger>npmlog>console-control-strings": true, "nyc>yargs>set-blocking": true } @@ -1009,9 +1008,6 @@ "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>aproba": true, "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>string-width": true, "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog>gauge>strip-ansi": true, - "@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>console-control-strings": true, - "@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>gauge>has-unicode": true, - "@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>gauge>wide-align": true, "@storybook/react>@storybook/node-logger>npmlog>console-control-strings": true, "@storybook/react>@storybook/node-logger>npmlog>gauge>has-unicode": true, "@storybook/react>@storybook/node-logger>npmlog>gauge>wide-align": true, @@ -1137,33 +1133,11 @@ "@metamask/jazzicon>color>color-convert>color-name": true } }, - "@sentry/cli>mkdirp": { - "builtin": { - "fs": true, - "path.dirname": true, - "path.resolve": true - } - }, "@storybook/addon-knobs>qs": { "packages": { "string.prototype.matchall>side-channel": true } }, - "@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>gauge>has-unicode": { - "builtin": { - "os.type": true - }, - "globals": { - "process.env.LANG": true, - "process.env.LC_ALL": true, - "process.env.LC_CTYPE": true - } - }, - "@storybook/addon-mdx-gfm>@storybook/node-logger>npmlog>gauge>wide-align": { - "packages": { - "yargs>string-width": true - } - }, "@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": { "builtin": { "os.homedir": true @@ -4895,20 +4869,9 @@ }, "packages": { "@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": true, - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": true, "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-homedir": { - "builtin": { - "os.homedir": true - }, - "globals": { - "process.env": true, - "process.getuid": true, - "process.platform": true - } - }, "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": { "globals": { "process.env.SystemRoot": true, @@ -4930,34 +4893,9 @@ "setTimeout": true }, "packages": { - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob": true, "nyc>glob": true } }, - "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf>glob": { - "builtin": { - "assert": true, - "events.EventEmitter": true, - "fs": true, - "path.join": true, - "path.resolve": true, - "util": true - }, - "globals": { - "console.error": true, - "process.cwd": true, - "process.nextTick": true, - "process.platform": true - }, - "packages": { - "eslint>minimatch": true, - "gulp-watch>path-is-absolute": true, - "nyc>glob>fs.realpath": true, - "nyc>glob>inflight": true, - "pump>once": true, - "pumpify>inherits": true - } - }, "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": { "globals": { "console": true, @@ -8246,7 +8184,14 @@ "path.dirname": true }, "packages": { - "@sentry/cli>mkdirp": true + "stylelint>file-entry-cache>flat-cache>write>mkdirp": true + } + }, + "stylelint>file-entry-cache>flat-cache>write>mkdirp": { + "builtin": { + "fs": true, + "path.dirname": true, + "path.resolve": true } }, "stylelint>global-modules": { From ad3140c9490e0a5fed562172f4206ca15ee0dec2 Mon Sep 17 00:00:00 2001 From: Gauthier Petetin Date: Fri, 23 Jun 2023 09:27:49 -0300 Subject: [PATCH 08/52] fix(action): add required permissions to remove labels (#19728) --- .github/workflows/remove-labels-after-pr-closed.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/remove-labels-after-pr-closed.yml b/.github/workflows/remove-labels-after-pr-closed.yml index 17845f6fe..20a8d1630 100644 --- a/.github/workflows/remove-labels-after-pr-closed.yml +++ b/.github/workflows/remove-labels-after-pr-closed.yml @@ -9,6 +9,9 @@ on: jobs: cleanup: runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write steps: - name: Remove labels From b86326b4bf44ef6744f8015395dd1cfb85bd3ce9 Mon Sep 17 00:00:00 2001 From: Brad Decker Date: Fri, 23 Jun 2023 09:48:44 -0500 Subject: [PATCH 09/52] signature approved metrics e2e test (#19628) --- test/e2e/helpers.js | 14 + test/e2e/metrics/signature-approved.spec.js | 323 ++++++++++++++++++++ test/e2e/run-all.js | 1 + 3 files changed, 338 insertions(+) create mode 100644 test/e2e/metrics/signature-approved.spec.js diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js index 040ed2166..42a8ba657 100644 --- a/test/e2e/helpers.js +++ b/test/e2e/helpers.js @@ -674,6 +674,19 @@ async function terminateServiceWorker(driver) { await driver.closeWindowHandle(serviceWorkerTab); } +/** + * This method assumes the extension is open, the dapp is open and waits for a + * third window handle to open (the notification window). Once it does it + * switches to the new window. + * + * @param {WebDriver} driver + */ +async function switchToNotificationWindow(driver) { + await driver.waitUntilXWindowHandles(3); + const windowHandles = await driver.getAllWindowHandles(); + await driver.switchToWindowWithTitle('MetaMask Notification', windowHandles); +} + module.exports = { DAPP_URL, DAPP_ONE_URL, @@ -720,4 +733,5 @@ module.exports = { switchToWindow, sleepSeconds, terminateServiceWorker, + switchToNotificationWindow, }; diff --git a/test/e2e/metrics/signature-approved.spec.js b/test/e2e/metrics/signature-approved.spec.js new file mode 100644 index 000000000..88a61131a --- /dev/null +++ b/test/e2e/metrics/signature-approved.spec.js @@ -0,0 +1,323 @@ +const { strict: assert } = require('assert'); +const { + defaultGanacheOptions, + switchToNotificationWindow, + withFixtures, + regularDelayMs, + openDapp, + unlockWallet, +} = require('../helpers'); +const FixtureBuilder = require('../fixture-builder'); + +/** + * mocks the segment api multiple times for specific payloads that we expect to + * see when these tests are run. In this case we are looking for + * 'Signature Requested' and 'Signature Received'. Do not use the constants + * from the metrics constants files, because if these change we want a strong + * indicator to our data team that the shape of data will change. + * + * @param {import('mockttp').Mockttp} mockServer + * @returns {Promise[]} + */ +async function mockSegment(mockServer) { + return [ + await mockServer + .forPost('https://api.segment.io/v1/batch') + .withJsonBodyIncluding({ + batch: [{ type: 'track', event: 'Signature Requested' }], + }) + .thenCallback(() => { + return { + statusCode: 200, + }; + }), + await mockServer + .forPost('https://api.segment.io/v1/batch') + .withJsonBodyIncluding({ + batch: [{ type: 'track', event: 'Signature Approved' }], + }) + .thenCallback(() => { + return { + statusCode: 200, + }; + }), + ]; +} + +/** + * Some signing methods have extra security that requires the user to click a + * button to validate that they have verified the details. This method handles + * performing the necessary steps to click that button. + * + * @param {WebDriver} driver + */ +async function validateContractDetails(driver) { + const verifyContractDetailsButton = await driver.findElement( + '.signature-request-content__verify-contract-details', + ); + + verifyContractDetailsButton.click(); + await driver.clickElement({ text: 'Got it', tag: 'button' }); + + // Approve signing typed data + await driver.clickElement('[data-testid="signature-request-scroll-button"]'); + await driver.delay(regularDelayMs); +} + +/** + * This method handles clicking the sign button on signature confrimation + * screen. + * + * @param {WebDriver} driver + */ +async function clickSignOnSignatureConfirmation(driver) { + await driver.clickElement({ text: 'Sign', tag: 'button' }); + await driver.waitUntilXWindowHandles(2); + await driver.getAllWindowHandles(); +} + +/** + * This method handles getting the mocked requests to the segment server + * + * @param {WebDriver} driver + * @param {import('mockttp').Mockttp} mockedEndpoints + * @returns {import('mockttp/dist/pluggable-admin').MockttpClientResponse[]} + */ +async function getEventPayloads(driver, mockedEndpoints) { + await driver.wait(async () => { + let isPending = true; + for (const mockedEndpoint of mockedEndpoints) { + isPending = await mockedEndpoint.isPending(); + } + return isPending === false; + }, 10000); + const mockedRequests = []; + for (const mockedEndpoint of mockedEndpoints) { + mockedRequests.push(...(await mockedEndpoint.getSeenRequests())); + } + return mockedRequests.map((req) => req.body.json.batch).flat(); +} + +describe('Signature Approved Event', function () { + it('Successfully tracked for signTypedData_v4', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withPermissionControllerConnectedToTestDapp() + .withMetaMetricsController({ + metaMetricsId: 'fake-metrics-id', + participateInMetaMetrics: true, + }) + .build(), + defaultGanacheOptions, + title: this.test.title, + testSpecificMock: mockSegment, + }, + async ({ driver, mockedEndpoint: mockedEndpoints }) => { + await driver.navigate(); + await unlockWallet(driver); + await openDapp(driver); + + // creates a sign typed data signature request + await driver.clickElement('#signTypedDataV4'); + await switchToNotificationWindow(driver); + await validateContractDetails(driver); + await clickSignOnSignatureConfirmation(driver); + const events = await getEventPayloads(driver, mockedEndpoints); + assert.deepStrictEqual(events[0].properties, { + signature_type: 'eth_signTypedData_v4', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + assert.deepStrictEqual(events[1].properties, { + signature_type: 'eth_signTypedData_v4', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + }, + ); + }); + it('Successfully tracked for signTypedData_v3', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withPermissionControllerConnectedToTestDapp() + .withMetaMetricsController({ + metaMetricsId: 'fake-metrics-id', + participateInMetaMetrics: true, + }) + .build(), + defaultGanacheOptions, + title: this.test.title, + testSpecificMock: mockSegment, + }, + async ({ driver, mockedEndpoint: mockedEndpoints }) => { + await driver.navigate(); + await unlockWallet(driver); + await openDapp(driver); + + // creates a sign typed data signature request + await driver.clickElement('#signTypedDataV3'); + await switchToNotificationWindow(driver); + await validateContractDetails(driver); + await clickSignOnSignatureConfirmation(driver); + const events = await getEventPayloads(driver, mockedEndpoints); + assert.deepStrictEqual(events[0].properties, { + signature_type: 'eth_signTypedData_v3', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + assert.deepStrictEqual(events[1].properties, { + signature_type: 'eth_signTypedData_v3', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + }, + ); + }); + it('Successfully tracked for signTypedData', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withPermissionControllerConnectedToTestDapp() + .withMetaMetricsController({ + metaMetricsId: 'fake-metrics-id', + participateInMetaMetrics: true, + }) + .build(), + defaultGanacheOptions, + title: this.test.title, + testSpecificMock: mockSegment, + }, + async ({ driver, mockedEndpoint: mockedEndpoints }) => { + await driver.navigate(); + await unlockWallet(driver); + await openDapp(driver); + + // creates a sign typed data signature request + await driver.clickElement('#signTypedData'); + await switchToNotificationWindow(driver); + await clickSignOnSignatureConfirmation(driver); + const events = await getEventPayloads(driver, mockedEndpoints); + assert.deepStrictEqual(events[0].properties, { + signature_type: 'eth_signTypedData', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + assert.deepStrictEqual(events[1].properties, { + signature_type: 'eth_signTypedData', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + }, + ); + }); + it('Successfully tracked for personalSign', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withPermissionControllerConnectedToTestDapp() + .withMetaMetricsController({ + metaMetricsId: 'fake-metrics-id', + participateInMetaMetrics: true, + }) + .build(), + defaultGanacheOptions, + title: this.test.title, + testSpecificMock: mockSegment, + }, + async ({ driver, mockedEndpoint: mockedEndpoints }) => { + await driver.navigate(); + await unlockWallet(driver); + await openDapp(driver); + + // creates a sign typed data signature request + await driver.clickElement('#personalSign'); + await switchToNotificationWindow(driver); + await clickSignOnSignatureConfirmation(driver); + const events = await getEventPayloads(driver, mockedEndpoints); + assert.deepStrictEqual(events[0].properties, { + signature_type: 'personal_sign', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + assert.deepStrictEqual(events[1].properties, { + signature_type: 'personal_sign', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + }, + ); + }); + it('Successfully tracked for eth_sign', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withPermissionControllerConnectedToTestDapp() + .withPreferencesController({ + disabledRpcMethodPreferences: { + eth_sign: true, + }, + }) + .withMetaMetricsController({ + metaMetricsId: 'fake-metrics-id', + participateInMetaMetrics: true, + }) + .build(), + defaultGanacheOptions, + title: this.test.title, + testSpecificMock: mockSegment, + }, + async ({ driver, mockedEndpoint: mockedEndpoints }) => { + await driver.navigate(); + await unlockWallet(driver); + await openDapp(driver); + + // creates a sign typed data signature request + await driver.clickElement('#ethSign'); + await switchToNotificationWindow(driver); + await driver.delay(regularDelayMs); + await driver.clickElement('[data-testid="page-container-footer-next"]'); + await driver.clickElement( + '.signature-request-warning__footer__sign-button', + ); + const events = await getEventPayloads(driver, mockedEndpoints); + assert.deepStrictEqual(events[0].properties, { + signature_type: 'eth_sign', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + assert.deepStrictEqual(events[1].properties, { + signature_type: 'eth_sign', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + }, + ); + }); +}); diff --git a/test/e2e/run-all.js b/test/e2e/run-all.js index af5849b37..d045233e5 100644 --- a/test/e2e/run-all.js +++ b/test/e2e/run-all.js @@ -72,6 +72,7 @@ async function main() { ...(await getTestPathsForTestDir(testDir)), ...(await getTestPathsForTestDir(path.join(__dirname, 'swaps'))), ...(await getTestPathsForTestDir(path.join(__dirname, 'nft'))), + ...(await getTestPathsForTestDir(path.join(__dirname, 'metrics'))), path.join(__dirname, 'metamask-ui.spec.js'), ]; From 365c1e32d262e45138b06f149dec81607359376b Mon Sep 17 00:00:00 2001 From: weizman Date: Fri, 23 Jun 2023 18:25:24 +0300 Subject: [PATCH 10/52] Integrate Snow with LavaMoat scuttling protection (#17969) --- app/scripts/use-snow.js | 19 +++- development/build/index.js | 7 +- lavamoat/build-system/policy.json | 100 ++++++++------------- package.json | 6 +- yarn.lock | 141 ++++++++++++++---------------- 5 files changed, 126 insertions(+), 147 deletions(-) diff --git a/app/scripts/use-snow.js b/app/scripts/use-snow.js index 11b01d78d..868db4e36 100644 --- a/app/scripts/use-snow.js +++ b/app/scripts/use-snow.js @@ -1,8 +1,21 @@ +/* +NOTICE: +This Snow + LavaMoat scuttling integration is currently being used +with an experimental API (https://github.com/LavaMoat/LavaMoat/pull/462). +Changing this code must be done cautiously to avoid breaking the app! +*/ + // eslint-disable-next-line import/unambiguous (function () { const log = console.log.bind(console); - const msg = 'SNOW INTERCEPTED NEW WINDOW CREATION IN METAMASK APP: '; - window.top.SNOW((win) => { - log(msg, win, win?.frameElement); + const msg = + 'Snow detected a new realm creation attempt in MetaMask. Performing scuttling on new realm.'; + Object.defineProperty(window.top, 'SCUTTLER', { + value: (realm, scuttle) => { + window.top.SNOW((win) => { + log(msg, win); + scuttle(win); + }, realm); + }, }); })(); diff --git a/development/build/index.js b/development/build/index.js index 33051f5a3..84ee91040 100755 --- a/development/build/index.js +++ b/development/build/index.js @@ -147,8 +147,11 @@ async function defineAndRunBuildTasks() { // build lavamoat runtime file await lavapack.buildRuntime({ - scuttleGlobalThis: applyLavaMoat && shouldScuttle, - scuttleGlobalThisExceptions, + scuttleGlobalThis: { + enabled: applyLavaMoat && shouldScuttle, + scuttlerName: 'SCUTTLER', + exceptions: scuttleGlobalThisExceptions, + }, }); } diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 9ee988092..98fd8942c 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -168,9 +168,13 @@ }, "@babel/eslint-parser": { "builtin": { - "path": true + "module": true, + "path": true, + "worker_threads": true }, "globals": { + "__dirname": true, + "process.cwd": true, "process.versions": true }, "packages": { @@ -1045,17 +1049,18 @@ "globals": { "__dirname": true, "__filename.slice": true, + "console.warn": true, "process.cwd": true, "setTimeout": true }, "packages": { "@lavamoat/lavapack>combine-source-map": true, - "@lavamoat/lavapack>lavamoat-core": true, + "@lavamoat/lavapack>convert-source-map": true, "@lavamoat/lavapack>readable-stream": true, "@lavamoat/lavapack>umd": true, "browserify>JSONStream": true, "lavamoat>json-stable-stringify": true, - "nyc>convert-source-map": true, + "lavamoat>lavamoat-core": true, "through2": true } }, @@ -1082,26 +1087,12 @@ "@lavamoat/lavapack>combine-source-map>inline-source-map>source-map": true } }, - "@lavamoat/lavapack>lavamoat-core": { - "builtin": { - "events": true, - "fs.existsSync": true, - "fs.readFileSync": true, - "fs.writeFileSync": true, - "path.extname": true, - "path.join": true - }, + "@lavamoat/lavapack>convert-source-map": { "globals": { - "__dirname": true, - "console.error": true, - "console.warn": true, - "define": true - }, - "packages": { - "lavamoat>json-stable-stringify": true, - "lavamoat>lavamoat-core>merge-deep": true, - "lavamoat>lavamoat-tofu": true, - "nyc>process-on-spawn>fromentries": true + "Buffer": true, + "atob": true, + "btoa": true, + "value": true } }, "@lavamoat/lavapack>readable-stream": { @@ -2858,12 +2849,12 @@ "eslint-plugin-react>estraverse": true, "eslint-plugin-react>jsx-ast-utils": true, "eslint-plugin-react>object.entries": true, + "eslint-plugin-react>object.fromentries": true, "eslint-plugin-react>object.hasown": true, "eslint-plugin-react>object.values": true, "eslint-plugin-react>resolve": true, "eslint-plugin-react>semver": true, "eslint>minimatch": true, - "lavamoat>object.fromentries": true, "prop-types": true, "string.prototype.matchall": true } @@ -2923,6 +2914,13 @@ "string.prototype.matchall>es-abstract": true } }, + "eslint-plugin-react>object.fromentries": { + "packages": { + "globalthis>define-properties": true, + "string.prototype.matchall>call-bind": true, + "string.prototype.matchall>es-abstract": true + } + }, "eslint-plugin-react>object.hasown": { "packages": { "string.prototype.matchall>es-abstract": true @@ -2984,6 +2982,9 @@ "util": true }, "globals": { + "__filename": true, + "process.cwd": true, + "process.emitWarning": true, "process.platform": true }, "packages": { @@ -6141,8 +6142,8 @@ "setTimeout": true }, "packages": { + "@lavamoat/lavapack": true, "duplexify": true, - "lavamoat-browserify>@lavamoat/lavapack": true, "lavamoat-browserify>browser-resolve": true, "lavamoat-browserify>concat-stream": true, "lavamoat-browserify>readable-stream": true, @@ -6152,37 +6153,6 @@ "lavamoat>lavamoat-core": true } }, - "lavamoat-browserify>@lavamoat/lavapack": { - "builtin": { - "assert": true, - "buffer.Buffer.from": true, - "fs.promises.readFile": true, - "fs.promises.writeFile": true, - "fs.readFileSync": true, - "path.join": true, - "path.relative": true - }, - "globals": { - "__dirname": true, - "process.cwd": true, - "setTimeout": true - }, - "packages": { - "@lavamoat/lavapack>combine-source-map": true, - "@lavamoat/lavapack>umd": true, - "browserify>JSONStream": true, - "lavamoat-browserify>@lavamoat/lavapack>through2": true, - "lavamoat-browserify>readable-stream": true, - "lavamoat>json-stable-stringify": true, - "lavamoat>lavamoat-core": true, - "nyc>convert-source-map": true - } - }, - "lavamoat-browserify>@lavamoat/lavapack>through2": { - "packages": { - "lavamoat-browserify>readable-stream": true - } - }, "lavamoat-browserify>browser-resolve": { "builtin": { "fs.readFile": true, @@ -6319,8 +6289,7 @@ "packages": { "lavamoat>json-stable-stringify": true, "lavamoat>lavamoat-core>merge-deep": true, - "lavamoat>lavamoat-tofu": true, - "nyc>process-on-spawn>fromentries": true + "lavamoat>lavamoat-tofu": true } }, "lavamoat>lavamoat-core>merge-deep": { @@ -6396,13 +6365,6 @@ "depcheck>@babel/traverse": true } }, - "lavamoat>object.fromentries": { - "packages": { - "globalthis>define-properties": true, - "string.prototype.matchall>call-bind": true, - "string.prototype.matchall>es-abstract": true - } - }, "lodash": { "globals": { "define": true @@ -8623,6 +8585,12 @@ "jsdom>request>is-typedarray": true } }, + "superstruct": { + "globals": { + "console.warn": true, + "define": true + } + }, "terser": { "globals": { "Buffer": true, @@ -8981,6 +8949,7 @@ }, "globals": { "Error": true, + "__dirname": true, "console": true, "process": true }, @@ -8995,6 +8964,9 @@ } }, "yargs>cliui": { + "globals": { + "process": true + }, "packages": { "eslint>strip-ansi": true, "yargs>cliui>wrap-ansi": true, diff --git a/package.json b/package.json index 021cad8ac..eb17e8b69 100644 --- a/package.json +++ b/package.json @@ -371,7 +371,7 @@ "@babel/register": "^7.5.5", "@ethersproject/bignumber": "^5.7.0", "@lavamoat/allow-scripts": "^2.0.3", - "@lavamoat/lavapack": "^5.0.0", + "@lavamoat/lavapack": "^5.2.0", "@metamask/auto-changelog": "^2.1.0", "@metamask/eslint-config": "^9.0.0", "@metamask/eslint-config-jest": "^9.0.0", @@ -494,8 +494,8 @@ "jsdom": "^11.2.0", "junit-report-merger": "^4.0.0", "koa": "^2.7.0", - "lavamoat": "^6.3.0", - "lavamoat-browserify": "^15.5.0", + "lavamoat": "^7.1.0", + "lavamoat-browserify": "^15.7.0", "lavamoat-viz": "^6.0.9", "lockfile-lint": "^4.9.6", "loose-envify": "^1.4.0", diff --git a/yarn.lock b/yarn.lock index 927c8c3d1..10aeefc01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -80,7 +80,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.21.4": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.21.4": version: 7.21.4 resolution: "@babel/code-frame@npm:7.21.4" dependencies: @@ -445,7 +445,7 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.18.6": +"@babel/highlight@npm:^7.18.6": version: 7.18.6 resolution: "@babel/highlight@npm:7.18.6" dependencies: @@ -3532,35 +3532,19 @@ __metadata: languageName: node linkType: hard -"@lavamoat/lavapack@npm:^3.3.0": - version: 3.3.0 - resolution: "@lavamoat/lavapack@npm:3.3.0" +"@lavamoat/lavapack@npm:^5.2.0": + version: 5.2.0 + resolution: "@lavamoat/lavapack@npm:5.2.0" dependencies: JSONStream: ^1.3.5 combine-source-map: ^0.8.0 - convert-source-map: ^1.7.0 - json-stable-stringify: ^1.0.1 - lavamoat-core: ^12.4.0 + convert-source-map: ^2.0.0 + json-stable-stringify: ^1.0.2 + lavamoat-core: ^14.2.0 readable-stream: ^3.6.0 through2: ^4.0.2 umd: ^3.0.3 - checksum: 77f6588d38d53f0feba1856de409829969dc3592b9b4d1e722fd395a1eabae6a8983648e2929ef9243fd6ead6919683cb87e65433325601bafabcf8b46dc83be - languageName: node - linkType: hard - -"@lavamoat/lavapack@npm:^5.0.0": - version: 5.0.0 - resolution: "@lavamoat/lavapack@npm:5.0.0" - dependencies: - JSONStream: ^1.3.5 - combine-source-map: ^0.8.0 - convert-source-map: ^1.7.0 - json-stable-stringify: ^1.0.1 - lavamoat-core: ^14.0.0 - readable-stream: ^3.6.0 - through2: ^4.0.2 - umd: ^3.0.3 - checksum: 93b60ced99a23a87f83bf354f6996029757ea76d6b92e8b4b874ef50224515feda47dadd62cdda88c53e703111ddf36a8ef8f19c682e85ad4218f709a4081dbd + checksum: c98bcc310de38b4ad2ce2aeafb69ba293a1083f6683a9f120aef2e187501620f5241361da2966fa07bcb57d004037b0ccf556325364f44c1c021c949fb87e45d languageName: node linkType: hard @@ -12858,6 +12842,13 @@ __metadata: languageName: node linkType: hard +"convert-source-map@npm:^1.9.0": + version: 1.9.0 + resolution: "convert-source-map@npm:1.9.0" + checksum: dc55a1f28ddd0e9485ef13565f8f756b342f9a46c4ae18b843fe3c30c675d058d6a4823eff86d472f187b176f0adf51ea7b69ea38be34be4a63cbbf91b0593c8 + languageName: node + linkType: hard + "convert-source-map@npm:^2.0.0": version: 2.0.0 resolution: "convert-source-map@npm:2.0.0" @@ -22988,24 +22979,23 @@ __metadata: languageName: node linkType: hard -"lavamoat-browserify@npm:^15.5.0": - version: 15.5.0 - resolution: "lavamoat-browserify@npm:15.5.0" +"lavamoat-browserify@npm:^15.7.0": + version: 15.7.0 + resolution: "lavamoat-browserify@npm:15.7.0" dependencies: - "@babel/code-frame": ^7.16.7 "@lavamoat/aa": ^3.1.0 - "@lavamoat/lavapack": ^3.3.0 + "@lavamoat/lavapack": ^5.2.0 browser-resolve: ^2.0.0 concat-stream: ^2.0.0 - convert-source-map: ^1.8.0 + convert-source-map: ^1.9.0 duplexify: ^4.1.1 json-stable-stringify: ^1.0.1 - lavamoat-core: ^12.4.0 + lavamoat-core: ^14.2.0 pify: ^4.0.1 readable-stream: ^3.6.0 - source-map: ^0.7.3 + source-map: ^0.7.4 through2: ^3.0.0 - checksum: b9d4ccbe6dd09aa63145f89f99f0b3ac269930a5e419cc836659f8c6a7e26b78d2dd3722e44055e6436d2334b044c348895f512d134ee8b5dc4ee87adc890b6f + checksum: 7832820c688439c699d4b99ef6860ff4cab67003e20fad4194e847873bfe3f2d3a4caea3229e61bd0e9e35ca384e2aa5f39ce1370a43b1bdd9c9bca8c226d080 languageName: node linkType: hard @@ -23022,27 +23012,14 @@ __metadata: languageName: node linkType: hard -"lavamoat-core@npm:^12.3.0, lavamoat-core@npm:^12.4.0": - version: 12.4.0 - resolution: "lavamoat-core@npm:12.4.0" +"lavamoat-core@npm:^14.2.0": + version: 14.2.0 + resolution: "lavamoat-core@npm:14.2.0" dependencies: - fromentries: ^1.2.0 - json-stable-stringify: ^1.0.1 + json-stable-stringify: ^1.0.2 lavamoat-tofu: ^6.0.2 - merge-deep: ^3.0.2 - checksum: 432a8968035370feb51e50f35306e7f85015e3b56440dbd41b6d3eec7f4bc82c3d1f16c6a627549df2665499c49bcb6e55fa697bccc6839bac1de12804019c1d - languageName: node - linkType: hard - -"lavamoat-core@npm:^14.0.0": - version: 14.0.0 - resolution: "lavamoat-core@npm:14.0.0" - dependencies: - fromentries: ^1.2.0 - json-stable-stringify: ^1.0.1 - lavamoat-tofu: ^6.0.2 - merge-deep: ^3.0.2 - checksum: 16c2402aceba339ab25b830d476e95078edc1c978ef2623497ecb07f6b5eb8241541f67755a06cf3562680c1834b69d7e86ca421848b670378ad4fb0d62923ad + merge-deep: ^3.0.3 + checksum: 2f254c85a466561393a9ad0b8bcd8ff93b7b195d2f820f89be452348559f3fa689260887dcf4af3d605bc7ddb8fef2637ca7d5bfe1b7f565050aca172b9733d6 languageName: node linkType: hard @@ -23072,26 +23049,25 @@ __metadata: languageName: node linkType: hard -"lavamoat@npm:^6.3.0": - version: 6.4.0 - resolution: "lavamoat@npm:6.4.0" +"lavamoat@npm:^7.1.0": + version: 7.1.0 + resolution: "lavamoat@npm:7.1.0" dependencies: - "@babel/code-frame": ^7.10.4 - "@babel/highlight": ^7.10.4 + "@babel/code-frame": ^7.21.4 + "@babel/highlight": ^7.18.6 "@lavamoat/aa": ^3.1.0 bindings: ^1.5.0 htmlescape: ^1.1.1 - json-stable-stringify: ^1.0.1 - lavamoat-core: ^12.3.0 + json-stable-stringify: ^1.0.2 + lavamoat-core: ^14.2.0 lavamoat-tofu: ^6.0.2 - node-gyp-build: ^4.2.3 - object.fromentries: ^2.0.2 - resolve: ^1.17.0 - yargs: ^16.0.0 + node-gyp-build: ^4.6.0 + resolve: ^1.22.3 + yargs: ^17.7.2 bin: lavamoat: src/cli.js lavamoat-run-command: src/run-command.js - checksum: 5a058b0b62fa4d6baa477775dc03433c0064e7ab0f14f4a540aa033154c3484cd9b59ec66e2968e387087c24531b09cbd6a70a3a11f4b52e3b4519cd3672c54c + checksum: 57414b6d434eaf07ad2875ebb5a79453da7d9c377ed19e604a73f66772bf61a40abfb747bc7e0bc5a4808b0debf3a228dc9069eb87dc772b4d615b11d4e91d34 languageName: node linkType: hard @@ -24309,7 +24285,7 @@ __metadata: languageName: node linkType: hard -"merge-deep@npm:^3.0.2": +"merge-deep@npm:^3.0.2, merge-deep@npm:^3.0.3": version: 3.0.3 resolution: "merge-deep@npm:3.0.3" dependencies: @@ -24411,7 +24387,7 @@ __metadata: "@keystonehq/bc-ur-registry-eth": ^0.19.1 "@keystonehq/metamask-airgapped-keyring": ^0.13.1 "@lavamoat/allow-scripts": ^2.0.3 - "@lavamoat/lavapack": ^5.0.0 + "@lavamoat/lavapack": ^5.2.0 "@lavamoat/snow": ^1.5.0 "@material-ui/core": ^4.11.0 "@metamask-institutional/custody-controller": 0.2.6 @@ -24638,8 +24614,8 @@ __metadata: junit-report-merger: ^4.0.0 koa: ^2.7.0 labeled-stream-splicer: ^2.0.2 - lavamoat: ^6.3.0 - lavamoat-browserify: ^15.5.0 + lavamoat: ^7.1.0 + lavamoat-browserify: ^15.7.0 lavamoat-viz: ^6.0.9 localforage: ^1.9.0 lockfile-lint: ^4.9.6 @@ -26111,14 +26087,14 @@ __metadata: languageName: node linkType: hard -"node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.2.2, node-gyp-build@npm:^4.2.3, node-gyp-build@npm:^4.3.0": - version: 4.5.0 - resolution: "node-gyp-build@npm:4.5.0" +"node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.2.2, node-gyp-build@npm:^4.3.0, node-gyp-build@npm:^4.6.0": + version: 4.6.0 + resolution: "node-gyp-build@npm:4.6.0" bin: node-gyp-build: bin.js node-gyp-build-optional: optional.js node-gyp-build-test: build-test.js - checksum: d888bae0fb88335f69af1b57a2294a931c5042f36e413d8d364c992c9ebfa0b96ffe773179a5a2c8f04b73856e8634e09cce108dbb9804396d3cc8c5455ff2db + checksum: 25d78c5ef1f8c24291f4a370c47ba52fcea14f39272041a90a7894cd50d766f7c8cb8fb06c0f42bf6f69b204b49d9be3c8fc344aac09714d5bdb95965499eb15 languageName: node linkType: hard @@ -26631,7 +26607,7 @@ __metadata: languageName: node linkType: hard -"object.fromentries@npm:^2.0.2, object.fromentries@npm:^2.0.5": +"object.fromentries@npm:^2.0.5": version: 2.0.6 resolution: "object.fromentries@npm:2.0.6" dependencies: @@ -35874,7 +35850,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:17.7.1, yargs@npm:^17.0.1, yargs@npm:^17.3.1": +"yargs@npm:17.7.1": version: 17.7.1 resolution: "yargs@npm:17.7.1" dependencies: @@ -35908,6 +35884,21 @@ __metadata: languageName: node linkType: hard +"yargs@npm:^17.0.1, yargs@npm:^17.3.1, yargs@npm:^17.7.2": + version: 17.7.2 + resolution: "yargs@npm:17.7.2" + dependencies: + cliui: ^8.0.1 + escalade: ^3.1.1 + get-caller-file: ^2.0.5 + require-directory: ^2.1.1 + string-width: ^4.2.3 + y18n: ^5.0.5 + yargs-parser: ^21.1.1 + checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a + languageName: node + linkType: hard + "yargs@npm:^4.7.1": version: 4.8.1 resolution: "yargs@npm:4.8.1" From 34375a57e558853aab95fe35d5f278aa52b66636 Mon Sep 17 00:00:00 2001 From: Ariella Vu <20778143+digiwand@users.noreply.github.com> Date: Fri, 23 Jun 2023 20:08:22 +0200 Subject: [PATCH 11/52] Security Provider cleanup (#19694) * security-prov: isFlaggedSecurityProviderResponse * security-prov: create shared/modules/util * security prov: rn isFlagged -> isSuspcious - util fn returns true if response is not verified and flagged * security prov: add util test and support undefined param * security prov: reorg util fn - no logic changes --- shared/constants/security-provider.ts | 13 ++++++++ .../modules/security-provider.utils.test.ts | 30 +++++++++++++++++++ shared/modules/security-provider.utils.ts | 19 ++++++++++++ ...onfirm-page-container-content.component.js | 11 +++---- ...m-page-container-content.component.test.js | 4 +-- ...urity-provider-banner-message.constants.js | 5 ---- .../security-provider-banner-message.js | 6 ++-- .../security-provider-banner-message.test.js | 14 ++++----- .../signature-request-original.component.js | 10 ++----- .../signature-request-original.test.js | 4 +-- .../signature-request-siwe.js | 11 +++---- .../signature-request.component.js | 10 ++----- .../signature-request.component.test.js | 8 ++--- .../confirm-approve-content.component.js | 11 +++---- ui/pages/token-allowance/token-allowance.js | 10 ++----- 15 files changed, 100 insertions(+), 66 deletions(-) create mode 100644 shared/constants/security-provider.ts create mode 100644 shared/modules/security-provider.utils.test.ts create mode 100644 shared/modules/security-provider.utils.ts delete mode 100644 ui/components/app/security-provider-banner-message/security-provider-banner-message.constants.js diff --git a/shared/constants/security-provider.ts b/shared/constants/security-provider.ts new file mode 100644 index 000000000..1862e8181 --- /dev/null +++ b/shared/constants/security-provider.ts @@ -0,0 +1,13 @@ +/** + * @typedef {object} SecurityProviderMessageSeverity + * @property {0} NOT_MALICIOUS - Indicates message is not malicious + * @property {1} MALICIOUS - Indicates message is malicious + * @property {2} NOT_SAFE - Indicates message is not safe + */ + +/** @type {SecurityProviderMessageSeverity} */ +export const SECURITY_PROVIDER_MESSAGE_SEVERITY = { + NOT_MALICIOUS: 0, + MALICIOUS: 1, + NOT_SAFE: 2, +}; diff --git a/shared/modules/security-provider.utils.test.ts b/shared/modules/security-provider.utils.test.ts new file mode 100644 index 000000000..c32ea7d38 --- /dev/null +++ b/shared/modules/security-provider.utils.test.ts @@ -0,0 +1,30 @@ +import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../constants/security-provider'; +import { isSuspiciousResponse } from './security-provider.utils'; + +describe('security-provider util', () => { + describe('isSuspiciousResponse', () => { + it('should return false if the response does not exist', () => { + const result = isSuspiciousResponse(undefined); + expect(result).toBeFalsy(); + }); + + it('should return false when flagAsDangerous exists and is not malicious', () => { + const result = isSuspiciousResponse({ + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS, + }); + expect(result).toBeFalsy(); + }); + + it('should return true when flagAsDangerous exists and is malicious or not safe', () => { + const result = isSuspiciousResponse({ + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_SAFE, + }); + expect(result).toBeTruthy(); + }); + + it('should return true if the response exists but is empty', () => { + const result = isSuspiciousResponse({}); + expect(result).toBeTruthy(); + }); + }); +}); diff --git a/shared/modules/security-provider.utils.ts b/shared/modules/security-provider.utils.ts new file mode 100644 index 000000000..3c341b4aa --- /dev/null +++ b/shared/modules/security-provider.utils.ts @@ -0,0 +1,19 @@ +import { Json } from '@metamask/utils'; +import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../constants/security-provider'; + +export function isSuspiciousResponse( + securityProviderResponse: Record | undefined, +): boolean { + if (!securityProviderResponse) { + return false; + } + + const isFlagged = + securityProviderResponse.flagAsDangerous !== undefined && + securityProviderResponse.flagAsDangerous !== + SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS; + + const isNotVerified = Object.keys(securityProviderResponse).length === 0; + + return isFlagged || isNotVerified; +} diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js index fd0651e13..713cd9293 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js +++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js @@ -10,8 +10,9 @@ import { INSUFFICIENT_FUNDS_ERROR_KEY } from '../../../../helpers/constants/erro import Typography from '../../../ui/typography'; import { TypographyVariant } from '../../../../helpers/constants/design-system'; +import { isSuspiciousResponse } from '../../../../../shared/modules/security-provider.utils'; import SecurityProviderBannerMessage from '../../security-provider-banner-message/security-provider-banner-message'; -import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../../security-provider-banner-message/security-provider-banner-message.constants'; + import { ConfirmPageContainerSummary, ConfirmPageContainerWarning } from '.'; export default class ConfirmPageContainerContent extends Component { @@ -214,15 +215,11 @@ export default class ConfirmPageContainerContent extends Component { {ethGasPriceWarning && ( )} - {(txData?.securityProviderResponse?.flagAsDangerous !== undefined && - txData?.securityProviderResponse?.flagAsDangerous !== - SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS) || - (txData?.securityProviderResponse && - Object.keys(txData.securityProviderResponse).length === 0) ? ( + {isSuspiciousResponse(txData?.securityProviderResponse) && ( - ) : null} + )} { @@ -155,7 +155,7 @@ describe('Confirm Page Container Content', () => { it('should not render SecurityProviderBannerMessage component when flagAsDangerous is not malicious', () => { props.txData.securityProviderResponse = { - flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS, + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS, }; const { queryByText } = renderWithProvider( diff --git a/ui/components/app/security-provider-banner-message/security-provider-banner-message.constants.js b/ui/components/app/security-provider-banner-message/security-provider-banner-message.constants.js deleted file mode 100644 index fc30d0b5c..000000000 --- a/ui/components/app/security-provider-banner-message/security-provider-banner-message.constants.js +++ /dev/null @@ -1,5 +0,0 @@ -export const SECURITY_PROVIDER_MESSAGE_SEVERITIES = { - NOT_MALICIOUS: 0, - MALICIOUS: 1, - NOT_SAFE: 2, -}; diff --git a/ui/components/app/security-provider-banner-message/security-provider-banner-message.js b/ui/components/app/security-provider-banner-message/security-provider-banner-message.js index 71c928edd..fdaba451f 100644 --- a/ui/components/app/security-provider-banner-message/security-provider-banner-message.js +++ b/ui/components/app/security-provider-banner-message/security-provider-banner-message.js @@ -6,9 +6,9 @@ import { Size, TextVariant, } from '../../../helpers/constants/design-system'; +import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../../../../shared/constants/security-provider'; import { I18nContext } from '../../../../.storybook/i18n'; import { BannerAlert, ButtonLink, Text } from '../../component-library'; -import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from './security-provider-banner-message.constants'; export default function SecurityProviderBannerMessage({ securityProviderResponse, @@ -21,7 +21,7 @@ export default function SecurityProviderBannerMessage({ if ( securityProviderResponse.flagAsDangerous === - SECURITY_PROVIDER_MESSAGE_SEVERITIES.MALICIOUS + SECURITY_PROVIDER_MESSAGE_SEVERITY.MALICIOUS ) { messageTitle = securityProviderResponse.reason_header === '' @@ -34,7 +34,7 @@ export default function SecurityProviderBannerMessage({ severity = SEVERITIES.DANGER; } else if ( securityProviderResponse.flagAsDangerous === - SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_SAFE + SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_SAFE ) { messageTitle = t('requestMayNotBeSafe'); messageText = t('requestMayNotBeSafeError'); diff --git a/ui/components/app/security-provider-banner-message/security-provider-banner-message.test.js b/ui/components/app/security-provider-banner-message/security-provider-banner-message.test.js index 4fd21f7e9..f131fad16 100644 --- a/ui/components/app/security-provider-banner-message/security-provider-banner-message.test.js +++ b/ui/components/app/security-provider-banner-message/security-provider-banner-message.test.js @@ -2,8 +2,8 @@ import { fireEvent } from '@testing-library/react'; import React from 'react'; import configureMockStore from 'redux-mock-store'; import { renderWithProvider } from '../../../../test/lib/render-helpers'; +import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../../../../shared/constants/security-provider'; import SecurityProviderBannerMessage from './security-provider-banner-message'; -import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from './security-provider-banner-message.constants'; describe('Security Provider Banner Message', () => { const store = configureMockStore()({}); @@ -12,7 +12,7 @@ describe('Security Provider Banner Message', () => { it('should render SecurityProviderBannerMessage component properly when flagAsDangerous is malicious', () => { const securityProviderResponse = { - flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITIES.MALICIOUS, + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.MALICIOUS, reason: 'Approval is to an unverified smart contract known for stealing NFTs in the past.', reason_header: 'This could be a scam', @@ -34,7 +34,7 @@ describe('Security Provider Banner Message', () => { it('should render SecurityProviderBannerMessage component properly when flagAsDangerous is not safe', () => { const securityProviderResponse = { - flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_SAFE, + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_SAFE, reason: 'Some reason...', reason_header: 'Some reason header...', }; @@ -99,7 +99,7 @@ describe('Security Provider Banner Message', () => { it('should navigate to the OpenSea web page when clicked on the OpenSea button', () => { const securityProviderResponse = { - flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_SAFE, + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_SAFE, reason: 'Some reason...', reason_header: 'Some reason header...', }; @@ -122,7 +122,7 @@ describe('Security Provider Banner Message', () => { it('should render SecurityProviderBannerMessage component properly, with predefined reason message, when a request is malicious and there is no reason given', () => { const securityProviderResponse = { - flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITIES.MALICIOUS, + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.MALICIOUS, reason: '', reason_header: 'Some reason header...', }; @@ -145,7 +145,7 @@ describe('Security Provider Banner Message', () => { it('should render SecurityProviderBannerMessage component properly, with predefined reason_header message, when a request is malicious and there is no reason header given', () => { const securityProviderResponse = { - flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITIES.MALICIOUS, + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.MALICIOUS, reason: 'Some reason...', reason_header: '', }; @@ -166,7 +166,7 @@ describe('Security Provider Banner Message', () => { it('should render SecurityProviderBannerMessage component properly, with predefined reason and reason_header messages, when a request is malicious and there are no reason and reason header given', () => { const securityProviderResponse = { - flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITIES.MALICIOUS, + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.MALICIOUS, reason: '', reason_header: '', }; diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js index 4b72ea529..b61bcf79e 100644 --- a/ui/components/app/signature-request-original/signature-request-original.component.js +++ b/ui/components/app/signature-request-original/signature-request-original.component.js @@ -13,6 +13,7 @@ import { ///: END:ONLY_INCLUDE_IN } from '../../../helpers/utils/util'; import { stripHexPrefix } from '../../../../shared/modules/hexstring-utils'; +import { isSuspiciousResponse } from '../../../../shared/modules/security-provider.utils'; import Button from '../../ui/button'; import SiteOrigin from '../../ui/site-origin'; import Typography from '../../ui/typography/typography'; @@ -32,7 +33,6 @@ import { } from '../../../helpers/constants/design-system'; import ConfirmPageContainerNavigation from '../confirm-page-container/confirm-page-container-navigation'; import SecurityProviderBannerMessage from '../security-provider-banner-message/security-provider-banner-message'; -import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../security-provider-banner-message/security-provider-banner-message.constants'; ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) import { Icon, IconName, Text } from '../../component-library'; import Box from '../../ui/box/box'; @@ -133,15 +133,11 @@ export default class SignatureRequestOriginal extends Component { return (
- {(txData?.securityProviderResponse?.flagAsDangerous !== undefined && - txData?.securityProviderResponse?.flagAsDangerous !== - SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS) || - (txData?.securityProviderResponse && - Object.keys(txData.securityProviderResponse).length === 0) ? ( + {isSuspiciousResponse(txData?.securityProviderResponse) && ( - ) : null} + )} { ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) diff --git a/ui/components/app/signature-request-original/signature-request-original.test.js b/ui/components/app/signature-request-original/signature-request-original.test.js index d9c136a86..030451514 100644 --- a/ui/components/app/signature-request-original/signature-request-original.test.js +++ b/ui/components/app/signature-request-original/signature-request-original.test.js @@ -3,10 +3,10 @@ import configureMockStore from 'redux-mock-store'; import { fireEvent, screen } from '@testing-library/react'; import { act } from 'react-dom/test-utils'; import { MESSAGE_TYPE } from '../../../../shared/constants/app'; +import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../../../../shared/constants/security-provider'; import mockState from '../../../../test/data/mock-state.json'; import { renderWithProvider } from '../../../../test/lib/render-helpers'; import configureStore from '../../../store/store'; -import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../security-provider-banner-message/security-provider-banner-message.constants'; import { resolvePendingApproval, rejectPendingApproval, @@ -168,7 +168,7 @@ describe('SignatureRequestOriginal', () => { it('should not render SecurityProviderBannerMessage component when flagAsDangerous is not malicious', () => { props.txData.securityProviderResponse = { - flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS, + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS, }; render(); diff --git a/ui/components/app/signature-request-siwe/signature-request-siwe.js b/ui/components/app/signature-request-siwe/signature-request-siwe.js index 33529e300..ddd4319e5 100644 --- a/ui/components/app/signature-request-siwe/signature-request-siwe.js +++ b/ui/components/app/signature-request-siwe/signature-request-siwe.js @@ -19,6 +19,7 @@ import { unconfirmedMessagesHashSelector, } from '../../../selectors'; import { getAccountByAddress, valuesFor } from '../../../helpers/utils/util'; +import { isSuspiciousResponse } from '../../../../shared/modules/security-provider.utils'; import { formatMessageParams } from '../../../../shared/modules/siwe'; import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/confirm-transaction.duck'; @@ -35,7 +36,6 @@ import { } from '../../../store/actions'; import SecurityProviderBannerMessage from '../security-provider-banner-message/security-provider-banner-message'; -import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../security-provider-banner-message/security-provider-banner-message.constants'; import ConfirmPageContainerNavigation from '../confirm-page-container/confirm-page-container-navigation'; import { getMostRecentOverviewPage } from '../../../ducks/history/history'; import LedgerInstructionField from '../ledger-instruction-field'; @@ -78,12 +78,9 @@ export default function SignatureRequestSIWE({ txData }) { const [hasAgreedToDomainWarning, setHasAgreedToDomainWarning] = useState(false); - const showSecurityProviderBanner = - (txData?.securityProviderResponse?.flagAsDangerous !== undefined && - txData?.securityProviderResponse?.flagAsDangerous !== - SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS) || - (txData?.securityProviderResponse && - Object.keys(txData.securityProviderResponse).length === 0); + const showSecurityProviderBanner = isSuspiciousResponse( + txData?.securityProviderResponse, + ); const onSign = useCallback(async () => { try { diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js index d03cf9fa8..8b6f1eaff 100644 --- a/ui/components/app/signature-request/signature-request.component.js +++ b/ui/components/app/signature-request/signature-request.component.js @@ -31,10 +31,10 @@ import { } from '../../../helpers/constants/design-system'; import NetworkAccountBalanceHeader from '../network-account-balance-header'; import { Numeric } from '../../../../shared/modules/Numeric'; +import { isSuspiciousResponse } from '../../../../shared/modules/security-provider.utils'; import { EtherDenomination } from '../../../../shared/constants/common'; import ConfirmPageContainerNavigation from '../confirm-page-container/confirm-page-container-navigation'; import SecurityProviderBannerMessage from '../security-provider-banner-message/security-provider-banner-message'; -import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../security-provider-banner-message/security-provider-banner-message.constants'; import { formatCurrency } from '../../../helpers/utils/confirm-tx.util'; import { getValueFromWeiHex } from '../../../../shared/modules/conversion.utils'; ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) @@ -284,15 +284,11 @@ export default class SignatureRequest extends PureComponent { />
- {(txData?.securityProviderResponse?.flagAsDangerous !== undefined && - txData?.securityProviderResponse?.flagAsDangerous !== - SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS) || - (txData?.securityProviderResponse && - Object.keys(txData.securityProviderResponse).length === 0) ? ( + {isSuspiciousResponse(txData?.securityProviderResponse) && ( - ) : null} + )} { ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) diff --git a/ui/components/app/signature-request/signature-request.component.test.js b/ui/components/app/signature-request/signature-request.component.test.js index eebae4d46..81f18932a 100644 --- a/ui/components/app/signature-request/signature-request.component.test.js +++ b/ui/components/app/signature-request/signature-request.component.test.js @@ -3,7 +3,7 @@ import { fireEvent } from '@testing-library/react'; import configureMockStore from 'redux-mock-store'; import mockState from '../../../../test/data/mock-state.json'; import { renderWithProvider } from '../../../../test/lib/render-helpers'; -import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../security-provider-banner-message/security-provider-banner-message.constants'; +import { SECURITY_PROVIDER_MESSAGE_SEVERITY } from '../../../../shared/constants/security-provider'; import SignatureRequest from './signature-request.component'; const baseProps = { @@ -308,8 +308,7 @@ describe('Signature Request Component', () => { txData={{ msgParams, securityProviderResponse: { - flagAsDangerous: - SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS, + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS, }, }} unapprovedMessagesCount={2} @@ -345,8 +344,7 @@ describe('Signature Request Component', () => { txData={{ msgParams, securityProviderResponse: { - flagAsDangerous: - SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS, + flagAsDangerous: SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS, }, }} unapprovedMessagesCount={2} diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js index c25e097fc..12f07dd94 100644 --- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js +++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js @@ -12,7 +12,6 @@ import SimulationErrorMessage from '../../../components/ui/simulation-error-mess import EditGasFeeButton from '../../../components/app/edit-gas-fee-button'; import MultiLayerFeeMessage from '../../../components/app/multilayer-fee-message'; import SecurityProviderBannerMessage from '../../../components/app/security-provider-banner-message/security-provider-banner-message'; -import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../../../components/app/security-provider-banner-message/security-provider-banner-message.constants'; import { BLOCK_SIZES, JustifyContent, @@ -24,6 +23,8 @@ import { } from '../../../helpers/constants/design-system'; import { ConfirmPageContainerWarning } from '../../../components/app/confirm-page-container/confirm-page-container-content'; import LedgerInstructionField from '../../../components/app/ledger-instruction-field'; +import { isSuspiciousResponse } from '../../../../shared/modules/security-provider.utils'; + import { TokenStandard } from '../../../../shared/constants/transaction'; import { CHAIN_IDS, TEST_CHAINS } from '../../../../shared/constants/network'; import ContractDetailsModal from '../../../components/app/modals/contract-details-modal/contract-details-modal'; @@ -594,15 +595,11 @@ export default class ConfirmApproveContent extends Component { 'confirm-approve-content--full': showFullTxDetails, })} > - {(txData?.securityProviderResponse?.flagAsDangerous !== undefined && - txData?.securityProviderResponse?.flagAsDangerous !== - SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS) || - (txData?.securityProviderResponse && - Object.keys(txData.securityProviderResponse).length === 0) ? ( + {isSuspiciousResponse(txData?.securityProviderResponse) && ( - ) : null} + )} {warning && (
diff --git a/ui/pages/token-allowance/token-allowance.js b/ui/pages/token-allowance/token-allowance.js index a6634ed8f..28fef706f 100644 --- a/ui/pages/token-allowance/token-allowance.js +++ b/ui/pages/token-allowance/token-allowance.js @@ -57,11 +57,11 @@ import { MAX_TOKEN_ALLOWANCE_AMOUNT, NUM_W_OPT_DECIMAL_COMMA_OR_DOT_REGEX, } from '../../../shared/constants/tokens'; +import { isSuspiciousResponse } from '../../../shared/modules/security-provider.utils'; import { ConfirmPageContainerNavigation } from '../../components/app/confirm-page-container'; import { useSimulationFailureWarning } from '../../hooks/useSimulationFailureWarning'; import SimulationErrorMessage from '../../components/ui/simulation-error-message'; import LedgerInstructionField from '../../components/app/ledger-instruction-field/ledger-instruction-field'; -import { SECURITY_PROVIDER_MESSAGE_SEVERITIES } from '../../components/app/security-provider-banner-message/security-provider-banner-message.constants'; import SecurityProviderBannerMessage from '../../components/app/security-provider-banner-message/security-provider-banner-message'; import { Text, Icon, IconName } from '../../components/component-library'; @@ -273,15 +273,11 @@ export default function TokenAllowance({ - {(txData?.securityProviderResponse?.flagAsDangerous !== undefined && - txData?.securityProviderResponse?.flagAsDangerous !== - SECURITY_PROVIDER_MESSAGE_SEVERITIES.NOT_MALICIOUS) || - (txData?.securityProviderResponse && - Object.keys(txData.securityProviderResponse).length === 0) ? ( + {isSuspiciousResponse(txData?.securityProviderResponse) && ( - ) : null} + )} Date: Fri, 23 Jun 2023 17:43:52 -0230 Subject: [PATCH 12/52] Update LavaMoat policies (#19744) Update LavaMoat policies to match what CI expects. --- lavamoat/browserify/beta/policy.json | 6 ++++++ lavamoat/browserify/desktop/policy.json | 6 ++++++ lavamoat/browserify/flask/policy.json | 6 ++++++ lavamoat/browserify/main/policy.json | 6 ++++++ lavamoat/browserify/mmi/policy.json | 6 ++++++ lavamoat/build-system/policy.json | 16 ++++++++-------- 6 files changed, 38 insertions(+), 8 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 494ce3924..88b3d6176 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -4490,6 +4490,12 @@ "string.prototype.matchall>regexp.prototype.flags>functions-have-names": true } }, + "superstruct": { + "globals": { + "console.warn": true, + "define": true + } + }, "uuid": { "globals": { "crypto": true, diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index fafcfcc40..a2a64b3ac 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -5148,6 +5148,12 @@ "string.prototype.matchall>regexp.prototype.flags>functions-have-names": true } }, + "superstruct": { + "globals": { + "console.warn": true, + "define": true + } + }, "terser>source-map-support>buffer-from": { "packages": { "browserify>buffer": true diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index fafcfcc40..a2a64b3ac 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -5148,6 +5148,12 @@ "string.prototype.matchall>regexp.prototype.flags>functions-have-names": true } }, + "superstruct": { + "globals": { + "console.warn": true, + "define": true + } + }, "terser>source-map-support>buffer-from": { "packages": { "browserify>buffer": true diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 494ce3924..88b3d6176 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -4490,6 +4490,12 @@ "string.prototype.matchall>regexp.prototype.flags>functions-have-names": true } }, + "superstruct": { + "globals": { + "console.warn": true, + "define": true + } + }, "uuid": { "globals": { "crypto": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 6f388ca84..bb82f34b7 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -4711,6 +4711,12 @@ "string.prototype.matchall>regexp.prototype.flags>functions-have-names": true } }, + "superstruct": { + "globals": { + "console.warn": true, + "define": true + } + }, "uuid": { "globals": { "crypto": true, diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 98fd8942c..a615563a8 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -1124,6 +1124,13 @@ "@metamask/jazzicon>color>color-convert>color-name": true } }, + "@sentry/cli>mkdirp": { + "builtin": { + "fs": true, + "path.dirname": true, + "path.resolve": true + } + }, "@storybook/addon-knobs>qs": { "packages": { "string.prototype.matchall>side-channel": true @@ -8146,14 +8153,7 @@ "path.dirname": true }, "packages": { - "stylelint>file-entry-cache>flat-cache>write>mkdirp": true - } - }, - "stylelint>file-entry-cache>flat-cache>write>mkdirp": { - "builtin": { - "fs": true, - "path.dirname": true, - "path.resolve": true + "@sentry/cli>mkdirp": true } }, "stylelint>global-modules": { From 1c7c89abcb0b54da7e1f8980268f3c95508f37fe Mon Sep 17 00:00:00 2001 From: Dhruv <79097544+dhruvv173@users.noreply.github.com> Date: Sat, 24 Jun 2023 03:08:40 +0530 Subject: [PATCH 13/52] Replacing deprecated constants & creating stories (#19686) * Replacing deprecated constants & creating stories * updating snapshot --- .../confirm-gas-display.stories.js | 19 ++++++++++ .../connected-account-permissions.stories.js | 25 +++++++++++++ .../compliance-details.test.js.snap | 16 ++++----- .../compliance-details/compliance-details.js | 35 +++++++++---------- .../product-tour-popover.js | 14 ++++---- 5 files changed, 76 insertions(+), 33 deletions(-) create mode 100644 ui/components/app/confirm-gas-display/confirm-gas-display.stories.js create mode 100644 ui/components/app/connected-accounts-permissions/connected-account-permissions.stories.js diff --git a/ui/components/app/confirm-gas-display/confirm-gas-display.stories.js b/ui/components/app/confirm-gas-display/confirm-gas-display.stories.js new file mode 100644 index 000000000..a8def4fc4 --- /dev/null +++ b/ui/components/app/confirm-gas-display/confirm-gas-display.stories.js @@ -0,0 +1,19 @@ +import React from 'react'; +import ConfirmGasDisplay from './confirm-gas-display'; + +export default { + title: 'Components/App/ConfirmGasDisplay', + component: ConfirmGasDisplay, + argTypes: { + userAcknowledgedGasMissing: { + control: 'boolean', + }, + }, + args: { + userAcknowledgedGasMissing: true, + }, +}; + +export const DefaultStory = (args) => ; + +DefaultStory.storyName = 'Default'; diff --git a/ui/components/app/connected-accounts-permissions/connected-account-permissions.stories.js b/ui/components/app/connected-accounts-permissions/connected-account-permissions.stories.js new file mode 100644 index 000000000..228abcc97 --- /dev/null +++ b/ui/components/app/connected-accounts-permissions/connected-account-permissions.stories.js @@ -0,0 +1,25 @@ +import React from 'react'; +import ConnectedAccountsPermissions from './connected-accounts-permissions'; + +export default { + title: 'Components/App/ConnectedAccountsPermissions', + component: ConnectedAccountsPermissions, + argTypes: { + permission: { + control: 'array', + }, + }, + args: { + permissions: [ + { key: 'permission1' }, + { key: 'permission2' }, + { key: 'permission3' }, + ], + }, +}; + +export const DefaultStory = (args) => ( + +); + +DefaultStory.storyName = 'Default'; diff --git a/ui/components/institutional/compliance-details/__snapshots__/compliance-details.test.js.snap b/ui/components/institutional/compliance-details/__snapshots__/compliance-details.test.js.snap index bd4b24a02..36420ca9f 100644 --- a/ui/components/institutional/compliance-details/__snapshots__/compliance-details.test.js.snap +++ b/ui/components/institutional/compliance-details/__snapshots__/compliance-details.test.js.snap @@ -3,10 +3,10 @@ exports[`ComplianceDetails should render correctly 1`] = `

{ @@ -50,17 +49,17 @@ const ComplianceDetails = ({ address, onClose, onGenerate }) => { return ( { {address} { diff --git a/ui/components/multichain/product-tour-popover/product-tour-popover.js b/ui/components/multichain/product-tour-popover/product-tour-popover.js index aa9361059..d782bc44c 100644 --- a/ui/components/multichain/product-tour-popover/product-tour-popover.js +++ b/ui/components/multichain/product-tour-popover/product-tour-popover.js @@ -1,13 +1,12 @@ import React from 'react'; import classnames from 'classnames'; import PropTypes from 'prop-types'; -import Box from '../../ui/box/box'; import { AlignItems, - BLOCK_SIZES, + BlockSize, BorderRadius, BackgroundColor, - DISPLAY, + Display, IconColor, JustifyContent, Size, @@ -20,6 +19,7 @@ import { ButtonIcon, IconName, Text, + Box, } from '../../component-library'; import { useI18nContext } from '../../../hooks/useI18nContext'; import { Menu } from '../../ui/menu'; @@ -63,13 +63,13 @@ export const ProductTour = ({ @@ -86,7 +86,7 @@ export const ProductTour = ({ {title} @@ -101,7 +101,7 @@ export const ProductTour = ({ {description} From 6bb786f3fd5586e0066a201e63c1ac8dbbd056d4 Mon Sep 17 00:00:00 2001 From: weizman Date: Mon, 26 Jun 2023 14:00:38 +0300 Subject: [PATCH 14/52] Disable warn logs in content-script (#19754) --- app/scripts/disable-console.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/scripts/disable-console.js b/app/scripts/disable-console.js index ff6fa46ed..fba61b383 100644 --- a/app/scripts/disable-console.js +++ b/app/scripts/disable-console.js @@ -6,6 +6,7 @@ if ( ) { console.log = noop; console.info = noop; + console.warn = noop; } function noop() { From ac8825b5b1ee3c45ad7010d11d6770b80870f34d Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Mon, 26 Jun 2023 09:05:53 -0230 Subject: [PATCH 15/52] Use Yarn caching in GitHub Actions (#19662) GitHub actions that install dependencies will now also cache those dependencies using the standard strategy for Yarn (which is to hash the lockfile). This matches the module template (see https://github.com/MetaMask/metamask-module-template/pull/145 for details). This should have no functional impact except that this action will run faster when dependencies are unchanged. --- .github/workflows/add-release-label.yml | 1 + .github/workflows/fitness-functions.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/add-release-label.yml b/.github/workflows/add-release-label.yml index 24d8f717a..8a9bf087f 100644 --- a/.github/workflows/add-release-label.yml +++ b/.github/workflows/add-release-label.yml @@ -21,6 +21,7 @@ jobs: uses: actions/setup-node@v3 with: node-version-file: '.nvmrc' + cache: yarn - name: Install dependencies run: yarn --immutable diff --git a/.github/workflows/fitness-functions.yml b/.github/workflows/fitness-functions.yml index 6ca53a53a..87e0bff2c 100644 --- a/.github/workflows/fitness-functions.yml +++ b/.github/workflows/fitness-functions.yml @@ -18,6 +18,7 @@ jobs: uses: actions/setup-node@v3 with: node-version-file: '.nvmrc' + cache: yarn - name: Install dependencies run: yarn --immutable From c8a6612bd2a471341f3bbf26a0cd9803c863a0c7 Mon Sep 17 00:00:00 2001 From: ryanml Date: Mon, 26 Jun 2023 05:33:15 -0700 Subject: [PATCH 16/52] Fixing misspelling in 10.28.0 changelog notes (#19756) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e628cdcbb..1b0039a80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -158,7 +158,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Additional incoming transactions support ([#14219](https://github.com/MetaMask/metamask-extension/pull/14219)) ### Changed -- UX: Loaclize the avatar-favicon description text ([#18132](https://github.com/MetaMask/metamask-extension/pull/18132)) +- UX: Localize the avatar-favicon description text ([#18132](https://github.com/MetaMask/metamask-extension/pull/18132)) - 17921 Update TransactionAlerts with BannerAlert ([#17940](https://github.com/MetaMask/metamask-extension/pull/17940)) - Part of 17670: Replace Typography with Text confirm-approve-content.component.js and home.component.js ([#18049](https://github.com/MetaMask/metamask-extension/pull/18049)) - UX: Icon: Update buy icon ([#18123](https://github.com/MetaMask/metamask-extension/pull/18123)) From e7e55dd8739814fc5493563f9a32d598593ba556 Mon Sep 17 00:00:00 2001 From: Alex Donesky Date: Mon, 26 Jun 2023 09:12:13 -0500 Subject: [PATCH 17/52] Add `tokenId` type validation in `wallet_watchAsset` middleware (#19738) --- .../handlers/watch-asset.js | 17 ++++ .../handlers/watch-asset.test.js | 99 +++++++++++++++++++ package.json | 2 +- yarn.lock | 10 +- 4 files changed, 122 insertions(+), 6 deletions(-) create mode 100644 app/scripts/lib/rpc-method-middleware/handlers/watch-asset.test.js diff --git a/app/scripts/lib/rpc-method-middleware/handlers/watch-asset.js b/app/scripts/lib/rpc-method-middleware/handlers/watch-asset.js index 8954a15f5..2f7fb5d7a 100644 --- a/app/scripts/lib/rpc-method-middleware/handlers/watch-asset.js +++ b/app/scripts/lib/rpc-method-middleware/handlers/watch-asset.js @@ -1,3 +1,5 @@ +import { ERC1155, ERC721 } from '@metamask/controller-utils'; +import { ethErrors } from 'eth-rpc-errors'; import { MESSAGE_TYPE } from '../../../../../shared/constants/app'; const watchAsset = { @@ -39,6 +41,21 @@ async function watchAssetHandler( params: { options: asset, type }, origin, } = req; + + const { tokenId } = asset; + + if ( + [ERC721, ERC1155].includes(type) && + tokenId !== undefined && + typeof tokenId !== 'string' + ) { + return end( + ethErrors.rpc.invalidParams({ + message: `Expected parameter 'tokenId' to be type 'string'. Received type '${typeof tokenId}'`, + }), + ); + } + await handleWatchAssetRequest(asset, type, origin); res.result = true; return end(); diff --git a/app/scripts/lib/rpc-method-middleware/handlers/watch-asset.test.js b/app/scripts/lib/rpc-method-middleware/handlers/watch-asset.test.js new file mode 100644 index 000000000..5af3ad1bd --- /dev/null +++ b/app/scripts/lib/rpc-method-middleware/handlers/watch-asset.test.js @@ -0,0 +1,99 @@ +import { ERC20, ERC721 } from '@metamask/controller-utils'; +import { ethErrors } from 'eth-rpc-errors'; +import watchAssetHandler from './watch-asset'; + +describe('watchAssetHandler', () => { + let mockEnd; + let mockHandleWatchAssetRequest; + + beforeEach(() => { + mockEnd = jest.fn(); + mockHandleWatchAssetRequest = jest.fn(); + }); + + it('should handle valid input for type ERC721 correctly', async () => { + const req = { + params: { + options: { + address: '0x1234', + tokenId: 'testTokenId', + }, + type: ERC721, + }, + origin: 'testOrigin', + }; + + const res = { + result: false, + }; + + await watchAssetHandler.implementation(req, res, null, mockEnd, { + handleWatchAssetRequest: mockHandleWatchAssetRequest, + }); + + expect(mockHandleWatchAssetRequest).toHaveBeenCalledWith( + req.params.options, + req.params.type, + req.origin, + ); + expect(res.result).toStrictEqual(true); + expect(mockEnd).toHaveBeenCalledWith(); + }); + + it('should handle valid input for type ERC20 correctly', async () => { + const req = { + params: { + options: { + address: '0x1234', + symbol: 'TEST', + decimals: 18, + }, + type: ERC20, + }, + origin: 'testOrigin', + }; + + const res = { + result: false, + }; + + await watchAssetHandler.implementation(req, res, null, mockEnd, { + handleWatchAssetRequest: mockHandleWatchAssetRequest, + }); + + expect(mockHandleWatchAssetRequest).toHaveBeenCalledWith( + req.params.options, + req.params.type, + req.origin, + ); + expect(res.result).toStrictEqual(true); + expect(mockEnd).toHaveBeenCalledWith(); + }); + + it('should throw when type is ERC721 and tokenId type is invalid', async () => { + const req = { + params: { + options: { + address: '0x1234', + tokenId: 222, + }, + type: ERC721, + }, + origin: 'testOrigin', + }; + + const res = { + result: false, + }; + + await watchAssetHandler.implementation(req, res, null, mockEnd, { + handleWatchAssetRequest: mockHandleWatchAssetRequest, + }); + + expect(mockEnd).toHaveBeenCalledWith( + ethErrors.rpc.invalidParams({ + message: `Expected parameter 'tokenId' to be type 'string'. Received type 'number'`, + }), + ); + }); +}); diff --git a/package.json b/package.json index eb17e8b69..5cfe68648 100644 --- a/package.json +++ b/package.json @@ -380,7 +380,7 @@ "@metamask/eslint-config-typescript": "^9.0.1", "@metamask/forwarder": "^1.1.0", "@metamask/phishing-warning": "^2.1.0", - "@metamask/test-dapp": "^7.0.0", + "@metamask/test-dapp": "^7.0.1", "@sentry/cli": "^1.58.0", "@storybook/addon-a11y": "^7.0.11", "@storybook/addon-actions": "^7.0.11", diff --git a/yarn.lock b/yarn.lock index 10aeefc01..368d60190 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4891,10 +4891,10 @@ __metadata: languageName: node linkType: hard -"@metamask/test-dapp@npm:^7.0.0": - version: 7.0.0 - resolution: "@metamask/test-dapp@npm:7.0.0" - checksum: 4a03ed86a97c94eef8131c0951fb7bf7eb0c988c407ae8e5ed6a897da30d1c48adf3e1e51e45220df6e5d51c22736a06c732ac95ba5741223573cd660706876b +"@metamask/test-dapp@npm:^7.0.1": + version: 7.0.1 + resolution: "@metamask/test-dapp@npm:7.0.1" + checksum: cbd9f7d66c32ecdccc2039b9d60ef7c0a118ce22392f2eec2ffc0911d3314f75eb81fc9bc6cdf14efd34de5fffb013693344ca2a2e46aa0a8cc33a3a8d8b0fea languageName: node linkType: hard @@ -24450,7 +24450,7 @@ __metadata: "@metamask/snaps-utils": ^0.32.2 "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.34.0-flask.1" "@metamask/subject-metadata-controller": ^2.0.0 - "@metamask/test-dapp": ^7.0.0 + "@metamask/test-dapp": ^7.0.1 "@metamask/utils": ^5.0.0 "@ngraveio/bc-ur": ^1.1.6 "@popperjs/core": ^2.4.0 From 55a8ff249c25adb3da69d7d5ed8d8eae5f1c347a Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Mon, 26 Jun 2023 11:50:00 -0230 Subject: [PATCH 18/52] Remove unused GitHub Action workflow (#19660) This GitHub action workflow was disabled, but was still running setup steps. It has now been removed entirely. We can re-introduce it again later once the problem that led to it being disabled has been fixed. The associated npm script and JavaScript module have been removed as well. --- .github/scripts/label-prs.ts | 177 -------------------------------- .github/workflows/label-prs.yml | 27 ----- package.json | 1 - 3 files changed, 205 deletions(-) delete mode 100644 .github/scripts/label-prs.ts delete mode 100644 .github/workflows/label-prs.yml diff --git a/.github/scripts/label-prs.ts b/.github/scripts/label-prs.ts deleted file mode 100644 index 8d05779d7..000000000 --- a/.github/scripts/label-prs.ts +++ /dev/null @@ -1,177 +0,0 @@ -import * as core from '@actions/core'; -import { context, getOctokit } from '@actions/github'; -import { GitHub } from '@actions/github/lib/utils'; - -main().catch((error: Error): void => { - console.error(error); - process.exit(1); -}); - -async function main(): Promise { - const token = process.env.GITHUB_TOKEN; - - if (!token) { - core.setFailed('GITHUB_TOKEN not found'); - process.exit(1); - } - - const octokit = getOctokit(token); - - const headRef = context.payload.pull_request?.head.ref || ''; - - let issueNumber = await getIssueNumberFromPullRequestBody(); - if (issueNumber === "") { - bailIfIsBranchNameInvalid(headRef); - bailIfIsNotFeatureBranch(headRef); - issueNumber = getIssueNumberFromBranchName(headRef); - } - - if (Number(issueNumber) === 0) { - process.exit(0); - } - - await updateLabels(octokit, issueNumber); -} - -async function getIssueNumberFromPullRequestBody(): Promise { - console.log("Checking if the PR's body references an issue..."); - - let ISSUE_LINK_IN_PR_DESCRIPTION_REGEX = - /(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s#\d+/gi; - - const prBody = await getPullRequestBody(); - - let matches = prBody.match(ISSUE_LINK_IN_PR_DESCRIPTION_REGEX); - if (!matches || matches?.length === 0) { - console.log( - 'No direct link can be drawn between the PR and an issue from the PR body because no issue number was referenced.', - ); - return ""; - } - - if (matches?.length > 1) { - console.log( - 'No direct link can be drawn between the PR and an issue from the PR body because more than one issue number was referenced.', - ); - return ""; - } - - const ISSUE_NUMBER_REGEX = /\d+/; - const issueNumber = matches[0].match(ISSUE_NUMBER_REGEX)?.[0] || ''; - - console.log(`Found issue number ${issueNumber} in PR body.`); - - return issueNumber; -} - -async function getPullRequestBody(): Promise { - if (context.eventName !== 'pull_request') { - console.log('This action should only run on pull_request events.'); - process.exit(1); - } - - const prBody = context.payload.pull_request?.body || ''; - return prBody; -} - -function bailIfIsBranchNameInvalid(branchName: string): void { - const BRANCH_REGEX = - /^(main|develop|(ci|chore|docs|feat|feature|fix|perf|refactor|revert|style)\/\d*(?:[-](?![-])\w*)*|Version-v\d+\.\d+\.\d+)$/; - const isValidBranchName = new RegExp(BRANCH_REGEX).test(branchName); - - if (!isValidBranchName) { - console.log('This branch name does not follow the convention.'); - console.log( - 'Here are some example branch names that are accepted: "fix/123-description", "feat/123-longer-description", "feature/123", "main", "develop", "Version-v10.24.2".', - ); - console.log( - 'No issue could be linked to this PR, so no labels were copied', - ); - - process.exit(0); - } -} - -function bailIfIsNotFeatureBranch(branchName: string): void { - if ( - branchName === 'main' || - branchName === 'develop' || - branchName.startsWith('Version-v') - ) { - console.log(`${branchName} is not a feature branch.`); - console.log( - 'No issue could be linked to this PR, so no labels were copied', - ); - process.exit(0); - } -} - -async function updateLabels(octokit: InstanceType, issueNumber: string): Promise { - interface ILabel { - name: string; - }; - - const owner = context.repo.owner; - const repo = context.repo.repo; - - const issue = await octokit.rest.issues.get({ - owner: owner, - repo: repo, - issue_number: Number(issueNumber), - }); - - const getNameFromLabel = (label: ILabel): string => label.name - - const issueLabels = issue.data.labels.map(label => getNameFromLabel(label as ILabel)); - - const prNumber = context.payload.number; - - const pr = await octokit.rest.issues.get({ - owner: owner, - repo: repo, - issue_number: prNumber, - }); - - const startingPRLabels = pr.data.labels.map(label => getNameFromLabel(label as ILabel)); - - const dedupedFinalPRLabels = [ - ...new Set([...startingPRLabels, ...issueLabels]), - ]; - - const hasIssueAdditionalLabels = !sortedArrayEqual( - startingPRLabels, - dedupedFinalPRLabels, - ); - if (hasIssueAdditionalLabels) { - await octokit.rest.issues.update({ - owner, - repo, - issue_number: prNumber, - labels: dedupedFinalPRLabels, - }); - } -} - -function getIssueNumberFromBranchName(branchName: string): string { - console.log('Checking if the branch name references an issue...'); - - let issueNumber: string; - if (branchName.split('/').length > 1) { - issueNumber = branchName.split('/')[1].split('-')[0]; - } else { - issueNumber = branchName.split('-')[0]; - } - - console.log(`Found issue number ${issueNumber} in branch name.`); - - return issueNumber; -} - -function sortedArrayEqual(array1: string[], array2: string[]): boolean { - const lengthsAreEqual = array1.length === array2.length; - const everyElementMatchesByIndex = array1.every( - (value: string, index: number): boolean => value === array2[index], - ); - - return lengthsAreEqual && everyElementMatchesByIndex; -} diff --git a/.github/workflows/label-prs.yml b/.github/workflows/label-prs.yml deleted file mode 100644 index 37e92725d..000000000 --- a/.github/workflows/label-prs.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Label PR - -on: - pull_request: - types: [assigned, opened, edited, synchronize, reopened] - -jobs: - label-pr: - runs-on: ubuntu-latest - permissions: - issues: write - pull-requests: write - - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Use Node.js - uses: actions/setup-node@v3 - with: - node-version: '16' - - - name: Install Yarn - run: npm install -g yarn - - - name: Install dependencies - run: yarn \ No newline at end of file diff --git a/package.json b/package.json index 5cfe68648..05c6599fd 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,6 @@ "fitness-functions": "ts-node development/fitness-functions/index.ts", "generate-beta-commit": "node ./development/generate-beta-commit.js", "validate-branch-name": "validate-branch-name", - "label-prs": "ts-node ./.github/scripts/label-prs.ts", "add-release-label-to-pr-and-linked-issues": "ts-node ./.github/scripts/add-release-label-to-pr-and-linked-issues.ts" }, "resolutions": { From e37e570b2eb80871e85c5851ab55793d9d0b8a34 Mon Sep 17 00:00:00 2001 From: David Walsh Date: Mon, 26 Jun 2023 11:13:26 -0500 Subject: [PATCH 19/52] Fix #847 - Don't show account address on token pages (#19740) Co-authored-by: Nidhi Kumari --- .../app/wallet-overview/eth-overview.js | 8 +++----- .../app/wallet-overview/token-overview.js | 1 + .../app/wallet-overview/wallet-overview.js | 20 +++++++++++-------- ui/pages/asset/components/native-asset.js | 2 +- ui/pages/home/home.component.js | 3 ++- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js index e5726f2d8..4cafa0514 100644 --- a/ui/components/app/wallet-overview/eth-overview.js +++ b/ui/components/app/wallet-overview/eth-overview.js @@ -49,7 +49,7 @@ import useRamps from '../../../hooks/experiences/useRamps'; import { getPortfolioUrl } from '../../../helpers/utils/portfolio'; import WalletOverview from './wallet-overview'; -const EthOverview = ({ className }) => { +const EthOverview = ({ className, showAddress }) => { const dispatch = useDispatch(); const t = useContext(I18nContext); const trackEvent = useContext(MetaMetricsContext); @@ -121,6 +121,7 @@ const EthOverview = ({ className }) => { return ( { EthOverview.propTypes = { className: PropTypes.string, -}; - -EthOverview.defaultProps = { - className: undefined, + showAddress: PropTypes.bool, }; export default EthOverview; diff --git a/ui/components/app/wallet-overview/token-overview.js b/ui/components/app/wallet-overview/token-overview.js index 7593ad72f..0820c946a 100644 --- a/ui/components/app/wallet-overview/token-overview.js +++ b/ui/components/app/wallet-overview/token-overview.js @@ -83,6 +83,7 @@ const TokenOverview = ({ className, token }) => { return (
diff --git a/ui/components/app/wallet-overview/wallet-overview.js b/ui/components/app/wallet-overview/wallet-overview.js index a56f8b8d8..f24957954 100644 --- a/ui/components/app/wallet-overview/wallet-overview.js +++ b/ui/components/app/wallet-overview/wallet-overview.js @@ -7,15 +7,22 @@ import { getSelectedIdentity } from '../../../selectors'; import { AddressCopyButton } from '../../multichain'; import Box from '../../ui/box/box'; -const WalletOverview = ({ balance, buttons, className }) => { +const WalletOverview = ({ + balance, + buttons, + className, + showAddress = false, +}) => { const selectedIdentity = useSelector(getSelectedIdentity); const checksummedAddress = toChecksumHexAddress(selectedIdentity?.address); return (
- - - + {showAddress ? ( + + + + ) : null} {balance}
{buttons}
@@ -27,10 +34,7 @@ WalletOverview.propTypes = { balance: PropTypes.element.isRequired, buttons: PropTypes.element.isRequired, className: PropTypes.string, -}; - -WalletOverview.defaultProps = { - className: undefined, + showAddress: PropTypes.bool, }; export default WalletOverview; diff --git a/ui/pages/asset/components/native-asset.js b/ui/pages/asset/components/native-asset.js index 0d5d6f98b..851b88b39 100644 --- a/ui/pages/asset/components/native-asset.js +++ b/ui/pages/asset/components/native-asset.js @@ -64,7 +64,7 @@ export default function NativeAsset({ nativeCurrency }) { /> } /> - + ); diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js index 9263dff65..52d8b1be9 100644 --- a/ui/pages/home/home.component.js +++ b/ui/pages/home/home.component.js @@ -778,12 +778,13 @@ export default class Home extends PureComponent {
{ ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) - + ///: END:ONLY_INCLUDE_IN } { ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) From 48f61dcf61e8b57186062216172d5720c2838e6c Mon Sep 17 00:00:00 2001 From: George Marshall Date: Mon, 26 Jun 2023 09:29:33 -0700 Subject: [PATCH 20/52] Deprecating FormField and fixing console error (#19739) * Deprecating FormField and fixing console error * Updating snapshots --- .../custom-spending-cap.test.js.snap | 6 +++--- ui/components/ui/form-field/README.mdx | 15 +++++++++++++ ui/components/ui/form-field/form-field.js | 21 ++++++++++++------- .../ui/form-field/form-field.stories.js | 1 - .../add-network-modal.test.js.snap | 20 +++++++++--------- .../create-password.test.js.snap | 10 ++++----- 6 files changed, 47 insertions(+), 26 deletions(-) diff --git a/ui/components/app/custom-spending-cap/__snapshots__/custom-spending-cap.test.js.snap b/ui/components/app/custom-spending-cap/__snapshots__/custom-spending-cap.test.js.snap index a62361e35..46ca44ffb 100644 --- a/ui/components/app/custom-spending-cap/__snapshots__/custom-spending-cap.test.js.snap +++ b/ui/components/app/custom-spending-cap/__snapshots__/custom-spending-cap.test.js.snap @@ -15,13 +15,13 @@ exports[`CustomSpendingCap should match snapshot 1`] = ` class="form-field" >
-
+
diff --git a/ui/pages/settings/contact-list-tab/index.scss b/ui/pages/settings/contact-list-tab/index.scss index 077b56fd8..f536a1650 100644 --- a/ui/pages/settings/contact-list-tab/index.scss +++ b/ui/pages/settings/contact-list-tab/index.scss @@ -21,19 +21,6 @@ align-items: center; } - &__header, - &__header--edit { - &__name { - @include H3; - - margin-left: 24px; - max-width: 8em; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - } - } - &__header--edit { display: flex; justify-content: space-between; @@ -186,10 +173,6 @@ padding-top: 0; } } - - .page-container__footer { - border-top: none; - } } &__add-contact { @@ -197,10 +180,16 @@ flex-flow: column nowrap; padding-bottom: 0 !important; height: 100%; + padding-top: 0; &__content { flex: 1 1 auto; height: 100%; + padding-top: 0; + + &__username { + padding-top: 0; + } } &__error { diff --git a/ui/pages/settings/contact-list-tab/view-contact/view-contact.component.js b/ui/pages/settings/contact-list-tab/view-contact/view-contact.component.js index 5045b9565..40c3e410f 100644 --- a/ui/pages/settings/contact-list-tab/view-contact/view-contact.component.js +++ b/ui/pages/settings/contact-list-tab/view-contact/view-contact.component.js @@ -2,19 +2,25 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Redirect } from 'react-router-dom'; -import Identicon from '../../../../components/ui/identicon'; import Button from '../../../../components/ui/button/button.component'; import { + AvatarAccount, + AvatarAccountSize, + Box, ButtonIcon, ButtonIconSize, IconName, + Text, } from '../../../../components/component-library'; import Tooltip from '../../../../components/ui/tooltip'; import { useI18nContext } from '../../../../hooks/useI18nContext'; import { useCopyToClipboard } from '../../../../hooks/useCopyToClipboard'; -import { IconColor } from '../../../../helpers/constants/design-system'; +import { + IconColor, + TextVariant, +} from '../../../../helpers/constants/design-system'; function quadSplit(address) { return `0x${address @@ -42,10 +48,19 @@ function ViewContact({ return (
-
- -
{name || address}
-
+ + + + {name || address} + +
-
-
- {t('memo')} + {memo.length > 0 ? ( +
+
+ {t('memo')} +
+
+ {memo} +
-
- {memo} -
-
+ ) : null}
); diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js index f1152ae2e..583c1f156 100644 --- a/ui/pages/settings/settings.component.js +++ b/ui/pages/settings/settings.component.js @@ -267,6 +267,8 @@ class SettingsPage extends PureComponent { history.push(key)} From f2d039f6cb1e7b8a16e051ad221eff28b3a55a14 Mon Sep 17 00:00:00 2001 From: George Marshall Date: Mon, 26 Jun 2023 10:29:02 -0700 Subject: [PATCH 23/52] Replacing deprecated components and fixing prop errors (#19745) --- ui/helpers/constants/design-system.ts | 24 ++ .../secure-your-wallet/index.scss | 40 ---- .../secure-your-wallet/secure-your-wallet.js | 210 +++++++++--------- 3 files changed, 126 insertions(+), 148 deletions(-) diff --git a/ui/helpers/constants/design-system.ts b/ui/helpers/constants/design-system.ts index b13ddf99c..18372b589 100644 --- a/ui/helpers/constants/design-system.ts +++ b/ui/helpers/constants/design-system.ts @@ -215,13 +215,37 @@ export enum BorderStyle { } export enum BorderRadius { + /** + * 2px + */ XS = 'xs', + /** + * 4px + */ SM = 'sm', + /** + * 6px + */ MD = 'md', + /** + * 8px + */ LG = 'lg', + /** + * 12px + */ XL = 'xl', + /** + * 0 + */ none = 'none', + /** + * 9999px + */ pill = 'pill', + /** + * 50% + */ full = 'full', } diff --git a/ui/pages/onboarding-flow/secure-your-wallet/index.scss b/ui/pages/onboarding-flow/secure-your-wallet/index.scss index 898a16002..1e217335e 100644 --- a/ui/pages/onboarding-flow/secure-your-wallet/index.scss +++ b/ui/pages/onboarding-flow/secure-your-wallet/index.scss @@ -1,50 +1,10 @@ .secure-your-wallet { - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; - &__video { max-width: 100%; - border-radius: 8px; - } - - &__actions { - flex-direction: column; - justify-content: space-between; - width: 100%; - - @include screen-sm-min { - flex-direction: row; - } - - button { - margin-bottom: 16px; - - @include screen-sm-min { - + button { - margin-left: 16px; - } - } - } } &__list { list-style: disc inside; - - li { - @include H4; - } - } - - &__highlighted { - background-color: var(--color-primary-muted); - padding: 12px; - border-radius: 10px; - - @include screen-sm-min { - margin-inline-end: 43px; - } } } diff --git a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js index 107bc0b11..f2130d817 100644 --- a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js +++ b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js @@ -1,14 +1,17 @@ import React, { useState, useContext } from 'react'; import { useHistory, useLocation } from 'react-router-dom'; import { useSelector } from 'react-redux'; -import Box from '../../../components/ui/box'; -import Button from '../../../components/ui/button'; + import { TextAlign, TextVariant, JustifyContent, - FontWeight, - DISPLAY, + BackgroundColor, + BorderRadius, + AlignItems, + FlexDirection, + Display, + BlockSize, } from '../../../helpers/constants/design-system'; import { ThreeStepProgressBar, @@ -22,7 +25,13 @@ import { MetaMetricsEventCategory, MetaMetricsEventName, } from '../../../../shared/constants/metametrics'; -import { Text } from '../../../components/component-library'; +import { + Text, + Box, + Button, + BUTTON_VARIANT, + BUTTON_SIZES, +} from '../../../components/component-library'; import SkipSRPBackup from './skip-srp-backup-popover'; export default function SecureYourWallet() { @@ -75,7 +84,14 @@ export default function SecureYourWallet() { const defaultLang = subtitles[currentLocale] ? currentLocale : 'en'; return ( -
+ {showSkipSRPBackupPopover && ( setShowSkipSRPBackupPopover(false)} /> )} @@ -83,129 +99,107 @@ export default function SecureYourWallet() { stage={threeStepStages.RECOVERY_PHRASE_VIDEO} marginBottom={4} /> - - - {t('seedPhraseIntroTitle')} - - - - - {t('seedPhraseIntroTitleCopy')} - - - - + {t('seedPhraseIntroTitle')} + + + {t('seedPhraseIntroTitleCopy')} + + { + trackEvent({ + category: MetaMetricsEventCategory.Onboarding, + event: MetaMetricsEventName.OnboardingWalletVideoPlay, + }); + }} + controls + > + + {Object.keys(subtitles).map((key) => { + return ( + + ); + })} - - - {t('seedPhraseIntroSidebarTitleOne')} - - - {t('seedPhraseIntroSidebarCopyOne')} - - - - - {t('seedPhraseIntroSidebarTitleTwo')} - -
    -
  • {t('seedPhraseIntroSidebarBulletOne')}
    • -
  • {t('seedPhraseIntroSidebarBulletThree')}
    • -
  • {t('seedPhraseIntroSidebarBulletFour')}
    • -
- - - - {t('seedPhraseIntroSidebarTitleThree')} - - - {t('seedPhraseIntroSidebarCopyTwo')} - - - - - {t('seedPhraseIntroSidebarCopyThree')} - + + {t('seedPhraseIntroSidebarTitleOne')} + + {t('seedPhraseIntroSidebarCopyOne')} + + {t('seedPhraseIntroSidebarTitleTwo')} + + + {t('seedPhraseIntroSidebarBulletOne')} + {t('seedPhraseIntroSidebarBulletThree')} + {t('seedPhraseIntroSidebarBulletFour')} + + {t('seedPhraseIntroSidebarTitleThree')} + + + {t('seedPhraseIntroSidebarCopyTwo')} + + + {t('seedPhraseIntroSidebarCopyThree')} + -
+ ); } From 3df690b85224c8cdcbd97936b58810a605f42120 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Mon, 26 Jun 2023 19:41:59 +0200 Subject: [PATCH 24/52] Use `snaps@0.35.2-flask.1` and `snaps@1.0.0-prerelease.1` (#19734) * snaps@0.35.0-flask.1 * Update LavaMoat policies * Update stable snaps packages to 1.0.0-prerelease.1 * Update LavaMoat policies * Fix lint * snaps@0.35.2 * Exclude snap_manageAccounts * Code fencing * Revert removing endowment:keyring exclusion * Bump iframe URLs --- .../snaps/snap-permissions.test.js | 8 - .../createMethodMiddleware.js | 10 +- .../metamask-controller.actions.test.js | 15 - app/scripts/metamask-controller.test.js | 17 -- builds.yml | 4 +- lavamoat/browserify/beta/policy.json | 121 +++++++- lavamoat/browserify/desktop/policy.json | 29 +- lavamoat/browserify/flask/policy.json | 29 +- lavamoat/browserify/main/policy.json | 121 +++++++- lavamoat/browserify/mmi/policy.json | 121 +++++++- package.json | 16 +- shared/constants/snaps/permissions.ts | 7 +- test/env.js | 2 +- ui/helpers/utils/permission.js | 2 +- yarn.lock | 268 ++++++++++-------- 15 files changed, 573 insertions(+), 197 deletions(-) diff --git a/app/scripts/controllers/permissions/snaps/snap-permissions.test.js b/app/scripts/controllers/permissions/snaps/snap-permissions.test.js index 334e12df5..08a21f1eb 100644 --- a/app/scripts/controllers/permissions/snaps/snap-permissions.test.js +++ b/app/scripts/controllers/permissions/snaps/snap-permissions.test.js @@ -8,14 +8,6 @@ import { buildSnapRestrictedMethodSpecifications, } from './snap-permissions'; -// Temporarily replace the snaps packages with the Flask versions. -jest.mock('@metamask/snaps-controllers', () => - jest.requireActual('@metamask/snaps-controllers-flask'), -); -jest.mock('@metamask/rpc-methods', () => - jest.requireActual('@metamask/rpc-methods-flask'), -); - describe('buildSnapRestrictedMethodSpecifications', () => { it('creates valid permission specification objects', () => { const hooks = { diff --git a/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js b/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js index 3b1530767..e0f1b87f4 100644 --- a/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js +++ b/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js @@ -1,8 +1,10 @@ -///: BEGIN:ONLY_INCLUDE_IN(snaps) -import { permittedMethods as permittedSnapMethods } from '@metamask/rpc-methods'; -///: END:ONLY_INCLUDE_IN import { permissionRpcMethods } from '@metamask/permission-controller'; -import { selectHooks } from '@metamask/rpc-methods/dist/utils'; +import { + selectHooks, + ///: BEGIN:ONLY_INCLUDE_IN(snaps) + permittedMethods as permittedSnapMethods, + ///: END:ONLY_INCLUDE_IN +} from '@metamask/rpc-methods'; import { ethErrors } from 'eth-rpc-errors'; import { flatten } from 'lodash'; import { UNSUPPORTED_RPC_METHODS } from '../../../../shared/constants/network'; diff --git a/app/scripts/metamask-controller.actions.test.js b/app/scripts/metamask-controller.actions.test.js index 85dd5fe6d..c1ea740f8 100644 --- a/app/scripts/metamask-controller.actions.test.js +++ b/app/scripts/metamask-controller.actions.test.js @@ -42,26 +42,11 @@ const createLoggerMiddlewareMock = () => (req, res, next) => { next(); }; -// Temporarily replace the snaps packages with the Flask versions. -const proxyPermissions = proxyquire('./controllers/permissions', { - './snaps/snap-permissions': proxyquire( - './controllers/permissions/snaps/snap-permissions', - { - // eslint-disable-next-line node/global-require - '@metamask/snaps-controllers': require('@metamask/snaps-controllers-flask'), - // eslint-disable-next-line node/global-require - '@metamask/rpc-methods': require('@metamask/rpc-methods-flask'), - }, - ), -}); - const TEST_SEED = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'; const MetaMaskController = proxyquire('./metamask-controller', { './lib/createLoggerMiddleware': { default: createLoggerMiddlewareMock }, - // Temporarily replace the snaps packages with the Flask versions. - './controllers/permissions': proxyPermissions, }).default; describe('MetaMaskController', function () { diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js index 8f013c48c..32d7b3c2f 100644 --- a/app/scripts/metamask-controller.test.js +++ b/app/scripts/metamask-controller.test.js @@ -74,19 +74,6 @@ function MockEthContract() { }; } -// Temporarily replace the snaps packages with the Flask versions. -const proxyPermissions = proxyquire('./controllers/permissions', { - './snaps/snap-permissions': proxyquire( - './controllers/permissions/snaps/snap-permissions', - { - // eslint-disable-next-line node/global-require - '@metamask/snaps-controllers': require('@metamask/snaps-controllers-flask'), - // eslint-disable-next-line node/global-require - '@metamask/rpc-methods': require('@metamask/rpc-methods-flask'), - }, - ), -}); - // TODO, Feb 24, 2023: // ethjs-contract is being added to proxyquire, but we might want to discontinue proxyquire // this is for expediency as we resolve a bug for v10.26.0. The proper solution here would have @@ -95,14 +82,10 @@ const proxyPermissions = proxyquire('./controllers/permissions', { const MetaMaskController = proxyquire('./metamask-controller', { './lib/createLoggerMiddleware': { default: createLoggerMiddlewareMock }, 'ethjs-contract': MockEthContract, - // Temporarily replace the snaps packages with the Flask versions. - './controllers/permissions': proxyPermissions, }).default; const MetaMaskControllerMV3 = proxyquire('./metamask-controller', { '../../shared/modules/mv3.utils': { isManifestV3: true }, - // Temporarily replace the snaps packages with the Flask versions. - './controllers/permissions': proxyPermissions, }).default; const currentNetworkId = '5'; diff --git a/builds.yml b/builds.yml index 3ca68bd59..ca31ff44d 100644 --- a/builds.yml +++ b/builds.yml @@ -51,7 +51,7 @@ buildTypes: - SEGMENT_FLASK_WRITE_KEY - ALLOW_LOCAL_SNAPS: true - REQUIRE_SNAPS_ALLOWLIST: false - - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/0.16.1-flask.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/0.35.2-flask.1/index.html - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID @@ -69,7 +69,7 @@ buildTypes: - SEGMENT_FLASK_WRITE_KEY - ALLOW_LOCAL_SNAPS: true - REQUIRE_SNAPS_ALLOWLIST: false - - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/0.16.1-flask.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/0.35.2-flask.1/index.html - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 88b3d6176..8f6e0cc03 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -186,8 +186,14 @@ "crypto": true }, "packages": { - "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true + } + }, + "@ethereumjs/tx>@ethereumjs/util>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethereumjs/tx>@ethereumjs/util>micro-ftch": { @@ -214,7 +220,7 @@ "crypto": true }, "packages": { - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true } }, "@ethereumjs/tx>ethereum-cryptography>@noble/curves": { @@ -222,7 +228,19 @@ "TextEncoder": true }, "packages": { - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethersproject/abi": { @@ -1712,9 +1730,15 @@ }, "@metamask/rpc-methods": { "packages": { + "@metamask/browser-passworder": true, "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, - "@metamask/utils": true, + "@metamask/permission-controller": true, + "@metamask/rpc-methods>@metamask/utils": true, + "@metamask/rpc-methods>nanoid": true, + "@metamask/snaps-ui": true, + "@metamask/snaps-utils": true, + "eth-rpc-errors": true, "superstruct": true } }, @@ -1723,6 +1747,18 @@ "crypto.getRandomValues": true } }, + "@metamask/rpc-methods>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, "@metamask/rpc-methods>nanoid": { "globals": { "crypto.getRandomValues": true @@ -1847,6 +1883,81 @@ "crypto.getRandomValues": true } }, + "@metamask/snaps-ui": { + "packages": { + "@metamask/snaps-ui>@metamask/utils": true, + "superstruct": true + } + }, + "@metamask/snaps-ui>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/snaps-utils": { + "globals": { + "TextDecoder": true, + "URL": true, + "console.error": true, + "console.log": true, + "console.warn": true, + "document.body.appendChild": true, + "document.createElement": true + }, + "packages": { + "@metamask/key-tree": true, + "@metamask/key-tree>@noble/hashes": true, + "@metamask/key-tree>@scure/base": true, + "@metamask/snaps-utils>@metamask/utils": true, + "@metamask/snaps-utils>cron-parser": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "@metamask/snaps-utils>rfdc": true, + "@metamask/snaps-utils>validate-npm-package-name": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/snaps-utils>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/snaps-utils>cron-parser": { + "packages": { + "browserify>browser-resolve": true, + "luxon": true + } + }, + "@metamask/snaps-utils>rfdc": { + "packages": { + "browserify>buffer": true + } + }, + "@metamask/snaps-utils>validate-npm-package-name": { + "packages": { + "@metamask/snaps-utils>validate-npm-package-name>builtins": true + } + }, + "@metamask/snaps-utils>validate-npm-package-name>builtins": { + "packages": { + "browserify>process": true, + "semver": true + } + }, "@metamask/subject-metadata-controller": { "packages": { "@metamask/subject-metadata-controller>@metamask/base-controller": true diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index a2a64b3ac..f3604c01e 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -186,8 +186,14 @@ "crypto": true }, "packages": { - "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true + } + }, + "@ethereumjs/tx>@ethereumjs/util>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethereumjs/tx>@ethereumjs/util>micro-ftch": { @@ -214,7 +220,7 @@ "crypto": true }, "packages": { - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true } }, "@ethereumjs/tx>ethereum-cryptography>@noble/curves": { @@ -222,7 +228,19 @@ "TextEncoder": true }, "packages": { - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethersproject/abi": { @@ -1883,6 +1901,7 @@ "document.createElement": true }, "packages": { + "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, "@metamask/rpc-methods-flask>@metamask/utils": true, @@ -2082,6 +2101,7 @@ "document.createElement": true }, "packages": { + "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, "@metamask/snaps-controllers-flask>@metamask/utils": true, @@ -2293,6 +2313,7 @@ "document.createElement": true }, "packages": { + "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, "@metamask/snaps-utils-flask>@metamask/utils": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index a2a64b3ac..f3604c01e 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -186,8 +186,14 @@ "crypto": true }, "packages": { - "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true + } + }, + "@ethereumjs/tx>@ethereumjs/util>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethereumjs/tx>@ethereumjs/util>micro-ftch": { @@ -214,7 +220,7 @@ "crypto": true }, "packages": { - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true } }, "@ethereumjs/tx>ethereum-cryptography>@noble/curves": { @@ -222,7 +228,19 @@ "TextEncoder": true }, "packages": { - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethersproject/abi": { @@ -1883,6 +1901,7 @@ "document.createElement": true }, "packages": { + "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, "@metamask/rpc-methods-flask>@metamask/utils": true, @@ -2082,6 +2101,7 @@ "document.createElement": true }, "packages": { + "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, "@metamask/snaps-controllers-flask>@metamask/utils": true, @@ -2293,6 +2313,7 @@ "document.createElement": true }, "packages": { + "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, "@metamask/key-tree>@scure/base": true, "@metamask/snaps-utils-flask>@metamask/utils": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 88b3d6176..8f6e0cc03 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -186,8 +186,14 @@ "crypto": true }, "packages": { - "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true + } + }, + "@ethereumjs/tx>@ethereumjs/util>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethereumjs/tx>@ethereumjs/util>micro-ftch": { @@ -214,7 +220,7 @@ "crypto": true }, "packages": { - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true } }, "@ethereumjs/tx>ethereum-cryptography>@noble/curves": { @@ -222,7 +228,19 @@ "TextEncoder": true }, "packages": { - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethersproject/abi": { @@ -1712,9 +1730,15 @@ }, "@metamask/rpc-methods": { "packages": { + "@metamask/browser-passworder": true, "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, - "@metamask/utils": true, + "@metamask/permission-controller": true, + "@metamask/rpc-methods>@metamask/utils": true, + "@metamask/rpc-methods>nanoid": true, + "@metamask/snaps-ui": true, + "@metamask/snaps-utils": true, + "eth-rpc-errors": true, "superstruct": true } }, @@ -1723,6 +1747,18 @@ "crypto.getRandomValues": true } }, + "@metamask/rpc-methods>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, "@metamask/rpc-methods>nanoid": { "globals": { "crypto.getRandomValues": true @@ -1847,6 +1883,81 @@ "crypto.getRandomValues": true } }, + "@metamask/snaps-ui": { + "packages": { + "@metamask/snaps-ui>@metamask/utils": true, + "superstruct": true + } + }, + "@metamask/snaps-ui>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/snaps-utils": { + "globals": { + "TextDecoder": true, + "URL": true, + "console.error": true, + "console.log": true, + "console.warn": true, + "document.body.appendChild": true, + "document.createElement": true + }, + "packages": { + "@metamask/key-tree": true, + "@metamask/key-tree>@noble/hashes": true, + "@metamask/key-tree>@scure/base": true, + "@metamask/snaps-utils>@metamask/utils": true, + "@metamask/snaps-utils>cron-parser": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "@metamask/snaps-utils>rfdc": true, + "@metamask/snaps-utils>validate-npm-package-name": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/snaps-utils>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/snaps-utils>cron-parser": { + "packages": { + "browserify>browser-resolve": true, + "luxon": true + } + }, + "@metamask/snaps-utils>rfdc": { + "packages": { + "browserify>buffer": true + } + }, + "@metamask/snaps-utils>validate-npm-package-name": { + "packages": { + "@metamask/snaps-utils>validate-npm-package-name>builtins": true + } + }, + "@metamask/snaps-utils>validate-npm-package-name>builtins": { + "packages": { + "browserify>process": true, + "semver": true + } + }, "@metamask/subject-metadata-controller": { "packages": { "@metamask/subject-metadata-controller>@metamask/base-controller": true diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index bb82f34b7..b4ce070d1 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -186,8 +186,14 @@ "crypto": true }, "packages": { - "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true, - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>@ethereumjs/util>ethereum-cryptography>@noble/hashes": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves": true + } + }, + "@ethereumjs/tx>@ethereumjs/util>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethereumjs/tx>@ethereumjs/util>micro-ftch": { @@ -214,7 +220,7 @@ "crypto": true }, "packages": { - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true } }, "@ethereumjs/tx>ethereum-cryptography>@noble/curves": { @@ -222,7 +228,19 @@ "TextEncoder": true }, "packages": { - "@metamask/key-tree>@noble/hashes": true + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/curves>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true } }, "@ethersproject/abi": { @@ -1933,9 +1951,15 @@ }, "@metamask/rpc-methods": { "packages": { + "@metamask/browser-passworder": true, "@metamask/key-tree": true, "@metamask/key-tree>@noble/hashes": true, - "@metamask/utils": true, + "@metamask/permission-controller": true, + "@metamask/rpc-methods>@metamask/utils": true, + "@metamask/rpc-methods>nanoid": true, + "@metamask/snaps-ui": true, + "@metamask/snaps-utils": true, + "eth-rpc-errors": true, "superstruct": true } }, @@ -1944,6 +1968,18 @@ "crypto.getRandomValues": true } }, + "@metamask/rpc-methods>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, "@metamask/rpc-methods>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2068,6 +2104,81 @@ "crypto.getRandomValues": true } }, + "@metamask/snaps-ui": { + "packages": { + "@metamask/snaps-ui>@metamask/utils": true, + "superstruct": true + } + }, + "@metamask/snaps-ui>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/snaps-utils": { + "globals": { + "TextDecoder": true, + "URL": true, + "console.error": true, + "console.log": true, + "console.warn": true, + "document.body.appendChild": true, + "document.createElement": true + }, + "packages": { + "@metamask/key-tree": true, + "@metamask/key-tree>@noble/hashes": true, + "@metamask/key-tree>@scure/base": true, + "@metamask/snaps-utils>@metamask/utils": true, + "@metamask/snaps-utils>cron-parser": true, + "@metamask/snaps-utils>fast-json-stable-stringify": true, + "@metamask/snaps-utils>rfdc": true, + "@metamask/snaps-utils>validate-npm-package-name": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/snaps-utils>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "browserify>buffer": true, + "nock>debug": true, + "semver": true, + "superstruct": true + } + }, + "@metamask/snaps-utils>cron-parser": { + "packages": { + "browserify>browser-resolve": true, + "luxon": true + } + }, + "@metamask/snaps-utils>rfdc": { + "packages": { + "browserify>buffer": true + } + }, + "@metamask/snaps-utils>validate-npm-package-name": { + "packages": { + "@metamask/snaps-utils>validate-npm-package-name>builtins": true + } + }, + "@metamask/snaps-utils>validate-npm-package-name>builtins": { + "packages": { + "browserify>process": true, + "semver": true + } + }, "@metamask/subject-metadata-controller": { "packages": { "@metamask/subject-metadata-controller>@metamask/base-controller": true diff --git a/package.json b/package.json index 05c6599fd..cef6fdbaf 100644 --- a/package.json +++ b/package.json @@ -252,19 +252,19 @@ "@metamask/post-message-stream": "^6.0.0", "@metamask/providers": "^10.2.1", "@metamask/rate-limit-controller": "^3.0.0", - "@metamask/rpc-methods": "^0.32.2", - "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.34.0-flask.1", + "@metamask/rpc-methods": "^1.0.0-prerelease.1", + "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.35.2-flask.1", "@metamask/safe-event-emitter": "^2.0.0", "@metamask/scure-bip39": "^2.0.3", "@metamask/signature-controller": "^4.0.1", "@metamask/slip44": "^3.0.0", "@metamask/smart-transactions-controller": "^3.1.0", - "@metamask/snaps-controllers": "^0.32.2", - "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.34.0-flask.1", - "@metamask/snaps-ui": "^0.32.2", - "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.34.0-flask.1", - "@metamask/snaps-utils": "^0.32.2", - "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.34.0-flask.1", + "@metamask/snaps-controllers": "^1.0.0-prerelease.1", + "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.35.2-flask.1", + "@metamask/snaps-ui": "^1.0.0-prerelease.1", + "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.35.2-flask.1", + "@metamask/snaps-utils": "^1.0.0-prerelease.1", + "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.35.2-flask.1", "@metamask/subject-metadata-controller": "^2.0.0", "@metamask/utils": "^5.0.0", "@ngraveio/bc-ur": "^1.1.6", diff --git a/shared/constants/snaps/permissions.ts b/shared/constants/snaps/permissions.ts index 2a5b3f1f6..c77d4a3c4 100644 --- a/shared/constants/snaps/permissions.ts +++ b/shared/constants/snaps/permissions.ts @@ -12,14 +12,19 @@ export const EndowmentPermissions = Object.freeze({ // Methods / permissions in external packages that we are temporarily excluding. export const ExcludedSnapPermissions = Object.freeze({ + // TODO: Enable in Flask + ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-flask) + snap_manageAccounts: + 'This permission is still in development and therefore not available.', + ///: END:ONLY_INCLUDE_IN eth_accounts: 'eth_accounts is disabled. For more information please see https://github.com/MetaMask/snaps-monorepo/issues/990.', }); export const ExcludedSnapEndowments = Object.freeze({ + ///: BEGIN:ONLY_INCLUDE_IN(build-main) 'endowment:keyring': 'This endowment is still in development therefore not available.', - ///: BEGIN:ONLY_INCLUDE_IN(build-main) 'endowment:long-running': 'endowment:long-running is deprecated. For more information please see https://github.com/MetaMask/snaps-monorepo/issues/945.', ///: END:ONLY_INCLUDE_IN diff --git a/test/env.js b/test/env.js index cb66e3d3b..4056fc287 100644 --- a/test/env.js +++ b/test/env.js @@ -1,4 +1,4 @@ process.env.METAMASK_ENVIRONMENT = 'test'; process.env.SUPPORT_LINK = 'https://support.metamask.io'; process.env.IFRAME_EXECUTION_ENVIRONMENT_URL = - 'https://execution.metamask.io/0.16.0-flask.1/index.html'; + 'https://execution.metamask.io/0.35.2-flask.1/index.html'; diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js index 1ff8478c9..c43f79a51 100644 --- a/ui/helpers/utils/permission.js +++ b/ui/helpers/utils/permission.js @@ -2,7 +2,7 @@ import deepFreeze from 'deep-freeze-strict'; import React from 'react'; ///: BEGIN:ONLY_INCLUDE_IN(snaps) -import { getRpcCaveatOrigins } from '@metamask/snaps-controllers/dist/snaps/endowments/rpc'; +import { getRpcCaveatOrigins } from '@metamask/snaps-controllers'; import { SnapCaveatType } from '@metamask/snaps-utils'; import { isNonEmptyArray } from '@metamask/controller-utils'; ///: END:ONLY_INCLUDE_IN diff --git a/yarn.lock b/yarn.lock index 368d60190..cdc786989 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4284,17 +4284,17 @@ __metadata: languageName: node linkType: hard -"@metamask/key-tree@npm:^7.0.0": - version: 7.0.0 - resolution: "@metamask/key-tree@npm:7.0.0" +"@metamask/key-tree@npm:^7.0.0, @metamask/key-tree@npm:^7.1.1": + version: 7.1.1 + resolution: "@metamask/key-tree@npm:7.1.1" dependencies: "@metamask/scure-bip39": ^2.1.0 - "@metamask/utils": ^3.3.0 + "@metamask/utils": ^6.0.1 "@noble/ed25519": ^1.6.0 "@noble/hashes": ^1.0.0 "@noble/secp256k1": ^1.5.5 "@scure/base": ^1.0.0 - checksum: e3b8371ba41766e1936ff0b0b34c46b7a1297e51fe177246ae6446c4f15a6601a6ed4fc5d01d0594e8b1e9b1682096900f7ab4e7e15df94041ec025116a635b9 + checksum: ddab7917e1214c51508f821a680f8e8819a8c866fd91244e0debf28464331dfcbf9a357e01716fc593cf00a8c71f95fd45ed4ff686ee6abc4c4061aed629537c languageName: node linkType: hard @@ -4447,7 +4447,7 @@ __metadata: languageName: node linkType: hard -"@metamask/permission-controller@npm:^3.0.0, @metamask/permission-controller@npm:^3.1.0": +"@metamask/permission-controller@npm:^3.0.0": version: 3.2.0 resolution: "@metamask/permission-controller@npm:3.2.0" dependencies: @@ -4557,6 +4557,25 @@ __metadata: languageName: node linkType: hard +"@metamask/providers@npm:^11.0.0": + version: 11.0.0 + resolution: "@metamask/providers@npm:11.0.0" + dependencies: + "@metamask/object-multiplex": ^1.1.0 + "@metamask/safe-event-emitter": ^3.0.0 + detect-browser: ^5.2.0 + eth-rpc-errors: ^4.0.2 + extension-port-stream: ^2.0.1 + fast-deep-equal: ^2.0.1 + is-stream: ^2.0.0 + json-rpc-engine: ^6.1.0 + json-rpc-middleware-stream: ^4.2.1 + pump: ^3.0.0 + webextension-polyfill: ^0.10.0 + checksum: 49667d9d9d2ad64adf480f8a6a04199f388f7a89f38978b6f9e8b18d5fbc7a82900326956b29af68c88d54cd45e0185d2198c687bb48470669b756742159bf95 + languageName: node + linkType: hard + "@metamask/rate-limit-controller@npm:^3.0.0": version: 3.0.0 resolution: "@metamask/rate-limit-controller@npm:3.0.0" @@ -4578,40 +4597,40 @@ __metadata: languageName: node linkType: hard -"@metamask/rpc-methods-flask@npm:@metamask/rpc-methods@0.34.0-flask.1, @metamask/rpc-methods@npm:^0.34.0-flask.1": - version: 0.34.0-flask.1 - resolution: "@metamask/rpc-methods@npm:0.34.0-flask.1" +"@metamask/rpc-methods-flask@npm:@metamask/rpc-methods@0.35.2-flask.1, @metamask/rpc-methods@npm:^0.35.2-flask.1": + version: 0.35.2-flask.1 + resolution: "@metamask/rpc-methods@npm:0.35.2-flask.1" dependencies: - "@metamask/key-tree": ^7.0.0 + "@metamask/key-tree": ^7.1.1 "@metamask/permission-controller": ^4.0.0 - "@metamask/snaps-ui": ^0.34.0-flask.1 - "@metamask/snaps-utils": ^0.34.0-flask.1 + "@metamask/snaps-ui": ^0.35.2-flask.1 + "@metamask/snaps-utils": ^0.35.2-flask.1 "@metamask/types": ^1.1.0 - "@metamask/utils": ^6.0.0 - "@noble/hashes": ^1.1.3 + "@metamask/utils": ^6.0.1 + "@noble/hashes": ^1.3.1 eth-rpc-errors: ^4.0.3 nanoid: ^3.1.31 superstruct: ^1.0.3 - checksum: e6f05ab479f1136561a86dc313f5cbcfb3588bcdc5d8c723bafca81b2f07dc9f835586d70c0373fc6d1a194288c5010025eb6af47f9becfebbfacf0422e393b9 + checksum: e949da37c7d3099c07fc3f110310a1f86dbfbdf0d3a84a584b697beb64dc4662ba93e843b7a28a41e41b6500128782a07a9884e14252ac98206b8ed58776034b languageName: node linkType: hard -"@metamask/rpc-methods@npm:^0.32.2": - version: 0.32.2 - resolution: "@metamask/rpc-methods@npm:0.32.2" +"@metamask/rpc-methods@npm:^1.0.0-prerelease.1": + version: 1.0.0-prerelease.1 + resolution: "@metamask/rpc-methods@npm:1.0.0-prerelease.1" dependencies: "@metamask/browser-passworder": ^4.0.2 - "@metamask/key-tree": ^7.0.0 - "@metamask/permission-controller": ^3.1.0 - "@metamask/snaps-ui": ^0.32.2 - "@metamask/snaps-utils": ^0.32.2 + "@metamask/key-tree": ^7.1.1 + "@metamask/permission-controller": ^4.0.0 + "@metamask/snaps-ui": ^1.0.0-prerelease.1 + "@metamask/snaps-utils": ^1.0.0-prerelease.1 "@metamask/types": ^1.1.0 - "@metamask/utils": ^5.0.0 + "@metamask/utils": ^6.0.1 "@noble/hashes": ^1.1.3 eth-rpc-errors: ^4.0.2 nanoid: ^3.1.31 superstruct: ^1.0.3 - checksum: 11a996de95c64ef26e22fcd276a04e7ef93e1cd8ef279bea46a6293c7c0e714f22c417ebd92ca50fca505aaf4c68bcaf818466c24cdc93c77afad9842a50f394 + checksum: 6c97446d41d77c11182a065d39e4030781fbbb67d941b2f85c739784f9ddef601fec1485567fa18d505ea8e50c825cbd6ccddafd5bc9939f2b8922d7009cf321 languageName: node linkType: hard @@ -4684,20 +4703,20 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-controllers-flask@npm:@metamask/snaps-controllers@0.34.0-flask.1": - version: 0.34.0-flask.1 - resolution: "@metamask/snaps-controllers@npm:0.34.0-flask.1" +"@metamask/snaps-controllers-flask@npm:@metamask/snaps-controllers@0.35.2-flask.1": + version: 0.35.2-flask.1 + resolution: "@metamask/snaps-controllers@npm:0.35.2-flask.1" dependencies: "@metamask/approval-controller": ^3.0.0 "@metamask/base-controller": ^3.0.0 "@metamask/object-multiplex": ^1.2.0 "@metamask/permission-controller": ^4.0.0 "@metamask/post-message-stream": ^6.1.2 - "@metamask/rpc-methods": ^0.34.0-flask.1 - "@metamask/snaps-execution-environments": ^0.34.0-flask.1 + "@metamask/rpc-methods": ^0.35.2-flask.1 + "@metamask/snaps-execution-environments": ^0.35.2-flask.1 "@metamask/snaps-registry": ^1.2.1 - "@metamask/snaps-utils": ^0.34.0-flask.1 - "@metamask/utils": ^6.0.0 + "@metamask/snaps-utils": ^0.35.2-flask.1 + "@metamask/utils": ^6.0.1 "@xstate/fsm": ^2.0.0 concat-stream: ^2.0.0 cron-parser: ^4.5.0 @@ -4710,25 +4729,24 @@ __metadata: pump: ^3.0.0 readable-web-to-node-stream: ^3.0.2 tar-stream: ^2.2.0 - checksum: 9c61f6b3dcc9d25411447a5b434bf2b1713190333a472f7e0f74bf644aebf140e58ba3e21b4df1a6d425180a916379868ae1932be044b675f1f365c5765b5f50 + checksum: 8b20ed3176da02c2bb5be642db83912b484dd85a0e9cb36b2d4bca6a0058cd28d578c91c595f20bcc084c73e8802b289191ac41972bc17ae921010e1b05fd307 languageName: node linkType: hard -"@metamask/snaps-controllers@npm:^0.32.2": - version: 0.32.2 - resolution: "@metamask/snaps-controllers@npm:0.32.2" +"@metamask/snaps-controllers@npm:^1.0.0-prerelease.1": + version: 1.0.0-prerelease.1 + resolution: "@metamask/snaps-controllers@npm:1.0.0-prerelease.1" dependencies: - "@metamask/approval-controller": ^2.0.0 - "@metamask/base-controller": ^2.0.0 - "@metamask/object-multiplex": ^1.1.0 - "@metamask/permission-controller": ^3.1.0 - "@metamask/post-message-stream": ^6.1.1 - "@metamask/rpc-methods": ^0.32.2 - "@metamask/snaps-execution-environments": ^0.32.2 - "@metamask/snaps-registry": ^1.2.0 - "@metamask/snaps-utils": ^0.32.2 - "@metamask/subject-metadata-controller": ^2.0.0 - "@metamask/utils": ^5.0.0 + "@metamask/approval-controller": ^3.0.0 + "@metamask/base-controller": ^3.0.0 + "@metamask/object-multiplex": ^1.2.0 + "@metamask/permission-controller": ^4.0.0 + "@metamask/post-message-stream": ^6.1.2 + "@metamask/rpc-methods": ^1.0.0-prerelease.1 + "@metamask/snaps-execution-environments": ^1.0.0-prerelease.1 + "@metamask/snaps-registry": ^1.2.1 + "@metamask/snaps-utils": ^1.0.0-prerelease.1 + "@metamask/utils": ^6.0.1 "@xstate/fsm": ^2.0.0 concat-stream: ^2.0.0 cron-parser: ^4.5.0 @@ -4741,40 +4759,20 @@ __metadata: pump: ^3.0.0 readable-web-to-node-stream: ^3.0.2 tar-stream: ^2.2.0 - checksum: f3994b4245d74f324b83ffb5ce2879201b77ea4916d46c5d20fba49d21d8cf10ff74252b0c0e29215587e67a94b18e2c2d6bbeac934ec669d3e56eeabae5b04f + checksum: 695fd90ad0f8bf2befd813e4ca8568b496575d581e94cac608a6daea55be57f508c5615d05e974d2de459a74cd6f84fb5ab7eb763e56e50b28484989e3e04ca6 languageName: node linkType: hard -"@metamask/snaps-execution-environments@npm:^0.32.2": - version: 0.32.2 - resolution: "@metamask/snaps-execution-environments@npm:0.32.2" - dependencies: - "@metamask/object-multiplex": ^1.2.0 - "@metamask/post-message-stream": ^6.1.1 - "@metamask/providers": ^10.2.0 - "@metamask/rpc-methods": ^0.32.2 - "@metamask/snaps-utils": ^0.32.2 - "@metamask/utils": ^5.0.0 - eth-rpc-errors: ^4.0.3 - json-rpc-engine: ^6.1.0 - pump: ^3.0.0 - ses: ^0.18.1 - stream-browserify: ^3.0.0 - superstruct: ^1.0.3 - checksum: 10d5d727dea00628c0644ab639bd734b9fb793cdc01ebe5d1101db3041de54b854acc8f935ec8acff134fa12a5713c038c466c2f2813b038dd1eea84d700856f - languageName: node - linkType: hard - -"@metamask/snaps-execution-environments@npm:^0.34.0-flask.1": - version: 0.34.0-flask.1 - resolution: "@metamask/snaps-execution-environments@npm:0.34.0-flask.1" +"@metamask/snaps-execution-environments@npm:^0.35.2-flask.1": + version: 0.35.2-flask.1 + resolution: "@metamask/snaps-execution-environments@npm:0.35.2-flask.1" dependencies: "@metamask/object-multiplex": ^1.2.0 "@metamask/post-message-stream": ^6.1.2 - "@metamask/providers": ^10.2.1 - "@metamask/rpc-methods": ^0.34.0-flask.1 - "@metamask/snaps-utils": ^0.34.0-flask.1 - "@metamask/utils": ^6.0.0 + "@metamask/providers": ^11.0.0 + "@metamask/rpc-methods": ^0.35.2-flask.1 + "@metamask/snaps-utils": ^0.35.2-flask.1 + "@metamask/utils": ^6.0.1 eth-rpc-errors: ^4.0.3 json-rpc-engine: ^6.1.0 nanoid: ^3.1.31 @@ -4782,11 +4780,31 @@ __metadata: ses: ^0.18.1 stream-browserify: ^3.0.0 superstruct: ^1.0.3 - checksum: 384105334b3346fbdffca18eb9934391bb88e0c06022e17afdd235be91b0bc434ce26680ee3fb81bd99dd601e376b4e8448f02f7fdb379914d7bcbf4ce3a92e5 + checksum: b112a25a5cd5574fd84dcc7a62b9076d59d0182d52c37645d44477efcb67d18a4dd40bef3778dcbd67009fe3b261ffe0e247def112737a16bac5e86bf16081e7 languageName: node linkType: hard -"@metamask/snaps-registry@npm:^1.2.0, @metamask/snaps-registry@npm:^1.2.1": +"@metamask/snaps-execution-environments@npm:^1.0.0-prerelease.1": + version: 1.0.0-prerelease.1 + resolution: "@metamask/snaps-execution-environments@npm:1.0.0-prerelease.1" + dependencies: + "@metamask/object-multiplex": ^1.2.0 + "@metamask/post-message-stream": ^6.1.1 + "@metamask/providers": ^10.2.0 + "@metamask/rpc-methods": ^1.0.0-prerelease.1 + "@metamask/snaps-utils": ^1.0.0-prerelease.1 + "@metamask/utils": ^6.0.1 + eth-rpc-errors: ^4.0.3 + json-rpc-engine: ^6.1.0 + pump: ^3.0.0 + ses: ^0.18.1 + stream-browserify: ^3.0.0 + superstruct: ^1.0.3 + checksum: f52a005f1355bb994ad5437a59efe69d9d873f4ed1624f428e54efeaf9728fccaa87a2801f8c80c8ecf76acc55792da0093c54b94676d3076fae0e4745bf7f96 + languageName: node + linkType: hard + +"@metamask/snaps-registry@npm:^1.2.1": version: 1.2.1 resolution: "@metamask/snaps-registry@npm:1.2.1" dependencies: @@ -4797,39 +4815,40 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-ui-flask@npm:@metamask/snaps-ui@0.34.0-flask.1, @metamask/snaps-ui@npm:^0.34.0-flask.1": - version: 0.34.0-flask.1 - resolution: "@metamask/snaps-ui@npm:0.34.0-flask.1" +"@metamask/snaps-ui-flask@npm:@metamask/snaps-ui@0.35.2-flask.1, @metamask/snaps-ui@npm:^0.35.2-flask.1": + version: 0.35.2-flask.1 + resolution: "@metamask/snaps-ui@npm:0.35.2-flask.1" dependencies: - "@metamask/utils": ^6.0.0 + "@metamask/utils": ^6.0.1 superstruct: ^1.0.3 - checksum: 1d8dbede166f5d6da08ad4cca4d6b6f64d282aeb9858a19ebd54274054014266e1ae089014fa6e786baf5f69f6df211c6e6c12399760f81a45cd5f0c508a1e77 + checksum: fb272068e04a9d4e0458aecef4df4091a9d9d9c0c3580d40c211a710566eb5610252456f0eb99533379d6d919c0c4156dda1ae6233693723e9227e54a4c5ddbf languageName: node linkType: hard -"@metamask/snaps-ui@npm:^0.32.2": - version: 0.32.2 - resolution: "@metamask/snaps-ui@npm:0.32.2" +"@metamask/snaps-ui@npm:^1.0.0-prerelease.1": + version: 1.0.0-prerelease.1 + resolution: "@metamask/snaps-ui@npm:1.0.0-prerelease.1" dependencies: - "@metamask/utils": ^5.0.0 + "@metamask/utils": ^6.0.1 superstruct: ^1.0.3 - checksum: 98e8900efb63a0f1ec4893624290a1bf2d0fa416f99d57f33532865063f4e4b9b3787b77630629c64d7dc041e3508cac81044eca067ed76a07aa380bc5997db2 + checksum: 58ab96cff1512e3a2ed607277f18c2a17a8c2dfe2e75df4705654cbfbcfcbfb5a7da6975fa81aaf0b58166e9d56cd36e44f4ddc50e10d51a8c1d75c826cd8b17 languageName: node linkType: hard -"@metamask/snaps-utils-flask@npm:@metamask/snaps-utils@0.34.0-flask.1, @metamask/snaps-utils@npm:^0.34.0-flask.1": - version: 0.34.0-flask.1 - resolution: "@metamask/snaps-utils@npm:0.34.0-flask.1" +"@metamask/snaps-utils-flask@npm:@metamask/snaps-utils@0.35.2-flask.1, @metamask/snaps-utils@npm:^0.35.2-flask.1": + version: 0.35.2-flask.1 + resolution: "@metamask/snaps-utils@npm:0.35.2-flask.1" dependencies: "@babel/core": ^7.20.12 "@babel/types": ^7.18.7 "@metamask/base-controller": ^3.0.0 + "@metamask/key-tree": ^7.1.1 "@metamask/permission-controller": ^4.0.0 - "@metamask/providers": ^10.2.1 + "@metamask/providers": ^11.0.0 "@metamask/snaps-registry": ^1.2.1 - "@metamask/snaps-ui": ^0.34.0-flask.1 - "@metamask/utils": ^6.0.0 - "@noble/hashes": ^1.1.3 + "@metamask/snaps-ui": ^0.35.2-flask.1 + "@metamask/utils": ^6.0.1 + "@noble/hashes": ^1.3.1 "@scure/base": ^1.1.1 cron-parser: ^4.5.0 eth-rpc-errors: ^4.0.3 @@ -4841,22 +4860,23 @@ __metadata: ses: ^0.18.1 superstruct: ^1.0.3 validate-npm-package-name: ^5.0.0 - checksum: bc4ff9460dce673e00a0a82c81b61f7a9ddb1ca18331236a0d68f7ed07c14edb2c7bbdec5817b446970c7e3761ddbdcabf129721e1f1c5376c39e126cdf3221c + checksum: 4a22bf42512e2bdc944042cb05ef8b8f733ce902c0f374f7d36e22344700a3d0674a48ddacbe096a7e253c24f7ba05cff7ff30a05d3e48a840b63cbeeb46f0ce languageName: node linkType: hard -"@metamask/snaps-utils@npm:^0.32.2": - version: 0.32.2 - resolution: "@metamask/snaps-utils@npm:0.32.2" +"@metamask/snaps-utils@npm:^1.0.0-prerelease.1": + version: 1.0.0-prerelease.1 + resolution: "@metamask/snaps-utils@npm:1.0.0-prerelease.1" dependencies: "@babel/core": ^7.18.6 "@babel/types": ^7.18.7 - "@metamask/base-controller": ^2.0.0 - "@metamask/permission-controller": ^3.1.0 + "@metamask/base-controller": ^3.0.0 + "@metamask/key-tree": ^7.1.1 + "@metamask/permission-controller": ^4.0.0 "@metamask/providers": ^10.2.1 - "@metamask/snaps-registry": ^1.2.0 - "@metamask/snaps-ui": ^0.32.2 - "@metamask/utils": ^5.0.0 + "@metamask/snaps-registry": ^1.2.1 + "@metamask/snaps-ui": ^1.0.0-prerelease.1 + "@metamask/utils": ^6.0.1 "@noble/hashes": ^1.1.3 "@scure/base": ^1.1.1 cron-parser: ^4.5.0 @@ -4868,7 +4888,7 @@ __metadata: ses: ^0.18.1 superstruct: ^1.0.3 validate-npm-package-name: ^5.0.0 - checksum: 3568fb79cff8283eacb6e1bd498e20191f2c7c6774675be372f5305a4b5275512d1ded2a9fb36c106a8b10c5cbf480f6a87cdacfc70baf642b9bf3094ee3aefa + checksum: cd16003c748c60c0db33eaf16189a210e7165abc5e6e913d164c2b20ce6b5bb27df5471fac5913b6ba07f7aff845f37c404fa13c4015448a75cb531418e8442f languageName: node linkType: hard @@ -4905,7 +4925,7 @@ __metadata: languageName: node linkType: hard -"@metamask/utils@npm:^3.0.1, @metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.3.0, @metamask/utils@npm:^3.4.1": +"@metamask/utils@npm:^3.0.1, @metamask/utils@npm:^3.0.3, @metamask/utils@npm:^3.4.1": version: 3.6.0 resolution: "@metamask/utils@npm:3.6.0" dependencies: @@ -4930,16 +4950,16 @@ __metadata: languageName: node linkType: hard -"@metamask/utils@npm:^6.0.0": - version: 6.0.0 - resolution: "@metamask/utils@npm:6.0.0" +"@metamask/utils@npm:^6.0.0, @metamask/utils@npm:^6.0.1": + version: 6.1.0 + resolution: "@metamask/utils@npm:6.1.0" dependencies: "@ethereumjs/tx": ^4.1.2 "@types/debug": ^4.1.7 debug: ^4.3.4 semver: ^7.3.8 superstruct: ^1.0.3 - checksum: 502a75c82af729f813a08382e8ca5e3bfab7903a377b375e781ffcd5541e3a57b468a0daf02bb8e5c5bcb9051408f51c1ffb7a92b90bfd89946e7691c1117ca9 + checksum: d4eac3ce3c08674b8e9ef838d1661a5025690c6f266c26ebdb8e8d0da11fce786e54c326b5d9c6d33b262f37e7057e31d6545a3715613bd0a5bfa10e7755643a languageName: node linkType: hard @@ -4999,13 +5019,20 @@ __metadata: languageName: node linkType: hard -"@noble/hashes@npm:1.3.0, @noble/hashes@npm:^1.0.0, @noble/hashes@npm:^1.1.3, @noble/hashes@npm:^1.3.0, @noble/hashes@npm:~1.3.0": +"@noble/hashes@npm:1.3.0": version: 1.3.0 resolution: "@noble/hashes@npm:1.3.0" checksum: d7ddb6d7c60f1ce1f87facbbef5b724cdea536fc9e7f59ae96e0fc9de96c8f1a2ae2bdedbce10f7dcc621338dfef8533daa73c873f2b5c87fa1a4e05a95c2e2e languageName: node linkType: hard +"@noble/hashes@npm:^1.0.0, @noble/hashes@npm:^1.1.3, @noble/hashes@npm:^1.3.0, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:~1.3.0": + version: 1.3.1 + resolution: "@noble/hashes@npm:1.3.1" + checksum: 7fdefc0f7a0c1ec27acc6ff88841793e3f93ec4ce6b8a6a12bfc0dd70ae6b7c4c82fe305fdfeda1735d5ad4a9eebe761e6693b3d355689c559e91242f4bc95b1 + languageName: node + linkType: hard + "@noble/hashes@npm:~1.1.1": version: 1.1.3 resolution: "@noble/hashes@npm:1.1.3" @@ -24436,19 +24463,19 @@ __metadata: "@metamask/post-message-stream": ^6.0.0 "@metamask/providers": ^10.2.1 "@metamask/rate-limit-controller": ^3.0.0 - "@metamask/rpc-methods": ^0.32.2 - "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.34.0-flask.1" + "@metamask/rpc-methods": ^1.0.0-prerelease.1 + "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.35.2-flask.1" "@metamask/safe-event-emitter": ^2.0.0 "@metamask/scure-bip39": ^2.0.3 "@metamask/signature-controller": ^4.0.1 "@metamask/slip44": ^3.0.0 "@metamask/smart-transactions-controller": ^3.1.0 - "@metamask/snaps-controllers": ^0.32.2 - "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.34.0-flask.1" - "@metamask/snaps-ui": ^0.32.2 - "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.34.0-flask.1" - "@metamask/snaps-utils": ^0.32.2 - "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.34.0-flask.1" + "@metamask/snaps-controllers": ^1.0.0-prerelease.1 + "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.35.2-flask.1" + "@metamask/snaps-ui": ^1.0.0-prerelease.1 + "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.35.2-flask.1" + "@metamask/snaps-utils": ^1.0.0-prerelease.1 + "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.35.2-flask.1" "@metamask/subject-metadata-controller": ^2.0.0 "@metamask/test-dapp": ^7.0.1 "@metamask/utils": ^5.0.0 @@ -35140,6 +35167,13 @@ __metadata: languageName: node linkType: hard +"webextension-polyfill@npm:^0.10.0": + version: 0.10.0 + resolution: "webextension-polyfill@npm:0.10.0" + checksum: 4a59036bda571360c2c0b2fb03fe1dc244f233946bcf9a6766f677956c40fd14d270aaa69cdba95e4ac521014afbe4008bfa5959d0ac39f91c990eb206587f91 + languageName: node + linkType: hard + "webextension-polyfill@npm:^0.7.0": version: 0.7.0 resolution: "webextension-polyfill@npm:0.7.0" From 9a9625d96cffcebac740ab182cf7100e331c5a1d Mon Sep 17 00:00:00 2001 From: David Walsh Date: Mon, 26 Jun 2023 12:54:32 -0500 Subject: [PATCH 25/52] UX: Ensure multichain native token name is always shown (#19705) * UX: Ensure multichain native token name is always shown * Fix lint --- ui/components/app/asset-list/asset-list.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js index 1f072b95b..903c4857d 100644 --- a/ui/components/app/asset-list/asset-list.js +++ b/ui/components/app/asset-list/asset-list.js @@ -10,7 +10,6 @@ import { getNativeCurrencyImage, getDetectedTokensInCurrentNetwork, getIstokenDetectionInactiveOnNonMainnetSupportedNetwork, - getTokenList, } from '../../../selectors'; import { getNativeCurrency } from '../../../ducks/metamask/metamask'; import { useCurrencyDisplay } from '../../../hooks/useCurrencyDisplay'; @@ -62,19 +61,15 @@ const AssetList = ({ onClickAsset }) => { const primaryTokenImage = useSelector(getNativeCurrencyImage); const detectedTokens = useSelector(getDetectedTokensInCurrentNetwork) || []; - const istokenDetectionInactiveOnNonMainnetSupportedNetwork = useSelector( + const isTokenDetectionInactiveOnNonMainnetSupportedNetwork = useSelector( getIstokenDetectionInactiveOnNonMainnetSupportedNetwork, ); - const tokenList = useSelector(getTokenList); - const tokenData = Object.values(tokenList).find( - (token) => token.symbol === primaryCurrencyProperties.suffix, - ); - const title = tokenData?.name || primaryCurrencyProperties.suffix; + return ( <> onClickAsset(nativeCurrency)} - title={title} + title={nativeCurrency} primary={ primaryCurrencyProperties.value ?? secondaryCurrencyProperties.value } @@ -96,7 +91,7 @@ const AssetList = ({ onClickAsset }) => { }} /> {detectedTokens.length > 0 && - !istokenDetectionInactiveOnNonMainnetSupportedNetwork ? ( + !isTokenDetectionInactiveOnNonMainnetSupportedNetwork ? ( setShowDetectedTokens(true)} margin={4} From eb506a5694574c1522d6080fc31bb87228abf981 Mon Sep 17 00:00:00 2001 From: Nidhi Kumari Date: Mon, 26 Jun 2023 23:27:56 +0530 Subject: [PATCH 26/52] UX Multichain: fixed padding for edit screen (#19707) * fixed padding for edit screen * Use network picker for header trigger * Fix swaps display * updated snapshot --------- Co-authored-by: David Walsh --- .../app-header/__snapshots__/app-header.test.js.snap | 2 +- ui/components/multichain/app-header/app-header.js | 5 +++++ ui/pages/routes/routes.component.js | 5 +---- ui/pages/swaps/index.scss | 3 +-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap index 86163faaf..bb44e6a6f 100644 --- a/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap +++ b/ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap @@ -200,7 +200,7 @@ exports[`App Header should match snapshot 1`] = `
{ }); }, [chainId, dispatch, trackEvent]); + // This is required to ensure send and confirmation screens + // look as desired + const headerBottomMargin = disableNetworkPicker ? 4 : 0; + return ( <> {isUnlocked && !popupStatus ? ( @@ -175,6 +179,7 @@ export const AppHeader = ({ location }) => { className={classnames('multichain-app-header', { 'multichain-app-header-shadow': !isUnlocked || popupStatus, })} + marginBottom={headerBottomMargin} alignItems={AlignItems.center} width={BlockSize.Full} backgroundColor={ diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js index 60a9406fb..d958cfd8f 100644 --- a/ui/pages/routes/routes.component.js +++ b/ui/pages/routes/routes.component.js @@ -562,10 +562,7 @@ export default class Routes extends Component { {accountDetailsAddress ? ( ) : null} - + {isLoading ? : null} {!isLoading && isNetworkLoading ? : null} {this.renderRoutes()} diff --git a/ui/pages/swaps/index.scss b/ui/pages/swaps/index.scss index c4a5e2142..83d0cdc7c 100644 --- a/ui/pages/swaps/index.scss +++ b/ui/pages/swaps/index.scss @@ -57,8 +57,7 @@ background: var(--color-background-default); box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border: 1px solid var(--color-border-muted); - border-top: 0; - border-radius: 0 0 8px 8px; + border-radius: 8px; height: 620px; } } From 0c047acdbfe3d3d58d29fc037b66dd3e05d2dc9e Mon Sep 17 00:00:00 2001 From: jiexi Date: Mon, 26 Jun 2023 11:27:03 -0700 Subject: [PATCH 27/52] Bump @metamask/providers to v11.1.0 (#19762) * Bump @metamask/providers to v11.1.0 --------- Co-authored-by: Alex --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index cef6fdbaf..71066fee0 100644 --- a/package.json +++ b/package.json @@ -250,7 +250,7 @@ "@metamask/permission-controller": "^4.0.0", "@metamask/phishing-controller": "^3.0.0", "@metamask/post-message-stream": "^6.0.0", - "@metamask/providers": "^10.2.1", + "@metamask/providers": "^11.1.0", "@metamask/rate-limit-controller": "^3.0.0", "@metamask/rpc-methods": "^1.0.0-prerelease.1", "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.35.2-flask.1", diff --git a/yarn.lock b/yarn.lock index cdc786989..eb4efd320 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4557,9 +4557,9 @@ __metadata: languageName: node linkType: hard -"@metamask/providers@npm:^11.0.0": - version: 11.0.0 - resolution: "@metamask/providers@npm:11.0.0" +"@metamask/providers@npm:^11.0.0, @metamask/providers@npm:^11.1.0": + version: 11.1.0 + resolution: "@metamask/providers@npm:11.1.0" dependencies: "@metamask/object-multiplex": ^1.1.0 "@metamask/safe-event-emitter": ^3.0.0 @@ -4572,7 +4572,7 @@ __metadata: json-rpc-middleware-stream: ^4.2.1 pump: ^3.0.0 webextension-polyfill: ^0.10.0 - checksum: 49667d9d9d2ad64adf480f8a6a04199f388f7a89f38978b6f9e8b18d5fbc7a82900326956b29af68c88d54cd45e0185d2198c687bb48470669b756742159bf95 + checksum: fe62112c650d0bc2c012fcb48b6d18709866448d5ded289c85c96d683a263b63a9f60c171fb4bc2cdffc00a6c72b27343611680d72274b5778243f1366be7256 languageName: node linkType: hard @@ -24461,7 +24461,7 @@ __metadata: "@metamask/phishing-controller": ^3.0.0 "@metamask/phishing-warning": ^2.1.0 "@metamask/post-message-stream": ^6.0.0 - "@metamask/providers": ^10.2.1 + "@metamask/providers": ^11.1.0 "@metamask/rate-limit-controller": ^3.0.0 "@metamask/rpc-methods": ^1.0.0-prerelease.1 "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.35.2-flask.1" From ec7e7fdf6d3eb069960aa939e9ead3ca607c29a6 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Mon, 26 Jun 2023 16:13:16 -0230 Subject: [PATCH 28/52] Fix fallback gas estimation (#19746) * Fix fallback gas estimation Our fallback gas estimation was failing due to a bug in the `@metamask/controller-utils` package. This was causing gas estimation to fail completely on certain networks (those not supported by our gas estimation APIs and non EIP-1559 compatibile), and it was causing the fallback gas estimation operation (in case our API was down) to fail across all networks. Fixes https://github.com/MetaMask/metamask-extension/issues/19735 * Add e2e tests E2E tests have been added to capture gas estimation. Cases are added for our API, for the fallback estimate, and for non-EIP-1559 estimates. As part of this work, the legacy gas API had to be disabled. This was being used in e2e tests but was dead code in production. It needed to be disabled to ensure the code under test was reachable. * Fix gas API referenced in e2e test * Update unit test snapshots --- app/scripts/metamask-controller.js | 6 +- package.json | 2 +- test/e2e/tests/gas-estimates.spec.js | 171 ++++++++++++++++++ .../confirm-gas-display.test.js.snap | 1 + .../confirm-gas-display.js | 8 +- .../confirm-legacy-gas-display.js | 9 +- .../app/gas-details-item/gas-details-item.js | 7 +- .../transaction-detail-item.component.js | 7 +- .../confirm-send-ether.test.js.snap | 1 + .../confirm-transaction-base.test.js.snap | 1 + .../send-content.component.test.js.snap | 1 + yarn.lock | 12 +- 12 files changed, 210 insertions(+), 16 deletions(-) create mode 100644 test/e2e/tests/gas-estimates.spec.js diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 0ccdb519d..8bb0f21b8 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -568,12 +568,8 @@ export default class MetamaskController extends EventEmitter { ), getCurrentAccountEIP1559Compatibility: this.getCurrentAccountEIP1559Compatibility.bind(this), - legacyAPIEndpoint: `${gasApiBaseUrl}/networks//gasPrices`, EIP1559APIEndpoint: `${gasApiBaseUrl}/networks//suggestedGasFees`, - getCurrentNetworkLegacyGasAPICompatibility: () => { - const { chainId } = this.networkController.state.providerConfig; - return process.env.IN_TEST || chainId === CHAIN_IDS.MAINNET; - }, + getCurrentNetworkLegacyGasAPICompatibility: () => false, getChainId: () => this.networkController.state.providerConfig.chainId, }); diff --git a/package.json b/package.json index 71066fee0..788102fdc 100644 --- a/package.json +++ b/package.json @@ -229,7 +229,7 @@ "@metamask/base-controller": "^3.0.0", "@metamask/browser-passworder": "^4.1.0", "@metamask/contract-metadata": "^2.3.1", - "@metamask/controller-utils": "^4.0.0", + "@metamask/controller-utils": "^4.0.1", "@metamask/design-tokens": "^1.9.0", "@metamask/desktop": "^0.3.0", "@metamask/eth-json-rpc-middleware": "^11.0.0", diff --git a/test/e2e/tests/gas-estimates.spec.js b/test/e2e/tests/gas-estimates.spec.js new file mode 100644 index 000000000..a7d121f31 --- /dev/null +++ b/test/e2e/tests/gas-estimates.spec.js @@ -0,0 +1,171 @@ +const { + convertToHexValue, + withFixtures, + logInWithBalanceValidation, +} = require('../helpers'); +const FixtureBuilder = require('../fixture-builder'); + +describe('Gas estimates generated by MetaMask', function () { + const baseGanacheOptions = { + accounts: [ + { + secretKey: + '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC', + balance: convertToHexValue(25000000000000000000), + }, + ], + }; + const preLondonGanacheOptions = { + ...baseGanacheOptions, + hardfork: 'berlin', + }; + const postLondonGanacheOptions = { + ...baseGanacheOptions, + hardfork: 'london', + }; + + describe('Send on a network that is EIP-1559 compatible', function () { + it('show expected gas defaults', async function () { + await withFixtures( + { + fixtures: new FixtureBuilder().build(), + ganacheOptions: postLondonGanacheOptions, + title: this.test.title, + }, + async ({ driver, ganacheServer }) => { + await driver.navigate(); + await logInWithBalanceValidation(driver, ganacheServer); + + await driver.clickElement('[data-testid="eth-overview-send"]'); + + await driver.fill( + 'input[placeholder="Enter public address (0x) or ENS name"]', + '0x2f318C334780961FB129D2a6c30D0763d9a5C970', + ); + + await driver.fill('.unit-input__input', '1'); + + // Check that the gas estimation is what we expect + await driver.findElement({ + cass: '[data-testid="confirm-gas-display"]', + text: '0.00043983', + }); + }, + ); + }); + + it('show expected gas defaults when API is down', async function () { + await withFixtures( + { + fixtures: new FixtureBuilder().build(), + ganacheOptions: postLondonGanacheOptions, + testSpecificMock: (mockServer) => { + mockServer + .forGet( + 'https://gas-api.metaswap.codefi.network/networks/1337/suggestedGasFees', + ) + .thenCallback(() => { + return { + json: { + error: 'cannot get gas prices for chain id 1337', + }, + statusCode: 503, + }; + }); + }, + title: this.test.title, + }, + async ({ driver, ganacheServer }) => { + await driver.navigate(); + await logInWithBalanceValidation(driver, ganacheServer); + + await driver.clickElement('[data-testid="eth-overview-send"]'); + + await driver.fill( + 'input[placeholder="Enter public address (0x) or ENS name"]', + '0x2f318C334780961FB129D2a6c30D0763d9a5C970', + ); + + await driver.fill('.unit-input__input', '1'); + + // Check that the gas estimation is what we expect + await driver.findElement({ + cass: '[data-testid="confirm-gas-display"]', + text: '0.00043983', + }); + }, + ); + }); + + it('show expected gas defaults when the network is not supported', async function () { + await withFixtures( + { + fixtures: new FixtureBuilder().build(), + ganacheOptions: postLondonGanacheOptions, + testSpecificMock: (mockServer) => { + mockServer + .forGet( + 'https://gas-api.metaswap.codefi.network/networks/1337/suggestedGasFees', + ) + .thenCallback(() => { + return { + statusCode: 422, + }; + }); + }, + title: this.test.title, + }, + async ({ driver, ganacheServer }) => { + await driver.navigate(); + await logInWithBalanceValidation(driver, ganacheServer); + + await driver.clickElement('[data-testid="eth-overview-send"]'); + + await driver.fill( + 'input[placeholder="Enter public address (0x) or ENS name"]', + '0x2f318C334780961FB129D2a6c30D0763d9a5C970', + ); + + await driver.fill('.unit-input__input', '1'); + + // Check that the gas estimation is what we expect + await driver.findElement({ + cass: '[data-testid="confirm-gas-display"]', + text: '0.00043983', + }); + }, + ); + }); + }); + + describe('Send on a network that is not EIP-1559 compatible', function () { + it('show expected gas defaults', async function () { + await withFixtures( + { + fixtures: new FixtureBuilder().build(), + ganacheOptions: preLondonGanacheOptions, + title: this.test.title, + }, + async ({ driver, ganacheServer }) => { + await driver.navigate(); + await logInWithBalanceValidation(driver, ganacheServer); + + await driver.clickElement('[data-testid="eth-overview-send"]'); + + await driver.fill( + 'input[placeholder="Enter public address (0x) or ENS name"]', + '0x2f318C334780961FB129D2a6c30D0763d9a5C970', + ); + + await driver.fill('.unit-input__input', '1'); + + // Check that the gas estimation is what we expect + await driver.findElement({ + cass: '[data-testid="confirm-gas-display"]', + text: '0.000042', + }); + }, + ); + }); + }); +}); diff --git a/ui/components/app/confirm-gas-display/__snapshots__/confirm-gas-display.test.js.snap b/ui/components/app/confirm-gas-display/__snapshots__/confirm-gas-display.test.js.snap index a993864ba..edd5c141f 100644 --- a/ui/components/app/confirm-gas-display/__snapshots__/confirm-gas-display.test.js.snap +++ b/ui/components/app/confirm-gas-display/__snapshots__/confirm-gas-display.test.js.snap @@ -4,6 +4,7 @@ exports[`ConfirmGasDisplay should match snapshot 1`] = `
{ checkNetworkAndAccountSupports1559, ); const supportsEIP1559 = networkAndAccountSupports1559 && !isLegacyTxn; + const dataTestId = 'confirm-gas-display'; return supportsEIP1559 ? ( - + ) : ( - + ); }; diff --git a/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js b/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js index 124fbb0d9..15e0abfb6 100644 --- a/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js +++ b/ui/components/app/confirm-gas-display/confirm-legacy-gas-display/confirm-legacy-gas-display.js @@ -1,4 +1,5 @@ import React from 'react'; +import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; import { useI18nContext } from '../../../../hooks/useI18nContext'; @@ -31,7 +32,7 @@ import { Icon, IconName } from '../../../component-library'; const renderHeartBeatIfNotInTest = () => process.env.IN_TEST ? null : ; -const ConfirmLegacyGasDisplay = () => { +const ConfirmLegacyGasDisplay = ({ 'data-testid': dataTestId } = {}) => { const t = useI18nContext(); // state selectors @@ -55,6 +56,7 @@ const ConfirmLegacyGasDisplay = () => { return [ { return ( @@ -186,4 +189,8 @@ const ConfirmLegacyGasDisplay = () => { ); }; +ConfirmLegacyGasDisplay.propTypes = { + 'data-testid': PropTypes.string, +}; + export default ConfirmLegacyGasDisplay; diff --git a/ui/components/app/gas-details-item/gas-details-item.js b/ui/components/app/gas-details-item/gas-details-item.js index 10e8ca459..7d5afd287 100644 --- a/ui/components/app/gas-details-item/gas-details-item.js +++ b/ui/components/app/gas-details-item/gas-details-item.js @@ -24,7 +24,10 @@ import { useDraftTransactionWithTxParams } from '../../../hooks/useDraftTransact import { PriorityLevels } from '../../../../shared/constants/gas'; import GasDetailsItemTitle from './gas-details-item-title'; -const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => { +const GasDetailsItem = ({ + 'data-testid': dataTestId, + userAcknowledgedGasMissing = false, +}) => { const t = useI18nContext(); const draftTransaction = useSelector(getCurrentDraftTransaction); const transactionData = useDraftTransactionWithTxParams(); @@ -64,6 +67,7 @@ const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => { return ( } detailTitleColor={TextColor.textDefault} detailText={ @@ -137,6 +141,7 @@ const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => { }; GasDetailsItem.propTypes = { + 'data-testid': PropTypes.string, userAcknowledgedGasMissing: PropTypes.bool, }; diff --git a/ui/components/app/transaction-detail-item/transaction-detail-item.component.js b/ui/components/app/transaction-detail-item/transaction-detail-item.component.js index a90bad16a..ed1578b62 100644 --- a/ui/components/app/transaction-detail-item/transaction-detail-item.component.js +++ b/ui/components/app/transaction-detail-item/transaction-detail-item.component.js @@ -14,6 +14,7 @@ import { } from '../../../helpers/constants/design-system'; export default function TransactionDetailItem({ + 'data-testid': dataTestId, detailTitle = '', detailText, detailTitleColor = Color.textDefault, @@ -24,7 +25,7 @@ export default function TransactionDetailItem({ flexWidthValues = false, }) { return ( -
+
Date: Tue, 27 Jun 2023 01:29:04 +0530 Subject: [PATCH 29/52] Update Label component font weight from bold to medium (#19731) * Update Label component font weight from bold to medium * update snapshot * fix snapshots * fix snapshots 2 * Removeing deprecated constants for enums --------- Co-authored-by: georgewrmarshall --- .../__snapshots__/eth-sign-modal.test.js.snap | 2 +- .../export-private-key-modal.test.js.snap | 2 +- .../label/__snapshots__/label.test.js.snap | 2 +- ui/components/component-library/label/label.js | 10 +++++----- .../confirm-remove-jwt-modal.test.js.snap | 6 +++--- .../__snapshots__/custody-labels.test.js.snap | 2 +- .../__snapshots__/note-to-trader.test.js.snap | 2 +- .../__snapshots__/confirm-send-ether.test.js.snap | 2 +- .../__snapshots__/account-list.test.js.snap | 8 ++++---- .../keychains/__snapshots__/reveal-seed.test.js.snap | 2 +- .../loading-swaps-quotes-stories-metadata.test.js.snap | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ui/components/app/modals/eth-sign-modal/__snapshots__/eth-sign-modal.test.js.snap b/ui/components/app/modals/eth-sign-modal/__snapshots__/eth-sign-modal.test.js.snap index cafb98ff3..d0c0d7d53 100644 --- a/ui/components/app/modals/eth-sign-modal/__snapshots__/eth-sign-modal.test.js.snap +++ b/ui/components/app/modals/eth-sign-modal/__snapshots__/eth-sign-modal.test.js.snap @@ -63,7 +63,7 @@ exports[`Eth Sign Modal should match snapshot 1`] = ` type="checkbox" />
, ] -`; +`; \ No newline at end of file diff --git a/ui/pages/institutional/connect-custody/__snapshots__/account-list.test.js.snap b/ui/pages/institutional/connect-custody/__snapshots__/account-list.test.js.snap index cb808587a..28ada1a91 100644 --- a/ui/pages/institutional/connect-custody/__snapshots__/account-list.test.js.snap +++ b/ui/pages/institutional/connect-custody/__snapshots__/account-list.test.js.snap @@ -27,7 +27,7 @@ exports[`CustodyAccountList renders accounts 1`] = ` class="box box--margin-left-2 box--display-flex box--flex-direction-column box--width-full" >

Signature request

Only sign this message if you fully understand the content and trust the requesting site.
@@ -223,7 +224,7 @@ exports[`Signature Request Component render should match snapshot when we are us tabindex="0" >
Verify third-party details
@@ -237,7 +238,7 @@ exports[`Signature Request Component render should match snapshot when we are us class="box signature-request-message__root box--margin-2 box--padding-top-3 box--padding-right-3 box--padding-bottom-3 box--flex-direction-row box--background-color-background-default box--rounded-xl box--border-color-border-muted box--border-style-solid box--border-width-1" >

Mail

@@ -982,12 +983,13 @@ exports[`Signature Request Component render should match snapshot when we want t

Signature request

Only sign this message if you fully understand the content and trust the requesting site.
@@ -999,7 +1001,7 @@ exports[`Signature Request Component render should match snapshot when we want t tabindex="0" >
Verify third-party details
@@ -1013,7 +1015,7 @@ exports[`Signature Request Component render should match snapshot when we want t class="box signature-request-message__root box--margin-2 box--padding-top-3 box--padding-right-3 box--padding-bottom-3 box--flex-direction-row box--background-color-background-default box--rounded-xl box--border-color-border-muted box--border-style-solid box--border-width-1" >

Mail

diff --git a/ui/components/app/signature-request/index.scss b/ui/components/app/signature-request/index.scss index a53a9d71c..5cc2a0981 100644 --- a/ui/components/app/signature-request/index.scss +++ b/ui/components/app/signature-request/index.scss @@ -47,12 +47,6 @@ flex-direction: column; min-height: min-content; - &__title { - @include H5; - - font-weight: 500; - } - &__info { @include H7; diff --git a/ui/components/app/signature-request/signature-request-message/signature-request-message.js b/ui/components/app/signature-request/signature-request-message/signature-request-message.js index d343a6584..52322d084 100644 --- a/ui/components/app/signature-request/signature-request-message/signature-request-message.js +++ b/ui/components/app/signature-request/signature-request-message/signature-request-message.js @@ -3,11 +3,10 @@ import PropTypes from 'prop-types'; import { debounce } from 'lodash'; import { I18nContext } from '../../../../contexts/i18n'; import Box from '../../../ui/box'; -import Typography from '../../../ui/typography'; +import { Text } from '../../../component-library'; import { - DISPLAY, - FONT_WEIGHT, - FLEX_DIRECTION, + Display, + FlexDirection, AlignItems, JustifyContent, Color, @@ -15,6 +14,7 @@ import { BorderColor, BorderRadius, TextColor, + FontWeight, } from '../../../../helpers/constants/design-system'; import SignatureRequestData from '../signature-request-data'; @@ -44,14 +44,14 @@ export default function SignatureRequestMessage({ return ( {messageIsScrollable ? ( - {primaryType} - + diff --git a/ui/components/app/signature-request/signature-request-message/signature-request-message.stories.js b/ui/components/app/signature-request/signature-request-message/signature-request-message.stories.js index 9449e33a5..db848c04e 100644 --- a/ui/components/app/signature-request/signature-request-message/signature-request-message.stories.js +++ b/ui/components/app/signature-request/signature-request-message/signature-request-message.stories.js @@ -4,7 +4,6 @@ import SignatureRequestMessage from './signature-request-message'; export default { title: 'Components/App/SignatureRequestMessage', - component: SignatureRequestMessage, argTypes: { data: { control: 'object' }, diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js index 8b6f1eaff..4ca3d1126 100644 --- a/ui/components/app/signature-request/signature-request.component.js +++ b/ui/components/app/signature-request/signature-request.component.js @@ -14,18 +14,15 @@ import { import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics'; import SiteOrigin from '../../ui/site-origin'; import Button from '../../ui/button'; -import Typography from '../../ui/typography/typography'; import ContractDetailsModal from '../modals/contract-details-modal/contract-details-modal'; import { - TypographyVariant, - FontWeight, TextAlign, TextColor, + TextVariant, ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) IconColor, - DISPLAY, - BLOCK_SIZES, - TextVariant, + Display, + BlockSize, BackgroundColor, ///: END:ONLY_INCLUDE_IN } from '../../../helpers/constants/design-system'; @@ -37,11 +34,15 @@ import ConfirmPageContainerNavigation from '../confirm-page-container/confirm-pa import SecurityProviderBannerMessage from '../security-provider-banner-message/security-provider-banner-message'; import { formatCurrency } from '../../../helpers/utils/confirm-tx.util'; import { getValueFromWeiHex } from '../../../../shared/modules/conversion.utils'; -///: BEGIN:ONLY_INCLUDE_IN(build-mmi) -import { Icon, IconName, Text } from '../../component-library'; -import Box from '../../ui/box/box'; -///: END:ONLY_INCLUDE_IN +import { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + Box, + Icon, + IconName, + ///: END:ONLY_INCLUDE_IN + Text, +} from '../../component-library'; import Footer from './signature-request-footer'; import Message from './signature-request-message'; @@ -295,8 +296,8 @@ export default class SignatureRequest extends PureComponent { this.props.selectedAccount.address === address ? null : ( {this.context.t('mismatchAccount', [ shortenAddress(this.props.selectedAccount.address), @@ -330,26 +330,25 @@ export default class SignatureRequest extends PureComponent { />
- {this.context.t('sigRequest')} - - + {this.context.t('signatureRequestGuidance')} - + {verifyingContract ? (
) : null} diff --git a/ui/components/app/signature-request/signature-request.stories.js b/ui/components/app/signature-request/signature-request.stories.js index fbae8f99c..1fc2e555b 100644 --- a/ui/components/app/signature-request/signature-request.stories.js +++ b/ui/components/app/signature-request/signature-request.stories.js @@ -9,7 +9,6 @@ const [MOCK_PRIMARY_IDENTITY, MOCK_SECONDARY_IDENTITY] = Object.values( export default { title: 'Components/App/SignatureRequest', - component: SignatureRequest, parameters: { docs: { @@ -30,6 +29,10 @@ export default { clearConfirmTransaction: { action: 'Clean Confirm' }, cancel: { action: 'Cancel' }, sign: { action: 'Sign' }, + showRejectTransactionsConfirmationModal: { + action: 'showRejectTransactionsConfirmationModal', + }, + cancelAll: { action: 'cancelAll' }, }, }; @@ -79,6 +82,8 @@ DefaultStory.args = { fromAccount: MOCK_PRIMARY_IDENTITY, providerConfig: { name: 'Goerli ETH' }, selectedAccount: MOCK_PRIMARY_IDENTITY, + hardwareWalletRequiresConnection: false, + currentCurrency: 'usd', }; export const AccountMismatchStory = (args) => { diff --git a/ui/components/component-library/popover/popover.stories.tsx b/ui/components/component-library/popover/popover.stories.tsx index ca297daf8..bf54ed248 100644 --- a/ui/components/component-library/popover/popover.stories.tsx +++ b/ui/components/component-library/popover/popover.stories.tsx @@ -731,7 +731,7 @@ export const Offset: StoryFn = (args) => { ); }; -export const onPressEscKey: StoryFn = (args) => { +export const OnPressEscKey: StoryFn = (args) => { const [referenceElement, setReferenceElement] = useState(); const [isOpen, setIsOpen] = useState(false); diff --git a/ui/components/ui/numeric-input/numeric-input.component.js b/ui/components/ui/numeric-input/numeric-input.component.js index 8d16351a8..8eba851be 100644 --- a/ui/components/ui/numeric-input/numeric-input.component.js +++ b/ui/components/ui/numeric-input/numeric-input.component.js @@ -1,12 +1,12 @@ import React from 'react'; import classNames from 'classnames'; import PropTypes from 'prop-types'; -import Typography from '../typography/typography'; import { TextColor, - TypographyVariant, + TextVariant, } from '../../../helpers/constants/design-system'; import { DECIMAL_REGEX } from '../../../../shared/constants/tokens'; +import { Text } from '../../component-library'; export default function NumericInput({ detailText = '', @@ -52,13 +52,13 @@ export default function NumericInput({ ref={inputRef} /> {detailText && ( - {detailText} - + )}
); diff --git a/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap b/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap index 22eaa593d..6ead1567f 100644 --- a/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap +++ b/ui/pages/confirm-signature-request/__snapshots__/index.test.js.snap @@ -205,12 +205,13 @@ exports[`Signature Request Component render should match snapshot 1`] = `

Signature request

Only sign this message if you fully understand the content and trust the requesting site.
@@ -222,7 +223,7 @@ exports[`Signature Request Component render should match snapshot 1`] = ` tabindex="0" >
Verify third-party details
@@ -236,7 +237,7 @@ exports[`Signature Request Component render should match snapshot 1`] = ` class="box signature-request-message__root box--margin-2 box--padding-top-3 box--padding-right-3 box--padding-bottom-3 box--flex-direction-row box--background-color-background-default box--rounded-xl box--border-color-border-muted box--border-style-solid box--border-width-1" >

Mail

From deabc3ed5f28dbd35fb0bafe55cc2ff5002d2d9b Mon Sep 17 00:00:00 2001 From: rohit kerkar <129620973+rohiiittttt@users.noreply.github.com> Date: Tue, 27 Jun 2023 08:05:45 +0530 Subject: [PATCH 32/52] Part of #18714: Replacing deprecated constants in `confirm-subtitle` folder (#19699) * repalcing deprecated constants * resolve issue * lint fixes --------- Co-authored-by: georgewrmarshall --- ui/components/app/confirm-subtitle/confirm-subtitle.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ui/components/app/confirm-subtitle/confirm-subtitle.js b/ui/components/app/confirm-subtitle/confirm-subtitle.js index bac8e4ca5..1ac59dcd1 100644 --- a/ui/components/app/confirm-subtitle/confirm-subtitle.js +++ b/ui/components/app/confirm-subtitle/confirm-subtitle.js @@ -3,11 +3,7 @@ import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; import { SECONDARY } from '../../../helpers/constants/common'; -import { - Color, - FONT_WEIGHT, - TextVariant, -} from '../../../helpers/constants/design-system'; +import { Color, TextVariant } from '../../../helpers/constants/design-system'; import { isNFTAssetStandard } from '../../../helpers/utils/transactions.util'; import { getShouldShowFiat } from '../../../selectors'; import { useTransactionInfo } from '../../../hooks/useTransactionInfo'; @@ -35,7 +31,6 @@ const ConfirmSubTitle = ({ From ec4c4050e64091654eadeb7e2f291171eb6f4f6f Mon Sep 17 00:00:00 2001 From: Harsh Shukla <125105825+PrgrmrHarshShukla@users.noreply.github.com> Date: Tue, 27 Jun 2023 08:06:01 +0530 Subject: [PATCH 33/52] Part of #17670: Replace Typography with Text component in: callout.js (#18912) * Part of #17670: Replace Typography with Text component in: callout.js * Update ui/components/ui/callout/callout.js Co-authored-by: Danica Shen * Update callout.js * Updating snapshot and deprecating component * Updating snapshot and deprecating component --------- Co-authored-by: Danica Shen Co-authored-by: George Marshall Co-authored-by: Garrett Bear --- ui/components/ui/callout/callout.js | 20 +++++++++++++------ .../add-ethereum-chain.test.js.snap | 4 ++-- .../switch-ethereum-chain.test.js.snap | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ui/components/ui/callout/callout.js b/ui/components/ui/callout/callout.js index 6c28dc117..c2a8f671d 100644 --- a/ui/components/ui/callout/callout.js +++ b/ui/components/ui/callout/callout.js @@ -2,10 +2,18 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import InfoIconInverted from '../icon/info-icon-inverted.component'; -import { SEVERITIES, Color } from '../../../helpers/constants/design-system'; +import { Severity, TextColor } from '../../../helpers/constants/design-system'; import { MILLISECOND } from '../../../../shared/constants/time'; -import Typography from '../typography'; -import { ButtonIcon, IconName, IconSize } from '../../component-library'; +import { ButtonIcon, IconName, IconSize, Text } from '../../component-library'; + +/** + * @deprecated `` has been deprecated in favor of the `` + * component in ./ui/components/component-library/banner-alert/banner-alert.js. + * See storybook documentation for BannerAlert here: + * {@see {@link https://metamask.github.io/metamask-storybook/?path=/docs/components-componentlibrary-banneralert--default-story#banneralert}} + * + * Help to replace `Callout` with `BannerAlert` by submitting a PR + */ export default function Callout({ severity, @@ -38,9 +46,9 @@ export default function Callout({ return (
- + {children} - + {dismiss && (

This custom network is not recognized @@ -438,7 +438,7 @@ exports[`add-ethereum-chain confirmation should match snapshot 2`] = ` />

diff --git a/ui/pages/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap b/ui/pages/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap index ff707e2f2..1043c0a12 100644 --- a/ui/pages/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap +++ b/ui/pages/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap @@ -241,7 +241,7 @@ exports[`switch-ethereum-chain confirmation should show alert if there are pendi />

Switching networks will cancel all pending confirmations From 1e56fdbf664b2d507e014200d84083e19d81c7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Oliv=C3=A9?= Date: Tue, 27 Jun 2023 08:30:42 +0200 Subject: [PATCH 34/52] [MMI] Added code fences in whats new popup (#19581) * added code fences in whats new popup * Improved code * Added missing prop * Update LavaMoat policies * updated functions by using an options object for the rendering functions in order to bypass possible typsecript issues --------- Co-authored-by: MetaMask Bot --- app/_locales/en/messages.json | 3 + app/scripts/metamask-controller.js | 12 +- shared/notifications/institutional/index.js | 35 +++++ .../app/whats-new-popup/whats-new-popup.js | 126 ++++++++++++++---- ui/pages/home/home.component.js | 9 +- 5 files changed, 157 insertions(+), 28 deletions(-) create mode 100644 shared/notifications/institutional/index.js diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 24b7bd7e6..706d6d6e5 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -5162,6 +5162,9 @@ "viewOnOpensea": { "message": "View on Opensea" }, + "viewPortfolioDashboard": { + "message": "View Portfolio Dashboard" + }, "viewinCustodianApp": { "message": "View in custodian app" }, diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 8bb0f21b8..335ccf14e 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -121,6 +121,9 @@ import { ///: END:ONLY_INCLUDE_IN } from '../../shared/constants/permissions'; import { UI_NOTIFICATIONS } from '../../shared/notifications'; +///: BEGIN:ONLY_INCLUDE_IN(build-mmi) +import { UI_INSTITUTIONAL_NOTIFICATIONS } from '../../shared/notifications/institutional'; +///: END:ONLY_INCLUDE_IN import { MILLISECOND, SECOND } from '../../shared/constants/time'; import { ORIGIN_METAMASK, @@ -618,9 +621,16 @@ export default class MetamaskController extends EventEmitter { const announcementMessenger = this.controllerMessenger.getRestricted({ name: 'AnnouncementController', }); + + let allAnnouncements = UI_NOTIFICATIONS; + + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + allAnnouncements = UI_INSTITUTIONAL_NOTIFICATIONS; + ///: END:ONLY_INCLUDE_IN + this.announcementController = new AnnouncementController({ messenger: announcementMessenger, - allAnnouncements: UI_NOTIFICATIONS, + allAnnouncements, state: initState.AnnouncementController, }); diff --git a/shared/notifications/institutional/index.js b/shared/notifications/institutional/index.js new file mode 100644 index 000000000..78b93399e --- /dev/null +++ b/shared/notifications/institutional/index.js @@ -0,0 +1,35 @@ +export const UI_INSTITUTIONAL_NOTIFICATIONS = { + 1: { + id: 11, + date: '2022-08-28', + image: { + src: 'images/portfolio.svg', + }, + hideDate: true, + descriptionInBullets: true, + }, +}; + +export const getTranslatedInstitutionalUINotifications = (t, locale) => { + const formattedLocale = locale.replace('_', '-'); + return { + 1: { + ...UI_INSTITUTIONAL_NOTIFICATIONS[11], + title: 'Portfolio dashboard', + description: [ + 'Portfolio snapshots', + 'Filtering by account and network', + 'Sector and protocol allocation', + 'Improved navigation', + ], + date: new Intl.DateTimeFormat(formattedLocale).format( + new Date(UI_INSTITUTIONAL_NOTIFICATIONS[11].date), + ), + customButton: { + name: 'mmi-portfolio', + text: t('viewPortfolioDashboard'), + logo: true, + }, + }, + }; +}; diff --git a/ui/components/app/whats-new-popup/whats-new-popup.js b/ui/components/app/whats-new-popup/whats-new-popup.js index 0b505eac3..5743cc841 100644 --- a/ui/components/app/whats-new-popup/whats-new-popup.js +++ b/ui/components/app/whats-new-popup/whats-new-popup.js @@ -7,9 +7,14 @@ import { debounce } from 'lodash'; import { getCurrentLocale } from '../../../ducks/locale/locale'; import { I18nContext } from '../../../contexts/i18n'; import { useEqualityCheck } from '../../../hooks/useEqualityCheck'; -import Button from '../../ui/button'; import Popover from '../../ui/popover'; -import { Text } from '../../component-library'; +import { + Button, + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + IconName, + ///: END:ONLY_INCLUDE_IN + Text, +} from '../../component-library'; import { updateViewedNotifications } from '../../../store/actions'; import { getTranslatedUINotifications } from '../../../../shared/notifications'; import { getSortedAnnouncementsToShow } from '../../../selectors'; @@ -20,7 +25,12 @@ import { EXPERIMENTAL_ROUTE, SECURITY_ROUTE, } from '../../../helpers/constants/routes'; -import { TextVariant } from '../../../helpers/constants/design-system'; +import { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + Size, + ///: END:ONLY_INCLUDE_IN + TextVariant, +} from '../../../helpers/constants/design-system'; import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; import { MetaMetricsContext } from '../../../contexts/metametrics'; import { @@ -118,15 +128,36 @@ const renderDescription = (description) => { ); }; -const renderFirstNotification = ( +const renderFirstNotification = ({ notification, idRefMap, history, isLast, trackEvent, -) => { - const { id, date, title, description, image, actionText } = notification; + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + mmiPortfolioUrl, + seenNotifications, + onClose, + ///: END:ONLY_INCLUDE_IN +}) => { + const { + id, + date, + title, + description, + image, + actionText, + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + customButton, + hideDate, + ///: END:ONLY_INCLUDE_IN + } = notification; const actionFunction = getActionFunctionById(id, history); + let showNotificationDate = true; + + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + showNotificationDate = !hideDate; + ///: END:ONLY_INCLUDE_IN const imageComponent = image && ( {renderDescription(description)}

-
{date}
+ {showNotificationDate && ( +
{date}
+ )}
{placeImageBelowDescription && imageComponent} {actionText && ( @@ -173,6 +206,25 @@ const renderFirstNotification = ( {actionText} )} + { + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + customButton && customButton.name === 'mmi-portfolio' && ( + + ) + ///: END:ONLY_INCLUDE_IN + }
{ +}) => { const { id, date, title, description, actionText } = notification; const actionFunction = getActionFunctionById(id, history); @@ -217,7 +269,12 @@ const renderSubsequentNotification = ( ); }; -export default function WhatsNewPopup({ onClose }) { +export default function WhatsNewPopup({ + onClose, + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + mmiPortfolioUrl, + ///: END:ONLY_INCLUDE_IN +}) { const t = useContext(I18nContext); const history = useHistory(); @@ -295,6 +352,16 @@ export default function WhatsNewPopup({ onClose }) { }; }, [idRefMap, setSeenNotifications]); + // Display the swaps notification with full image + // Displays the NFTs & OpenSea notifications 18,19 with full image + const notificationRenderers = { + 0: renderFirstNotification, + 1: renderFirstNotification, + 18: renderFirstNotification, + 19: renderFirstNotification, + 21: renderFirstNotification, + }; + return ( { const notification = getTranslatedUINotifications(t, locale)[id]; const isLast = index === notifications.length - 1; - // Display the swaps notification with full image - // Displays the NFTs & OpenSea notifications 18,19 with full image - return index === 0 || id === 1 || id === 18 || id === 19 || id === 21 - ? renderFirstNotification( - notification, - idRefMap, - history, - isLast, - trackEvent, - ) - : renderSubsequentNotification( - notification, - idRefMap, - history, - isLast, - ); + // Choose the appropriate rendering function based on the id + let renderNotification = + notificationRenderers[id] || renderSubsequentNotification; + + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + renderNotification = renderFirstNotification; + ///: END:ONLY_INCLUDE_IN + + return renderNotification({ + notification, + idRefMap, + history, + isLast, + trackEvent, + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + mmiPortfolioUrl, + seenNotifications, + onClose, + ///: END:ONLY_INCLUDE_IN + }); })}
@@ -345,4 +416,7 @@ export default function WhatsNewPopup({ onClose }) { WhatsNewPopup.propTypes = { onClose: PropTypes.func.isRequired, + ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) + mmiPortfolioUrl: PropTypes.string.isRequired, + ///: END:ONLY_INCLUDE_IN }; diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js index 52d8b1be9..9affebafe 100644 --- a/ui/pages/home/home.component.js +++ b/ui/pages/home/home.component.js @@ -755,10 +755,17 @@ export default class Home extends PureComponent { exact />
+ {showWhatsNew ? ( + + ) : null} { ///: BEGIN:ONLY_INCLUDE_IN(build-main,build-beta,build-flask) } - {showWhatsNew ? : null} {!showWhatsNew && showRecoveryPhraseReminder ? ( Date: Tue, 27 Jun 2023 12:05:31 +0530 Subject: [PATCH 35/52] Updated action list in token, NFTs and activity view (#19702) * updated ui for nft import button * updated no nft image found in the center * updated footer for all screens in tabs * removed no nft state from nft tab * updated snapshot * lint fix * fixed e2e tests * fixed prep build error * removed no nfts yet test * updated tabs * fixed prod error * updated no nft screen * changed button size to md --- app/_locales/de/messages.json | 9 - app/_locales/el/messages.json | 9 - app/_locales/en/messages.json | 6 - app/_locales/es/messages.json | 9 - app/_locales/es_419/messages.json | 9 - app/_locales/fr/messages.json | 9 - app/_locales/hi/messages.json | 9 - app/_locales/id/messages.json | 9 - app/_locales/ja/messages.json | 9 - app/_locales/ko/messages.json | 9 - app/_locales/pt/messages.json | 9 - app/_locales/pt_BR/messages.json | 9 - app/_locales/ru/messages.json | 9 - app/_locales/tl/messages.json | 9 - app/_locales/tr/messages.json | 9 - app/_locales/vi/messages.json | 9 - app/_locales/zh_CN/messages.json | 9 - test/e2e/nft/import-erc1155.spec.js | 4 +- test/e2e/nft/import-nft.spec.js | 4 +- ui/components/app/asset-list/asset-list.js | 2 +- ui/components/app/nfts-tab/index.scss | 7 - ui/components/app/nfts-tab/nfts-tab.js | 136 ++++++------ ui/components/app/nfts-tab/nfts-tab.test.js | 2 +- .../import-token-link.test.js.snap | 8 +- .../import-token-link/import-token-link.js | 8 +- ui/components/ui/tabs/index.scss | 1 - ui/pages/home/home.component.js | 204 ++++++++++-------- 27 files changed, 199 insertions(+), 327 deletions(-) diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 15c7bfc8e..3da5e212e 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "Die ID eines NFTs ist eine eindeutige Kennung, da keine zwei NFTs gleich sind. Auch diese Nummer finden Sie in OpenSea unter „Details“. Notieren Sie diese oder kopieren Sie sie in Ihre Zwischenablage." }, - "importNFTs": { - "message": "NFTs importieren" - }, "importSelectedTokens": { "message": "Ausgewählte Token importieren?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "Laut unseren Aufzeichnungen stimmt der angegebene RPC-URL-Wert nicht mit einem bekannten Provider für diese Chain-ID überein." }, - "missingNFT": { - "message": "Sie sehen Ihr NFT nicht?" - }, "missingSetting": { "message": "Sie können eine Einstellung nicht finden?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "Kein Umrechnungskurs verfügbar" }, - "noNFTs": { - "message": "Noch keine NFTs" - }, "noSnaps": { "message": "Keine Snaps installiert" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index b9995422b..7bbe75c6b 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "Ένα αναγνωριστικό του συλλεκτικού είναι ένα μοναδικό αναγνωριστικό δεδομένου ότι δεν υπάρχουν δύο ίδια NFT. Και πάλι, στο OpenSea αυτός ο αριθμός βρίσκεται στην ενότητα \"Λεπτομέρειες\". Σημειώστε τον ή αντιγράψτε τον στο πρόχειρο σας." }, - "importNFTs": { - "message": "Εισαγωγή NFT" - }, "importSelectedTokens": { "message": "Εισαγωγή επιλεγμένων token;" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "Σύμφωνα με τις καταχωρήσεις μας, η τιμή RPC URL που υποβλήθηκε δεν ταιριάζει με κάποιον γνωστό πάροχο για αυτό το αναγνωριστικό αλυσίδας." }, - "missingNFT": { - "message": "Δεν βλέπετε το NFT σας;" - }, "missingSetting": { "message": "Δεν μπορείτε να βρείτε μια ρύθμιση;" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "Δεν Υπάρχει Διαθέσιμη Ισοτιμία Μετατροπής" }, - "noNFTs": { - "message": "Δεν υπάρχουν NFT ακόμα" - }, "noSnaps": { "message": "Δεν εγκαταστάθηκαν Snaps" }, diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 706d6d6e5..3405e0712 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1884,9 +1884,6 @@ "importNFTTokenIdToolTip": { "message": "An NFT's ID is a unique identifier since no two NFTs are alike. Again, on OpenSea this number is under 'Details'. Make a note of it, or copy it onto your clipboard." }, - "importNFTs": { - "message": "Import NFTs" - }, "importSelectedTokens": { "message": "Import selected tokens?" }, @@ -2273,9 +2270,6 @@ "mismatchedRpcUrl": { "message": "According to our records the submitted RPC URL value does not match a known provider for this chain ID." }, - "missingNFT": { - "message": "Don't see your NFT?" - }, "missingSetting": { "message": "Can't find a setting?" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 5ee5aac3b..bc3dfb601 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "La ID de un NFT es un identificador único, ya que no hay dos NFT iguales. Nuevamente, en OpenSea, este número se encuentra en 'Detalles'. Tome nota de ello o cópielo en su portapapeles." }, - "importNFTs": { - "message": "AGREGAR NFT" - }, "importSelectedTokens": { "message": "¿Agregar los tokens seleccionados?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "Según nuestros registros, el valor de la URL de RPC enviado no coincide con un proveedor conocido para este ID de cadena." }, - "missingNFT": { - "message": "¿No ve su NFT?" - }, "missingSetting": { "message": "¿No puede encontrar un ajuste?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "No hay tasa de conversión disponible" }, - "noNFTs": { - "message": "No hay ningún NFT aún" - }, "noSnaps": { "message": "No hay complementos instalados" }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 8b384dfdf..7628f9c7a 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -1070,9 +1070,6 @@ "importMyWallet": { "message": "Importar Mi cartera" }, - "importNFTs": { - "message": "Importar NFT" - }, "importTokenQuestion": { "message": "¿Desea importar el token?" }, @@ -1330,9 +1327,6 @@ "message": "verifique los detalles de la red", "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key." }, - "missingNFT": { - "message": "¿No ve su NFT?" - }, "mustSelectOne": { "message": "Debe seleccionar al menos 1 token." }, @@ -1465,9 +1459,6 @@ "noConversionRateAvailable": { "message": "No hay tasa de conversión disponible" }, - "noNFTs": { - "message": "Aún no hay NFT" - }, "noTransactions": { "message": "No tiene transacciones" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index f25d3339c..aafeeead8 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "L’ID d’un NFT est un identifiant unique puisqu’il n’y a pas deux NFT identiques. Encore une fois, sur OpenSea, ce numéro se trouve dans la section « Détails ». Prenez-en note ou copiez-le dans votre presse-papiers." }, - "importNFTs": { - "message": "Importer des NFT" - }, "importSelectedTokens": { "message": "Voulez-vous importer les jetons sélectionnés ?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "Selon nos informations, la valeur de l’URL RPC soumise ne correspond pas à un fournisseur connu pour cet ID de chaîne." }, - "missingNFT": { - "message": "Vous ne voyez pas votre NFT ?" - }, "missingSetting": { "message": "Vous ne trouvez pas un paramètre ?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "Aucun taux de conversion disponible" }, - "noNFTs": { - "message": "Aucun NFT pour le moment" - }, "noSnaps": { "message": "Aucun Snap installé" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 5e61df8f1..2fcc7b43c 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "किसी एनएफटी की आईडी एक विशिष्ट पहचानकर्ता है क्योंकि कोई भी दो एनएफटी एक जैसे नहीं होते हैं। फिर से, OpenSea पर यह संख्या 'डिटेल्स' के नीचे होगी। इसे नोट कर लें या अपने क्लिपबोर्ड पर कॉपी कर लें।" }, - "importNFTs": { - "message": "NFT आयात करें" - }, "importSelectedTokens": { "message": "चयनित टोकन आयात करें?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "हमारे रिकॉर्ड के अनुसार, सबमिट किया गया RPC-URL मान इस चेन आईडी के लिए किसी ज्ञात प्रदाता से मेल नहीं खाता।" }, - "missingNFT": { - "message": "अपना NFT नहीं देख रहे हैं?" - }, "missingSetting": { "message": "सेटिंग नहीं मिल पाया?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "कोई भी रूपांतरण दर उपलब्ध नहीं है" }, - "noNFTs": { - "message": "अभी तक कोई NFT नहीं" - }, "noSnaps": { "message": "कोई स्नैप इंस्टाल नहीं किया गया" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 89681cac4..d03338321 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "ID NFT merupakan pengenal unik karena tidak ada dua NFT yang sama. Sekali lagi, angka ini berada di bawah 'Detail' pada OpenSea. Catat atau salin ke papan klip." }, - "importNFTs": { - "message": "Impor NFT" - }, "importSelectedTokens": { "message": "Impor token yang dipilih?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "Menurut catatan kami, nilai URL RPC yang dikirimkan tidak sesuai dengan penyedia yang dikenal untuk ID rantai ini." }, - "missingNFT": { - "message": "Tidak melihat NFT Anda?" - }, "missingSetting": { "message": "Tidak dapat menemukan pengaturan?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "Nilai konversi tidak tersedia" }, - "noNFTs": { - "message": "Belum ada NFT" - }, "noSnaps": { "message": "Belum ada Snap yang diinstal" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index d720cb4b8..18cd136db 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "NFT の ID は一意の識別子で、同じ NFT は 2 つとして存在しません。前述の通り、OpenSea ではこの番号は「詳細」に表示されます。この ID を書き留めるか、クリップボードにコピーしてください。" }, - "importNFTs": { - "message": "NFTをインポート" - }, "importSelectedTokens": { "message": "選択したトークンをインポートしますか？" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "弊社の記録によると、送信された RPC URL の値がこのチェーン ID の既知のプロバイダーと一致しません。" }, - "missingNFT": { - "message": "NFTが見当たりませんか？" - }, "missingSetting": { "message": "設定が見つかりませんか？" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "利用可能な換算レートがありません" }, - "noNFTs": { - "message": "NFTはまだありません" - }, "noSnaps": { "message": "スナップがインストールされていません" }, diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 3326cf36d..2926560e3 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "NFT의 ID는 고유한 식별자이므로 동일한 NFT는 존재하지 않습니다. 다시 말하지만, OpenSea에서 이 번호는 '세부 정보(Details)'에서 찾아볼 수 있습니다. 이를 기록하거나 클립보드에 복사해 두세요." }, - "importNFTs": { - "message": "NFT 가져오기" - }, "importSelectedTokens": { "message": "선택한 토큰을 불러올까요?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "기록에 따르면 제출한 RPC URL 값이 이 체인 ID의 알려진 공급업체와 일치하지 않습니다." }, - "missingNFT": { - "message": "NFT가 보이지 않나요?" - }, "missingSetting": { "message": "설정을 찾으세요?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "사용 가능한 환율 없음" }, - "noNFTs": { - "message": "아직 NFT가 없음" - }, "noSnaps": { "message": "설치된 스냅이 없습니다" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index a0d30d288..39997d6ff 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "O ID de um NFT é um identificador único, pois não há dois NFTs iguais. Novamente, na OpenSea, esse número se encontra em \"Detalhes\". Anote-o ou copie-o para sua área de transferência." }, - "importNFTs": { - "message": "Importar NFTs" - }, "importSelectedTokens": { "message": "Importar tokens selecionados?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "De acordo com os nossos registros, o valor da URL da RPC enviado não corresponde a um provedor conhecido da ID desta cadeia." }, - "missingNFT": { - "message": "Não está vendo o seu NFT?" - }, "missingSetting": { "message": "Não consegue encontrar uma configuração?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "Não há uma taxa de conversão disponível" }, - "noNFTs": { - "message": "Nenhum NFT até agora" - }, "noSnaps": { "message": "Nenhum snap instalado" }, diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index ed3bc8ae8..cb2c55d69 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -1070,9 +1070,6 @@ "importMyWallet": { "message": "Importar minha carteira" }, - "importNFTs": { - "message": "Importar NFTs" - }, "importTokenQuestion": { "message": "Importar token?" }, @@ -1330,9 +1327,6 @@ "message": "verifique os detalhes da rede", "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key." }, - "missingNFT": { - "message": "Não está vendo o seu NFT?" - }, "mustSelectOne": { "message": "Selecione pelo menos 1 token." }, @@ -1465,9 +1459,6 @@ "noConversionRateAvailable": { "message": "Não há uma taxa de conversão disponível" }, - "noNFTs": { - "message": "Ainda não há nenhum NFT" - }, "noTransactions": { "message": "Você não tem transações" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 2f268a702..1921b112b 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "Идентификатор коллекционного актива является уникальным идентификатором, поскольку нет двух одинаковых NFT. Опять же, в OpenSea этот номер находится в разделе «Подробности». Запишите его или скопируйте в буфер обмена." }, - "importNFTs": { - "message": "Импорт NFT" - }, "importSelectedTokens": { "message": "Импортировать выбранные токены?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "Согласно нашим записям, отправленное значение URL-адреса RPC не соответствует известному поставщику для этого идентификатора блокчейна." }, - "missingNFT": { - "message": "Не видите свои NFT?" - }, "missingSetting": { "message": "Не удается найти настройку?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "Нет доступного обменного курса" }, - "noNFTs": { - "message": "Пока нет NFT-токенов" - }, "noSnaps": { "message": "Снапы не установлены" }, diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index b28a01b98..2ca598754 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "Ang ID ng NFT ay isang natatanging pagkakakilanlan dahil walang dalawang NFT ang magkatulad. Muli, sa OpenSea ang numerong ito ay nasa ilalim ng 'Mga Detalye'. Itala ito, o kopyahin ito sa iyong clipboard." }, - "importNFTs": { - "message": "I-import ang mga NFT" - }, "importSelectedTokens": { "message": "I-import ang mga napiling token?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "Ayon sa aming mga talaan, ang isinumiteng RPC URL value ay hindi tumutugma sa isang kilalang provider para sa chain ID na ito." }, - "missingNFT": { - "message": "Hindi makita ang NFT mo?" - }, "missingSetting": { "message": "Hindi makahanap ng setting?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "Hindi available ang rate ng conversion" }, - "noNFTs": { - "message": "Wala pang mga NFT" - }, "noSnaps": { "message": "Walang mga Snap na naka-install" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index f996c5896..9c9ee1ec8 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "Hiçbir iki NFT kimliği birbiriyle aynı olmadığı için her NFT kimliği benzersiz bir tanımlayıcıdır. Yine, OpenSea'de bu sayı 'Detaylar' kısmının altında yer alır. Not alın veya panonuza kopyalayın." }, - "importNFTs": { - "message": "NFS'leri İçe Aktar" - }, "importSelectedTokens": { "message": "Seçilen tokenleri içe aktar?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "Kayıtlarımıza göre, sunulan RPC URL adresi değeri bu zincir kimliğinin bilinen bir sağlayıcısı ile uyumlu değil." }, - "missingNFT": { - "message": "NFT'nizi görmüyor musunuz?" - }, "missingSetting": { "message": "Bir ayarı bulamıyor musun?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "Dönüşüm oranı mevcut değil" }, - "noNFTs": { - "message": "Henüz NFT yok" - }, "noSnaps": { "message": "Hiç Snap yüklü değil" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index dc690e89f..7c8851b15 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "ID của NFT là một mã nhận dạng duy nhất vì không có hai NFT nào giống hệt nhau. Một lần nữa, trên OpenSea, mã số này nằm bên dưới mục 'Chi tiết'. Hãy ghi chú lại hoặc sao chép vào bộ nhớ đệm." }, - "importNFTs": { - "message": "Nhập NFT" - }, "importSelectedTokens": { "message": "Nhập các token đã chọn?" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "Theo hồ sơ của chúng tôi, giá trị RPC URL đã gửi không khớp với một nhà cung cấp đã biết cho ID chuỗi này." }, - "missingNFT": { - "message": "Không thấy NFT của mình?" - }, "missingSetting": { "message": "Không tìm thấy thiết lập?" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "Không có sẵn tỷ lệ quy đổi nào" }, - "noNFTs": { - "message": "Chưa có NFT" - }, "noSnaps": { "message": "Chưa cài đặt Snap nào" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 995f3c47b..9090ca86a 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -1599,9 +1599,6 @@ "importNFTTokenIdToolTip": { "message": "NFT的ID是唯一标识符，因为所有NFT都是独一无二的。同样，在OpenSea上，此数字位于“详情”下方。记下它，或将它复制到剪贴板上。" }, - "importNFTs": { - "message": "添加收藏品" - }, "importSelectedTokens": { "message": "要导入所选代币吗？" }, @@ -1953,9 +1950,6 @@ "mismatchedRpcUrl": { "message": "根据我们的记录，所提交的RPC URL值与此链ID的已知提供者不匹配。" }, - "missingNFT": { - "message": "找不到您的 NFT？" - }, "missingSetting": { "message": "找不到设置吗？" }, @@ -2162,9 +2156,6 @@ "noConversionRateAvailable": { "message": "无可用汇率" }, - "noNFTs": { - "message": "尚无 NFT" - }, "noSnaps": { "message": "没有安装Snap" }, diff --git a/test/e2e/nft/import-erc1155.spec.js b/test/e2e/nft/import-erc1155.spec.js index 598b70182..e27155e3c 100644 --- a/test/e2e/nft/import-erc1155.spec.js +++ b/test/e2e/nft/import-erc1155.spec.js @@ -35,7 +35,7 @@ describe('Import ERC1155 NFT', function () { // After login, go to NFTs tab, open the import NFT/ERC1155 form await driver.clickElement('[data-testid="home__nfts-tab"]'); - await driver.clickElement({ text: 'Import NFTs', tag: 'a' }); + await driver.clickElement({ text: 'Import NFT', tag: 'button' }); // Enter a valid NFT that belongs to user and check success message appears await driver.fill('[data-testid="address"]', contractAddress); @@ -83,7 +83,7 @@ describe('Import ERC1155 NFT', function () { // After login, go to NFTs tab, open the import NFT form await driver.clickElement('[data-testid="home__nfts-tab"]'); - await driver.clickElement({ text: 'Import NFTs', tag: 'a' }); + await driver.clickElement({ text: 'Import NFT', tag: 'button' }); // Enter an NFT that not belongs to user with a valid address and an invalid token id await driver.fill('[data-testid="address"]', contractAddress); diff --git a/test/e2e/nft/import-nft.spec.js b/test/e2e/nft/import-nft.spec.js index 60e375b5c..373edc70a 100644 --- a/test/e2e/nft/import-nft.spec.js +++ b/test/e2e/nft/import-nft.spec.js @@ -35,7 +35,7 @@ describe('Import NFT', function () { // After login, go to NFTs tab, open the import NFT form await driver.clickElement('[data-testid="home__nfts-tab"]'); - await driver.clickElement({ text: 'Import NFTs', tag: 'a' }); + await driver.clickElement({ text: 'Import NFT', tag: 'button' }); // Enter a valid NFT that belongs to user and check success message appears await driver.fill('[data-testid="address"]', contractAddress); @@ -82,7 +82,7 @@ describe('Import NFT', function () { // After login, go to NFTs tab, open the import NFT form await driver.clickElement('[data-testid="home__nfts-tab"]'); - await driver.clickElement({ text: 'Import NFTs', tag: 'a' }); + await driver.clickElement({ text: 'Import NFT', tag: 'button' }); // Enter an NFT that not belongs to user with a valid address and an invalid token id await driver.fill('[data-testid="address"]', contractAddress); diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js index 903c4857d..c74079364 100644 --- a/ui/components/app/asset-list/asset-list.js +++ b/ui/components/app/asset-list/asset-list.js @@ -98,7 +98,7 @@ const AssetList = ({ onClickAsset }) => { /> ) : null} 0 ? 0 : 4}> - + {showDetectedTokens && ( diff --git a/ui/components/app/nfts-tab/index.scss b/ui/components/app/nfts-tab/index.scss index d6104ea12..2f5e266c1 100644 --- a/ui/components/app/nfts-tab/index.scss +++ b/ui/components/app/nfts-tab/index.scss @@ -1,11 +1,4 @@ .nfts-tab { - &__link { - a { - padding: 4px; - font-size: 0.875rem; - } - } - &__loading { display: flex; height: 250px; diff --git a/ui/components/app/nfts-tab/nfts-tab.js b/ui/components/app/nfts-tab/nfts-tab.js index 7e3393c98..69f9b3e11 100644 --- a/ui/components/app/nfts-tab/nfts-tab.js +++ b/ui/components/app/nfts-tab/nfts-tab.js @@ -2,18 +2,15 @@ import React from 'react'; import PropTypes from 'prop-types'; import { useDispatch, useSelector } from 'react-redux'; import { useHistory } from 'react-router-dom'; -import Box from '../../ui/box'; -import Button from '../../ui/button'; -import Typography from '../../ui/typography/typography'; -import NftsDetectionNotice from '../nfts-detection-notice'; import NftsItems from '../nfts-items'; import { - TypographyVariant, - TextAlign, JustifyContent, - FLEX_DIRECTION, - FontWeight, + FlexDirection, AlignItems, + Size, + Display, + TextAlign, + TextVariant, TextColor, } from '../../../helpers/constants/design-system'; import { useI18nContext } from '../../../hooks/useI18nContext'; @@ -24,6 +21,8 @@ import { detectNfts, } from '../../../store/actions'; import { useNftsCollections } from '../../../hooks/useNftsCollections'; +import { Box, ButtonLink, IconName, Text } from '../../component-library'; +import NftsDetectionNotice from '../nfts-detection-notice'; import ZENDESK_URLS from '../../../helpers/constants/zendesk-url'; export default function NftsTab({ onAddNFT }) { @@ -61,88 +60,91 @@ export default function NftsTab({ onAddNFT }) { /> ) : ( <> - {isMainnet && !useNftDetection ? : null} - + {isMainnet && !useNftDetection ? : null}{' '} + - {t('noNFTs')} - - + )} - - {t('missingNFT')} - - - {!isMainnet && Object.keys(collections).length < 1 ? null : ( - <> - - {isMainnet && !useNftDetection ? ( - - ) : ( - - )} - - - {t('or')} - - - )} - - - - + {t('importNFT')} + + {!isMainnet && Object.keys(collections).length < 1 ? null : ( + <> + + {isMainnet && !useNftDetection ? ( + + {t('enableAutoDetect')} + + ) : ( + + {t('refreshList')} + + )} + + + )} ); diff --git a/ui/components/app/nfts-tab/nfts-tab.test.js b/ui/components/app/nfts-tab/nfts-tab.test.js index 0ab8e29e6..2cc2048d1 100644 --- a/ui/components/app/nfts-tab/nfts-tab.test.js +++ b/ui/components/app/nfts-tab/nfts-tab.test.js @@ -303,7 +303,7 @@ describe('NFT Items', () => { onAddNFT: onAddNFTStub, }); expect(onAddNFTStub).toHaveBeenCalledTimes(0); - fireEvent.click(screen.queryByText('Import NFTs')); + fireEvent.click(screen.queryByText('Import NFT')); expect(onAddNFTStub).toHaveBeenCalledTimes(1); }); }); diff --git a/ui/components/multichain/import-token-link/__snapshots__/import-token-link.test.js.snap b/ui/components/multichain/import-token-link/__snapshots__/import-token-link.test.js.snap index 5b8d9b685..6204663e0 100644 --- a/ui/components/multichain/import-token-link/__snapshots__/import-token-link.test.js.snap +++ b/ui/components/multichain/import-token-link/__snapshots__/import-token-link.test.js.snap @@ -20,10 +20,10 @@ exports[`Import Token Link should match snapshot for goerli chainId 1`] = `

Custodial Accounts

@@ -30,16 +30,16 @@ exports[`CustodyPage renders CustodyPage 1`] = ` Please choose the custodian you want to connect in order to add or refresh a token.
    Saturn Custody
    - + +

    + Back +

    +

    Enter your token or add a new token

    Paste or drop your token here:

    @@ -131,7 +140,7 @@ exports[`CustodyPage renders CustodyPage 2`] = `

    @@ -432,6 +443,7 @@ const CustodyPage = () => { disabled={ !selectedCustodianName || (addNewTokenClicked && !currentJwt) } + block > {t('connect')} @@ -445,7 +457,7 @@ const CustodyPage = () => { {t('selectAnAccount')} @@ -454,8 +466,8 @@ const CustodyPage = () => { @@ -561,7 +573,7 @@ const CustodyPage = () => { > @@ -571,7 +583,11 @@ const CustodyPage = () => { {t('allCustodianAccountsConnectedSubtitle')} - +
    -
    - - -
    + cancelPermissionsRequest(permissionsRequestId)} + cancelText={t('cancel')} + onSubmit={() => selectAccounts(selectedAccounts)} + submitText={t('next')} + disabled={selectedAccounts.size === 0} + />
    ); diff --git a/ui/pages/permissions-connect/choose-account/index.scss b/ui/pages/permissions-connect/choose-account/index.scss index 5456135bf..4e31284df 100644 --- a/ui/pages/permissions-connect/choose-account/index.scss +++ b/ui/pages/permissions-connect/choose-account/index.scss @@ -29,31 +29,9 @@ justify-content: space-between; padding-bottom: 20px; } - } - &__bottom-buttons { - display: flex; - justify-content: space-between; - width: 100%; - padding-top: 16px; - padding-bottom: 16px; - margin-top: 12px; - border-top: 1px solid var(--color-border-muted); - - @include screen-sm-min { - border-top: none; - } - - button { - width: 124px; - } - - .btn-secondary { - margin-left: 16px; - } - - .btn-primary { - margin-right: 16px; + .page-container__footer { + margin-top: 12px; } } } diff --git a/ui/pages/permissions-connect/permissions-connect.component.js b/ui/pages/permissions-connect/permissions-connect.component.js index da06d002b..eaf4065ad 100644 --- a/ui/pages/permissions-connect/permissions-connect.component.js +++ b/ui/pages/permissions-connect/permissions-connect.component.js @@ -279,7 +279,7 @@ export default class PermissionConnect extends Component { onClick={() => this.goBack()} > From fd20f48e2c938408a186336b0808fbcd6bfb0a36 Mon Sep 17 00:00:00 2001 From: David Walsh Date: Wed, 28 Jun 2023 08:37:03 -0500 Subject: [PATCH 45/52] UX: Multichain: Make imports consistent (#19793) --- .../multichain/account-details/account-details.stories.js | 2 +- .../connected-site-menu/connected-site-menu.stories.js | 2 +- .../multichain/connected-site-menu/connected-site-menu.test.js | 2 +- .../detected-token-banner/detected-token-banner.stories.js | 2 +- .../detected-token-banner/detected-token-banner.test.js | 2 +- .../multichain/import-token-link/import-token-link.stories.js | 2 +- .../multichain/import-token-link/import-token-link.test.js | 2 +- ui/components/multichain/nft-item/nft-item.stories.js | 2 +- .../product-tour-popover/product-tour-popover.stories.js | 2 +- .../product-tour-popover/product-tour-popover.test.js | 2 +- .../multichain/token-list-item/token-list-item.stories.js | 2 +- .../multichain/token-list-item/token-list-item.test.js | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ui/components/multichain/account-details/account-details.stories.js b/ui/components/multichain/account-details/account-details.stories.js index 7989834c7..fd78b220d 100644 --- a/ui/components/multichain/account-details/account-details.stories.js +++ b/ui/components/multichain/account-details/account-details.stories.js @@ -1,6 +1,6 @@ import React from 'react'; import testData from '../../../../.storybook/test-data'; -import { AccountDetails } from './account-details'; +import { AccountDetails } from '.'; const [, address] = Object.keys(testData.metamask.identities); diff --git a/ui/components/multichain/connected-site-menu/connected-site-menu.stories.js b/ui/components/multichain/connected-site-menu/connected-site-menu.stories.js index bc4fe5a72..18c17ee47 100644 --- a/ui/components/multichain/connected-site-menu/connected-site-menu.stories.js +++ b/ui/components/multichain/connected-site-menu/connected-site-menu.stories.js @@ -8,7 +8,7 @@ import { BackgroundColor, Color, } from '../../../helpers/constants/design-system'; -import { ConnectedSiteMenu } from './connected-site-menu'; +import { ConnectedSiteMenu } from '.'; export default { title: 'Components/Multichain/ConnectedSiteMenu', diff --git a/ui/components/multichain/connected-site-menu/connected-site-menu.test.js b/ui/components/multichain/connected-site-menu/connected-site-menu.test.js index d61fcc48f..154ce0248 100644 --- a/ui/components/multichain/connected-site-menu/connected-site-menu.test.js +++ b/ui/components/multichain/connected-site-menu/connected-site-menu.test.js @@ -10,7 +10,7 @@ import { BackgroundColor, Color, } from '../../../helpers/constants/design-system'; -import { ConnectedSiteMenu } from './connected-site-menu'; +import { ConnectedSiteMenu } from '.'; describe('Connected Site Menu', () => { const selectedAddress = '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b'; diff --git a/ui/components/multichain/detected-token-banner/detected-token-banner.stories.js b/ui/components/multichain/detected-token-banner/detected-token-banner.stories.js index 080b476ef..2558bef43 100644 --- a/ui/components/multichain/detected-token-banner/detected-token-banner.stories.js +++ b/ui/components/multichain/detected-token-banner/detected-token-banner.stories.js @@ -1,5 +1,5 @@ import React from 'react'; -import { DetectedTokensBanner } from './detected-token-banner'; +import { DetectedTokensBanner } from '.'; export default { title: 'Components/Multichain/DetectedTokensBanner', diff --git a/ui/components/multichain/detected-token-banner/detected-token-banner.test.js b/ui/components/multichain/detected-token-banner/detected-token-banner.test.js index e7c78b47b..a33367f96 100644 --- a/ui/components/multichain/detected-token-banner/detected-token-banner.test.js +++ b/ui/components/multichain/detected-token-banner/detected-token-banner.test.js @@ -3,7 +3,7 @@ import { renderWithProvider, screen, fireEvent } from '../../../../test/jest'; import configureStore from '../../../store/store'; import testData from '../../../../.storybook/test-data'; -import { DetectedTokensBanner } from './detected-token-banner'; +import { DetectedTokensBanner } from '.'; describe('DetectedTokensBanner', () => { let setShowDetectedTokensSpy; diff --git a/ui/components/multichain/import-token-link/import-token-link.stories.js b/ui/components/multichain/import-token-link/import-token-link.stories.js index 605f7278d..c03e7b201 100644 --- a/ui/components/multichain/import-token-link/import-token-link.stories.js +++ b/ui/components/multichain/import-token-link/import-token-link.stories.js @@ -1,5 +1,5 @@ import React from 'react'; -import { ImportTokenLink } from './import-token-link'; +import { ImportTokenLink } from '.'; export default { title: 'Components/Multichain/ImportTokenLink', diff --git a/ui/components/multichain/import-token-link/import-token-link.test.js b/ui/components/multichain/import-token-link/import-token-link.test.js index 8ac0931aa..130252a41 100644 --- a/ui/components/multichain/import-token-link/import-token-link.test.js +++ b/ui/components/multichain/import-token-link/import-token-link.test.js @@ -3,7 +3,7 @@ import configureMockStore from 'redux-mock-store'; import { fireEvent, screen } from '@testing-library/react'; import { detectNewTokens } from '../../../store/actions'; import { renderWithProvider } from '../../../../test/lib/render-helpers'; -import { ImportTokenLink } from './import-token-link'; +import { ImportTokenLink } from '.'; const mockPushHistory = jest.fn(); diff --git a/ui/components/multichain/nft-item/nft-item.stories.js b/ui/components/multichain/nft-item/nft-item.stories.js index 564f5dd9c..1bda206b5 100644 --- a/ui/components/multichain/nft-item/nft-item.stories.js +++ b/ui/components/multichain/nft-item/nft-item.stories.js @@ -1,5 +1,5 @@ import React from 'react'; -import { NftItem } from './nft-item'; +import { NftItem } from '.'; export default { title: 'Components/Multichain/NftItem', diff --git a/ui/components/multichain/product-tour-popover/product-tour-popover.stories.js b/ui/components/multichain/product-tour-popover/product-tour-popover.stories.js index 51d97d86b..b3772799b 100644 --- a/ui/components/multichain/product-tour-popover/product-tour-popover.stories.js +++ b/ui/components/multichain/product-tour-popover/product-tour-popover.stories.js @@ -1,5 +1,5 @@ import React from 'react'; -import { ProductTour } from './product-tour-popover'; +import { ProductTour } from '.'; export default { title: 'Components/Multichain/ProductTour', diff --git a/ui/components/multichain/product-tour-popover/product-tour-popover.test.js b/ui/components/multichain/product-tour-popover/product-tour-popover.test.js index fe0abb341..2180d55e9 100644 --- a/ui/components/multichain/product-tour-popover/product-tour-popover.test.js +++ b/ui/components/multichain/product-tour-popover/product-tour-popover.test.js @@ -1,7 +1,7 @@ import React from 'react'; import { render } from '@testing-library/react'; -import { ProductTour } from './product-tour-popover'; +import { ProductTour } from '.'; describe('DetectedTokensBanner', () => { const props = { diff --git a/ui/components/multichain/token-list-item/token-list-item.stories.js b/ui/components/multichain/token-list-item/token-list-item.stories.js index a716d0800..73af87ec8 100644 --- a/ui/components/multichain/token-list-item/token-list-item.stories.js +++ b/ui/components/multichain/token-list-item/token-list-item.stories.js @@ -2,7 +2,7 @@ import React from 'react'; import { Provider } from 'react-redux'; import testData from '../../../../.storybook/test-data'; import configureStore from '../../../store/store'; -import { TokenListItem } from './token-list-item'; +import { TokenListItem } from '.'; export default { title: 'Components/Multichain/MultichainTokenListItem', diff --git a/ui/components/multichain/token-list-item/token-list-item.test.js b/ui/components/multichain/token-list-item/token-list-item.test.js index 9211fbd66..4dfc4c50d 100644 --- a/ui/components/multichain/token-list-item/token-list-item.test.js +++ b/ui/components/multichain/token-list-item/token-list-item.test.js @@ -3,7 +3,7 @@ import configureMockStore from 'redux-mock-store'; import { fireEvent } from '@testing-library/react'; import { renderWithProvider } from '../../../../test/lib/render-helpers'; -import { TokenListItem } from './token-list-item'; +import { TokenListItem } from '.'; const state = { metamask: { From de14b1ddb244155dabc9a50371adb9c3b150d1b8 Mon Sep 17 00:00:00 2001 From: Brad Decker Date: Wed, 28 Jun 2023 08:54:49 -0500 Subject: [PATCH 46/52] e2e tests for permissions metrics (#19789) --- test/e2e/metrics/permissions-approved.spec.js | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 test/e2e/metrics/permissions-approved.spec.js diff --git a/test/e2e/metrics/permissions-approved.spec.js b/test/e2e/metrics/permissions-approved.spec.js new file mode 100644 index 000000000..df479b952 --- /dev/null +++ b/test/e2e/metrics/permissions-approved.spec.js @@ -0,0 +1,121 @@ +const { strict: assert } = require('assert'); +const { + defaultGanacheOptions, + switchToNotificationWindow, + withFixtures, + openDapp, + unlockWallet, +} = require('../helpers'); +const FixtureBuilder = require('../fixture-builder'); + +/** + * mocks the segment api multiple times for specific payloads that we expect to + * see when these tests are run. In this case we are looking for + * 'Permissions Requested' and 'Permissions Received'. Do not use the constants + * from the metrics constants files, because if these change we want a strong + * indicator to our data team that the shape of data will change. + * + * @param {import('mockttp').Mockttp} mockServer + * @returns {Promise[]} + */ +async function mockSegment(mockServer) { + return [ + await mockServer + .forPost('https://api.segment.io/v1/batch') + .withJsonBodyIncluding({ + batch: [{ type: 'track', event: 'Permissions Requested' }], + }) + .thenCallback(() => { + return { + statusCode: 200, + }; + }), + await mockServer + .forPost('https://api.segment.io/v1/batch') + .withJsonBodyIncluding({ + batch: [{ type: 'track', event: 'Permissions Approved' }], + }) + .thenCallback(() => { + return { + statusCode: 200, + }; + }), + ]; +} + +/** + * This method handles getting the mocked requests to the segment server + * + * @param {WebDriver} driver + * @param {import('mockttp').Mockttp} mockedEndpoints + * @returns {import('mockttp/dist/pluggable-admin').MockttpClientResponse[]} + */ +async function getEventPayloads(driver, mockedEndpoints) { + await driver.wait(async () => { + let isPending = true; + for (const mockedEndpoint of mockedEndpoints) { + isPending = await mockedEndpoint.isPending(); + } + return isPending === false; + }, 10000); + const mockedRequests = []; + for (const mockedEndpoint of mockedEndpoints) { + mockedRequests.push(...(await mockedEndpoint.getSeenRequests())); + } + return mockedRequests.map((req) => req.body.json.batch).flat(); +} + +describe('Permissions Approved Event', function () { + it('Successfully tracked when connecting to dapp', async function () { + await withFixtures( + { + dapp: true, + fixtures: new FixtureBuilder() + .withMetaMetricsController({ + metaMetricsId: 'fake-metrics-id', + participateInMetaMetrics: true, + }) + .build(), + defaultGanacheOptions, + title: this.test.title, + testSpecificMock: mockSegment, + }, + async ({ driver, mockedEndpoint: mockedEndpoints }) => { + await driver.navigate(); + await unlockWallet(driver); + await openDapp(driver); + + await driver.clickElement({ + text: 'Connect', + tag: 'button', + }); + + await switchToNotificationWindow(driver); + await driver.clickElement({ + text: 'Next', + tag: 'button', + }); + await driver.clickElement({ + text: 'Connect', + tag: 'button', + }); + + const events = await getEventPayloads(driver, mockedEndpoints); + assert.deepStrictEqual(events[0].properties, { + method: 'eth_requestAccounts', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + assert.deepStrictEqual(events[1].properties, { + method: 'eth_requestAccounts', + category: 'inpage_provider', + locale: 'en', + chain_id: '0x539', + environment_type: 'background', + }); + }, + ); + }); +}); From 9454bddef6e3c17b9b3d870937dfb50b25f9a6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= Date: Wed, 28 Jun 2023 15:45:22 +0100 Subject: [PATCH 47/52] [MMI] replace logic from preferences controller with event emitter (#19781) * adds the emit and cleans old code * clean up * lint * review update * deep comparison with lodash --- app/scripts/controllers/mmi-controller.js | 56 +++++++++++++++++++++++ app/scripts/controllers/preferences.js | 38 --------------- app/scripts/metamask-controller.js | 39 +--------------- 3 files changed, 58 insertions(+), 75 deletions(-) diff --git a/app/scripts/controllers/mmi-controller.js b/app/scripts/controllers/mmi-controller.js index 689472829..8923487b5 100644 --- a/app/scripts/controllers/mmi-controller.js +++ b/app/scripts/controllers/mmi-controller.js @@ -1,6 +1,7 @@ import EventEmitter from 'events'; import log from 'loglevel'; import { captureException } from '@sentry/browser'; +import { isEqual } from 'lodash'; import { PersonalMessageManager, TypedMessageManager, @@ -14,11 +15,17 @@ import { REFRESH_TOKEN_CHANGE_EVENT, INTERACTIVE_REPLACEMENT_TOKEN_CHANGE_EVENT, } from '@metamask-institutional/sdk'; +import { + handleMmiPortfolio, + setDashboardCookie, +} from '@metamask-institutional/portfolio-dashboard'; import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils'; +import { CHAIN_IDS } from '../../../shared/constants/network'; import { BUILD_QUOTE_ROUTE, CONNECT_HARDWARE_ROUTE, } from '../../../ui/helpers/constants/routes'; +import { previousValueComparator } from '../lib/util'; import { getPermissionBackgroundApiMethods } from './permissions'; export default class MMIController extends EventEmitter { @@ -69,6 +76,17 @@ export default class MMIController extends EventEmitter { this.transactionUpdateController.subscribeToEvents(); }); } + + this.preferencesController.store.subscribe( + previousValueComparator(async (prevState, currState) => { + const { identities: prevIdentities } = prevState; + const { identities: currIdentities } = currState; + if (isEqual(prevIdentities, currIdentities)) { + return; + } + await this.prepareMmiPortfolio(); + }, this.preferencesController.store.getState()), + ); } // End of constructor async persistKeyringsAfterRefreshTokenChange() { @@ -542,6 +560,44 @@ export default class MMIController extends EventEmitter { }); } + async handleMmiDashboardData() { + await this.appStateController.getUnlockPromise(true); + const keyringAccounts = await this.keyringController.getAccounts(); + const { identities } = this.preferencesController.store.getState(); + const { metaMetricsId } = this.metaMetricsController.store.getState(); + const getAccountDetails = (address) => + this.custodyController.getAccountDetails(address); + const extensionId = this.extension.runtime.id; + const networks = [ + ...this.preferencesController.getRpcMethodPreferences(), + { chainId: CHAIN_IDS.MAINNET }, + { chainId: CHAIN_IDS.GOERLI }, + ]; + + return handleMmiPortfolio({ + keyringAccounts, + identities, + metaMetricsId, + networks, + getAccountDetails, + extensionId, + }); + } + + async prepareMmiPortfolio() { + if (!process.env.IN_TEST) { + try { + const mmiDashboardData = await this.handleMmiDashboardData(); + const cookieSetUrls = + this.mmiConfigurationController.store.mmiConfiguration?.portfolio + ?.cookieSetUrls; + setDashboardCookie(mmiDashboardData, cookieSetUrls); + } catch (error) { + console.error(error); + } + } + } + async setAccountAndNetwork(origin, address, chainId) { await this.appStateController.getUnlockPromise(true); const selectedAddress = this.preferencesController.getSelectedAddress(); diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js index 0386d4d94..85b2ccc43 100644 --- a/app/scripts/controllers/preferences.js +++ b/app/scripts/controllers/preferences.js @@ -1,8 +1,5 @@ import { ObservableStore } from '@metamask/obs-store'; import { normalize as normalizeAddress } from 'eth-sig-util'; -///: BEGIN:ONLY_INCLUDE_IN(build-mmi) -import { setDashboardCookie } from '@metamask-institutional/portfolio-dashboard'; -///: END:ONLY_INCLUDE_IN import { IPFS_DEFAULT_GATEWAY_URL } from '../../../shared/constants/network'; import { LedgerTransportTypes } from '../../../shared/constants/hardware-wallets'; import { ThemeType } from '../../../shared/constants/preferences'; @@ -81,14 +78,6 @@ export default class PreferencesController { this.store.setMaxListeners(13); this.tokenListController = opts.tokenListController; - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - this.handleMmiDashboardData = opts.handleMmiDashboardData; - - if (!process.env.IN_TEST) { - this.mmiConfigurationStore = opts.mmiConfigurationStore.getState(); - } - ///: END:ONLY_INCLUDE_IN - this._subscribeToInfuraAvailability(); global.setPreference = (key, value) => { @@ -261,10 +250,6 @@ export default class PreferencesController { return ids; }, {}); - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - this.prepareMmiPortfolio(); - ///: END:ONLY_INCLUDE_IN - this.store.updateState({ identities }); } @@ -290,10 +275,6 @@ export default class PreferencesController { this.setSelectedAddress(selected); } - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - this.prepareMmiPortfolio(); - ///: END:ONLY_INCLUDE_IN - return address; } @@ -350,10 +331,6 @@ export default class PreferencesController { this.store.updateState({ identities, lostIdentities }); this.addAddresses(addresses); - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - this.prepareMmiPortfolio(); - ///: END:ONLY_INCLUDE_IN - // If the selected account is no longer valid, // select an arbitrary other account: let selected = this.getSelectedAddress(); @@ -534,21 +511,6 @@ export default class PreferencesController { return this.store.getState().disabledRpcMethodPreferences; } - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - async prepareMmiPortfolio() { - if (!process.env.IN_TEST) { - try { - const mmiDashboardData = await this.handleMmiDashboardData(); - const cookieSetUrls = - this.mmiConfigurationStore.mmiConfiguration?.portfolio?.cookieSetUrls; - setDashboardCookie(mmiDashboardData, cookieSetUrls); - } catch (error) { - console.error(error); - } - } - } - ///: END:ONLY_INCLUDE_IN - // // PRIVATE METHODS // diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 335ccf14e..b71dbbe7d 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -71,7 +71,6 @@ import { } from '@metamask-institutional/custody-keyring'; import { InstitutionalFeaturesController } from '@metamask-institutional/institutional-features'; import { CustodyController } from '@metamask-institutional/custody-controller'; -import { handleMmiPortfolio } from '@metamask-institutional/portfolio-dashboard'; import { TransactionUpdateController } from '@metamask-institutional/transaction-update'; ///: END:ONLY_INCLUDE_IN import { SignatureController } from '@metamask/signature-controller'; @@ -382,10 +381,6 @@ export default class MetamaskController extends EventEmitter { ), tokenListController: this.tokenListController, provider: this.provider, - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - handleMmiDashboardData: this.handleMmiDashboardData.bind(this), - mmiConfigurationStore: this.mmiConfigurationController.store, - ///: END:ONLY_INCLUDE_IN }); this.preferencesController.store.subscribe(async ({ currentLocale }) => { @@ -3918,7 +3913,8 @@ export default class MetamaskController extends EventEmitter { ), handleMmiCheckIfTokenIsPresent: this.mmiController.handleMmiCheckIfTokenIsPresent.bind(this), - handleMmiDashboardData: this.handleMmiDashboardData.bind(this), + handleMmiDashboardData: + this.mmiController.handleMmiDashboardData.bind(this), handleMmiOpenSwaps: this.mmiController.handleMmiOpenSwaps.bind(this), handleMmiSetAccountAndNetwork: this.mmiController.setAccountAndNetwork.bind(this), @@ -3977,37 +3973,6 @@ export default class MetamaskController extends EventEmitter { return engine; } - ///: BEGIN:ONLY_INCLUDE_IN(build-mmi) - /** - * This method is needed in preferences controller - * so it needs to be here and not in our controller because - * preferences controllers is initiated first - */ - async handleMmiDashboardData() { - await this.appStateController.getUnlockPromise(true); - const keyringAccounts = await this.keyringController.getAccounts(); - const { identities } = this.preferencesController.store.getState(); - const { metaMetricsId } = this.metaMetricsController.store.getState(); - const getAccountDetails = (address) => - this.custodyController.getAccountDetails(address); - const extensionId = this.extension.runtime.id; - const networks = [ - ...this.preferencesController.getRpcMethodPreferences(), - { chainId: CHAIN_IDS.MAINNET }, - { chainId: CHAIN_IDS.GOERLI }, - ]; - - return handleMmiPortfolio({ - keyringAccounts, - identities, - metaMetricsId, - networks, - getAccountDetails, - extensionId, - }); - } - ///: END:ONLY_INCLUDE_IN - /** * TODO:LegacyProvider: Delete * A method for providing our public config info over a stream. From 7e7b4f018ce056b42185a0744f4d588efc59e750 Mon Sep 17 00:00:00 2001 From: David Walsh Date: Wed, 28 Jun 2023 10:03:50 -0500 Subject: [PATCH 48/52] UX: Multichain: Update deprecated variables (#19795) --- .../account-details/account-details-authenticate.js | 8 ++++---- .../account-details/account-details-display.js | 8 ++++---- .../account-details/account-details-key.js | 12 ++++++------ .../multichain/account-details/account-details.js | 10 +++++----- .../account-list-menu/account-list-menu.js | 4 ++-- .../connected-site-menu/connected-site-menu.js | 4 ++-- .../network-list-item/network-list-item.js | 4 ++-- .../network-list-menu/network-list-menu.js | 4 ++-- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ui/components/multichain/account-details/account-details-authenticate.js b/ui/components/multichain/account-details/account-details-authenticate.js index c76bde71b..6094f6f5a 100644 --- a/ui/components/multichain/account-details/account-details-authenticate.js +++ b/ui/components/multichain/account-details/account-details-authenticate.js @@ -2,9 +2,9 @@ import React, { useCallback, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import PropTypes from 'prop-types'; import { - DISPLAY, + Display, FontWeight, - SEVERITIES, + Severity, TextVariant, } from '../../../helpers/constants/design-system'; import { @@ -60,10 +60,10 @@ export const AccountDetailsAuthenticate = ({ address, onCancel }) => { labelProps={{ fontWeight: FontWeight.Medium }} autoFocus /> - + {t('privateKeyWarning')} - + {t('cancel')} diff --git a/ui/components/multichain/account-details/account-details-display.js b/ui/components/multichain/account-details/account-details-display.js index e3c609813..210670fbb 100644 --- a/ui/components/multichain/account-details/account-details-display.js +++ b/ui/components/multichain/account-details/account-details-display.js @@ -18,8 +18,8 @@ import { } from '../../component-library'; import { AlignItems, - DISPLAY, - FLEX_DIRECTION, + Display, + FlexDirection, TextVariant, } from '../../../helpers/constants/design-system'; import { MetaMetricsContext } from '../../../contexts/metametrics'; @@ -50,9 +50,9 @@ export const AccountDetailsDisplay = ({ return ( { {t('privateKeyCopyWarning', [accountName])} { iconName={privateKeyCopied ? IconName.CopySuccess : IconName.Copy} /> - + {t('privateKeyWarning')} diff --git a/ui/components/multichain/account-details/account-details.js b/ui/components/multichain/account-details/account-details.js index 67244de38..8ba53230f 100644 --- a/ui/components/multichain/account-details/account-details.js +++ b/ui/components/multichain/account-details/account-details.js @@ -21,11 +21,11 @@ import { getMetaMaskAccountsOrdered } from '../../../selectors'; import { useI18nContext } from '../../../hooks/useI18nContext'; import { AlignItems, - DISPLAY, - FLEX_DIRECTION, JustifyContent, TextVariant, Size, + Display, + FlexDirection, } from '../../../helpers/constants/design-system'; import { AddressCopyButton } from '../address-copy-button'; import { AccountDetailsDisplay } from './account-details-display'; @@ -93,7 +93,7 @@ export const AccountDetails = ({ address }) => { ) : ( @@ -106,9 +106,9 @@ export const AccountDetails = ({ address }) => { {attemptingExport ? ( <> {avatar} { > setSearchQuery(e.target.value)} diff --git a/ui/components/multichain/connected-site-menu/connected-site-menu.js b/ui/components/multichain/connected-site-menu/connected-site-menu.js index 1a868f18a..9914066dd 100644 --- a/ui/components/multichain/connected-site-menu/connected-site-menu.js +++ b/ui/components/multichain/connected-site-menu/connected-site-menu.js @@ -11,7 +11,7 @@ import { BackgroundColor, BorderColor, BorderRadius, - DISPLAY, + Display, IconColor, JustifyContent, } from '../../../helpers/constants/design-system'; @@ -41,7 +41,7 @@ export const ConnectedSiteMenu = ({ data-testid="connection-menu" as="button" onClick={onClick} - display={DISPLAY.FLEX} + display={Display.Flex} alignItems={AlignItems.center} justifyContent={JustifyContent.center} backgroundColor={BackgroundColor.backgroundDefault} diff --git a/ui/components/multichain/network-list-item/network-list-item.js b/ui/components/multichain/network-list-item/network-list-item.js index d4b84ddfc..ad05b00a0 100644 --- a/ui/components/multichain/network-list-item/network-list-item.js +++ b/ui/components/multichain/network-list-item/network-list-item.js @@ -10,8 +10,8 @@ import { Size, JustifyContent, TextColor, - BLOCK_SIZES, BackgroundColor, + BlockSize, } from '../../../helpers/constants/design-system'; import { AvatarNetwork, @@ -69,7 +69,7 @@ export const NetworkListItem = ({ })} alignItems={AlignItems.center} justifyContent={JustifyContent.spaceBetween} - width={BLOCK_SIZES.FULL} + width={BlockSize.Full} ref={networkRef} > {selected && ( diff --git a/ui/components/multichain/network-list-menu/network-list-menu.js b/ui/components/multichain/network-list-menu/network-list-menu.js index 10d856079..bd211d5d7 100644 --- a/ui/components/multichain/network-list-menu/network-list-menu.js +++ b/ui/components/multichain/network-list-menu/network-list-menu.js @@ -21,7 +21,7 @@ import { import Box from '../../ui/box/box'; import ToggleButton from '../../ui/toggle-button'; import { - DISPLAY, + Display, JustifyContent, } from '../../../helpers/constants/design-system'; import { @@ -140,7 +140,7 @@ export const NetworkListMenu = ({ onClose }) => { {t('showTestnetNetworks')} From b9bca5feca10019c94393bae2f99cc0c4ae70a89 Mon Sep 17 00:00:00 2001 From: Nidhi Kumari Date: Wed, 28 Jun 2023 20:41:19 +0530 Subject: [PATCH 49/52] removed margin for popup view (#19804) --- ui/components/multichain/app-header/app-header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/components/multichain/app-header/app-header.js b/ui/components/multichain/app-header/app-header.js index e26141c4b..3b98c957d 100644 --- a/ui/components/multichain/app-header/app-header.js +++ b/ui/components/multichain/app-header/app-header.js @@ -151,7 +151,7 @@ export const AppHeader = ({ location }) => { // This is required to ensure send and confirmation screens // look as desired - const headerBottomMargin = disableNetworkPicker ? 4 : 0; + const headerBottomMargin = !popupStatus && disableNetworkPicker ? 4 : 0; return ( <> From fb80873aeb5cbc9d8260d6bf2d4a59a3072cd9c7 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Wed, 28 Jun 2023 14:05:54 -0230 Subject: [PATCH 50/52] Add reaction when a policy update is requested (#19776) This lets the commenter know that the process has started. --- .../workflows/update-lavamoat-policies.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/update-lavamoat-policies.yml b/.github/workflows/update-lavamoat-policies.yml index eb649555e..3d26c2033 100644 --- a/.github/workflows/update-lavamoat-policies.yml +++ b/.github/workflows/update-lavamoat-policies.yml @@ -20,6 +20,28 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PR_NUMBER: ${{ github.event.issue.number }} + react-to-comment: + name: React to the comment + runs-on: ubuntu-latest + needs: is-fork-pull-request + # Early exit if this is a fork, since later steps are skipped for forks + if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }} + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: React to the comment + run: | + gh api \ + --method POST \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/repos/${REPO}/issues/comments/${COMMENT_ID}/reactions" \ + -f content='+1' + env: + COMMENT_ID: ${{ github.event.comment.id }} + GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }} + REPO: ${{ github.repository }} + prepare: name: Prepare dependencies runs-on: ubuntu-latest From d271b28ede8ed021ca59d9efa68c3ac363df5fcb Mon Sep 17 00:00:00 2001 From: Alex Donesky Date: Wed, 28 Jun 2023 12:59:54 -0500 Subject: [PATCH 51/52] Bump `@metamask/assets-controllers` one minor version to `v9.2.0` (#19807) * bump @metamask/assets-controllers one minor version to v9.2.0 * dedupe --- package.json | 2 +- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index b9276b90a..ae531d703 100644 --- a/package.json +++ b/package.json @@ -225,7 +225,7 @@ "@metamask/address-book-controller": "^3.0.0", "@metamask/announcement-controller": "^4.0.0", "@metamask/approval-controller": "^3.1.0", - "@metamask/assets-controllers": "^9.1.0", + "@metamask/assets-controllers": "^9.2.0", "@metamask/base-controller": "^3.0.0", "@metamask/browser-passworder": "^4.1.0", "@metamask/contract-metadata": "^2.3.1", diff --git a/yarn.lock b/yarn.lock index 2885a2999..389c05c8c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3870,21 +3870,21 @@ __metadata: languageName: node linkType: hard -"@metamask/assets-controllers@npm:^9.1.0": - version: 9.1.0 - resolution: "@metamask/assets-controllers@npm:9.1.0" +"@metamask/assets-controllers@npm:^9.2.0": + version: 9.2.0 + resolution: "@metamask/assets-controllers@npm:9.2.0" dependencies: "@ethersproject/address": ^5.7.0 "@ethersproject/bignumber": ^5.7.0 "@ethersproject/contracts": ^5.7.0 "@ethersproject/providers": ^5.7.0 "@metamask/abi-utils": ^1.2.0 - "@metamask/approval-controller": ^3.2.0 + "@metamask/approval-controller": ^3.3.0 "@metamask/base-controller": ^3.0.0 "@metamask/contract-metadata": ^2.3.1 - "@metamask/controller-utils": ^4.0.0 + "@metamask/controller-utils": ^4.0.1 "@metamask/metamask-eth-abis": 3.0.0 - "@metamask/network-controller": ^10.1.0 + "@metamask/network-controller": ^10.2.0 "@metamask/preferences-controller": ^4.1.0 "@metamask/rpc-errors": ^5.1.1 "@metamask/utils": ^5.0.2 @@ -3899,10 +3899,10 @@ __metadata: single-call-balance-checker-abi: ^1.0.0 uuid: ^8.3.2 peerDependencies: - "@metamask/approval-controller": ^3.2.0 - "@metamask/network-controller": ^10.1.0 + "@metamask/approval-controller": ^3.3.0 + "@metamask/network-controller": ^10.2.0 "@metamask/preferences-controller": ^4.1.0 - checksum: 99504638f2b7612a2636c71c9bbfb0cd91b02949a22c7535ec69a49635673387faeeb67027798cf0c38f89a1e1bb4d62f31e9e815c43845837aa123e150ee437 + checksum: 020e86dfc3dfa5eea927ada0b2f5a00642495589edbf5ab54f160e65e5e904502682f11ebebe10d892a091d05eb10306cf92d403a2ac8434048cd3e1f3df3f89 languageName: node linkType: hard @@ -4333,12 +4333,12 @@ __metadata: languageName: node linkType: hard -"@metamask/network-controller@npm:^10.1.0": - version: 10.1.0 - resolution: "@metamask/network-controller@npm:10.1.0" +"@metamask/network-controller@npm:^10.1.0, @metamask/network-controller@npm:^10.2.0": + version: 10.2.0 + resolution: "@metamask/network-controller@npm:10.2.0" dependencies: "@metamask/base-controller": ^3.0.0 - "@metamask/controller-utils": ^4.0.0 + "@metamask/controller-utils": ^4.0.1 "@metamask/eth-json-rpc-infura": ^8.0.0 "@metamask/eth-json-rpc-middleware": ^11.0.0 "@metamask/eth-json-rpc-provider": ^1.0.0 @@ -4352,7 +4352,7 @@ __metadata: immer: ^9.0.6 json-rpc-engine: ^6.1.0 uuid: ^8.3.2 - checksum: f5f1621e00bd5f818405554cfb0c01a648aba5fde30ac9e4b63ef4d00dacf58d86aabd0d4dc3342e17358ea48cbcce40f68d4aa6f61fb39e80aac50b44c2dde6 + checksum: 6474125845d838564ef60105b5914369aa650a6769df5f3f2a471839f351d798984faa5e3184054a5bfb4ec738e2a50c6fbf31f9eceb9cea4c227651105295dc languageName: node linkType: hard @@ -24431,7 +24431,7 @@ __metadata: "@metamask/address-book-controller": ^3.0.0 "@metamask/announcement-controller": ^4.0.0 "@metamask/approval-controller": ^3.1.0 - "@metamask/assets-controllers": ^9.1.0 + "@metamask/assets-controllers": ^9.2.0 "@metamask/auto-changelog": ^2.1.0 "@metamask/base-controller": ^3.0.0 "@metamask/browser-passworder": ^4.1.0 From 230c0c6fa1626bc1afd68c22321f5c166425dd12 Mon Sep 17 00:00:00 2001 From: Alex Donesky Date: Wed, 28 Jun 2023 13:01:38 -0500 Subject: [PATCH 52/52] fix issue where non-standard NFT watchAsset requests result in notification with home screen view (#19788) --- ui/selectors/selectors.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js index 675b52108..38722ac80 100644 --- a/ui/selectors/selectors.js +++ b/ui/selectors/selectors.js @@ -1,7 +1,7 @@ ///: BEGIN:ONLY_INCLUDE_IN(snaps) import { SubjectType } from '@metamask/subject-metadata-controller'; ///: END:ONLY_INCLUDE_IN -import { ApprovalType, ERC1155, ERC721 } from '@metamask/controller-utils'; +import { ApprovalType } from '@metamask/controller-utils'; import { createSelector, createSelectorCreator, @@ -574,7 +574,7 @@ export function getSuggestedNfts(state) { getUnapprovedConfirmations(state)?.filter(({ requestData, type }) => { return ( type === ApprovalType.WatchAsset && - [ERC721, ERC1155].includes(requestData?.asset?.standard) + requestData?.asset?.tokenId !== undefined ); }) || [] );