Merge pull request #784 from autonomys/main

Sync Production with main
autonomys · Jul 31, 2024 · 2a323dc · 2a323dc
2 parents b7a340a + 0810d96
commit 2a323dc
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/explorer/src/components/Account/AccountExtrinsicList.tsx b/explorer/src/components/Account/AccountExtrinsicList.tsx
@@ -59,6 +59,16 @@ export const AccountExtrinsicList: FC<Props> = ({ accountId }) => {
     [sorting],
   )
 
+  const where = useMemo(
+    () => ({
+      ...filters,
+      signer: {
+        id_eq: accountId,
+      },
+    }),
+    [accountId, filters],
+  )
+
   const variables = useMemo(() => {
     return {
       first: pagination.pageSize,
@@ -67,14 +77,9 @@ export const AccountExtrinsicList: FC<Props> = ({ accountId }) => {
           ? (pagination.pageIndex * pagination.pageSize).toString()
           : undefined,
       orderBy,
-      where: {
-        ...filters,
-        signer: {
-          id_eq: accountId,
-        },
-      },
+      where,
     }
-  }, [accountId, filters, orderBy, pagination.pageIndex, pagination.pageSize])
+  }, [orderBy, pagination.pageIndex, pagination.pageSize, where])
 
   const { setIsVisible } = useSquidQuery<
     ExtrinsicsByAccountIdQuery,
@@ -107,8 +112,11 @@ export const AccountExtrinsicList: FC<Props> = ({ accountId }) => {
 
   const fullDataDownloader = useCallback(
     () =>
-      downloadFullData(apolloClient, QUERY_ACCOUNT_EXTRINSICS, 'extrinsicsConnection', { orderBy }),
-    [apolloClient, orderBy],
+      downloadFullData(apolloClient, QUERY_ACCOUNT_EXTRINSICS, 'extrinsicsConnection', {
+        orderBy,
+        where,
+      }),
+    [apolloClient, orderBy, where],
   )
 
   const extrinsicsConnection = useMemo(() => data && data.extrinsicsConnection, [data])

diff --git a/explorer/src/components/Account/AccountRewardList.tsx b/explorer/src/components/Account/AccountRewardList.tsx
@@ -193,8 +193,9 @@ export const AccountRewardList: FC = () => {
     () =>
       downloadFullData(apolloClient, QUERY_REWARDS_LIST, 'rewardEventsConnection', {
         sortBy,
+        accountId: accountId ?? '',
       }),
-    [apolloClient, sortBy],
+    [accountId, apolloClient, sortBy],
   )
 
   useEffect(() => {

diff --git a/explorer/src/components/Staking/OperatorsList.tsx b/explorer/src/components/Staking/OperatorsList.tsx
@@ -515,7 +515,7 @@ export const OperatorsList: FC = () => {
   }, [])
 
   const operatorsConnection = useMemo(() => {
-    if (useRpcData && subspaceAccount) {
+    if (useRpcData) {
       const myRpcNominatorIds = deposits
         .filter((d) => d.account === subspaceAccount)
         .map((n) => n.operatorId.toString())

diff --git a/explorer/src/providers/WalletProvider.tsx b/explorer/src/providers/WalletProvider.tsx
@@ -180,7 +180,6 @@ export const WalletProvider: FC<Props> = ({ children }) => {
   }, [actingAccount])
 
   useEffect(() => {
-    if (!injector) return
     setup()
   }, [injector, setup])
 

diff --git a/explorer/src/utils/table.ts b/explorer/src/utils/table.ts
@@ -1,2 +1,2 @@
 export const countTablePages = (totalCount: number, pageSize: number) =>
-  Math.max(1, Math.floor(totalCount / pageSize))
+  Math.max(1, Math.floor(totalCount / pageSize)) + (totalCount % pageSize > 0 ? 1 : 0)