Merge pull request #164 from dappforce/improvement/creator-reward

Show Creator Reward Card Everytime
dappforce · Jan 11, 2024 · 17e8b75 · 17e8b75
2 parents 6c8840a + 8923bd3
commit 17e8b75
Showing 1 changed file with 18 additions and 23 deletions.
diff --git a/src/components/creators/CreatorDashboardSidebar.tsx b/src/components/creators/CreatorDashboardSidebar.tsx
@@ -50,15 +50,20 @@ function HomePageSidebar({ variant }: Extract<CreatorDashboardSidebarType, { nam
   const { data, loading } = useFetchTotalStake(myAddress)
 
   if (loading) return null
-  if (data?.hasStaked)
-    return (
-      <>
-        <CreatePostCard variant={variant} />
-        <StakerRewardInfoCard />
-        <CreatorRewardInfoCard />
-      </>
-    )
-  return <SupportCreatorsCard />
+
+  return (
+    <>
+      {data?.hasStaked ? (
+        <>
+          <CreatePostCard variant={variant} />
+          <StakerRewardInfoCard />
+        </>
+      ) : (
+        <SupportCreatorsCard />
+      )}
+      <CreatorRewardInfoCard />
+    </>
+  )
 }
 
 function SpacePageSidebar({ space }: Extract<CreatorDashboardSidebarType, { name: 'space-page' }>) {
@@ -84,12 +89,8 @@ function SpacePageSidebar({ space }: Extract<CreatorDashboardSidebarType, { name
   return (
     <>
       {renderTopCard()}
-      {!loadingTotalStake && totalStake?.hasStaked && (
-        <>
-          <StakerRewardInfoCard />
-          <CreatorRewardInfoCard />
-        </>
-      )}
+      {!loadingTotalStake && totalStake?.hasStaked && <StakerRewardInfoCard />}
+      <CreatorRewardInfoCard />
     </>
   )
 }
@@ -107,14 +108,8 @@ function PostPageSidebar({ space }: Extract<CreatorDashboardSidebarType, { name:
     <>
       <CreatorInfoCard showStakeButton={data?.hasStaked} space={space} />
       {!loadingTotalStake &&
-        (data?.hasStaked ? (
-          <>
-            <StakerRewardInfoCard />
-            <CreatorRewardInfoCard />
-          </>
-        ) : (
-          <StakeSubCard space={space} />
-        ))}
+        (data?.hasStaked ? <StakerRewardInfoCard /> : <StakeSubCard space={space} />)}
+      <CreatorRewardInfoCard />
     </>
   )
 }