fix: marketplace signin redirect (#2098)

decentraland · Jan 10, 2024 · 216336e · 216336e
1 parent 5b28dff
commit 216336e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/webapp/config-overrides.js b/webapp/config-overrides.js
@@ -16,7 +16,8 @@ const overridedConfig = override(
     path.resolve(__dirname, 'node_modules/@cosmjs'),
     path.resolve(__dirname, 'node_modules/cosmjs-types'),
     path.resolve(__dirname, 'node_modules/ethers-multicall-provide'),
-    path.resolve(__dirname, 'node_modules/@noble')
+    path.resolve(__dirname, 'node_modules/@noble'),
+    path.resolve(__dirname, 'node_modules/decentraland-connect/node_modules/ethers')
   ])
 )
 

diff --git a/webapp/src/components/Navbar/Navbar.tsx b/webapp/src/components/Navbar/Navbar.tsx
@@ -15,9 +15,14 @@ const Navbar = (props: Props) => {
   const handleOnSignIn = useCallback(() => {
     const searchParams = new URLSearchParams(search)
     const currentRedirectTo = searchParams.get('redirectTo')
+    const basename = /^decentraland.(zone|org|today)$/.test(
+      window.location.host
+    )
+      ? '/marketplace'
+      : ''
     const redirectTo = !currentRedirectTo
-      ? `${pathname}${search}`
-      : currentRedirectTo
+      ? `${basename}${pathname}${search}`
+      : `${basename}${currentRedirectTo}`
     if (isAuthDappEnabled) {
       window.location.replace(
         `${config.get('AUTH_URL')}/login?redirectTo=${redirectTo}`