Merge branch 'epic-base' of https://github.com/dappforce/grillchat in…

…to epic-base
dappforce · Jun 11, 2024 · 5de225d · 5de225d
2 parents f474402 + eb0d528
commit 5de225d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 18 deletions.
diff --git a/src/components/AddressAvatar.tsx b/src/components/AddressAvatar.tsx
@@ -43,9 +43,7 @@ const AddressAvatar = forwardRef<HTMLDivElement, AddressAvatarProps>(
     const [isAvatarError, setIsAvatarError] = useState(false)
     const onImageError = useCallback(() => setIsAvatarError(true), [])
 
-    const { data: profile, isLoading } = getProfileQuery.useQuery(address, {
-      refetchOnMount: 'always',
-    })
+    const { data: profile, isLoading } = getProfileQuery.useQuery(address)
 
     const profileSource = profile?.profileSpace?.content?.profileSource
     const subsocialProfileImage = profile?.profileSpace?.content?.image

diff --git a/src/components/Name.tsx b/src/components/Name.tsx
@@ -163,7 +163,7 @@ LinkOrText.displayName = 'LinkOrText'
 
 export function useName(address: string) {
   const { data: profile, isLoading: isLoadingProfile } =
-    getProfileQuery.useQuery(address, { refetchOnMount: 'always' })
+    getProfileQuery.useQuery(address)
   const textColor = useRandomColor(address)
 
   let name = generateRandomName(address)

diff --git a/src/modules/telegram/StatsPage/LeaderboardTable.tsx b/src/modules/telegram/StatsPage/LeaderboardTable.tsx
@@ -96,7 +96,6 @@ function createObserver(
 const LeaderboardTable = ({ period }: LeaderboardTableProps) => {
   const myAddress = useMyMainAddress()
 
-  console.log('My main address', myAddress)
   const { data: leaderboardDataResult, isLoading } =
     leaderboardDataQueryByPeriod[period].useQuery(period)
 
@@ -124,8 +123,6 @@ const LeaderboardTable = ({ period }: LeaderboardTableProps) => {
     [address, rank, reward]
   )
 
-  console.log('CurrentUserRank', currentUserRank)
-
   const dataItems = useMemo(
     () => (leaderboardDataResult as any[]) || [],
     [leaderboardDataResult]
@@ -190,8 +187,6 @@ const LeaderboardTable = ({ period }: LeaderboardTableProps) => {
     ].filter(Boolean)
   }, [currentUserRank, dataItems, isElementIntersecting, initIsIntersection])
 
-  console.log('Leaderboard data', data)
-
   return (
     <>
       {data.length === 0 &&

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -39,10 +39,6 @@ export type AppCommonProps = {
 }
 
 export default function App(props: AppProps<AppCommonProps>) {
-  useEffect(() => {
-    import('eruda').then((eruda) => eruda.default.init())
-  })
-
   return (
     <SessionProvider
       basePath={

diff --git a/src/services/datahub/profiles/fetcher.ts b/src/services/datahub/profiles/fetcher.ts
@@ -10,8 +10,13 @@ export type SubsocialProfile = {
 }
 
 const GET_PROFILES = gql`
-  query GetProfiles($addresses: [String!]) {
-    spaces(args: { filter: { asProfileForAccounts: $addresses } }) {
+  query GetProfiles($addresses: [String!], $pageSize: Int!) {
+    spaces(
+      args: {
+        filter: { asProfileForAccounts: $addresses }
+        pageSize: $pageSize
+      }
+    ) {
       data {
         id
         name
@@ -32,10 +37,10 @@ export async function getProfiles(
   if (addresses.length === 0) return []
   const res = await datahubQueryRequest<
     GetProfilesQuery,
-    GetProfilesQueryVariables
+    GetProfilesQueryVariables & { pageSize: number }
   >({
     document: GET_PROFILES,
-    variables: { addresses },
+    variables: { addresses, pageSize: addresses.length },
   })
   return res.spaces.data.map((space) => ({
     isUpdated: space.updatedAtTime !== space.createdAtTime,

diff --git a/src/stores/my-account.tsx b/src/stores/my-account.tsx
@@ -322,7 +322,6 @@ async function validateParentProxyAddress({
   try {
     // Remove proxy with type 'Any'
     const currentProxy = await getParentProxyAddress(grillAddress)
-    // console.log(grillAddress, currentProxy)
     if (!currentProxy || currentProxy !== parentProxyAddress) {
       onInvalidProxy()
     }