From 383c70eff335faba07c61b3d324dcf2b2c1f4516 Mon Sep 17 00:00:00 2001
From: Terry Li <terryli0095@gmail.com>
Date: Mon, 29 Jan 2024 12:59:49 -0800
Subject: [PATCH] nft fixes (#2195) (#2196)

Co-authored-by: Adrian <mustea.adrian95@gmail.com>
---
 wondrous-bot-admin/src/components/NFT/ClaimButton/index.tsx | 6 +++---
 wondrous-bot-admin/src/graphql/mutations/payment.ts         | 4 ++--
 wondrous-bot-admin/src/graphql/queries/payment.ts           | 5 +++--
 .../src/pages/community-badge/claim/index.tsx               | 6 ++----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/wondrous-bot-admin/src/components/NFT/ClaimButton/index.tsx b/wondrous-bot-admin/src/components/NFT/ClaimButton/index.tsx
index 558edd0bcd..268e83c9ec 100644
--- a/wondrous-bot-admin/src/components/NFT/ClaimButton/index.tsx
+++ b/wondrous-bot-admin/src/components/NFT/ClaimButton/index.tsx
@@ -37,14 +37,14 @@ const ClaimButton = ({ chain, nonce, signature, tokenId, setSuccess, nftMetadata
 
       const transaction = await contractInstance.claimBadge(1, BigInt(tokenId), nonce, signature);
       await transaction.wait();
-
       await linkTx({
         variables: {
           txHash: transaction.hash,
-          nftMetadataId,
+          signature,
           cmtyUserId,
         },
       });
+
       setSnackbarAlertMessage("Minting successful");
       setSnackbarAlertOpen(true);
       setSuccess(true);
@@ -95,7 +95,7 @@ const ClaimButton = ({ chain, nonce, signature, tokenId, setSuccess, nftMetadata
       <SharedSecondaryButton onClick={handleOnClaimClick}>
         <>{isMinting ?<Spinner />: <>{address ? "Claim now" : "Connect wallet"}</>}</>
       </SharedSecondaryButton>
-      {isMinting && <Typography>Please don't close the webpage</Typography>}
+      {isMinting && <Typography color="black">Please don't close the webpage</Typography>}
       {isConnected ? (
         <ButtonBase onClick={() => open()} disabled={isMinting}>
           <Typography
diff --git a/wondrous-bot-admin/src/graphql/mutations/payment.ts b/wondrous-bot-admin/src/graphql/mutations/payment.ts
index 51b8765c20..12d60cfd02 100644
--- a/wondrous-bot-admin/src/graphql/mutations/payment.ts
+++ b/wondrous-bot-admin/src/graphql/mutations/payment.ts
@@ -99,8 +99,8 @@ export const IMPORT_COMMUNITY_NFT = gql`
 `;
 
 export const LINK_TRANSACTION_TO_COMMUNITY_NFT = gql`
-  mutation linkTransactionToCommunityNFT($cmtyUserId: String!, $nftMetadataId: String!, $txHash: String!) {
-    linkTransactionToCommunityNFT(cmtyUserId: $cmtyUserId, nftMetadataId: $nftMetadataId, txHash: $txHash) {
+  mutation linkTransactionToCommunityNFT($cmtyUserId: String!, $signature: String!, $txHash: String!) {
+    linkTransactionToCommunityNFT(cmtyUserId: $cmtyUserId, signature: $signature, txHash: $txHash) {
       success
     }
   }
diff --git a/wondrous-bot-admin/src/graphql/queries/payment.ts b/wondrous-bot-admin/src/graphql/queries/payment.ts
index 88deb1afcd..882ae3a3e8 100644
--- a/wondrous-bot-admin/src/graphql/queries/payment.ts
+++ b/wondrous-bot-admin/src/graphql/queries/payment.ts
@@ -115,12 +115,13 @@ export const GET_COMMUNITY_NFT_BY_TOKEN_ID = gql`
 `;
 
 export const GET_CMTY_USER_NFT_METADATA = gql`
-  query getCmtyUserNftMetadata($signature: String!, $cmtyUserId: String!, $tokenId: String!) {
-    getCmtyUserNftMetadata(signature: $signature, cmtyUserId: $cmtyUserId, tokenId: $tokenId) {
+  query getCmtyUserNftMetadata($cmtyUserId: String!, $tokenId: String!) {
+    getCmtyUserNftMetadata(cmtyUserId: $cmtyUserId, tokenId: $tokenId) {
       orgId
       chain
       receiverAddress
       name
+      signature
       nftMetadataId
       mediaUrl
       cmtyUserUsername
diff --git a/wondrous-bot-admin/src/pages/community-badge/claim/index.tsx b/wondrous-bot-admin/src/pages/community-badge/claim/index.tsx
index 503c295ab1..58e0ab196f 100644
--- a/wondrous-bot-admin/src/pages/community-badge/claim/index.tsx
+++ b/wondrous-bot-admin/src/pages/community-badge/claim/index.tsx
@@ -19,7 +19,6 @@ const CommunityBadgeClaimPage = () => {
 
   const [isSuccess, setSuccess] = useState(false);
   const searchParams = new URLSearchParams(search);
-  const signature = searchParams.get("signature");
   const cmtyUserId = searchParams.get("cmtyUserId");
   const tokenId = searchParams.get("tokenId");
 
@@ -35,11 +34,10 @@ const CommunityBadgeClaimPage = () => {
         variables: {
           tokenId,
           cmtyUserId,
-          signature,
         },
       });
     }
-  }, [cmtyUserId, tokenId, signature]);
+  }, [cmtyUserId, tokenId]);
 
   const address = data?.getCmtyUserNftMetadata?.receiverAddress || "";
 
@@ -248,7 +246,7 @@ const CommunityBadgeClaimPage = () => {
             >
               <ClaimButton
                 chain={data?.getCmtyUserNftMetadata?.chain}
-                signature={signature}
+                signature={data?.getCmtyUserNftMetadata?.signature}
                 nftMetadataId={data?.getCmtyUserNftMetadata?.nftMetadataId}
                 cmtyUserId={cmtyUserId}
                 tokenId={tokenId}