diff --git a/webapp/package-lock.json b/webapp/package-lock.json index a74e9e9dd5..c205c1c972 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -27,9 +27,9 @@ "dcl-catalyst-commons": "^9.0.1", "decentraland-connect": "^6.3.1", "decentraland-crypto-fetch": "^1.0.3", - "decentraland-dapps": "file:../../decentraland-dapps/decentraland-dapps-0.0.3-development.tgz", + "decentraland-dapps": "^21.0.0", "decentraland-transactions": "^2.6.0", - "decentraland-ui": "^5.23.3", + "decentraland-ui": "^6.1.1", "ethers": "^5.6.8", "graphql": "^14.7.0", "history": "^4.10.1", @@ -8871,9 +8871,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.10", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", - "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" + "version": "1.11.11", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz", + "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==" }, "node_modules/dayzed": { "version": "3.2.3", @@ -9197,9 +9197,9 @@ } }, "node_modules/decentraland-dapps": { - "version": "0.0.0-development", - "resolved": "file:../../decentraland-dapps/decentraland-dapps-0.0.3-development.tgz", - "integrity": "sha512-gUqxgH3XY0iDhRDaKMDM/jOPZGoftlKpcvw25eYkK4GjZ6qzRt5wcwtKdRrGZBVsagFF/Pg9UG6RACS0W41agw==", + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/decentraland-dapps/-/decentraland-dapps-21.0.0.tgz", + "integrity": "sha512-QkdzMdm8cin5A4+NFRAArNiP8qoC5WOHEK4zNx/7D/h7HQTmCDBjEyyS4l1IaMgctcn9RA9ZRnaqZ8a0Ox6IFg==", "dependencies": { "@0xsequence/multicall": "^0.25.1", "@0xsequence/relayer": "^0.25.1", @@ -9215,10 +9215,10 @@ "axios": "^0.21.1", "date-fns": "^1.29.0", "dcl-catalyst-client": "^21.1.0", - "decentraland-connect": "file:../decentraland-connect/decentraland-connect-0.0.4-development.tgz", + "decentraland-connect": "^7.0.0", "decentraland-crypto-fetch": "^2.0.1", "decentraland-transactions": "^2.6.0", - "decentraland-ui": "file:../ui/decentraland-ui-0.0.1-development.tgz", + "decentraland-ui": "^6.1.1", "ethers": "^5.6.8", "events": "^3.3.0", "flat": "^5.0.2", @@ -9316,9 +9316,9 @@ "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" }, "node_modules/decentraland-dapps/node_modules/decentraland-connect": { - "version": "0.0.0-development", - "resolved": "file:../../decentraland-connect/decentraland-connect-0.0.4-development.tgz", - "integrity": "sha512-ZJ0ZKLcFjsB88RlSULYBes3AdvezA0JGC4fSpDechKBUAE7wo4OpIYqP2BAAN6IK0MoZVSbPSiQWBC9Vf5/myg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/decentraland-connect/-/decentraland-connect-7.0.0.tgz", + "integrity": "sha512-jqLjAsHDpzvnN2FrUdNYJfDQBKCwMuWGf3YTV6Qk/YgEuVVv1KJ9YEAJYZk+ppJX4a2UnmBQN3ZZ50jIeHiCFw==", "dependencies": { "@dcl/schemas": "^11.4.0", "@dcl/single-sign-on-client": "^0.1.0", @@ -9336,9 +9336,9 @@ } }, "node_modules/decentraland-dapps/node_modules/decentraland-connect/node_modules/ethers": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.12.1.tgz", - "integrity": "sha512-j6wcVoZf06nqEcBbDWkKg8Fp895SS96dSnTCjiXT+8vt2o02raTn4Lo9ERUuIVU5bAjoPYeA+7ytQFexFmLuVw==", + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.12.2.tgz", + "integrity": "sha512-MNfR2kzZyNF8bRNDSmjM+rT1+yqCgYNqfrXyNnpiNId2MQPiAOOr/7lrgdrdwoBxzKPSnSYZaGb5lcNyvzhuvA==", "funding": [ { "type": "individual", @@ -9380,49 +9380,6 @@ "npm": ">=6" } }, - "node_modules/decentraland-dapps/node_modules/decentraland-ui": { - "version": "0.0.0-development", - "resolved": "file:../../ui/decentraland-ui-0.0.1-development.tgz", - "integrity": "sha512-gNJLkghBfqYcm7tpcc3tWHU3rawCqoFFz7KludE+UAQ3i/pmkrsEgf8LSUijIkmT77aTs+g1z88GSeNwCP1dEg==", - "license": "MIT", - "dependencies": { - "@dcl/schemas": "^11.9.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", - "mitt": "^3.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" - }, - "engines": { - "node": "18" - }, - "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", @@ -9506,9 +9463,9 @@ } }, "node_modules/decentraland-ui": { - "version": "5.23.3", - "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-5.23.3.tgz", - "integrity": "sha512-k/+gt+MRPb2CJ/9xymkNX8orxrK48G2kztoxfyL3wqeRIh/s99FwKA806S0k8i7LM96tuv+wvl4CJ9XJPU3xPg==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-6.1.1.tgz", + "integrity": "sha512-KYovAGqdIyIhV/B+AcroyFKPLb2t+g9q1c92j8kiqsaGqjxKpbO4C8dAbcdCYMmKrlMJN09RN+QrMxD2X7nrqw==", "dependencies": { "@dcl/schemas": "^11.9.0", "@dcl/ui-env": "^1.4.0", @@ -13261,9 +13218,9 @@ } }, "node_modules/hyphenate-style-name": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz", - "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.5.tgz", + "integrity": "sha512-fedL7PRwmeVkgyhu9hLeTBaI6wcGk7JGJswdaRsa5aUbkXI1kr1xZwTPBtaYPpwf56878iDek6VbVnuWMebJmw==" }, "node_modules/iconv-lite": { "version": "0.6.3", diff --git a/webapp/package.json b/webapp/package.json index b5decec2cf..8bc998d56d 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -22,9 +22,9 @@ "dcl-catalyst-commons": "^9.0.1", "decentraland-connect": "^6.3.1", "decentraland-crypto-fetch": "^1.0.3", - "decentraland-dapps": "file:../../decentraland-dapps/decentraland-dapps-0.0.3-development.tgz", + "decentraland-dapps": "^21.0.0", "decentraland-transactions": "^2.6.0", - "decentraland-ui": "^5.23.3", + "decentraland-ui": "^6.1.1", "ethers": "^5.6.8", "graphql": "^14.7.0", "history": "^4.10.1", diff --git a/webapp/src/components/AccountPage/AccountBanner/AccountBanner.css b/webapp/src/components/AccountPage/AccountBanner/AccountBanner.css index d807c2bab8..dc6d65a079 100644 --- a/webapp/src/components/AccountPage/AccountBanner/AccountBanner.css +++ b/webapp/src/components/AccountPage/AccountBanner/AccountBanner.css @@ -11,6 +11,11 @@ right: 0; } +.AccountBanner .profile-name a { + color: white; + text-decoration: underline; +} + .AccountBanner .cover-top { display: flex; justify-content: space-between; diff --git a/webapp/src/components/AccountPage/AccountBanner/AccountBanner.tsx b/webapp/src/components/AccountPage/AccountBanner/AccountBanner.tsx index 339a4003db..54bf8d6e3e 100644 --- a/webapp/src/components/AccountPage/AccountBanner/AccountBanner.tsx +++ b/webapp/src/components/AccountPage/AccountBanner/AccountBanner.tsx @@ -5,6 +5,7 @@ import { Profile } from 'decentraland-dapps/dist/containers' import { isMobile } from 'decentraland-dapps/dist/lib/utils' import { t } from 'decentraland-dapps/dist/modules/translation/utils' import { Back, Container, Loader } from 'decentraland-ui' +import { config } from '../../../config' import copyText from '../../../lib/copyText' import { useTimer } from '../../../lib/timer' import { LinkType } from '../../../modules/store/types' @@ -16,6 +17,8 @@ import { PageHeader } from '../../PageHeader' import { Props } from './AccountBanner.types' import './AccountBanner.css' +const PROFILE_URL = config.get('PROFILE_URL') + const AccountBanner = ({ address, store, isLoading, onBack, onFetchStore }: Props) => { const [hasCopiedAddress, setHasCopied] = useTimer(1200) const [openExternalLinkModal, setOpenExternalLinkModal] = useState() @@ -51,7 +54,9 @@ const AccountBanner = ({ address, store, isLoading, onBack, onFetchStore }: Prop
- + + +
{shortenAddress(address)}
diff --git a/webapp/src/components/Navbar/Navbar.tsx b/webapp/src/components/Navbar/Navbar.tsx index e8989a79fe..8e9e2a4521 100644 --- a/webapp/src/components/Navbar/Navbar.tsx +++ b/webapp/src/components/Navbar/Navbar.tsx @@ -32,7 +32,7 @@ const Navbar = (props: Props) => { hasActivity={props.hasPendingTransactions} identity={props.identity} onSignIn={handleOnSignIn} - onClickAccountSettings={handleOnClickAccount} + onClickMarketplaceAuthorization={handleOnClickAccount} /> ) } diff --git a/webapp/src/components/RankingsTable/RankingCreatorRow/RankingCreatorRow.css b/webapp/src/components/RankingsTable/RankingCreatorRow/RankingCreatorRow.css index daff9e1d79..c950d02422 100644 --- a/webapp/src/components/RankingsTable/RankingCreatorRow/RankingCreatorRow.css +++ b/webapp/src/components/RankingsTable/RankingCreatorRow/RankingCreatorRow.css @@ -23,7 +23,7 @@ line-height: 18px; position: absolute; left: 60px; - bottom: 36px; + bottom: 20px; white-space: nowrap; }