From 4d318aa6f74844c5ce8151ad3f3e05f734d841de Mon Sep 17 00:00:00 2001
From: Chaojun Huang <chaojun@opensquare.network>
Date: Mon, 21 Oct 2024 15:41:54 +0800
Subject: [PATCH] fix: curator display after unassigned (#4915)

* fix: curator display after unassigned

* fix
---
 packages/next/pages/treasury/bounties/[id].js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/next/pages/treasury/bounties/[id].js b/packages/next/pages/treasury/bounties/[id].js
index 432dc11fd0..29e8f576a3 100644
--- a/packages/next/pages/treasury/bounties/[id].js
+++ b/packages/next/pages/treasury/bounties/[id].js
@@ -21,7 +21,7 @@ import { OffChainArticleActionsProvider } from "next-common/noSima/context/artic
 import { OffChainCommentActionsProvider } from "next-common/noSima/context/commentActionsProvider";
 import dynamicClientOnly from "next-common/lib/dynamic/clientOnly";
 import { CuratorProvider } from "next-common/context/treasury/bounties";
-import useBountyCuratorData from "next-common/hooks/treasury/bounty/useBountyCuratorData";
+import { useBountyStatus } from "next-common/components/treasury/bounty/useBountyStatus";
 import { useCuratorMultisigAddress } from "next-common/hooks/treasury/bounty/useCuratorMultisigAddress";
 import { TreasuryProvider } from "next-common/context/treasury";
 import { gov2TracksApi } from "next-common/services/url";
@@ -36,13 +36,25 @@ const Timeline = dynamicClientOnly(() =>
   import("next-common/components/timeline"),
 );
 
+function useBountyCurator(bountyIndex) {
+  const status = useBountyStatus(bountyIndex);
+  if (status?.isActive) {
+    return status.asActive.curator.toString();
+  }
+  if (status?.isPendingPayout) {
+    return status.asPendingPayout.curator.toString();
+  }
+  return null;
+}
+
 function BountyContent() {
   const { childBounties } = usePageProps();
   const detail = usePost();
+  const bountyIndex = detail?.bountyIndex;
 
-  useSubscribePostDetail(detail?.bountyIndex);
+  useSubscribePostDetail(bountyIndex);
 
-  const curator = useBountyCuratorData(detail?.onchainData);
+  const curator = useBountyCurator(bountyIndex);
   const curatorParams = useCuratorMultisigAddress(curator);
   const timelineData = useBountyTimelineData(detail?.onchainData);
   const isTimelineCompact = useIsTimelineCompact();