From facc04f4996900842ad18a7ba0c811e38a92fe3c Mon Sep 17 00:00:00 2001 From: Lautaro Petaccio Date: Mon, 14 Aug 2023 14:44:04 -0300 Subject: [PATCH 1/4] fix: Cards glowing issue --- webapp/package-lock.json | 368 +++++++++++++----- webapp/package.json | 4 +- .../AssetFilters/PriceFilter/PriceFilter.tsx | 58 ++- 3 files changed, 319 insertions(+), 111 deletions(-) diff --git a/webapp/package-lock.json b/webapp/package-lock.json index aa76d562f6..1dd6953ffe 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.0-development", "dependencies": { "@dcl/crypto": "^3.0.0", - "@dcl/schemas": "^8.2.2", + "@dcl/schemas": "^9.2.0", "@dcl/single-sign-on-client": "^0.0.12", "@dcl/ui-env": "^1.2.0", "@ethersproject/providers": "^5.6.2", @@ -23,7 +23,7 @@ "decentraland-crypto-fetch": "^1.0.3", "decentraland-dapps": "^15.8.4", "decentraland-transactions": "^1.47.0", - "decentraland-ui": "^4.5.3", + "decentraland-ui": "^4.6.0", "dotenv": "^10.0.0", "ethers": "^5.6.8", "graphql": "^14.7.0", @@ -1999,6 +1999,50 @@ "ethereum-cryptography": "^1.0.3" } }, + "node_modules/@dcl/crypto/node_modules/@dcl/schemas": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-8.2.2.tgz", + "integrity": "sha512-IZqcT1YOKxw5XWs6LW6Uw+7Ue5vHCVERPMwefAdt26jW1OTH818od0rBc1tQzzfBTwsrAvbgFJvpbZedieu00g==", + "dependencies": { + "ajv": "^8.11.0", + "ajv-errors": "^3.0.0", + "ajv-keywords": "^5.1.0" + } + }, + "node_modules/@dcl/crypto/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/@dcl/crypto/node_modules/ajv-errors": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==", + "peerDependencies": { + "ajv": "^8.0.1" + } + }, + "node_modules/@dcl/crypto/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, "node_modules/@dcl/crypto/node_modules/ethereum-cryptography": { "version": "1.0.3", "license": "MIT", @@ -2095,9 +2139,9 @@ } }, "node_modules/@dcl/schemas": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-8.2.2.tgz", - "integrity": "sha512-IZqcT1YOKxw5XWs6LW6Uw+7Ue5vHCVERPMwefAdt26jW1OTH818od0rBc1tQzzfBTwsrAvbgFJvpbZedieu00g==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.2.0.tgz", + "integrity": "sha512-OGjjfbL+JsTqphvc6Msl4a5kYCGJlq2LmAMBY9WDlYRE+9DZBE2Sin+ebekYWBmSUA75mJHO+qUpg0/FC8z+oQ==", "dependencies": { "ajv": "^8.11.0", "ajv-errors": "^3.0.0", @@ -9914,6 +9958,50 @@ "form-data": "^4.0.0" } }, + "node_modules/dcl-catalyst-client/node_modules/@dcl/schemas": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-8.2.2.tgz", + "integrity": "sha512-IZqcT1YOKxw5XWs6LW6Uw+7Ue5vHCVERPMwefAdt26jW1OTH818od0rBc1tQzzfBTwsrAvbgFJvpbZedieu00g==", + "dependencies": { + "ajv": "^8.11.0", + "ajv-errors": "^3.0.0", + "ajv-keywords": "^5.1.0" + } + }, + "node_modules/dcl-catalyst-client/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/dcl-catalyst-client/node_modules/ajv-errors": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==", + "peerDependencies": { + "ajv": "^8.0.1" + } + }, + "node_modules/dcl-catalyst-client/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, "node_modules/dcl-catalyst-client/node_modules/cookie": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", @@ -10050,20 +10138,6 @@ "typescript": "^2.2.0 || ^3.0.0" } }, - "node_modules/dcl-tslint-config-standard/node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", - "dev": true, - "peer": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, "node_modules/debug": { "version": "4.3.4", "license": "MIT", @@ -10354,6 +10428,16 @@ "redux-saga": "^1.1.3" } }, + "node_modules/decentraland-dapps/node_modules/@dcl/schemas": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-8.2.2.tgz", + "integrity": "sha512-IZqcT1YOKxw5XWs6LW6Uw+7Ue5vHCVERPMwefAdt26jW1OTH818od0rBc1tQzzfBTwsrAvbgFJvpbZedieu00g==", + "dependencies": { + "ajv": "^8.11.0", + "ajv-errors": "^3.0.0", + "ajv-keywords": "^5.1.0" + } + }, "node_modules/decentraland-dapps/node_modules/@formatjs/intl": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.2.1.tgz", @@ -10376,6 +10460,40 @@ } } }, + "node_modules/decentraland-dapps/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/decentraland-dapps/node_modules/ajv-errors": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==", + "peerDependencies": { + "ajv": "^8.0.1" + } + }, + "node_modules/decentraland-dapps/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, "node_modules/decentraland-dapps/node_modules/date-fns": { "version": "1.30.1", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", @@ -10426,11 +10544,11 @@ "integrity": "sha512-L4/bPD2fOeEdtFx+OnO3N81+/gsOkdensIuV9uFGYSN1mSTFaxHkWkhG8DOZ/8jlD0H2Qjkj6yDcWFaK+qu1Dg==" }, "node_modules/decentraland-ui": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.5.3.tgz", - "integrity": "sha512-PJomvIBnS4tEz0z/m12NRaJ8R+GeZgveJK9hNjAh2dgjAhn7eipz2D34NX3GLpx2H3yt3sEANMU7BuxzVnYW1Q==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.6.0.tgz", + "integrity": "sha512-dGa0aXpIGUaHTD9T9y7JRXT9JpQtgpwHWmpJWJWeG8A3yUUlfJwdIayLEATmtUpYeCGDJGNZhx4ctgUjoV7Y/Q==", "dependencies": { - "@dcl/schemas": "^8.1.0", + "@dcl/schemas": "^9.2.0", "balloon-css": "^0.5.0", "classnames": "^2.3.2", "deep-equal": "^2.0.5", @@ -10438,8 +10556,8 @@ "events": "^3.3.0", "fp-future": "^1.0.1", "parallax-js": "^3.1.0", - "react": "^17.0.0", - "react-dom": "^17.0.0", + "react": "^16.8.0 || ^17.0.0", + "react-dom": "^16.8.0 || ^17.0.0", "react-responsive": "^9.0.0-beta.3", "react-semantic-ui-datepickers": "^2.17.2", "react-tile-map": "^0.4.1", @@ -25775,6 +25893,7 @@ "version": "4.9.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz", "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==", + "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -29247,6 +29366,40 @@ "ethereum-cryptography": "^1.0.3" }, "dependencies": { + "@dcl/schemas": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-8.2.2.tgz", + "integrity": "sha512-IZqcT1YOKxw5XWs6LW6Uw+7Ue5vHCVERPMwefAdt26jW1OTH818od0rBc1tQzzfBTwsrAvbgFJvpbZedieu00g==", + "requires": { + "ajv": "^8.11.0", + "ajv-errors": "^3.0.0", + "ajv-keywords": "^5.1.0" + } + }, + "ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "ajv-errors": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==" + }, + "ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "requires": { + "fast-deep-equal": "^3.1.3" + } + }, "ethereum-cryptography": { "version": "1.0.3", "requires": { @@ -29316,9 +29469,9 @@ } }, "@dcl/schemas": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-8.2.2.tgz", - "integrity": "sha512-IZqcT1YOKxw5XWs6LW6Uw+7Ue5vHCVERPMwefAdt26jW1OTH818od0rBc1tQzzfBTwsrAvbgFJvpbZedieu00g==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.2.0.tgz", + "integrity": "sha512-OGjjfbL+JsTqphvc6Msl4a5kYCGJlq2LmAMBY9WDlYRE+9DZBE2Sin+ebekYWBmSUA75mJHO+qUpg0/FC8z+oQ==", "requires": { "ajv": "^8.11.0", "ajv-errors": "^3.0.0", @@ -29339,8 +29492,7 @@ "ajv-errors": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", - "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==", - "requires": {} + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==" }, "ajv-keywords": { "version": "5.1.0", @@ -30353,8 +30505,7 @@ }, "dependencies": { "ws": { - "version": "7.5.7", - "requires": {} + "version": "7.5.7" } } }, @@ -31207,8 +31358,7 @@ "version": "14.4.3", "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.4.3.tgz", "integrity": "sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==", - "dev": true, - "requires": {} + "dev": true }, "@tootallnate/once": { "version": "1.1.2" @@ -32066,8 +32216,7 @@ "ws": { "version": "7.5.9", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", - "requires": {} + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==" } } }, @@ -32459,8 +32608,7 @@ }, "dependencies": { "ws": { - "version": "7.5.3", - "requires": {} + "version": "7.5.3" } } }, @@ -32875,8 +33023,7 @@ } }, "acorn-jsx": { - "version": "5.3.2", - "requires": {} + "version": "5.3.2" }, "acorn-walk": { "version": "7.2.0" @@ -32922,12 +33069,10 @@ } }, "ajv-errors": { - "version": "1.0.1", - "requires": {} + "version": "1.0.1" }, "ajv-keywords": { - "version": "3.5.2", - "requires": {} + "version": "3.5.2" }, "alphanum-sort": { "version": "1.0.2" @@ -33295,8 +33440,7 @@ } }, "babel-plugin-named-asset-import": { - "version": "0.3.8", - "requires": {} + "version": "0.3.8" }, "babel-plugin-polyfill-corejs2": { "version": "0.3.1", @@ -34916,6 +35060,40 @@ "form-data": "^4.0.0" }, "dependencies": { + "@dcl/schemas": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-8.2.2.tgz", + "integrity": "sha512-IZqcT1YOKxw5XWs6LW6Uw+7Ue5vHCVERPMwefAdt26jW1OTH818od0rBc1tQzzfBTwsrAvbgFJvpbZedieu00g==", + "requires": { + "ajv": "^8.11.0", + "ajv-errors": "^3.0.0", + "ajv-keywords": "^5.1.0" + } + }, + "ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "ajv-errors": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==" + }, + "ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "requires": { + "fast-deep-equal": "^3.1.3" + } + }, "cookie": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", @@ -34959,8 +35137,7 @@ "ajv-errors": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", - "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==", - "requires": {} + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==" }, "ajv-keywords": { "version": "5.1.0", @@ -35028,13 +35205,6 @@ "tslib": "1.9.0", "tsutils": "^3.0.0" } - }, - "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", - "dev": true, - "peer": true } } }, @@ -35181,8 +35351,7 @@ "ajv-errors": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", - "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==", - "requires": {} + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==" }, "ajv-keywords": { "version": "5.1.0", @@ -35263,6 +35432,16 @@ "typesafe-actions": "^2.0.3" }, "dependencies": { + "@dcl/schemas": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-8.2.2.tgz", + "integrity": "sha512-IZqcT1YOKxw5XWs6LW6Uw+7Ue5vHCVERPMwefAdt26jW1OTH818od0rBc1tQzzfBTwsrAvbgFJvpbZedieu00g==", + "requires": { + "ajv": "^8.11.0", + "ajv-errors": "^3.0.0", + "ajv-keywords": "^5.1.0" + } + }, "@formatjs/intl": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.2.1.tgz", @@ -35277,6 +35456,30 @@ "tslib": "^2.1.0" } }, + "ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "ajv-errors": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==" + }, + "ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "requires": { + "fast-deep-equal": "^3.1.3" + } + }, "date-fns": { "version": "1.30.1", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", @@ -35317,11 +35520,11 @@ "integrity": "sha512-L4/bPD2fOeEdtFx+OnO3N81+/gsOkdensIuV9uFGYSN1mSTFaxHkWkhG8DOZ/8jlD0H2Qjkj6yDcWFaK+qu1Dg==" }, "decentraland-ui": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.5.3.tgz", - "integrity": "sha512-PJomvIBnS4tEz0z/m12NRaJ8R+GeZgveJK9hNjAh2dgjAhn7eipz2D34NX3GLpx2H3yt3sEANMU7BuxzVnYW1Q==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.6.0.tgz", + "integrity": "sha512-dGa0aXpIGUaHTD9T9y7JRXT9JpQtgpwHWmpJWJWeG8A3yUUlfJwdIayLEATmtUpYeCGDJGNZhx4ctgUjoV7Y/Q==", "requires": { - "@dcl/schemas": "^8.1.0", + "@dcl/schemas": "^9.2.0", "balloon-css": "^0.5.0", "classnames": "^2.3.2", "deep-equal": "^2.0.5", @@ -35329,8 +35532,8 @@ "events": "^3.3.0", "fp-future": "^1.0.1", "parallax-js": "^3.1.0", - "react": "^17.0.0", - "react-dom": "^17.0.0", + "react": "^16.8.0 || ^17.0.0", + "react-dom": "^16.8.0 || ^17.0.0", "react-responsive": "^9.0.0-beta.3", "react-semantic-ui-datepickers": "^2.17.2", "react-tile-map": "^0.4.1", @@ -36336,8 +36539,7 @@ } }, "eslint-plugin-react-hooks": { - "version": "4.3.0", - "requires": {} + "version": "4.3.0" }, "eslint-plugin-testing-library": { "version": "3.10.2", @@ -36888,8 +37090,7 @@ "ws": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", - "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==", - "requires": {} + "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" } } }, @@ -39394,8 +39595,7 @@ "isomorphic-ws": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz", - "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==", - "requires": {} + "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==" }, "isstream": { "version": "0.1.2" @@ -39824,8 +40024,7 @@ } }, "jest-pnp-resolver": { - "version": "1.2.2", - "requires": {} + "version": "1.2.2" }, "jest-regex-util": { "version": "26.0.0" @@ -40230,8 +40429,7 @@ } }, "ws": { - "version": "7.5.7", - "requires": {} + "version": "7.5.7" } } }, @@ -43223,8 +43421,7 @@ "react-intersection-observer": { "version": "9.4.3", "resolved": "https://registry.npmjs.org/react-intersection-observer/-/react-intersection-observer-9.4.3.tgz", - "integrity": "sha512-WNRqMQvKpupr6MzecAQI0Pj0+JQong307knLP4g/nBex7kYfIaZsPpXaIhKHR+oV8z+goUbH9e10j6lGRnTzlQ==", - "requires": {} + "integrity": "sha512-WNRqMQvKpupr6MzecAQI0Pj0+JQong307knLP4g/nBex7kYfIaZsPpXaIhKHR+oV8z+goUbH9e10j6lGRnTzlQ==" }, "react-is": { "version": "16.13.1" @@ -43473,8 +43670,7 @@ "react-virtualized-auto-sizer": { "version": "1.0.15", "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.15.tgz", - "integrity": "sha512-01yhkssgHShMiu5W8k+86kgl8lutpl+Uef9KP4wrozXnzZjxWIgj+cH8Qi064oQpKD8myn/JNMzp4tcZNQ3Avg==", - "requires": {} + "integrity": "sha512-01yhkssgHShMiu5W8k+86kgl8lutpl+Uef9KP4wrozXnzZjxWIgj+cH8Qi064oQpKD8myn/JNMzp4tcZNQ3Avg==" }, "react-window": { "version": "1.8.8", @@ -43488,8 +43684,7 @@ "react-window-infinite-loader": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/react-window-infinite-loader/-/react-window-infinite-loader-1.0.8.tgz", - "integrity": "sha512-907ZLAiZZfBHuZyiY0V7uiSL4P/rI6UQyCF9wES1cDWTeyNLgGLaxu+BZkcUW3R5tSCQcbCcWBl0jVIpYzrKGQ==", - "requires": {} + "integrity": "sha512-907ZLAiZZfBHuZyiY0V7uiSL4P/rI6UQyCF9wES1cDWTeyNLgGLaxu+BZkcUW3R5tSCQcbCcWBl0jVIpYzrKGQ==" }, "read-pkg": { "version": "5.2.0", @@ -45702,8 +45897,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-7.0.3.tgz", "integrity": "sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==", - "dev": true, - "requires": {} + "dev": true }, "ts-pnp": { "version": "1.2.0" @@ -45801,8 +45995,7 @@ }, "tslint-no-circular-imports": { "version": "0.7.0", - "dev": true, - "requires": {} + "dev": true }, "tslint-plugin-prettier": { "version": "2.3.0", @@ -45928,7 +46121,8 @@ "typescript": { "version": "4.9.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz", - "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==" + "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==", + "dev": true }, "typescript-compare": { "version": "0.0.2", @@ -46132,8 +46326,7 @@ "use-sync-external-store": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz", - "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==", - "requires": {} + "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==" }, "utf8": { "version": "3.0.0", @@ -47507,8 +47700,7 @@ } }, "ws": { - "version": "7.4.6", - "requires": {} + "version": "7.4.6" }, "xhr": { "version": "2.6.0", diff --git a/webapp/package.json b/webapp/package.json index 2197a1b634..68c1a62289 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -3,7 +3,7 @@ "version": "0.0.0-development", "dependencies": { "@dcl/crypto": "^3.0.0", - "@dcl/schemas": "^8.2.2", + "@dcl/schemas": "^9.2.0", "@dcl/single-sign-on-client": "^0.0.12", "@dcl/ui-env": "^1.2.0", "@ethersproject/providers": "^5.6.2", @@ -17,7 +17,7 @@ "decentraland-crypto-fetch": "^1.0.3", "decentraland-dapps": "^15.8.4", "decentraland-transactions": "^1.47.0", - "decentraland-ui": "^4.5.3", + "decentraland-ui": "^4.6.0", "dotenv": "^10.0.0", "ethers": "^5.6.8", "graphql": "^14.7.0", diff --git a/webapp/src/components/AssetFilters/PriceFilter/PriceFilter.tsx b/webapp/src/components/AssetFilters/PriceFilter/PriceFilter.tsx index 2f20605810..2fcebdc4ad 100644 --- a/webapp/src/components/AssetFilters/PriceFilter/PriceFilter.tsx +++ b/webapp/src/components/AssetFilters/PriceFilter/PriceFilter.tsx @@ -1,7 +1,7 @@ import { useMemo, useCallback } from 'react' import { ethers } from 'ethers' import { Box, useTabletAndBelowMediaQuery } from 'decentraland-ui' -import { RentalsListingsFilterByCategory } from '@dcl/schemas' +import { Network, RentalsListingsFilterByCategory } from '@dcl/schemas' import { t } from 'decentraland-dapps/dist/modules/translation/utils' import { getNetwork, getPriceLabel } from '../../../utils/filters' import { LANDFilters } from '../../Vendor/decentraland/types' @@ -70,26 +70,37 @@ export const PriceFilter = ({ section ]) - const rentalPriceFetchFilters = useCallback(() => ({ - category: category as any as RentalsListingsFilterByCategory, - rentalDays, - minEstateSize: minEstateSize ? Number.parseFloat(minEstateSize) : undefined, - maxEstateSize: maxEstateSize ? Number.parseFloat(maxEstateSize) : undefined, - minDistanceToPlaza: minDistanceToPlaza ? Number.parseFloat(minDistanceToPlaza) : undefined, - maxDistanceToPlaza: maxDistanceToPlaza ? Number.parseFloat(maxDistanceToPlaza) : undefined, - adjacentToRoad: adjacentToRoad || undefined, - }), [ - category, - minEstateSize, - maxEstateSize, - minDistanceToPlaza, - maxDistanceToPlaza, - adjacentToRoad, - rentalDays - ]) + const rentalPriceFetchFilters = useCallback( + () => ({ + category: (category as any) as RentalsListingsFilterByCategory, + rentalDays, + minEstateSize: minEstateSize + ? Number.parseFloat(minEstateSize) + : undefined, + maxEstateSize: maxEstateSize + ? Number.parseFloat(maxEstateSize) + : undefined, + minDistanceToPlaza: minDistanceToPlaza + ? Number.parseFloat(minDistanceToPlaza) + : undefined, + maxDistanceToPlaza: maxDistanceToPlaza + ? Number.parseFloat(maxDistanceToPlaza) + : undefined, + adjacentToRoad: adjacentToRoad || undefined + }), + [ + category, + minEstateSize, + maxEstateSize, + minDistanceToPlaza, + maxDistanceToPlaza, + adjacentToRoad, + rentalDays + ] + ) const title = useMemo(() => { - if(landStatus === LANDFilters.ONLY_FOR_RENT) { + if (landStatus === LANDFilters.ONLY_FOR_RENT) { return t('nft_filters.price_per_day') } return t('filters.price') @@ -128,7 +139,12 @@ export const PriceFilter = ({ acc[ethers.utils.formatEther(key)] = value return acc }, {} as Record) - }, [priceFetchFilters, landStatus, isRentalPriceFitlerChartEnabled, rentalPriceFetchFilters]) + }, [ + priceFetchFilters, + landStatus, + isRentalPriceFitlerChartEnabled, + rentalPriceFetchFilters + ]) return ( From 0d29a2ff698b0469edb7eaaa9d55612f140abb73 Mon Sep 17 00:00:00 2001 From: Lautaro Petaccio Date: Mon, 14 Aug 2023 14:51:41 -0300 Subject: [PATCH 2/4] fix: Remove unused import --- webapp/src/components/AssetFilters/PriceFilter/PriceFilter.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/AssetFilters/PriceFilter/PriceFilter.tsx b/webapp/src/components/AssetFilters/PriceFilter/PriceFilter.tsx index 2fcebdc4ad..00d661d86c 100644 --- a/webapp/src/components/AssetFilters/PriceFilter/PriceFilter.tsx +++ b/webapp/src/components/AssetFilters/PriceFilter/PriceFilter.tsx @@ -1,7 +1,7 @@ import { useMemo, useCallback } from 'react' import { ethers } from 'ethers' import { Box, useTabletAndBelowMediaQuery } from 'decentraland-ui' -import { Network, RentalsListingsFilterByCategory } from '@dcl/schemas' +import { RentalsListingsFilterByCategory } from '@dcl/schemas' import { t } from 'decentraland-dapps/dist/modules/translation/utils' import { getNetwork, getPriceLabel } from '../../../utils/filters' import { LANDFilters } from '../../Vendor/decentraland/types' From d8bc24355fefe661b02f5d289d0408067e3f2680 Mon Sep 17 00:00:00 2001 From: Lautaro Petaccio Date: Mon, 14 Aug 2023 16:25:54 -0300 Subject: [PATCH 3/4] fix: Update dcl-tslint-config-standard --- webapp/package-lock.json | 79 +++++++++++++++++++++++++++++++--------- webapp/package.json | 2 +- 2 files changed, 63 insertions(+), 18 deletions(-) diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 1dd6953ffe..3257a8722c 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -73,7 +73,7 @@ "@typescript-eslint/parser": "^4.13.0", "css-mediaquery": "^0.1.2", "customize-cra": "^1.0.0", - "dcl-tslint-config-standard": "^2.0.0", + "dcl-tslint-config-standard": "^3.0.0", "prettier": "^1.19.1", "react-app-rewired": "^2.2.1", "react-error-overlay": "^6.0.9", @@ -10080,13 +10080,14 @@ } }, "node_modules/dcl-tslint-config-standard": { - "version": "2.0.0", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/dcl-tslint-config-standard/-/dcl-tslint-config-standard-3.0.0.tgz", + "integrity": "sha512-6oDLMtVWvcJD8VwWPzqR8K/RwtQHl2H92m6kyQbJb79a/eJzUb4HKSrsnjPEsGZY6zUZ2QNZBTXVN3j5l+2SBg==", "dev": true, - "license": "Apache-2.0", "dependencies": { - "tslint-clean-code": "^0.2.9", - "tslint-eslint-rules": "^5.4.0", - "tslint-no-circular-imports": "^0.7.0" + "tslint-clean-code": "^0.2.5", + "tslint-eslint-rules": "^5.1.0", + "tslint-no-circular-imports": "^0.2.1" } }, "node_modules/dcl-tslint-config-standard/node_modules/doctrine": { @@ -25642,12 +25643,33 @@ } }, "node_modules/tslint-no-circular-imports": { - "version": "0.7.0", + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tslint-no-circular-imports/-/tslint-no-circular-imports-0.2.1.tgz", + "integrity": "sha512-KK1GcYJcyCeiybEab59KAdSvLYgPUdiud41Fe/cT3ns2EpvZvzOn2HWrkPqh3uuJ6mgyB3LhfEvE13WoU+3e3A==", "dev": true, - "license": "MIT", - "peerDependencies": { - "tslint": ">=5.0.0", - "typescript": ">=2.1.0" + "dependencies": { + "@types/node": "^8.0.28", + "tslint": "^5.7.0", + "typescript": "^2.5.2" + } + }, + "node_modules/tslint-no-circular-imports/node_modules/@types/node": { + "version": "8.10.66", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz", + "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==", + "dev": true + }, + "node_modules/tslint-no-circular-imports/node_modules/typescript": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", + "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" } }, "node_modules/tslint-plugin-prettier": { @@ -35159,12 +35181,14 @@ } }, "dcl-tslint-config-standard": { - "version": "2.0.0", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/dcl-tslint-config-standard/-/dcl-tslint-config-standard-3.0.0.tgz", + "integrity": "sha512-6oDLMtVWvcJD8VwWPzqR8K/RwtQHl2H92m6kyQbJb79a/eJzUb4HKSrsnjPEsGZY6zUZ2QNZBTXVN3j5l+2SBg==", "dev": true, "requires": { - "tslint-clean-code": "^0.2.9", - "tslint-eslint-rules": "^5.4.0", - "tslint-no-circular-imports": "^0.7.0" + "tslint-clean-code": "^0.2.5", + "tslint-eslint-rules": "^5.1.0", + "tslint-no-circular-imports": "^0.2.1" }, "dependencies": { "doctrine": { @@ -45994,8 +46018,29 @@ } }, "tslint-no-circular-imports": { - "version": "0.7.0", - "dev": true + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tslint-no-circular-imports/-/tslint-no-circular-imports-0.2.1.tgz", + "integrity": "sha512-KK1GcYJcyCeiybEab59KAdSvLYgPUdiud41Fe/cT3ns2EpvZvzOn2HWrkPqh3uuJ6mgyB3LhfEvE13WoU+3e3A==", + "dev": true, + "requires": { + "@types/node": "^8.0.28", + "tslint": "^5.7.0", + "typescript": "^2.5.2" + }, + "dependencies": { + "@types/node": { + "version": "8.10.66", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz", + "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==", + "dev": true + }, + "typescript": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", + "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", + "dev": true + } + } }, "tslint-plugin-prettier": { "version": "2.3.0", diff --git a/webapp/package.json b/webapp/package.json index 68c1a62289..7e9bdd44b8 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -67,7 +67,7 @@ "@typescript-eslint/parser": "^4.13.0", "css-mediaquery": "^0.1.2", "customize-cra": "^1.0.0", - "dcl-tslint-config-standard": "^2.0.0", + "dcl-tslint-config-standard": "^3.0.0", "prettier": "^1.19.1", "react-app-rewired": "^2.2.1", "react-error-overlay": "^6.0.9", From 587c9bbea31302afebb1800c3b52ccb2e950e4bd Mon Sep 17 00:00:00 2001 From: Lautaro Petaccio Date: Mon, 14 Aug 2023 16:28:49 -0300 Subject: [PATCH 4/4] fix: Re-add removed package --- webapp/package-lock.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 3257a8722c..62aa6d0dc0 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -10154,6 +10154,20 @@ } } }, + "node_modules/dcl-tslint-config-standard/node_modules/typescript": { + "version": "3.9.10", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", + "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "dev": true, + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/debug/node_modules/ms": { "version": "2.1.2", "license": "MIT"