Merge pull request #155 from NetSepio/rushikesh-nft

ffx : user nft
NetSepio · Oct 14, 2024 · 12bca98 · 12bca98
2 parents 866a10b + 8a8e3cc
commit 12bca98
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/components/NftdataCard.tsx b/components/NftdataCard.tsx
@@ -92,18 +92,21 @@ const NftdataCard: React.FC<ReviewCardProps> = ({
 
   useEffect(() => {
     const fetchMetaData = async () => {
-      if (chainSymbol === 'sol') {
-        // Handling for Solana NFTs
-        if (metaData?.current_token_data?.token_uri) {
-          try {
-            const response = await axios.get(metaData.current_token_data.token_uri);
-            const metadata = response.data;
-            console.log("Solana Metadata:", metadata);
-            setImageSrc(metadata?.image);
-            setAttributes(metadata?.attributes);
-          } catch (error) {
-            console.error("Error fetching Solana metadata:", error);
-          }
+      if (chainSymbol === 'sol' && metaData?.current_token_data?.token_uri) {
+        try {
+          const response = await axios.get(metaData.current_token_data.token_uri);
+          const metadata = response.data;
+          console.log("Solana Metadata:", metadata);
+          setImageSrc(metadata.image);
+          setAttributes({
+            name: metadata.name,
+            description: metadata.description,
+            symbol: metadata.symbol,
+            externalUrl: metadata.external_url,
+            collection: metadata.collection,
+          });
+        } catch (error) {
+          console.error("Error fetching Solana metadata:", error);
         }
       } else {
         // Existing code for Aptos NFTs
@@ -167,10 +170,10 @@ const NftdataCard: React.FC<ReviewCardProps> = ({
               <h3 className="leading-12 mb-2 text-white">
                 <div className="lg:flex md:flex justify-between">
                   <div className="text-xl font-semibold mt-4">
-                    {metaData.current_token_data.token_name}
+                  {attributes?.name || metaData.current_token_data.token_name}
                   </div>
                   <a
-              href={`https://explorer.solana.com/tx/dyu7uefnn2Y2bKCDu6uTP4pVBPcBu4RPwsV522rjtbR6B2BJyA4vWC4eLGosDXqPzMpXsaBgzbE8VjqMkaYgf6g?cluster=devnet  -- <@748192618659315753>`}
+              href={attributes?.externalUrl}
               target="_blank"
               rel="noopener noreferrer"
               className="mt-5 text-white"
@@ -183,19 +186,18 @@ const NftdataCard: React.FC<ReviewCardProps> = ({
               <div className="rounded-xl">
                 <div className="text-sm text-white text-start flex mt-2">
                   <div className="">
-                    {metaData.current_token_data.description}
+                  {attributes?.description || metaData.current_token_data.description}
                   </div>
                 </div>
               </div>
 
               {attributes && chainSymbol === 'sol' && (
 
                 <div className="flex-wrap flex gap-2 text-xs text-white justify-center rounded-full px-4 py-2 mt-4" style={{backgroundColor:'#0162FF'}}>
-                  {attributes.map((attr, index) => (
-                    <div key={index} className="">{attr.value}</div>
-                  ))}
-
-                </div>
+                <div>Symbol: {attributes.symbol}</div>
+                <div>Collection: {attributes.collection?.name}</div>
+                <div>Family: {attributes.collection?.family}</div>
+              </div>
 
               )}
 

diff --git a/components/UserNFTs.tsx b/components/UserNFTs.tsx
@@ -1,7 +1,7 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { Metaplex } from '@metaplex-foundation/js';
 
-const ALLOWED_SYMBOLS = ['SMB', 'sharx', '$TEAM','DEAN', 'SMB Gen3', "EVPN"];
+const ALLOWED_NAMES = ['SMB Gen2', 'sharx by sharky.fi', 'Superteam Member NFT', 'Deanslist', 'SMB Gen3', "Erebrus Community NFT #001"];
 
 const fetchUserNFTs = async (userAddress: string, chainSymbol: string) => {
   if (!userAddress) {
@@ -32,7 +32,7 @@ const fetchUserNFTs = async (userAddress: string, chainSymbol: string) => {
       console.log('All user NFTs:', userNFTs);
 
       const filteredNFTs = userNFTs.filter(nft => 
-        ALLOWED_SYMBOLS.includes(nft.symbol)
+        ALLOWED_NAMES.includes(nft.name)
       ).map(nft => ({
         amount: 1,
         current_token_data: {
@@ -48,7 +48,7 @@ const fetchUserNFTs = async (userAddress: string, chainSymbol: string) => {
         },
       }));
 
-      console.log('Filtered NFTs with specified symbols:', filteredNFTs);
+      console.log('Filtered NFTs with specified Names:', filteredNFTs);
 
       return filteredNFTs;
     } else {