From f5e028f76eed4cd63733ddb156f993c75ab41b2e Mon Sep 17 00:00:00 2001
From: Lautaro Petaccio <lausuper@gmail.com>
Date: Wed, 29 Nov 2023 13:00:32 -0300
Subject: [PATCH 1/4] fix: Prefixed links

---
 src/components/Layout/OverviewList.tsx             |  4 +++-
 src/components/Place/PlaceCard/PlaceCard.tsx       | 14 ++++++++++++--
 .../Place/PlaceFeatured/PlaceFeatured.tsx          |  6 ++++--
 src/pages/place.tsx                                |  4 +++-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/components/Layout/OverviewList.tsx b/src/components/Layout/OverviewList.tsx
index ced0cbb4..ac7d1cc0 100644
--- a/src/components/Layout/OverviewList.tsx
+++ b/src/components/Layout/OverviewList.tsx
@@ -1,5 +1,7 @@
 import React from "react"
 
+import { withPrefix } from "gatsby"
+
 import useFormatMessage from "decentraland-gatsby/dist/hooks/useFormatMessage"
 import { navigate } from "decentraland-gatsby/dist/plugins/intl"
 import TokenList from "decentraland-gatsby/dist/utils/dom/TokenList"
@@ -83,7 +85,7 @@ export default React.memo(function OverviewList(props: OverviewListProps) {
               <Button
                 basic
                 as="a"
-                href={props.href}
+                href={withPrefix(props.href)}
                 onClick={(e) => {
                   e.preventDefault()
                   navigate(props.href)
diff --git a/src/components/Place/PlaceCard/PlaceCard.tsx b/src/components/Place/PlaceCard/PlaceCard.tsx
index fae5a725..87ce04b2 100644
--- a/src/components/Place/PlaceCard/PlaceCard.tsx
+++ b/src/components/Place/PlaceCard/PlaceCard.tsx
@@ -1,5 +1,7 @@
 import React, { useCallback, useContext, useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import ImgFixed from "decentraland-gatsby/dist/components/Image/ImgFixed"
 import useTrackContext from "decentraland-gatsby/dist/context/Track/useTrackContext"
 import useTrackLinkContext from "decentraland-gatsby/dist/context/Track/useTrackLinkContext"
@@ -109,10 +111,18 @@ export default React.memo(function PlaceCard(props: PlaceCardProps) {
         </div>
       </Link>
       <Card.Content>
-        <Card.Header as="a" href={href} onClick={handleClickCard}>
+        <Card.Header
+          as="a"
+          href={href ? withPrefix(href) : href}
+          onClick={handleClickCard}
+        >
           {place?.title || " "}
         </Card.Header>
-        <Card.Meta as="a" href={href} onClick={handleClickCard}>
+        <Card.Meta
+          as="a"
+          href={href ? withPrefix(href) : href}
+          onClick={handleClickCard}
+        >
           {place?.contact_name || " "}
         </Card.Meta>
         {false && (
diff --git a/src/components/Place/PlaceFeatured/PlaceFeatured.tsx b/src/components/Place/PlaceFeatured/PlaceFeatured.tsx
index 69df2be1..f45f729e 100644
--- a/src/components/Place/PlaceFeatured/PlaceFeatured.tsx
+++ b/src/components/Place/PlaceFeatured/PlaceFeatured.tsx
@@ -1,5 +1,7 @@
 import React, { useMemo } from "react"
 
+import { withPrefix } from "gatsby"
+
 import useTrackLinkContext from "decentraland-gatsby/dist/context/Track/useTrackLinkContext"
 import useFormatMessage from "decentraland-gatsby/dist/hooks/useFormatMessage"
 import { navigate } from "decentraland-gatsby/dist/plugins/intl/utils"
@@ -51,7 +53,7 @@ export default React.memo(function PlaceFeatured(props: PlaceFeaturedProps) {
           <Button
             primary
             as="a"
-            href={placeJumpInUrl}
+            href={withPrefix(placeJumpInUrl)}
             onClick={handleJumpInTrack}
             target="_blank"
             data-event={SegmentPlace.JumpIn}
@@ -64,7 +66,7 @@ export default React.memo(function PlaceFeatured(props: PlaceFeaturedProps) {
           <Button
             secondary
             as="a"
-            href={placeDetailUrl}
+            href={withPrefix(placeDetailUrl)}
             onClick={(e: React.MouseEvent<HTMLButtonElement>) => {
               e.preventDefault()
               placeDetailUrl && navigate(placeDetailUrl)
diff --git a/src/pages/place.tsx b/src/pages/place.tsx
index 007fabb9..f04fd684 100644
--- a/src/pages/place.tsx
+++ b/src/pages/place.tsx
@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react"
 
+import { withPrefix } from "gatsby"
 import { Helmet } from "react-helmet"
 
 import { useLocation } from "@gatsbyjs/reach-router"
@@ -102,7 +103,8 @@ export default function PlacePage() {
         share({
           title: place.title || undefined,
           text: `${l("general.place_share")}${shareableText}`,
-          url: location.origin + locations.place(place.base_position),
+          url:
+            location.origin + withPrefix(locations.place(place.base_position)),
           thumbnail: place.image || undefined,
         })
       }

From 45ed6644b241aa5d1847bf643a0089f5af1ae239 Mon Sep 17 00:00:00 2001
From: Braian Mellor <braianj@gmail.com>
Date: Wed, 29 Nov 2023 16:31:14 -0300
Subject: [PATCH 2/4] chore: update decentraland-gatsby v5.96.0

---
 package-lock.json | 33 ++++++++++++++++++---------------
 package.json      |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d029512b..ab599b52 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "caniuse-lite": "^1.0.30001470",
         "core-js": "^3.22.2",
         "cssnano": "^5.0.10",
-        "decentraland-gatsby": "^5.92.0",
+        "decentraland-gatsby": "^5.96.0",
         "es6-shim": "^0.35.6",
         "express-fileupload": "^1.2.1",
         "gatsby": "4.23.0",
@@ -15308,9 +15308,9 @@
       }
     },
     "node_modules/decentraland-gatsby": {
-      "version": "5.92.0",
-      "resolved": "https://registry.npmjs.org/decentraland-gatsby/-/decentraland-gatsby-5.92.0.tgz",
-      "integrity": "sha512-RO0ILCeghoLuBqSVlLFed3KnQy0q/lfGFwFR8JrcZP6vobrzseDlK2I3yj7yLdkUCN8kb3TI6QVEcGujHikY1g==",
+      "version": "5.96.0",
+      "resolved": "https://registry.npmjs.org/decentraland-gatsby/-/decentraland-gatsby-5.96.0.tgz",
+      "integrity": "sha512-hHLSGdtguQkz+F6XtCrzjShnGTFKf0UVjBR+iOB2t+PcFyJzXGK3Fixu3DhK1LpnOcXfeb+RWeti+J53+sSBHw==",
       "dependencies": {
         "@aws-sdk/client-ses": "^3.421.0",
         "@dcl/crypto": "^3.4.3",
@@ -15367,7 +15367,7 @@
         "pbkdf2": "^3.1.2",
         "pg-tsquery": "^8.3.0",
         "prom-client": "^14.0.1",
-        "radash": "^7.1.0",
+        "radash": "^11.0.0",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
         "react-helmet": "^6.1.0",
@@ -30419,9 +30419,12 @@
       }
     },
     "node_modules/radash": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/radash/-/radash-7.1.0.tgz",
-      "integrity": "sha512-NOWTaF5YMY3mCgrNq9Fw9fK8yvJv92uqRb2StcVq5W8kcJ6949EbV2vk6nLJKAocYs29rzJafZZP1lFkEkoVGw=="
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/radash/-/radash-11.0.0.tgz",
+      "integrity": "sha512-CRWxTFTDff0IELGJ/zz58yY4BDgyI14qSM5OLNKbCItJrff7m7dXbVF0kWYVCXQtPb3SXIVhXvAImH6eT7VLSg==",
+      "engines": {
+        "node": ">=14.18.0"
+      }
     },
     "node_modules/raf": {
       "version": "3.4.1",
@@ -48576,9 +48579,9 @@
       }
     },
     "decentraland-gatsby": {
-      "version": "5.92.0",
-      "resolved": "https://registry.npmjs.org/decentraland-gatsby/-/decentraland-gatsby-5.92.0.tgz",
-      "integrity": "sha512-RO0ILCeghoLuBqSVlLFed3KnQy0q/lfGFwFR8JrcZP6vobrzseDlK2I3yj7yLdkUCN8kb3TI6QVEcGujHikY1g==",
+      "version": "5.96.0",
+      "resolved": "https://registry.npmjs.org/decentraland-gatsby/-/decentraland-gatsby-5.96.0.tgz",
+      "integrity": "sha512-hHLSGdtguQkz+F6XtCrzjShnGTFKf0UVjBR+iOB2t+PcFyJzXGK3Fixu3DhK1LpnOcXfeb+RWeti+J53+sSBHw==",
       "requires": {
         "@aws-sdk/client-ses": "^3.421.0",
         "@dcl/crypto": "^3.4.3",
@@ -48635,7 +48638,7 @@
         "pbkdf2": "^3.1.2",
         "pg-tsquery": "^8.3.0",
         "prom-client": "^14.0.1",
-        "radash": "^7.1.0",
+        "radash": "^11.0.0",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
         "react-helmet": "^6.1.0",
@@ -59779,9 +59782,9 @@
       "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
     },
     "radash": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/radash/-/radash-7.1.0.tgz",
-      "integrity": "sha512-NOWTaF5YMY3mCgrNq9Fw9fK8yvJv92uqRb2StcVq5W8kcJ6949EbV2vk6nLJKAocYs29rzJafZZP1lFkEkoVGw=="
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/radash/-/radash-11.0.0.tgz",
+      "integrity": "sha512-CRWxTFTDff0IELGJ/zz58yY4BDgyI14qSM5OLNKbCItJrff7m7dXbVF0kWYVCXQtPb3SXIVhXvAImH6eT7VLSg=="
     },
     "raf": {
       "version": "3.4.1",
diff --git a/package.json b/package.json
index 1c18b249..dc57f738 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "caniuse-lite": "^1.0.30001470",
     "core-js": "^3.22.2",
     "cssnano": "^5.0.10",
-    "decentraland-gatsby": "^5.92.0",
+    "decentraland-gatsby": "^5.96.0",
     "es6-shim": "^0.35.6",
     "express-fileupload": "^1.2.1",
     "gatsby": "4.23.0",

From 7cfa8bc053b5a8454ca0664b3f0445e6e0540014 Mon Sep 17 00:00:00 2001
From: Lautaro Petaccio <lausuper@gmail.com>
Date: Wed, 29 Nov 2023 17:13:34 -0300
Subject: [PATCH 3/4] fix: Use radash from root path

---
 src/components/Place/PlaceDetails/PlaceDetails.tsx  | 2 +-
 src/entities/Place/model.ts                         | 2 +-
 src/entities/Place/routes/getPlaceMostActiveList.ts | 2 +-
 src/entities/Place/routes/getPlaceUserVisitsList.ts | 2 +-
 src/entities/Report/routes.ts                       | 2 +-
 src/modules/entityScene.ts                          | 2 +-
 src/modules/sceneStats.ts                           | 2 +-
 src/modules/worldsLiveData.ts                       | 2 +-
 src/pages/favorites/index.tsx                       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/Place/PlaceDetails/PlaceDetails.tsx b/src/components/Place/PlaceDetails/PlaceDetails.tsx
index 110638bf..f6a87c19 100644
--- a/src/components/Place/PlaceDetails/PlaceDetails.tsx
+++ b/src/components/Place/PlaceDetails/PlaceDetails.tsx
@@ -10,7 +10,7 @@ import useFormatMessage from "decentraland-gatsby/dist/hooks/useFormatMessage"
 import { SceneContentRating } from "decentraland-gatsby/dist/utils/api/Catalyst.types"
 import TokenList from "decentraland-gatsby/dist/utils/dom/TokenList"
 import { Tabs } from "decentraland-ui/dist/components/Tabs/Tabs"
-import { intersects } from "radash/dist/array"
+import { intersects } from "radash"
 import rehypeSanitize from "rehype-sanitize"
 import remarkGfm from "remark-gfm"
 import Icon from "semantic-ui-react/dist/commonjs/elements/Icon"
diff --git a/src/entities/Place/model.ts b/src/entities/Place/model.ts
index 53a87f0a..e5e2e7c5 100644
--- a/src/entities/Place/model.ts
+++ b/src/entities/Place/model.ts
@@ -15,7 +15,7 @@ import {
   values,
 } from "decentraland-gatsby/dist/entities/Database/utils"
 import { numeric, oneOf } from "decentraland-gatsby/dist/entities/Schema/utils"
-import { diff, unique } from "radash/dist/array"
+import { diff, unique } from "radash"
 import isEthereumAddress from "validator/lib/isEthereumAddress"
 
 import PlaceCategories from "../PlaceCategories/model"
diff --git a/src/entities/Place/routes/getPlaceMostActiveList.ts b/src/entities/Place/routes/getPlaceMostActiveList.ts
index 04997f65..e9c11819 100644
--- a/src/entities/Place/routes/getPlaceMostActiveList.ts
+++ b/src/entities/Place/routes/getPlaceMostActiveList.ts
@@ -7,7 +7,7 @@ import {
   numeric,
   oneOf,
 } from "decentraland-gatsby/dist/entities/Schema/utils"
-import { flat, sort } from "radash/dist/array"
+import { flat, sort } from "radash"
 
 import { getHotScenes } from "../../../modules/hotScenes"
 import { getSceneStats } from "../../../modules/sceneStats"
diff --git a/src/entities/Place/routes/getPlaceUserVisitsList.ts b/src/entities/Place/routes/getPlaceUserVisitsList.ts
index 542fc91d..182fb091 100644
--- a/src/entities/Place/routes/getPlaceUserVisitsList.ts
+++ b/src/entities/Place/routes/getPlaceUserVisitsList.ts
@@ -3,7 +3,7 @@ import Context from "decentraland-gatsby/dist/entities/Route/wkc/context/Context
 import ApiResponse from "decentraland-gatsby/dist/entities/Route/wkc/response/ApiResponse"
 import Router from "decentraland-gatsby/dist/entities/Route/wkc/routes/Router"
 import { bool, numeric } from "decentraland-gatsby/dist/entities/Schema/utils"
-import { sort } from "radash/dist/array"
+import { sort } from "radash"
 
 import { getHotScenes } from "../../../modules/hotScenes"
 import { getSceneStats } from "../../../modules/sceneStats"
diff --git a/src/entities/Report/routes.ts b/src/entities/Report/routes.ts
index 4095b2e5..354e6d15 100644
--- a/src/entities/Report/routes.ts
+++ b/src/entities/Report/routes.ts
@@ -4,7 +4,7 @@ import Context from "decentraland-gatsby/dist/entities/Route/wkc/context/Context
 import ApiResponse from "decentraland-gatsby/dist/entities/Route/wkc/response/ApiResponse"
 import routes from "decentraland-gatsby/dist/entities/Route/wkc/routes"
 import env from "decentraland-gatsby/dist/utils/env"
-import { retry } from "radash/dist/async"
+import { retry } from "radash"
 
 import { extension } from "./util"
 
diff --git a/src/modules/entityScene.ts b/src/modules/entityScene.ts
index ff10c491..e2a69d93 100644
--- a/src/modules/entityScene.ts
+++ b/src/modules/entityScene.ts
@@ -3,7 +3,7 @@ import Catalyst, {
   ContentEntityScene,
 } from "decentraland-gatsby/dist/utils/api/Catalyst"
 import Time from "decentraland-gatsby/dist/utils/date/Time"
-import { memo } from "radash/dist/curry"
+import { memo } from "radash"
 
 const loader = new DataLoader(
   async function (
diff --git a/src/modules/sceneStats.ts b/src/modules/sceneStats.ts
index a439d127..e062d349 100644
--- a/src/modules/sceneStats.ts
+++ b/src/modules/sceneStats.ts
@@ -1,5 +1,5 @@
 import Time from "decentraland-gatsby/dist/utils/date/Time"
-import { memo } from "radash/dist/curry"
+import { memo } from "radash"
 
 import DataTeam from "../api/DataTeam"
 
diff --git a/src/modules/worldsLiveData.ts b/src/modules/worldsLiveData.ts
index ab01da36..a043dfb5 100644
--- a/src/modules/worldsLiveData.ts
+++ b/src/modules/worldsLiveData.ts
@@ -1,6 +1,6 @@
 import Time from "decentraland-gatsby/dist/utils/date/Time"
 import fetch from "node-fetch"
-import { memo } from "radash/dist/curry"
+import { memo } from "radash"
 
 export type WorldLivePerWorldProps = {
   users: number
diff --git a/src/pages/favorites/index.tsx b/src/pages/favorites/index.tsx
index 956691d0..a0a1ff8f 100644
--- a/src/pages/favorites/index.tsx
+++ b/src/pages/favorites/index.tsx
@@ -17,7 +17,7 @@ import { Container } from "decentraland-ui/dist/components/Container/Container"
 import { Header } from "decentraland-ui/dist/components/Header/Header"
 import { HeaderMenu } from "decentraland-ui/dist/components/HeaderMenu/HeaderMenu"
 import { SignIn } from "decentraland-ui/dist/components/SignIn/SignIn"
-import { cluster } from "radash/dist/array"
+import { cluster } from "radash"
 import Icon from "semantic-ui-react/dist/commonjs/elements/Icon"
 
 import Navigation, { NavigationTab } from "../../components/Layout/Navigation"

From 69d7e75ff4b36ebed3543a7e455a11b9a9e864f4 Mon Sep 17 00:00:00 2001
From: Lautaro Petaccio <lausuper@gmail.com>
Date: Wed, 29 Nov 2023 17:22:47 -0300
Subject: [PATCH 4/4] fix: Change radash

---
 src/modules/pois.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/pois.ts b/src/modules/pois.ts
index cda56c22..cd1dcb42 100644
--- a/src/modules/pois.ts
+++ b/src/modules/pois.ts
@@ -1,6 +1,6 @@
 import Time from "decentraland-gatsby/dist/utils/date/Time"
 import env from "decentraland-gatsby/dist/utils/env"
-import { memo } from "radash/dist/curry"
+import { memo } from "radash"
 
 const DCL_LIST_URL = env(
   `GATSBY_DCL_LIST_URL`,