From f40f7bfa56a021b11896917e2bb833122ed1c292 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:36:28 +0100 Subject: [PATCH 1/5] Chore(deps-dev): Bump @typescript-eslint/eslint-plugin (#4732) --- apps/web/package.json | 2 +- yarn.lock | 142 ++++++++++++++++++++---------------------- 2 files changed, 70 insertions(+), 74 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 18ada15ff1..518ed5db49 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -129,7 +129,7 @@ "@types/react-dom": "^19.0.0", "@types/react-gtm-module": "^2.0.3", "@types/semver": "^7.3.10", - "@typescript-eslint/eslint-plugin": "^7.6.0", + "@typescript-eslint/eslint-plugin": "^8.19.0", "@typescript-eslint/parser": "^8.18.1", "cross-env": "^7.0.3", "cypress": "^13.15.2", diff --git a/yarn.lock b/yarn.lock index d283b885e6..91880614aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7709,7 +7709,7 @@ __metadata: "@types/react-dom": "npm:^19.0.0" "@types/react-gtm-module": "npm:^2.0.3" "@types/semver": "npm:^7.3.10" - "@typescript-eslint/eslint-plugin": "npm:^7.6.0" + "@typescript-eslint/eslint-plugin": "npm:^8.19.0" "@typescript-eslint/parser": "npm:^8.18.1" "@walletconnect/core": "npm:^2.17.2" "@walletconnect/utils": "npm:^2.17.3" @@ -12574,26 +12574,24 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^7.6.0": - version: 7.18.0 - resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0" +"@typescript-eslint/eslint-plugin@npm:^8.19.0": + version: 8.19.0 + resolution: "@typescript-eslint/eslint-plugin@npm:8.19.0" dependencies: "@eslint-community/regexpp": "npm:^4.10.0" - "@typescript-eslint/scope-manager": "npm:7.18.0" - "@typescript-eslint/type-utils": "npm:7.18.0" - "@typescript-eslint/utils": "npm:7.18.0" - "@typescript-eslint/visitor-keys": "npm:7.18.0" + "@typescript-eslint/scope-manager": "npm:8.19.0" + "@typescript-eslint/type-utils": "npm:8.19.0" + "@typescript-eslint/utils": "npm:8.19.0" + "@typescript-eslint/visitor-keys": "npm:8.19.0" graphemer: "npm:^1.4.0" ignore: "npm:^5.3.1" natural-compare: "npm:^1.4.0" ts-api-utils: "npm:^1.3.0" peerDependencies: - "@typescript-eslint/parser": ^7.0.0 - eslint: ^8.56.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 10/6ee4c61f145dc05f0a567b8ac01b5399ef9c75f58bc6e9a3ffca8927b15e2be2d4c3fd32a2c1a7041cc0848fdeadac30d9cb0d3bcd3835d301847a88ffd19c4d + "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0 + eslint: ^8.57.0 || ^9.0.0 + typescript: ">=4.8.4 <5.8.0" + checksum: 10/9b12f1e0708d5f5a0a6819119d6c98bc21c5d9b2b589ecaad6b7fdb50bcf6444b52ea3ed227ffe90d90422a957d3aa30b8ab95f10d0d4d2829996fa1152d0762 languageName: node linkType: hard @@ -12631,16 +12629,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:7.18.0": - version: 7.18.0 - resolution: "@typescript-eslint/scope-manager@npm:7.18.0" - dependencies: - "@typescript-eslint/types": "npm:7.18.0" - "@typescript-eslint/visitor-keys": "npm:7.18.0" - checksum: 10/9eb2ae5d69d9f723e706c16b2b97744fc016996a5473bed596035ac4d12429b3d24e7340a8235d704efa57f8f52e1b3b37925ff7c2e3384859d28b23a99b8bcc - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:8.17.0": version: 8.17.0 resolution: "@typescript-eslint/scope-manager@npm:8.17.0" @@ -12661,20 +12649,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:7.18.0": - version: 7.18.0 - resolution: "@typescript-eslint/type-utils@npm:7.18.0" +"@typescript-eslint/scope-manager@npm:8.19.0": + version: 8.19.0 + resolution: "@typescript-eslint/scope-manager@npm:8.19.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:7.18.0" - "@typescript-eslint/utils": "npm:7.18.0" - debug: "npm:^4.3.4" - ts-api-utils: "npm:^1.3.0" - peerDependencies: - eslint: ^8.56.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 10/bcc7958a4ecdddad8c92e17265175773e7dddf416a654c1a391e69cb16e43960b39d37b6ffa349941bf3635e050f0ca7cd8f56ec9dd774168f2bbe7afedc9676 + "@typescript-eslint/types": "npm:8.19.0" + "@typescript-eslint/visitor-keys": "npm:8.19.0" + checksum: 10/ab7f72533c62b6e7c87e4c91c187098e1026a8d67044c2a8376affede949c7c2f3d1b4bec0047d4001cd16c3a30db0b01672f596ef284d12b143cd4a984cdfdc languageName: node linkType: hard @@ -12710,10 +12691,18 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:7.18.0": - version: 7.18.0 - resolution: "@typescript-eslint/types@npm:7.18.0" - checksum: 10/0e30c73a3cc3c67dd06360a5a12fd12cee831e4092750eec3d6c031bdc4feafcb0ab1d882910a73e66b451a4f6e1dd015e9e2c4d45bf6bf716a474e5d123ddf0 +"@typescript-eslint/type-utils@npm:8.19.0": + version: 8.19.0 + resolution: "@typescript-eslint/type-utils@npm:8.19.0" + dependencies: + "@typescript-eslint/typescript-estree": "npm:8.19.0" + "@typescript-eslint/utils": "npm:8.19.0" + debug: "npm:^4.3.4" + ts-api-utils: "npm:^1.3.0" + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: ">=4.8.4 <5.8.0" + checksum: 10/c8fc5ca2a3f0b701389a2c45ee1ebc5ca211769164b822d54af873a7f1735a160845fcdd14a988a547dda12e1a3249ecef5bc381a1d067b1ab9e6bbf6398f509 languageName: node linkType: hard @@ -12731,22 +12720,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:7.18.0": - version: 7.18.0 - resolution: "@typescript-eslint/typescript-estree@npm:7.18.0" - dependencies: - "@typescript-eslint/types": "npm:7.18.0" - "@typescript-eslint/visitor-keys": "npm:7.18.0" - debug: "npm:^4.3.4" - globby: "npm:^11.1.0" - is-glob: "npm:^4.0.3" - minimatch: "npm:^9.0.4" - semver: "npm:^7.6.0" - ts-api-utils: "npm:^1.3.0" - peerDependenciesMeta: - typescript: - optional: true - checksum: 10/b01e66235a91aa4439d02081d4a5f8b4a7cf9cb24f26b334812f657e3c603493e5f41e5c1e89cf4efae7d64509fa1f73affc16afc5e15cb7f83f724577c82036 +"@typescript-eslint/types@npm:8.19.0": + version: 8.19.0 + resolution: "@typescript-eslint/types@npm:8.19.0" + checksum: 10/1bf02b6fcae72ccd60bbd9858e8e13ff49332bb819e9479d48b081026b62512baa8f72f2123bb3abdf816cc667aae25b311db941bee737afad6118189f761a17 languageName: node linkType: hard @@ -12787,17 +12764,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:7.18.0": - version: 7.18.0 - resolution: "@typescript-eslint/utils@npm:7.18.0" +"@typescript-eslint/typescript-estree@npm:8.19.0": + version: 8.19.0 + resolution: "@typescript-eslint/typescript-estree@npm:8.19.0" dependencies: - "@eslint-community/eslint-utils": "npm:^4.4.0" - "@typescript-eslint/scope-manager": "npm:7.18.0" - "@typescript-eslint/types": "npm:7.18.0" - "@typescript-eslint/typescript-estree": "npm:7.18.0" + "@typescript-eslint/types": "npm:8.19.0" + "@typescript-eslint/visitor-keys": "npm:8.19.0" + debug: "npm:^4.3.4" + fast-glob: "npm:^3.3.2" + is-glob: "npm:^4.0.3" + minimatch: "npm:^9.0.4" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" peerDependencies: - eslint: ^8.56.0 - checksum: 10/f43fedb4f4d2e3836bdf137889449063a55c0ece74fdb283929cd376197b992313be8ef4df920c1c801b5c3076b92964c84c6c3b9b749d263b648d0011f5926e + typescript: ">=4.8.4 <5.8.0" + checksum: 10/6d396f82079f67d32a5ef644767697e8bbd79d166cc5ea034dcc2b146a62744de91d87885495ecfe3d9a0de98413e4dbb618b76bd657377df174cd2d12bab863 languageName: node linkType: hard @@ -12833,13 +12814,18 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:7.18.0": - version: 7.18.0 - resolution: "@typescript-eslint/visitor-keys@npm:7.18.0" +"@typescript-eslint/utils@npm:8.19.0": + version: 8.19.0 + resolution: "@typescript-eslint/utils@npm:8.19.0" dependencies: - "@typescript-eslint/types": "npm:7.18.0" - eslint-visitor-keys: "npm:^3.4.3" - checksum: 10/b7cfe6fdeae86c507357ac6b2357813c64fb2fbf1aaf844393ba82f73a16e2599b41981b34200d9fc7765d70bc3a8181d76b503051e53f04bcb7c9afef637eab + "@eslint-community/eslint-utils": "npm:^4.4.0" + "@typescript-eslint/scope-manager": "npm:8.19.0" + "@typescript-eslint/types": "npm:8.19.0" + "@typescript-eslint/typescript-estree": "npm:8.19.0" + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: ">=4.8.4 <5.8.0" + checksum: 10/e57f5e5d6fc00be3596f58be77904b66079f67a61effa633372ebcc92a0b6090f71183b3be145c55b5a5ab8f0536f98f0034c4d9a8031c1422e4e2753b97fd21 languageName: node linkType: hard @@ -12863,6 +12849,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:8.19.0": + version: 8.19.0 + resolution: "@typescript-eslint/visitor-keys@npm:8.19.0" + dependencies: + "@typescript-eslint/types": "npm:8.19.0" + eslint-visitor-keys: "npm:^4.2.0" + checksum: 10/065b95253be57cf5e8f15ebb09dbcb70e97cd37d238a6cf3d4be3c7bc42e94d77a062e8f97a2333a2e03eb58c736c00ec0ab3b7a1bddfef30387eb167776116e + languageName: node + linkType: hard + "@ungap/structured-clone@npm:^1.0.0": version: 1.2.1 resolution: "@ungap/structured-clone@npm:1.2.1" @@ -20477,7 +20473,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:^11.0.1, globby@npm:^11.1.0": +"globby@npm:^11.0.1": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: From 2ba2f6d4221a467ea0419e267835df757c044370 Mon Sep 17 00:00:00 2001 From: Manuel Gellfart Date: Mon, 6 Jan 2025 13:24:50 +0100 Subject: [PATCH 2/5] fix(web): do not copy addresses in SignerForm (#4730) --- .../src/components/tx/SignOrExecuteForm/SignerForm/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/components/tx/SignOrExecuteForm/SignerForm/index.tsx b/apps/web/src/components/tx/SignOrExecuteForm/SignerForm/index.tsx index a6c3989e43..ceace9f5e3 100644 --- a/apps/web/src/components/tx/SignOrExecuteForm/SignerForm/index.tsx +++ b/apps/web/src/components/tx/SignOrExecuteForm/SignerForm/index.tsx @@ -100,7 +100,7 @@ export const SignerForm = ({ willExecute }: { willExecute?: boolean }) => { > {options?.map((owner) => ( - + {!isOptionEnabled(owner) && ( Already signed From 37d6bc0b64ffb3c2efc96a139d8a82301c0c2edb Mon Sep 17 00:00:00 2001 From: katspaugh <381895+katspaugh@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:51:57 +0100 Subject: [PATCH 3/5] Fix: lint --- apps/web/src/components/common/TokenIcon/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/components/common/TokenIcon/index.tsx b/apps/web/src/components/common/TokenIcon/index.tsx index 3df24157ed..232c08e245 100644 --- a/apps/web/src/components/common/TokenIcon/index.tsx +++ b/apps/web/src/components/common/TokenIcon/index.tsx @@ -19,7 +19,7 @@ const TokenIcon = ({ }): ReactElement => { const src = useMemo(() => { return logoUri?.replace(COINGECKO_THUMB, COINGECKO_SMALL) - }, []) + }, [logoUri]) return ( Date: Mon, 6 Jan 2025 13:58:11 +0100 Subject: [PATCH 4/5] Revert "Chore(deps-dev): Bump @typescript-eslint/eslint-plugin (#4732)" This reverts commit f40f7bfa56a021b11896917e2bb833122ed1c292. --- apps/web/package.json | 2 +- yarn.lock | 142 ++++++++++++++++++++++-------------------- 2 files changed, 74 insertions(+), 70 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 518ed5db49..18ada15ff1 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -129,7 +129,7 @@ "@types/react-dom": "^19.0.0", "@types/react-gtm-module": "^2.0.3", "@types/semver": "^7.3.10", - "@typescript-eslint/eslint-plugin": "^8.19.0", + "@typescript-eslint/eslint-plugin": "^7.6.0", "@typescript-eslint/parser": "^8.18.1", "cross-env": "^7.0.3", "cypress": "^13.15.2", diff --git a/yarn.lock b/yarn.lock index 91880614aa..d283b885e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7709,7 +7709,7 @@ __metadata: "@types/react-dom": "npm:^19.0.0" "@types/react-gtm-module": "npm:^2.0.3" "@types/semver": "npm:^7.3.10" - "@typescript-eslint/eslint-plugin": "npm:^8.19.0" + "@typescript-eslint/eslint-plugin": "npm:^7.6.0" "@typescript-eslint/parser": "npm:^8.18.1" "@walletconnect/core": "npm:^2.17.2" "@walletconnect/utils": "npm:^2.17.3" @@ -12574,24 +12574,26 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^8.19.0": - version: 8.19.0 - resolution: "@typescript-eslint/eslint-plugin@npm:8.19.0" +"@typescript-eslint/eslint-plugin@npm:^7.6.0": + version: 7.18.0 + resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0" dependencies: "@eslint-community/regexpp": "npm:^4.10.0" - "@typescript-eslint/scope-manager": "npm:8.19.0" - "@typescript-eslint/type-utils": "npm:8.19.0" - "@typescript-eslint/utils": "npm:8.19.0" - "@typescript-eslint/visitor-keys": "npm:8.19.0" + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/type-utils": "npm:7.18.0" + "@typescript-eslint/utils": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" graphemer: "npm:^1.4.0" ignore: "npm:^5.3.1" natural-compare: "npm:^1.4.0" ts-api-utils: "npm:^1.3.0" peerDependencies: - "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0 - eslint: ^8.57.0 || ^9.0.0 - typescript: ">=4.8.4 <5.8.0" - checksum: 10/9b12f1e0708d5f5a0a6819119d6c98bc21c5d9b2b589ecaad6b7fdb50bcf6444b52ea3ed227ffe90d90422a957d3aa30b8ab95f10d0d4d2829996fa1152d0762 + "@typescript-eslint/parser": ^7.0.0 + eslint: ^8.56.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/6ee4c61f145dc05f0a567b8ac01b5399ef9c75f58bc6e9a3ffca8927b15e2be2d4c3fd32a2c1a7041cc0848fdeadac30d9cb0d3bcd3835d301847a88ffd19c4d languageName: node linkType: hard @@ -12629,6 +12631,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/scope-manager@npm:7.18.0" + dependencies: + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" + checksum: 10/9eb2ae5d69d9f723e706c16b2b97744fc016996a5473bed596035ac4d12429b3d24e7340a8235d704efa57f8f52e1b3b37925ff7c2e3384859d28b23a99b8bcc + languageName: node + linkType: hard + "@typescript-eslint/scope-manager@npm:8.17.0": version: 8.17.0 resolution: "@typescript-eslint/scope-manager@npm:8.17.0" @@ -12649,13 +12661,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:8.19.0": - version: 8.19.0 - resolution: "@typescript-eslint/scope-manager@npm:8.19.0" +"@typescript-eslint/type-utils@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/type-utils@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:8.19.0" - "@typescript-eslint/visitor-keys": "npm:8.19.0" - checksum: 10/ab7f72533c62b6e7c87e4c91c187098e1026a8d67044c2a8376affede949c7c2f3d1b4bec0047d4001cd16c3a30db0b01672f596ef284d12b143cd4a984cdfdc + "@typescript-eslint/typescript-estree": "npm:7.18.0" + "@typescript-eslint/utils": "npm:7.18.0" + debug: "npm:^4.3.4" + ts-api-utils: "npm:^1.3.0" + peerDependencies: + eslint: ^8.56.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/bcc7958a4ecdddad8c92e17265175773e7dddf416a654c1a391e69cb16e43960b39d37b6ffa349941bf3635e050f0ca7cd8f56ec9dd774168f2bbe7afedc9676 languageName: node linkType: hard @@ -12691,18 +12710,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:8.19.0": - version: 8.19.0 - resolution: "@typescript-eslint/type-utils@npm:8.19.0" - dependencies: - "@typescript-eslint/typescript-estree": "npm:8.19.0" - "@typescript-eslint/utils": "npm:8.19.0" - debug: "npm:^4.3.4" - ts-api-utils: "npm:^1.3.0" - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - typescript: ">=4.8.4 <5.8.0" - checksum: 10/c8fc5ca2a3f0b701389a2c45ee1ebc5ca211769164b822d54af873a7f1735a160845fcdd14a988a547dda12e1a3249ecef5bc381a1d067b1ab9e6bbf6398f509 +"@typescript-eslint/types@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/types@npm:7.18.0" + checksum: 10/0e30c73a3cc3c67dd06360a5a12fd12cee831e4092750eec3d6c031bdc4feafcb0ab1d882910a73e66b451a4f6e1dd015e9e2c4d45bf6bf716a474e5d123ddf0 languageName: node linkType: hard @@ -12720,10 +12731,22 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:8.19.0": - version: 8.19.0 - resolution: "@typescript-eslint/types@npm:8.19.0" - checksum: 10/1bf02b6fcae72ccd60bbd9858e8e13ff49332bb819e9479d48b081026b62512baa8f72f2123bb3abdf816cc667aae25b311db941bee737afad6118189f761a17 +"@typescript-eslint/typescript-estree@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.18.0" + dependencies: + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" + debug: "npm:^4.3.4" + globby: "npm:^11.1.0" + is-glob: "npm:^4.0.3" + minimatch: "npm:^9.0.4" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/b01e66235a91aa4439d02081d4a5f8b4a7cf9cb24f26b334812f657e3c603493e5f41e5c1e89cf4efae7d64509fa1f73affc16afc5e15cb7f83f724577c82036 languageName: node linkType: hard @@ -12764,21 +12787,17 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:8.19.0": - version: 8.19.0 - resolution: "@typescript-eslint/typescript-estree@npm:8.19.0" +"@typescript-eslint/utils@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/utils@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:8.19.0" - "@typescript-eslint/visitor-keys": "npm:8.19.0" - debug: "npm:^4.3.4" - fast-glob: "npm:^3.3.2" - is-glob: "npm:^4.0.3" - minimatch: "npm:^9.0.4" - semver: "npm:^7.6.0" - ts-api-utils: "npm:^1.3.0" + "@eslint-community/eslint-utils": "npm:^4.4.0" + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/typescript-estree": "npm:7.18.0" peerDependencies: - typescript: ">=4.8.4 <5.8.0" - checksum: 10/6d396f82079f67d32a5ef644767697e8bbd79d166cc5ea034dcc2b146a62744de91d87885495ecfe3d9a0de98413e4dbb618b76bd657377df174cd2d12bab863 + eslint: ^8.56.0 + checksum: 10/f43fedb4f4d2e3836bdf137889449063a55c0ece74fdb283929cd376197b992313be8ef4df920c1c801b5c3076b92964c84c6c3b9b749d263b648d0011f5926e languageName: node linkType: hard @@ -12814,18 +12833,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:8.19.0": - version: 8.19.0 - resolution: "@typescript-eslint/utils@npm:8.19.0" +"@typescript-eslint/visitor-keys@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.18.0" dependencies: - "@eslint-community/eslint-utils": "npm:^4.4.0" - "@typescript-eslint/scope-manager": "npm:8.19.0" - "@typescript-eslint/types": "npm:8.19.0" - "@typescript-eslint/typescript-estree": "npm:8.19.0" - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - typescript: ">=4.8.4 <5.8.0" - checksum: 10/e57f5e5d6fc00be3596f58be77904b66079f67a61effa633372ebcc92a0b6090f71183b3be145c55b5a5ab8f0536f98f0034c4d9a8031c1422e4e2753b97fd21 + "@typescript-eslint/types": "npm:7.18.0" + eslint-visitor-keys: "npm:^3.4.3" + checksum: 10/b7cfe6fdeae86c507357ac6b2357813c64fb2fbf1aaf844393ba82f73a16e2599b41981b34200d9fc7765d70bc3a8181d76b503051e53f04bcb7c9afef637eab languageName: node linkType: hard @@ -12849,16 +12863,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:8.19.0": - version: 8.19.0 - resolution: "@typescript-eslint/visitor-keys@npm:8.19.0" - dependencies: - "@typescript-eslint/types": "npm:8.19.0" - eslint-visitor-keys: "npm:^4.2.0" - checksum: 10/065b95253be57cf5e8f15ebb09dbcb70e97cd37d238a6cf3d4be3c7bc42e94d77a062e8f97a2333a2e03eb58c736c00ec0ab3b7a1bddfef30387eb167776116e - languageName: node - linkType: hard - "@ungap/structured-clone@npm:^1.0.0": version: 1.2.1 resolution: "@ungap/structured-clone@npm:1.2.1" @@ -20473,7 +20477,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:^11.0.1": +"globby@npm:^11.0.1, globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: From 5bcc4c7872a54052da68d1ab82317fc3d5b57343 Mon Sep 17 00:00:00 2001 From: James Mealy Date: Tue, 7 Jan 2025 08:33:15 +0000 Subject: [PATCH 5/5] Fix: close the outreach banner in cypress tests when connecting a signer (#4739) * fix: dismiss outreach banner in batch_tx e2e tests * fix: close outreach popup whenever a signer is connected * remove duplicate check for outreach popup --- apps/web/cypress/e2e/pages/main.page.js | 12 ++++++++++++ apps/web/cypress/support/utils/wallet.js | 8 ++++++-- .../components/OutreachPopup/OutreachPopup.tsx | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/apps/web/cypress/e2e/pages/main.page.js b/apps/web/cypress/e2e/pages/main.page.js index 229e7e963d..5a770954af 100644 --- a/apps/web/cypress/e2e/pages/main.page.js +++ b/apps/web/cypress/e2e/pages/main.page.js @@ -4,6 +4,8 @@ const acceptSelection = 'Save settings' const executeStr = 'Execute' const connectedOwnerBlock = '[data-testid="open-account-center"]' export const modalDialogCloseBtn = '[data-testid="modal-dialog-close-btn"]' +const closeOutreachPopupBtn = 'button[aria-label="close outreach popup"]' + export const noRelayAttemptsError = 'Not enough relay attempts remaining' export function checkElementBackgroundColor(element, color) { @@ -204,6 +206,16 @@ export function acceptCookies2() { }) } +export function closeOutreachPopup() { + cy.wait(1000) + cy.get('body').then(($body) => { + if ($body.find(closeOutreachPopupBtn).length > 0) { + cy.get(closeOutreachPopupBtn).click() + cy.wait(500) + } + }) +} + export function verifyOwnerConnected(prefix = 'sep:') { cy.get(connectedOwnerBlock).should('contain', prefix) } diff --git a/apps/web/cypress/support/utils/wallet.js b/apps/web/cypress/support/utils/wallet.js index 93673c2164..9a75493d36 100644 --- a/apps/web/cypress/support/utils/wallet.js +++ b/apps/web/cypress/support/utils/wallet.js @@ -1,3 +1,5 @@ +import * as main from '../../e2e/pages/main.page' + const onboardv2 = 'onboard-v2' const pkInput = '[data-testid="private-key-input"]' const pkConnectBtn = '[data-testid="pk-connect-btn"]' @@ -42,7 +44,7 @@ export function connectSigner(signer) { function enterPrivateKey() { cy.wait(3000) - cy.get('body').then(($body) => { + return cy.get('body').then(($body) => { if ($body.find(pkInput).length > 0) { cy.get(pkInput) .find('input') @@ -65,5 +67,7 @@ export function connectSigner(signer) { }) } - enterPrivateKey() + enterPrivateKey().then(() => { + main.closeOutreachPopup() + }) } diff --git a/apps/web/src/features/targetedOutreach/components/OutreachPopup/OutreachPopup.tsx b/apps/web/src/features/targetedOutreach/components/OutreachPopup/OutreachPopup.tsx index 929e2637b7..3fe0a5f440 100644 --- a/apps/web/src/features/targetedOutreach/components/OutreachPopup/OutreachPopup.tsx +++ b/apps/web/src/features/targetedOutreach/components/OutreachPopup/OutreachPopup.tsx @@ -124,7 +124,7 @@ const OutreachPopup = (): ReactElement | null => { - +