Merge remote-tracking branch 'origin/telegram-dev-03' into telegram-d…

…ev-03
Koniverse · Aug 16, 2024 · 3185fd4 · 3185fd4
2 parents 7cf5dbd + 282651c
commit 3185fd4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/packages/extension-koni-ui/src/components/Leaderboard/LeaderboardContent.tsx b/packages/extension-koni-ui/src/components/Leaderboard/LeaderboardContent.tsx
@@ -67,6 +67,8 @@ const Component = ({ className, defaultSelectedTab, gameId, tabGroupItems }: Pro
   })();
 
   const currentTabInfo = useMemo(() => {
+    setLeaderboardItems([]);
+
     return tabGroupItems.find((i) => i.value === selectedTab);
   }, [selectedTab, tabGroupItems]);
 
@@ -87,10 +89,10 @@ const Component = ({ className, defaultSelectedTab, gameId, tabGroupItems }: Pro
   }, [defaultSelectedTab]);
 
   useEffect(() => {
-    let leaderboardSub: { unsubscribe: () => void } | null = null;
 
-    if (currentTabInfo) {
-      leaderboardSub = apiSDK.subscribeLeaderboard(currentTabInfo.leaderboardInfo.id, currentTabInfo.leaderboardInfo.context).subscribe((data) => {
+    const subscribeLeaderboard = async () => {
+      if (currentTabInfo) {
+        const data = await apiSDK.fetchLeaderboard(currentTabInfo.leaderboardInfo.id, currentTabInfo.leaderboardInfo.context) as LeaderboardPerson[];
         setLeaderboardItems(data);
 
         // Find mine
@@ -99,15 +101,13 @@ const Component = ({ className, defaultSelectedTab, gameId, tabGroupItems }: Pro
         if (mine) {
           setMine(mine);
         }
-      });
-    }
-
-    return () => {
-      if (leaderboardSub) {
-        leaderboardSub.unsubscribe();
       }
     };
-  }, [currentTabInfo, gameId]);
+
+    subscribeLeaderboard();
+
+    return () => {};
+  }, [currentTabInfo]);
 
   return <div className={className}>
     {

diff --git a/packages/extension-koni-ui/src/connector/booka/sdk.ts b/packages/extension-koni-ui/src/connector/booka/sdk.ts
@@ -649,6 +649,7 @@ export class BookaSdk {
     if (leaderBoard) {
       this.leaderBoardSubject.next(leaderBoard);
     }
+    return leaderBoard;
   }
 
   subscribeLeaderboard (id: number, context: Record<string, unknown> = {}) {