Merge pull request #377 from picsoritdidnthappen/database-staging

fix: open bounties
picsoritdidnthappen · Nov 15, 2024 · 3739cec · 3739cec
2 parents 419564d + a98c2b4
commit 3739cec
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 35 deletions.
diff --git a/src/components/bounty/ClaimItem.tsx b/src/components/bounty/ClaimItem.tsx
@@ -23,7 +23,6 @@ export default function ClaimItem({
   issuer,
   bountyId,
   accepted,
-  isMultiplayer,
   url,
 }: {
   id: string;
@@ -32,7 +31,6 @@ export default function ClaimItem({
   issuer: string;
   bountyId: string;
   accepted: boolean;
-  isMultiplayer: boolean;
   url: string;
 }) {
   const account = useAccount();
@@ -189,43 +187,27 @@ export default function ClaimItem({
       />
       <div className='p-[2px] text-white relative bg-[#F15E5F] border-[#F15E5F] border-2 rounded-xl '>
         <div className='left-5 top-5 absolute  flex flex-col text-white'>
-          {isMultiplayer && account.address === issuer && (
-            <button
-              className='submitForVote cursor-pointer text-[#F15E5F] hover:text-white hover:bg-[#F15E5F] border border-[#F15E5F] rounded-[8px] py-2 px-5  '
-              onClick={() => {
-                if (account.isConnected) {
-                  submitForVoteMutation.mutate({
-                    bountyId: BigInt(bountyId),
-                    claimId: BigInt(id),
-                  });
-                } else {
-                  toast.error('Please connect wallet to continue');
-                }
-              }}
-            >
-              submit for vote
-            </button>
-          )}
-
           {bounty.data &&
             bounty.data.inProgress &&
-            !isMultiplayer &&
             account.address === bounty.data.issuer && (
-              <div
+              <button
+                className='cursor-pointer mt-5 text-white hover:bg-[#F15E5F] border border-[#F15E5F] rounded-[8px] py-2 px-5'
                 onClick={() => {
-                  if (account.isConnected) {
-                    acceptClaimMutation.mutate({
-                      bountyId: BigInt(bountyId),
-                      claimId: BigInt(id),
-                    });
-                  } else {
-                    toast.error('Please connect wallet to continue');
-                  }
+                  bounty.data.participants.length > 1
+                    ? submitForVoteMutation.mutate({
+                        bountyId: BigInt(bountyId),
+                        claimId: BigInt(id),
+                      })
+                    : acceptClaimMutation.mutate({
+                        bountyId: BigInt(bountyId),
+                        claimId: BigInt(id),
+                      });
                 }}
-                className='acceptButton cursor-pointer mt-5 text-white hover:bg-[#F15E5F] border border-[#F15E5F] rounded-[8px] py-2 px-5'
               >
-                accept
-              </div>
+                {bounty.data.participants.length > 1
+                  ? 'submit for vote'
+                  : 'accept'}
+              </button>
             )}
         </div>
 

diff --git a/src/components/bounty/ClaimList.tsx b/src/components/bounty/ClaimList.tsx
@@ -35,7 +35,6 @@ export default function ClaimList({
         {votingClaim && (
           <div className='lg:col-span-4'>
             <ClaimItem
-              isMultiplayer={isMultiplayer}
               bountyId={bountyId}
               id={votingClaim.id}
               title={votingClaim.title}
@@ -60,7 +59,6 @@ export default function ClaimList({
           .map((claim) => (
             <div key={claim.id} className='lg:col-span-4 otherClaims'>
               <ClaimItem
-                isMultiplayer={isMultiplayer}
                 bountyId={bountyId}
                 id={claim.id}
                 title={claim.title}

diff --git a/src/trpc/routers/_app.ts b/src/trpc/routers/_app.ts
@@ -42,6 +42,11 @@ export const appRouter = createTRPCRouter({
           claims: {
             take: 1,
           },
+          participants: {
+            select: {
+              user: true,
+            },
+          },
         },
       });