From 2e2a59727f96723e248bfbc7b1f5ac2e30c21a4b Mon Sep 17 00:00:00 2001 From: Kyle Espinola Date: Wed, 31 Aug 2022 23:39:34 +0200 Subject: [PATCH] fix: types for wallet objects --- src/components/CookieSettings.tsx | 2 - .../fragments/FollowEventPreview.graphql | 1 + .../fragments/ListingEventPreview.graphql | 1 + .../fragments/MintEventPreview.graphql | 1 + .../fragments/OfferEventPreview.graphql | 1 + .../fragments/PurchaseEventPreview.graphql | 1 + src/graphql/indexerTypes.ssr.ts | 20 ++++++++++ src/graphql/indexerTypes.ts | 20 ++++++++++ .../profiles/[publicKey]/collections.tsx | 8 ---- src/views/alpha/MyActivityList.tsx | 37 ------------------- 10 files changed, 45 insertions(+), 47 deletions(-) diff --git a/src/components/CookieSettings.tsx b/src/components/CookieSettings.tsx index 0f8d5378..29790b56 100644 --- a/src/components/CookieSettings.tsx +++ b/src/components/CookieSettings.tsx @@ -28,8 +28,6 @@ const CookieSettings = (props: { cookies.holaplex_preference_cookies_acceptance === 'true' || false ); - console.log(preferenceCookies, analyticsCookies); - useEffect(() => { setAnalyticsCookies(cookies.holaplex_analytics_cookies_acceptance === 'true'); setPreferenceCookies(cookies.holaplex_preference_cookies_acceptance === 'true'); diff --git a/src/graphql/fragments/FollowEventPreview.graphql b/src/graphql/fragments/FollowEventPreview.graphql index e9ef655c..cf84ea4e 100644 --- a/src/graphql/fragments/FollowEventPreview.graphql +++ b/src/graphql/fragments/FollowEventPreview.graphql @@ -24,6 +24,7 @@ fragment FollowEventPreview on FollowEvent { } } wallet { + address nftCounts { owned created diff --git a/src/graphql/fragments/ListingEventPreview.graphql b/src/graphql/fragments/ListingEventPreview.graphql index d86e2787..07968b40 100644 --- a/src/graphql/fragments/ListingEventPreview.graphql +++ b/src/graphql/fragments/ListingEventPreview.graphql @@ -77,6 +77,7 @@ fragment ListingEventPreview on ListingEvent { } } wallet { + address nftCounts { owned created diff --git a/src/graphql/fragments/MintEventPreview.graphql b/src/graphql/fragments/MintEventPreview.graphql index c1cc8f67..74f505f5 100644 --- a/src/graphql/fragments/MintEventPreview.graphql +++ b/src/graphql/fragments/MintEventPreview.graphql @@ -29,6 +29,7 @@ fragment MintEventPreview on MintEvent { mintAddress } wallet { + address nftCounts { owned created diff --git a/src/graphql/fragments/OfferEventPreview.graphql b/src/graphql/fragments/OfferEventPreview.graphql index daf14762..6b621673 100644 --- a/src/graphql/fragments/OfferEventPreview.graphql +++ b/src/graphql/fragments/OfferEventPreview.graphql @@ -52,6 +52,7 @@ fragment OfferEventPreview on OfferEvent { } } wallet { + address nftCounts { owned created diff --git a/src/graphql/fragments/PurchaseEventPreview.graphql b/src/graphql/fragments/PurchaseEventPreview.graphql index d85a574e..002805b1 100644 --- a/src/graphql/fragments/PurchaseEventPreview.graphql +++ b/src/graphql/fragments/PurchaseEventPreview.graphql @@ -35,6 +35,7 @@ fragment PurchaseEventPreview on PurchaseEvent { } } wallet { + address nftCounts { owned created diff --git a/src/graphql/indexerTypes.ssr.ts b/src/graphql/indexerTypes.ssr.ts index 1571374e..6e1fe6cf 100644 --- a/src/graphql/indexerTypes.ssr.ts +++ b/src/graphql/indexerTypes.ssr.ts @@ -2606,6 +2606,7 @@ export type FeedQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -2708,6 +2709,7 @@ export type FeedQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -2755,6 +2757,7 @@ export type FeedQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -2829,6 +2832,7 @@ export type FeedQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -2883,6 +2887,7 @@ export type FeedQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -2963,6 +2968,7 @@ export type FollowEventPreviewFragment = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; }; @@ -3066,6 +3072,7 @@ export type ListingEventPreviewFragment = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; }; @@ -3135,6 +3142,7 @@ export type MintEventPreviewFragment = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; }; @@ -3311,6 +3319,7 @@ export type OfferEventPreviewFragment = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; }; @@ -3375,6 +3384,7 @@ export type PurchaseEventPreviewFragment = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; }; @@ -3584,6 +3594,7 @@ export type HomeQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -3686,6 +3697,7 @@ export type HomeQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -3733,6 +3745,7 @@ export type HomeQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -3807,6 +3820,7 @@ export type HomeQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -3861,6 +3875,7 @@ export type HomeQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -5378,6 +5393,7 @@ export const FollowEventPreviewFragmentDoc = gql` } } wallet { + address nftCounts { owned created @@ -5464,6 +5480,7 @@ export const ListingEventPreviewFragmentDoc = gql` } } wallet { + address nftCounts { owned created @@ -5522,6 +5539,7 @@ export const MintEventPreviewFragmentDoc = gql` mintAddress } wallet { + address nftCounts { owned created @@ -5681,6 +5699,7 @@ export const OfferEventPreviewFragmentDoc = gql` } } wallet { + address nftCounts { owned created @@ -5725,6 +5744,7 @@ export const PurchaseEventPreviewFragmentDoc = gql` } } wallet { + address nftCounts { owned created diff --git a/src/graphql/indexerTypes.ts b/src/graphql/indexerTypes.ts index 2cd02898..07e19df1 100644 --- a/src/graphql/indexerTypes.ts +++ b/src/graphql/indexerTypes.ts @@ -2606,6 +2606,7 @@ export type FeedQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -2708,6 +2709,7 @@ export type FeedQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -2755,6 +2757,7 @@ export type FeedQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -2829,6 +2832,7 @@ export type FeedQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -2883,6 +2887,7 @@ export type FeedQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -2963,6 +2968,7 @@ export type FollowEventPreviewFragment = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; }; @@ -3066,6 +3072,7 @@ export type ListingEventPreviewFragment = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; }; @@ -3135,6 +3142,7 @@ export type MintEventPreviewFragment = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; }; @@ -3311,6 +3319,7 @@ export type OfferEventPreviewFragment = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; }; @@ -3375,6 +3384,7 @@ export type PurchaseEventPreviewFragment = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; }; @@ -3584,6 +3594,7 @@ export type HomeQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -3686,6 +3697,7 @@ export type HomeQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -3733,6 +3745,7 @@ export type HomeQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -3807,6 +3820,7 @@ export type HomeQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -3861,6 +3875,7 @@ export type HomeQuery = { } | null; wallet: { __typename?: 'Wallet'; + address: any; nftCounts: { __typename?: 'WalletNftCount'; owned: number; created: number }; }; } @@ -5378,6 +5393,7 @@ export const FollowEventPreviewFragmentDoc = gql` } } wallet { + address nftCounts { owned created @@ -5464,6 +5480,7 @@ export const ListingEventPreviewFragmentDoc = gql` } } wallet { + address nftCounts { owned created @@ -5522,6 +5539,7 @@ export const MintEventPreviewFragmentDoc = gql` mintAddress } wallet { + address nftCounts { owned created @@ -5681,6 +5699,7 @@ export const OfferEventPreviewFragmentDoc = gql` } } wallet { + address nftCounts { owned created @@ -5725,6 +5744,7 @@ export const PurchaseEventPreviewFragmentDoc = gql` } } wallet { + address nftCounts { owned created diff --git a/src/pages/profiles/[publicKey]/collections.tsx b/src/pages/profiles/[publicKey]/collections.tsx index 2c495354..57fedc08 100644 --- a/src/pages/profiles/[publicKey]/collections.tsx +++ b/src/pages/profiles/[publicKey]/collections.tsx @@ -105,7 +105,6 @@ function CollectionsPage({ publicKey, ...props }: WalletDependantPageProps) { collectionNft.collection && !uniqueCollections.find((u) => u.address === collectionNft.collection?.address) ) { - console.log(`Collected`, collectionNft); uniqueCollections.push(collectionNft.collection); } }); @@ -114,7 +113,6 @@ function CollectionsPage({ publicKey, ...props }: WalletDependantPageProps) { collectionNft.collection && !uniqueCollections.find((u) => u.address === collectionNft.collection?.address) ) { - console.log(`Created`, collectionNft); uniqueCollections.push(collectionNft.collection); } }); @@ -123,15 +121,9 @@ function CollectionsPage({ publicKey, ...props }: WalletDependantPageProps) { const ownedCollections = data?.ownedCollection || []; const createdCollections = data?.createdCollection || []; - console.log( - ownedCollections.length > COLLECTION_FETCH - 1 || - createdCollections.length > COLLECTION_FETCH - 1 - ); - const collections = unique(ownedCollections, createdCollections); const onLoadMore = async (inView: boolean) => { - console.log(`Hello`); if (!inView || loading || (ownedCollections.length <= 0 && createdCollections.length <= 0)) { return; } diff --git a/src/views/alpha/MyActivityList.tsx b/src/views/alpha/MyActivityList.tsx index 7b92a949..814f7aac 100644 --- a/src/views/alpha/MyActivityList.tsx +++ b/src/views/alpha/MyActivityList.tsx @@ -17,37 +17,6 @@ export function MyActivityList() { }, }); - const isLoading = activityPage.loading; - - // const { data, loading, called, refetch } = useFeedQuery({ - // // fetchPolicy: `cache-and-network`, - // fetchPolicy: 'no-cache', - // variables: { - // address: myPubkey, - // }, - // }); - - // const myFeedItems = useMemo( - // () => - // activityPage.data?.wallet?.bids - // ? // @ts-ignore - // data?.feedEvents - // .map((e) => generateFeedCardAttributes(e)) - // .filter((a) => a?.sourceUser.address === myPubkey) - // : [], - - // [data?.feedEvents] - // ); - - // const myFeedActivityItems: IFeedItem[] = myFeedItems.map((i) => ({ - // id: i?.id, - // timestamp: i?.createdAt, - // type: i?.type, - // sourceUser: i?.sourceUser, - // nft: i?.nft, - // solAmount: i?.solAmount, - // })); - const activityItems = useMemo( () => activityPage.data?.wallet?.activities @@ -58,12 +27,6 @@ export function MyActivityList() { [activityPage.data?.wallet?.activities] ); - // console.log('My activity', { - // myFeedItems, - // myFeedActivityItems, - // activityItems, - // }); - return (