diff --git a/package-lock.json b/package-lock.json index c814f7cd..415ac9c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@sentry/react": "^7.64.0", "@typechain/ethers-v5": "^10.0.0", "connected-react-router": "^6.9.1", - "decentraland-dapps": "^16.33.0", + "decentraland-dapps": "^17.6.0", "decentraland-transactions": "^1.46.0", "decentraland-ui": "^4.35.3", "dotenv": "8.2.0", @@ -167,6 +167,148 @@ "@ethersproject/properties": "^5.0.7" } }, + "node_modules/@0xsquid/sdk": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/@0xsquid/sdk/-/sdk-2.8.9.tgz", + "integrity": "sha512-8bkp6GGRxUI7XbuQ5kfbkGY8qQXOA6q0fDK92gmlq0ooNFW/4eRv7U9WHr6ivsMl4UcxGcPfTP+yDES+FVHTcA==", + "dependencies": { + "@cosmjs/encoding": "^0.31.0", + "@cosmjs/stargate": "^0.31.3", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/wallet": "^5.7.0", + "axios": "^1.5.0", + "cosmjs-types": "^0.8.0", + "ethers": "6.8.1", + "ethers-multicall-provider": "^5.0.0", + "lodash": "^4.17.21", + "long": "^5.2.3" + } + }, + "node_modules/@0xsquid/sdk/node_modules/@noble/curves": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz", + "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==", + "dependencies": { + "@noble/hashes": "1.3.2" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@0xsquid/sdk/node_modules/@noble/hashes": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz", + "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@0xsquid/sdk/node_modules/@types/node": { + "version": "18.15.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz", + "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==" + }, + "node_modules/@0xsquid/sdk/node_modules/aes-js": { + "version": "4.0.0-beta.5", + "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz", + "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==" + }, + "node_modules/@0xsquid/sdk/node_modules/axios": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", + "dependencies": { + "follow-redirects": "^1.15.4", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/@0xsquid/sdk/node_modules/ethers": { + "version": "6.8.1", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.8.1.tgz", + "integrity": "sha512-iEKm6zox5h1lDn6scuRWdIdFJUCGg3+/aQWu0F4K0GVyEZiktFkqrJbRjTn1FlYEPz7RKA707D6g5Kdk6j7Ljg==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/ethers-io/" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@adraffy/ens-normalize": "1.10.0", + "@noble/curves": "1.2.0", + "@noble/hashes": "1.3.2", + "@types/node": "18.15.13", + "aes-js": "4.0.0-beta.5", + "tslib": "2.4.0", + "ws": "8.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@0xsquid/sdk/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@0xsquid/sdk/node_modules/long": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", + "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" + }, + "node_modules/@0xsquid/sdk/node_modules/tslib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + }, + "node_modules/@0xsquid/sdk/node_modules/ws": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", + "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/@0xsquid/squid-types": { + "version": "0.1.53", + "resolved": "https://registry.npmjs.org/@0xsquid/squid-types/-/squid-types-0.1.53.tgz", + "integrity": "sha512-n+pVQXiDoos89PgGTPYhMEFG3EeBy/rrAPzGFbtnYXL5R2Pq3loANyTmSjKMY3hCwAxyQ3tGYym52peKq4TYSQ==", + "dependencies": { + "@axelar-network/axelarjs-sdk": "^0.13.6", + "@ethersproject/providers": "^5.7.2", + "typescript": "*" + }, + "peerDependencies": { + "typescript": "^5.3.3" + } + }, "node_modules/@adobe/css-tools": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz", @@ -194,6 +336,136 @@ "version": "0.9.4", "license": "Apache-2.0" }, + "node_modules/@axelar-network/axelar-cgp-solidity": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@axelar-network/axelar-cgp-solidity/-/axelar-cgp-solidity-4.5.0.tgz", + "integrity": "sha512-4F4rmHei0cmzeUR7/mW4Bap5rc/KlPV2crD9HA7HTRfl15mVcN6/3z8p+pAm9We6bOrQplNW9KBZ3HJFP3C1Gw==", + "engines": { + "node": "^16.0.0 || ^18.0.0" + } + }, + "node_modules/@axelar-network/axelarjs-sdk": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/@axelar-network/axelarjs-sdk/-/axelarjs-sdk-0.13.9.tgz", + "integrity": "sha512-c7UooF1/2V51LAB936GOHRxMtautB7uGXW3QfeEufzoBAPx2Sfx2IB8pT7KHaohdY4zZUI8lVYRNogOVeZhjpg==", + "hasInstallScript": true, + "dependencies": { + "@axelar-network/axelar-cgp-solidity": "^4.5.0", + "@axelar-network/axelarjs-types": "^0.33.0", + "@cosmjs/json-rpc": "^0.30.1", + "@cosmjs/stargate": "0.31.0-alpha.1", + "@ethersproject/abstract-provider": "^5.7.0", + "@ethersproject/networks": "^5.7.1", + "@ethersproject/providers": "^5.7.2", + "@types/uuid": "^8.3.1", + "bech32": "^2.0.0", + "clone-deep": "^4.0.1", + "cross-fetch": "^3.1.5", + "ethers": "^5.7.2", + "socket.io-client": "^4.6.1", + "standard-http-error": "^2.0.1", + "string-similarity-js": "^2.1.4", + "uuid": "^8.3.2", + "ws": "^8.13.0" + } + }, + "node_modules/@axelar-network/axelarjs-sdk/node_modules/@cosmjs/stargate": { + "version": "0.31.0-alpha.1", + "resolved": "https://registry.npmjs.org/@cosmjs/stargate/-/stargate-0.31.0-alpha.1.tgz", + "integrity": "sha512-kCTUT3niB2hvcHjhlxpM8cNw1KOVmgZROdJUQaO8Ts4j22OyRZRFdwRPrOIuAKpqhVW2I1vI2HQL9Bg7pk9Glw==", + "dependencies": { + "@confio/ics23": "^0.6.8", + "@cosmjs/amino": "^0.31.0-alpha.1", + "@cosmjs/encoding": "^0.31.0-alpha.1", + "@cosmjs/math": "^0.31.0-alpha.1", + "@cosmjs/proto-signing": "^0.31.0-alpha.1", + "@cosmjs/stream": "^0.31.0-alpha.1", + "@cosmjs/tendermint-rpc": "^0.31.0-alpha.1", + "@cosmjs/utils": "^0.31.0-alpha.1", + "cosmjs-types": "^0.8.0", + "long": "^4.0.0", + "protobufjs": "~6.11.3", + "xstream": "^11.14.0" + } + }, + "node_modules/@axelar-network/axelarjs-sdk/node_modules/@cosmjs/stream": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.31.3.tgz", + "integrity": "sha512-8keYyI7X0RjsLyVcZuBeNjSv5FA4IHwbFKx7H60NHFXszN8/MvXL6aZbNIvxtcIHHsW7K9QSQos26eoEWlAd+w==", + "dependencies": { + "xstream": "^11.14.0" + } + }, + "node_modules/@axelar-network/axelarjs-sdk/node_modules/bech32": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz", + "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg==" + }, + "node_modules/@axelar-network/axelarjs-sdk/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@axelar-network/axelarjs-sdk/node_modules/ws": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/@axelar-network/axelarjs-types": { + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/@axelar-network/axelarjs-types/-/axelarjs-types-0.33.0.tgz", + "integrity": "sha512-aCbX/5G+tgWPjr9tl3dQfJftWwRMkILz61ytach7dKqxtO9G9jlxpNvELJQ6gKVOodUtSY8qBCO/fWU19v4hdQ==", + "dependencies": { + "long": "^5.2.0", + "protobufjs": "^7.0.0" + } + }, + "node_modules/@axelar-network/axelarjs-types/node_modules/long": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", + "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" + }, + "node_modules/@axelar-network/axelarjs-types/node_modules/protobufjs": { + "version": "7.2.6", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.6.tgz", + "integrity": "sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==", + "hasInstallScript": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/node": ">=13.7.0", + "long": "^5.0.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/@babel/code-frame": { "version": "7.23.5", "license": "MIT", @@ -762,6 +1034,174 @@ "ieee754": "^1.2.1" } }, + "node_modules/@confio/ics23": { + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@confio/ics23/-/ics23-0.6.8.tgz", + "integrity": "sha512-wB6uo+3A50m0sW/EWcU64xpV/8wShZ6bMTa7pF8eYsTrSkQA7oLUIJcs/wb8g4y2Oyq701BaGiO6n/ak5WXO1w==", + "dependencies": { + "@noble/hashes": "^1.0.0", + "protobufjs": "^6.8.8" + } + }, + "node_modules/@cosmjs/amino": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/amino/-/amino-0.31.3.tgz", + "integrity": "sha512-36emtUq895sPRX8PTSOnG+lhJDCVyIcE0Tr5ct59sUbgQiI14y43vj/4WAlJ/utSOxy+Zhj9wxcs4AZfu0BHsw==", + "dependencies": { + "@cosmjs/crypto": "^0.31.3", + "@cosmjs/encoding": "^0.31.3", + "@cosmjs/math": "^0.31.3", + "@cosmjs/utils": "^0.31.3" + } + }, + "node_modules/@cosmjs/crypto": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/crypto/-/crypto-0.31.3.tgz", + "integrity": "sha512-vRbvM9ZKR2017TO73dtJ50KxoGcFzKtKI7C8iO302BQ5p+DuB+AirUg1952UpSoLfv5ki9O416MFANNg8UN/EQ==", + "dependencies": { + "@cosmjs/encoding": "^0.31.3", + "@cosmjs/math": "^0.31.3", + "@cosmjs/utils": "^0.31.3", + "@noble/hashes": "^1", + "bn.js": "^5.2.0", + "elliptic": "^6.5.4", + "libsodium-wrappers-sumo": "^0.7.11" + } + }, + "node_modules/@cosmjs/encoding": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/encoding/-/encoding-0.31.3.tgz", + "integrity": "sha512-6IRtG0fiVYwyP7n+8e54uTx2pLYijO48V3t9TLiROERm5aUAIzIlz6Wp0NYaI5he9nh1lcEGJ1lkquVKFw3sUg==", + "dependencies": { + "base64-js": "^1.3.0", + "bech32": "^1.1.4", + "readonly-date": "^1.0.0" + } + }, + "node_modules/@cosmjs/json-rpc": { + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/@cosmjs/json-rpc/-/json-rpc-0.30.1.tgz", + "integrity": "sha512-pitfC/2YN9t+kXZCbNuyrZ6M8abnCC2n62m+JtU9vQUfaEtVsgy+1Fk4TRQ175+pIWSdBMFi2wT8FWVEE4RhxQ==", + "dependencies": { + "@cosmjs/stream": "^0.30.1", + "xstream": "^11.14.0" + } + }, + "node_modules/@cosmjs/math": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/math/-/math-0.31.3.tgz", + "integrity": "sha512-kZ2C6glA5HDb9hLz1WrftAjqdTBb3fWQsRR+Us2HsjAYdeE6M3VdXMsYCP5M3yiihal1WDwAY2U7HmfJw7Uh4A==", + "dependencies": { + "bn.js": "^5.2.0" + } + }, + "node_modules/@cosmjs/proto-signing": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/proto-signing/-/proto-signing-0.31.3.tgz", + "integrity": "sha512-24+10/cGl6lLS4VCrGTCJeDRPQTn1K5JfknzXzDIHOx8THR31JxA7/HV5eWGHqWgAbudA7ccdSvEK08lEHHtLA==", + "dependencies": { + "@cosmjs/amino": "^0.31.3", + "@cosmjs/crypto": "^0.31.3", + "@cosmjs/encoding": "^0.31.3", + "@cosmjs/math": "^0.31.3", + "@cosmjs/utils": "^0.31.3", + "cosmjs-types": "^0.8.0", + "long": "^4.0.0" + } + }, + "node_modules/@cosmjs/socket": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/socket/-/socket-0.31.3.tgz", + "integrity": "sha512-aqrDGGi7os/hsz5p++avI4L0ZushJ+ItnzbqA7C6hamFSCJwgOkXaOUs+K9hXZdX4rhY7rXO4PH9IH8q09JkTw==", + "dependencies": { + "@cosmjs/stream": "^0.31.3", + "isomorphic-ws": "^4.0.1", + "ws": "^7", + "xstream": "^11.14.0" + } + }, + "node_modules/@cosmjs/socket/node_modules/@cosmjs/stream": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.31.3.tgz", + "integrity": "sha512-8keYyI7X0RjsLyVcZuBeNjSv5FA4IHwbFKx7H60NHFXszN8/MvXL6aZbNIvxtcIHHsW7K9QSQos26eoEWlAd+w==", + "dependencies": { + "xstream": "^11.14.0" + } + }, + "node_modules/@cosmjs/stargate": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/stargate/-/stargate-0.31.3.tgz", + "integrity": "sha512-53NxnzmB9FfXpG4KjOUAYAvWLYKdEmZKsutcat/u2BrDXNZ7BN8jim/ENcpwXfs9/Og0K24lEIdvA4gsq3JDQw==", + "dependencies": { + "@confio/ics23": "^0.6.8", + "@cosmjs/amino": "^0.31.3", + "@cosmjs/encoding": "^0.31.3", + "@cosmjs/math": "^0.31.3", + "@cosmjs/proto-signing": "^0.31.3", + "@cosmjs/stream": "^0.31.3", + "@cosmjs/tendermint-rpc": "^0.31.3", + "@cosmjs/utils": "^0.31.3", + "cosmjs-types": "^0.8.0", + "long": "^4.0.0", + "protobufjs": "~6.11.3", + "xstream": "^11.14.0" + } + }, + "node_modules/@cosmjs/stargate/node_modules/@cosmjs/stream": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.31.3.tgz", + "integrity": "sha512-8keYyI7X0RjsLyVcZuBeNjSv5FA4IHwbFKx7H60NHFXszN8/MvXL6aZbNIvxtcIHHsW7K9QSQos26eoEWlAd+w==", + "dependencies": { + "xstream": "^11.14.0" + } + }, + "node_modules/@cosmjs/stream": { + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.30.1.tgz", + "integrity": "sha512-Fg0pWz1zXQdoxQZpdHRMGvUH5RqS6tPv+j9Eh7Q953UjMlrwZVo0YFLC8OTf/HKVf10E4i0u6aM8D69Q6cNkgQ==", + "dependencies": { + "xstream": "^11.14.0" + } + }, + "node_modules/@cosmjs/tendermint-rpc": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.31.3.tgz", + "integrity": "sha512-s3TiWkPCW4QceTQjpYqn4xttUJH36mTPqplMl+qyocdqk5+X5mergzExU/pHZRWQ4pbby8bnR7kMvG4OC1aZ8g==", + "dependencies": { + "@cosmjs/crypto": "^0.31.3", + "@cosmjs/encoding": "^0.31.3", + "@cosmjs/json-rpc": "^0.31.3", + "@cosmjs/math": "^0.31.3", + "@cosmjs/socket": "^0.31.3", + "@cosmjs/stream": "^0.31.3", + "@cosmjs/utils": "^0.31.3", + "axios": "^0.21.2", + "readonly-date": "^1.0.0", + "xstream": "^11.14.0" + } + }, + "node_modules/@cosmjs/tendermint-rpc/node_modules/@cosmjs/json-rpc": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/json-rpc/-/json-rpc-0.31.3.tgz", + "integrity": "sha512-7LVYerXjnm69qqYR3uA6LGCrBW2EO5/F7lfJxAmY+iII2C7xO3a0vAjMSt5zBBh29PXrJVS6c2qRP22W1Le2Wg==", + "dependencies": { + "@cosmjs/stream": "^0.31.3", + "xstream": "^11.14.0" + } + }, + "node_modules/@cosmjs/tendermint-rpc/node_modules/@cosmjs/stream": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/stream/-/stream-0.31.3.tgz", + "integrity": "sha512-8keYyI7X0RjsLyVcZuBeNjSv5FA4IHwbFKx7H60NHFXszN8/MvXL6aZbNIvxtcIHHsW7K9QSQos26eoEWlAd+w==", + "dependencies": { + "xstream": "^11.14.0" + } + }, + "node_modules/@cosmjs/utils": { + "version": "0.31.3", + "resolved": "https://registry.npmjs.org/@cosmjs/utils/-/utils-0.31.3.tgz", + "integrity": "sha512-VBhAgzrrYdIe0O5IbKRqwszbQa7ZyQLx9nEQuHQ3HUplQW7P44COG/ye2n6AzCudtqxmwdX7nyX8ta1J07GoqA==" + }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", @@ -850,8 +1290,9 @@ } }, "node_modules/@dcl/schemas": { - "version": "9.10.0", - "license": "Apache-2.0", + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-9.12.0.tgz", + "integrity": "sha512-CQjajLNZZCHdL8+c0wujbQ1DEmg4WBfwtQTAHgWEQenujQv4FLaEwFeZ5HOlBU6g7K0OU0qfotl8ArbtiTpfgw==", "dependencies": { "ajv": "^8.11.0", "ajv-errors": "^3.0.0", @@ -5789,6 +6230,11 @@ "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==" }, + "node_modules/@types/uuid": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", + "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==" + }, "node_modules/@types/ws": { "version": "7.4.7", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.7.tgz", @@ -6242,6 +6688,11 @@ "version": "20.4.1", "license": "MIT" }, + "node_modules/@wert-io/widget-initializer": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@wert-io/widget-initializer/-/widget-initializer-5.2.0.tgz", + "integrity": "sha512-Rs9XLeFtvWtZGg9kOVvMZ+PpRxFconMFox6fGQO9psET1B29bBNO6sifOeNzxQ5pMVVbLiK2ZQD5w194sqrB3A==" + }, "node_modules/abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", @@ -7384,6 +7835,19 @@ "node": ">= 8" } }, + "node_modules/clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dependencies": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/clsx": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", @@ -7585,6 +8049,15 @@ "node": ">=10" } }, + "node_modules/cosmjs-types": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/cosmjs-types/-/cosmjs-types-0.8.0.tgz", + "integrity": "sha512-Q2Mj95Fl0PYMWEhA2LuGEIhipF7mQwd9gTQ85DdP9jjjopeoGaDxvmPa5nakNzsq7FnO1DMTatXTAx6bxMH7Lg==", + "dependencies": { + "long": "^4.0.0", + "protobufjs": "~6.11.2" + } + }, "node_modules/crc-32": { "version": "1.2.2", "license": "Apache-2.0", @@ -8207,25 +8680,27 @@ } }, "node_modules/decentraland-dapps": { - "version": "16.33.0", - "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-16.33.0.tgz", - "integrity": "sha512-t2qTuQoQa/WysFc5ahgOY+srePTFF+VUQ3dbS0M3JalVHX/ZLuwmRXpOmXR3d8XB8sJzP1kgF42qBxfRsJV9yA==", + "version": "17.6.0", + "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-17.6.0.tgz", + "integrity": "sha512-ZDZxqsVH9U/MPItJva2BaVY3z2+HKG+N9ZrFbkuQUXOZyR7ondLylt/BWZnnCFzmmQ7q0cx+dZhx79Wu2O6YOQ==", "dependencies": { "@0xsequence/multicall": "^0.25.1", "@0xsequence/relayer": "^0.25.1", "@dcl/crypto": "^3.3.1", "@dcl/schemas": "^9.10.0", + "@dcl/single-sign-on-client": "^0.1.0", "@dcl/ui-env": "^1.4.0", "@transak/transak-sdk": "^1.0.31", "@types/flat": "0.0.28", "@well-known-components/fetch-component": "^2.0.1", + "@wert-io/widget-initializer": "^5.2.0", "axios": "^0.21.1", "date-fns": "^1.29.0", "dcl-catalyst-client": "^21.1.0", "decentraland-connect": "^5.5.0", "decentraland-crypto-fetch": "^2.0.1", - "decentraland-transactions": "^1.47.0", - "decentraland-ui": "^4.35.3", + "decentraland-transactions": "^1.50.2", + "decentraland-ui": "^5.5.0", "ethers": "^5.6.8", "events": "^3.3.0", "flat": "^5.0.2", @@ -8272,6 +8747,44 @@ } } }, + "node_modules/decentraland-dapps/node_modules/decentraland-ui": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-5.5.0.tgz", + "integrity": "sha512-jBkpYRQCSpMKIPgosKCzJ5+n4JMgpHMhtujsa2bMooYVeJfVAwLBrwJFHuHu/O/fjUWoxiL47p3BYvvJOOWdAA==", + "dependencies": { + "@dcl/schemas": "^9.12.0", + "@dcl/ui-env": "^1.4.0", + "balloon-css": "^0.5.0", + "classnames": "^2.3.2", + "dayjs": "^1.11.10", + "deep-equal": "^2.0.5", + "ethereum-blockies": "^0.1.1", + "events": "^3.3.0", + "fp-future": "^1.0.1", + "parallax-js": "^3.1.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", + "recharts": "^2.3.2", + "semantic-ui-css": "^2.4.1", + "semantic-ui-react": "^2.0.3", + "uuid": "^9.0.1" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0", + "react-dom": "^16.8.0 || ^17.0.0" + }, + "peerDependenciesMeta": { + "react": { + "optional": true + }, + "react-dom": { + "optional": true + } + } + }, "node_modules/decentraland-dapps/node_modules/react-intl": { "version": "5.25.1", "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.25.1.tgz", @@ -8336,8 +8849,17 @@ } }, "node_modules/decentraland-transactions": { - "version": "1.47.0", - "license": "LGPL-3.0" + "version": "1.50.2", + "resolved": "https://registry.npmjs.org/decentraland-transactions/-/decentraland-transactions-1.50.2.tgz", + "integrity": "sha512-ikpFti2GB0yShvOKbcHY0E55QQLNf+SLTTqJGO59st8YM3U6FY1NWgWg0jEvsZ2d2HlW13Wbylpu1v58j7+P5A==", + "dependencies": { + "@0xsquid/sdk": "^2.8.9", + "@0xsquid/squid-types": "^0.1.51", + "decentraland-connect": "^5.5.0" + }, + "peerDependencies": { + "@dcl/schemas": ">=1.1.1" + } }, "node_modules/decentraland-ui": { "version": "4.35.3", @@ -9234,6 +9756,105 @@ "@ethersproject/wordlists": "5.7.0" } }, + "node_modules/ethers-multicall-provider": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ethers-multicall-provider/-/ethers-multicall-provider-5.0.0.tgz", + "integrity": "sha512-dsfIwBSbr8yG+F0o87uoMFje1k5w988883MMJvK7R66mYT6NApQhQ7sMH/cxKGXTRf3at+nGt/4QIYHbYhe/8A==", + "dependencies": { + "ethers": "^6.0.0", + "lodash": "^4.17.0" + }, + "engines": { + "node": ">=12.0" + }, + "peerDependencies": { + "lodash": "^4.17.0" + } + }, + "node_modules/ethers-multicall-provider/node_modules/@noble/curves": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz", + "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==", + "dependencies": { + "@noble/hashes": "1.3.2" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/ethers-multicall-provider/node_modules/@noble/hashes": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz", + "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/ethers-multicall-provider/node_modules/@types/node": { + "version": "18.15.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz", + "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==" + }, + "node_modules/ethers-multicall-provider/node_modules/aes-js": { + "version": "4.0.0-beta.5", + "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz", + "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==" + }, + "node_modules/ethers-multicall-provider/node_modules/ethers": { + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.10.0.tgz", + "integrity": "sha512-nMNwYHzs6V1FR3Y4cdfxSQmNgZsRj1RiTU25JwvnJLmyzw9z3SKxNc2XKDuiXXo/v9ds5Mp9m6HBabgYQQ26tA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/ethers-io/" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "dependencies": { + "@adraffy/ens-normalize": "1.10.0", + "@noble/curves": "1.2.0", + "@noble/hashes": "1.3.2", + "@types/node": "18.15.13", + "aes-js": "4.0.0-beta.5", + "tslib": "2.4.0", + "ws": "8.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/ethers-multicall-provider/node_modules/tslib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + }, + "node_modules/ethers-multicall-provider/node_modules/ws": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", + "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/ethjs-unit": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz", @@ -9719,14 +10340,15 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.1", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "funding": [ { "type": "individual", "url": "https://github.com/sponsors/RubenVerborgh" } ], - "license": "MIT", "engines": { "node": ">=4.0" }, @@ -10109,6 +10731,20 @@ "node": ">=4" } }, + "node_modules/globalthis": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", + "dependencies": { + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/gopd": { "version": "1.0.1", "license": "MIT", @@ -14511,6 +15147,19 @@ "node": ">=6" } }, + "node_modules/libsodium-sumo": { + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/libsodium-sumo/-/libsodium-sumo-0.7.13.tgz", + "integrity": "sha512-zTGdLu4b9zSNLfovImpBCbdAA4xkpkZbMnSQjP8HShyOutnGjRHmSOKlsylh1okao6QhLiz7nG98EGn+04cZjQ==" + }, + "node_modules/libsodium-wrappers-sumo": { + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.13.tgz", + "integrity": "sha512-lz4YdplzDRh6AhnLGF2Dj2IUj94xRN6Bh8T0HLNwzYGwPehQJX6c7iYVrFUPZ3QqxE0bqC+K0IIqqZJYWumwSQ==", + "dependencies": { + "libsodium-sumo": "^0.7.13" + } + }, "node_modules/lie": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", @@ -15763,6 +16412,11 @@ "resolved": "https://registry.npmjs.org/proxy-compare/-/proxy-compare-2.5.1.tgz", "integrity": "sha512-oyfc0Tx87Cpwva5ZXezSp5V9vht1c7dZBhvuV/y3ctkgMVUmiAGDVeeB0dKhGSyT0v1ZTEQYpe/RXlBVBNuCLA==" }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/prr": { "version": "1.0.1", "license": "MIT" @@ -16459,6 +17113,11 @@ "node": ">=8.10.0" } }, + "node_modules/readonly-date": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/readonly-date/-/readonly-date-1.0.0.tgz", + "integrity": "sha512-tMKIV7hlk0h4mO3JTmmVuIlJVXjKk3Sep9Bf5OH0O+758ruuVkUy2J9SttDLm91IEX/WHlXPSpxMGjPj4beMIQ==" + }, "node_modules/real-require": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.1.0.tgz", @@ -17209,6 +17868,17 @@ "sha.js": "bin.js" } }, + "node_modules/shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "dependencies": { + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/shallow-equal": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz", @@ -17584,6 +18254,19 @@ "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==" }, + "node_modules/standard-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/standard-error/-/standard-error-1.1.0.tgz", + "integrity": "sha512-4v7qzU7oLJfMI5EltUSHCaaOd65J6S4BqKRWgzMi4EYaE5fvNabPxmAPGdxpGXqrcWjhDGI/H09CIdEuUOUeXg==" + }, + "node_modules/standard-http-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/standard-http-error/-/standard-http-error-2.0.1.tgz", + "integrity": "sha512-DX/xPIoyXQTuY6BMZK4Utyi4l3A4vFoafsfqrU6/dO4Oe/59c7PyqPd2IQj9m+ZieDg2K3RL9xOYJsabcD9IUA==", + "dependencies": { + "standard-error": ">= 1.1.0 < 2" + } + }, "node_modules/static-extend": { "version": "0.1.2", "license": "MIT", @@ -17693,6 +18376,11 @@ "node": ">=8" } }, + "node_modules/string-similarity-js": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/string-similarity-js/-/string-similarity-js-2.1.4.tgz", + "integrity": "sha512-uApODZNjCHGYROzDSAdCmAHf60L/pMDHnP/yk6TAbvGg7JSPZlSto/ceCI7hZEqzc53/juU2aOJFkM2yUVTMTA==" + }, "node_modules/strip-final-newline": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", @@ -17764,6 +18452,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/symbol-observable": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz", + "integrity": "sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==", + "engines": { + "node": ">=0.10" + } + }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -19241,6 +19937,15 @@ "node": ">=0.4.0" } }, + "node_modules/xstream": { + "version": "11.14.0", + "resolved": "https://registry.npmjs.org/xstream/-/xstream-11.14.0.tgz", + "integrity": "sha512-1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw==", + "dependencies": { + "globalthis": "^1.0.1", + "symbol-observable": "^2.0.3" + } + }, "node_modules/xtend": { "version": "4.0.2", "license": "MIT", diff --git a/package.json b/package.json index 1f196c3f..7aa6d1f1 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@sentry/react": "^7.64.0", "@typechain/ethers-v5": "^10.0.0", "connected-react-router": "^6.9.1", - "decentraland-dapps": "^16.33.0", + "decentraland-dapps": "^17.6.0", "decentraland-transactions": "^1.46.0", "decentraland-ui": "^4.35.3", "dotenv": "8.2.0", diff --git a/src/components/Navbar/Navbar.container.ts b/src/components/Navbar/Navbar.container.ts index beb74010..53ad761b 100644 --- a/src/components/Navbar/Navbar.container.ts +++ b/src/components/Navbar/Navbar.container.ts @@ -7,7 +7,6 @@ import { } from 'decentraland-dapps/dist/modules/wallet/selectors' import { getIsAuthDappEnabled, - getIsNavbarV2Enabled, } from '../../modules/features/selectors' import { RootState } from '../../modules/reducer' import { MapStateProps, MapDispatch, MapDispatchProps } from './Navbar.types' @@ -22,8 +21,7 @@ const mapState = (state: RootState): MapStateProps => { : false, isConnected: isConnected(state), pathname: getLocation(state).pathname, - isAuthDappEnabled: !!getIsAuthDappEnabled(state), - isNavbarV2Enabled: getIsNavbarV2Enabled(state), + isAuthDappEnabled: !!getIsAuthDappEnabled(state) } } diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx index e7ccdaee..32e55120 100644 --- a/src/components/Navbar/Navbar.tsx +++ b/src/components/Navbar/Navbar.tsx @@ -1,9 +1,5 @@ import React, { useCallback } from 'react' -import { - Navbar as BaseNavbar, - Navbar2 as BaseNavbar2, - UserInformation, -} from 'decentraland-dapps/dist/containers' +import { Navbar as BaseNavbar } from 'decentraland-dapps/dist/containers' import { locations } from '../../modules/locations' import { config } from '../../config' @@ -11,50 +7,17 @@ import { Props } from './Navbar.types' import './Navbar.css' const Navbar = (props: Props) => { - const { - pathname, - onNavigate, - isConnected, - isAuthDappEnabled, - isNavbarV2Enabled, - } = props - - if (isConnected) { - props = { - ...props, - rightMenu: , - } - } + const { pathname, onNavigate, isAuthDappEnabled } = props const handleOnSignIn = useCallback(() => { if (isAuthDappEnabled) { - window.location.replace( - `${config.get('AUTH_URL')}/login?redirectTo=${window.location.href}` - ) + window.location.replace(`${config.get('AUTH_URL')}/login?redirectTo=${window.location.href}`) return } onNavigate(locations.signIn()) }, [isAuthDappEnabled, onNavigate]) - const handleOnClickAccount = useCallback(() => { - onNavigate(locations.settings()) - }, [onNavigate]) - - return isNavbarV2Enabled ? ( - - ) : ( - - ) + return } export default React.memo(Navbar) diff --git a/src/components/Navbar/Navbar.types.ts b/src/components/Navbar/Navbar.types.ts index acdbf7fa..a8f14b64 100644 --- a/src/components/Navbar/Navbar.types.ts +++ b/src/components/Navbar/Navbar.types.ts @@ -7,7 +7,6 @@ export type Props = Partial & { pathname: string isConnected: boolean isAuthDappEnabled: boolean - isNavbarV2Enabled: boolean onNavigate: (path: string) => void } @@ -17,7 +16,6 @@ export type MapStateProps = Pick< | 'hasActivity' | 'isConnected' | 'isAuthDappEnabled' - | 'isNavbarV2Enabled' > export type MapDispatchProps = Pick export type MapDispatch = Dispatch diff --git a/src/modules/features/selectors.ts b/src/modules/features/selectors.ts index 363d47dd..0116d551 100644 --- a/src/modules/features/selectors.ts +++ b/src/modules/features/selectors.ts @@ -17,13 +17,3 @@ export const getIsAuthDappEnabled = (state: RootState) => { return false } -export const getIsNavbarV2Enabled = (state: RootState) => { - if (hasLoadedInitialFlags(state)) { - return getIsFeatureEnabled( - state, - ApplicationName.DAPPS, - FeatureName.NAVBAR_V2 - ) - } - return false -} diff --git a/src/modules/features/types.ts b/src/modules/features/types.ts index c29430c4..669c1ac4 100644 --- a/src/modules/features/types.ts +++ b/src/modules/features/types.ts @@ -1,4 +1,3 @@ export enum FeatureName { AUTH_DAPP = 'auth-dapp', - NAVBAR_V2 = 'navbar2_variant', } diff --git a/src/modules/sagas.ts b/src/modules/sagas.ts index 35507ea4..0edfac4d 100644 --- a/src/modules/sagas.ts +++ b/src/modules/sagas.ts @@ -17,22 +17,23 @@ import { locationSaga as localLocationSaga } from './location/sagas' import { manaSaga } from './mana/sagas' import { config } from '../config' import * as translations from '../locales' +import { FiatGateway } from 'decentraland-dapps/dist/modules/gateway/types' const analyticsSaga = createAnalyticsSaga() const profileSaga = createProfileSaga({ peerUrl: config.get('PEER_URL')!, - getIdentity: () => undefined, + getIdentity: () => undefined }) const translationSaga = createTranslationSaga({ - translations: translations as any, + translations: translations as any }) const walletSaga = createWalletSaga({ CHAIN_ID: +(config.get('CHAIN_ID') || 1), POLL_INTERVAL: 0, - TRANSACTIONS_API_URL, + TRANSACTIONS_API_URL }) const gatewaySaga = createGatewaySaga({ @@ -40,7 +41,7 @@ const gatewaySaga = createGatewaySaga({ apiBaseUrl: config.get('MOON_PAY_API_URL'), apiKey: config.get('MOON_PAY_API_KEY'), pollingDelay: +config.get('MOON_PAY_POLLING_DELAY'), - widgetBaseUrl: config.get('MOON_PAY_WIDGET_URL'), + widgetBaseUrl: config.get('MOON_PAY_WIDGET_URL') }, [NetworkGatewayType.TRANSAK]: { apiBaseUrl: config.get('TRANSAK_API_URL'), @@ -49,9 +50,14 @@ const gatewaySaga = createGatewaySaga({ pollingDelay: +config.get('TRANSAK_POLLING_DELAY'), pusher: { appKey: config.get('TRANSAK_PUSHER_APP_KEY'), - appCluster: config.get('TRANSAK_PUSHER_APP_CLUSTER'), - }, + appCluster: config.get('TRANSAK_PUSHER_APP_CLUSTER') + } }, + // Wert is not being used in account dapp + [FiatGateway.WERT]: { + marketplaceServerURL: '', + url: '' + } }) export function* rootSaga() { @@ -68,11 +74,11 @@ export function* rootSaga() { featuresSaga({ polling: { apps: [ApplicationName.DAPPS], - delay: 60000 /** 60 seconds */, - }, + delay: 60000 /** 60 seconds */ + } }), manaSaga(), toastSaga(), - gatewaySaga(), + gatewaySaga() ]) }