From ac4cf4fe5e1d69e1143b17a622d2dec5dca6c2d5 Mon Sep 17 00:00:00 2001
From: Kevin Szuchet <31735779+kevinszuchet@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:15:46 +0000
Subject: [PATCH] fix: Jump In doesn't work for Worlds (#715)

---
 src/components/Button/AttendingButtons.tsx | 4 ++--
 src/components/Button/JumpInPosition.tsx   | 4 ++--
 src/entities/Event/utils.ts                | 9 +++++++--
 src/modules/servers.ts                     | 2 +-
 src/pages/submit/index.tsx                 | 4 ++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/Button/AttendingButtons.tsx b/src/components/Button/AttendingButtons.tsx
index 0a2bc2ae..2e2466de 100644
--- a/src/components/Button/AttendingButtons.tsx
+++ b/src/components/Button/AttendingButtons.tsx
@@ -28,7 +28,7 @@ import shareIcon from "../../images/share.svg"
 import { launchDesktopApp } from "../../modules/desktop"
 import locations from "../../modules/locations"
 import { SegmentEvent } from "../../modules/segment"
-import { getReamls } from "../../modules/servers"
+import { getRealms } from "../../modules/servers"
 import { Star } from "../Icon/Star"
 import DownloadModal from "../Modal/DownloadModal"
 
@@ -137,7 +137,7 @@ export default function AttendingButtons(props: AttendingButtonsProps) {
     [setFallbackShare]
   )
 
-  const [servers] = useAsyncMemo(getReamls)
+  const [servers] = useAsyncMemo(getRealms)
 
   let hasDecentralandLauncher: null | boolean = null
 
diff --git a/src/components/Button/JumpInPosition.tsx b/src/components/Button/JumpInPosition.tsx
index c3461f0b..55edaf26 100644
--- a/src/components/Button/JumpInPosition.tsx
+++ b/src/components/Button/JumpInPosition.tsx
@@ -13,7 +13,7 @@ import secondaryPinIcon from "../../images/secondary-pin-small.svg"
 import { launchDesktopApp } from "../../modules/desktop"
 import locations from "../../modules/locations"
 import { SegmentEvent } from "../../modules/segment"
-import { getReamls } from "../../modules/servers"
+import { getRealms } from "../../modules/servers"
 import DownloadModal from "../Modal/DownloadModal"
 
 import "./JumpInPosition.css"
@@ -30,7 +30,7 @@ export default function JumpInPosition({
 }: JumpInPositionProps) {
   const track = useTrackContext()
   const [showModal, setShowModal] = useState(false)
-  const [servers] = useAsyncMemo(getReamls)
+  const [servers] = useAsyncMemo(getRealms)
 
   const isPosition = !!event
   const position = isPosition ? event && `${event.x},${event.y}` : "HTTP"
diff --git a/src/entities/Event/utils.ts b/src/entities/Event/utils.ts
index bed274cf..38f81566 100644
--- a/src/entities/Event/utils.ts
+++ b/src/entities/Event/utils.ts
@@ -76,7 +76,7 @@ export function eventTargetUrl(
 }
 
 export function eventClientOptions(
-  event: Pick<EventAttributes, "x" | "y" | "server">,
+  event: Pick<EventAttributes, "x" | "y" | "server" | "world">,
   servers?: (CatalystAbout | null)[] | null
 ): {
   position: string
@@ -90,7 +90,12 @@ export function eventClientOptions(
   }
 
   let realmURL
-  if (event.server && servers) {
+
+  if (event.world) {
+    realmURL = event.server
+  }
+
+  if (!realmURL && event.server && servers) {
     realmURL = servers
       .map((server) => {
         if (server?.configurations?.realmName === event.server) {
diff --git a/src/modules/servers.ts b/src/modules/servers.ts
index e655c5d7..ed7cbd46 100644
--- a/src/modules/servers.ts
+++ b/src/modules/servers.ts
@@ -23,7 +23,7 @@ export const getServers = memo(
   { ttl: Infinity }
 )
 
-export const getReamls = memo(
+export const getRealms = memo(
   async () => {
     const servers: { address: string }[] = cache.catalysts.mainnet
     // add main realm
diff --git a/src/pages/submit/index.tsx b/src/pages/submit/index.tsx
index 85bb5c65..d29718b0 100644
--- a/src/pages/submit/index.tsx
+++ b/src/pages/submit/index.tsx
@@ -68,7 +68,7 @@ import WorldIcon from "../../images/worlds-icon.svg"
 import { getSchedules, getSchedulesOptions } from "../../modules/events"
 import { Flags } from "../../modules/features"
 import locations from "../../modules/locations"
-import { getReamls, getServerOptions } from "../../modules/servers"
+import { getRealms, getServerOptions } from "../../modules/servers"
 import { getWorldNames, getWorldNamesOptions } from "../../modules/worlds"
 
 import "./index.css"
@@ -185,7 +185,7 @@ export default function SubmitPage() {
 
   const [state, patchState] = usePatchState<SubmitPageState>({})
   const [account, accountState] = useAuthContext()
-  const [servers] = useAsyncMemo(getReamls)
+  const [servers] = useAsyncMemo(getRealms)
   const [worlds] = useAsyncMemo(getWorldNames)
   const [categories] = useCategoriesContext()
   const [schedules] = useAsyncMemo(getSchedules)