Merge branch 'master' of github.com:decentraland/marketplace into fea…

…t/new-disconnection-flow
decentraland · Jun 3, 2024 · 6c774c3 · 6c774c3
2 parents c2dd377 + 35f901b
commit 6c774c3
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 70 deletions.
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git 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
@@ -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
@@ -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<string>()
@@ -51,7 +54,9 @@ const AccountBanner = ({ address, store, isLoading, onBack, onFetchStore }: Prop
             <Column>
               <Profile address={address} imageOnly inline={false} size="huge" />
               <div className="profile-name">
-                <Profile address={address} textOnly inline={false} />
+                <a href={`${PROFILE_URL}/accounts/${address}`} target="_blank">
+                  <Profile address={address} textOnly inline={false} />
+                </a>
               </div>
               <div className="profile-address">
                 <div className="profile-address-hash">{shortenAddress(address)}</div>

diff --git 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
@@ -23,7 +23,7 @@
     line-height: 18px;
     position: absolute;
     left: 60px;
-    bottom: 36px;
+    bottom: 20px;
     white-space: nowrap;
   }