Refactor

Emurgo · Aug 2, 2024 · f89a9b3 · f89a9b3
1 parent f95f4fa
commit f89a9b3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/packages/dapp-connector/src/dapp-connector.ts b/packages/dapp-connector/src/dapp-connector.ts
@@ -15,14 +15,18 @@ export type DappConnectorManager = {
     trustedUrl: string,
     sendMessage: (id: string, result: unknown, error?: Error) => void,
   ): Promise<void>
+  readonly chainId: number
 }
 
 export const dappConnectorMaker = (storage: Storage, wallet: ResolverWallet, api: Api): DappConnector => {
   return new DappConnector(storage, wallet, api)
 }
 
 export class DappConnector implements DappConnectorManager {
-  constructor(private storage: Storage, private wallet: ResolverWallet, private api: Api) {}
+  chainId: number
+  constructor(private storage: Storage, private wallet: ResolverWallet, private api: Api) {
+    this.chainId = wallet.networkId
+  }
 
   async getDAppList() {
     return this.api.getDApps({chainId: this.wallet.networkId})

diff --git a/packages/dapp-connector/src/manager.mocks.ts b/packages/dapp-connector/src/manager.mocks.ts
@@ -2,6 +2,7 @@ import {DappConnectorManager} from './dapp-connector'
 import {DappListResponse} from './adapters/api'
 
 export const managerMock: DappConnectorManager = {
+  chainId: 1,
   getDAppList(): Promise<DappListResponse> {
     return Promise.resolve(mockedDAppList)
   },

diff --git a/packages/dapp-connector/src/translators/reactjs/useDappList.test.tsx b/packages/dapp-connector/src/translators/reactjs/useDappList.test.tsx
@@ -16,7 +16,7 @@ describe('useDappList', () => {
       </QueryClientProvider>
     )
 
-    const {result} = renderHook(() => useDappList({suspense: false}), {wrapper})
+    const {result} = renderHook(() => useDappList(), {wrapper})
     await waitFor(() => expect(result.current.data?.dapps).toBeDefined())
     await waitFor(() => expect(result.current.data?.filters).toBeDefined())
     client.clear()

diff --git a/packages/dapp-connector/src/translators/reactjs/useDappList.ts b/packages/dapp-connector/src/translators/reactjs/useDappList.ts
@@ -2,12 +2,16 @@ import {useQuery, UseQueryOptions} from 'react-query'
 import {DappListResponse} from '../../adapters/api'
 import {useDappConnector} from './DappConnectorProvider'
 
-export const useDappList = (options?: UseQueryOptions<DappListResponse, Error, DappListResponse, ['dappList']>) => {
+export const useDappList = (
+  options?: UseQueryOptions<DappListResponse, Error, DappListResponse, ['dappList', string]>,
+) => {
   const {manager} = useDappConnector()
-  return useQuery(['dappList'], {
+  return useQuery(['dappList', String(manager.chainId)], {
     queryFn: () => manager.getDAppList(),
-    refetchOnMount: true,
-    suspense: true,
+    refetchOnMount: false,
+    refetchInterval: ONE_DAY,
     ...options,
   })
 }
+
+const ONE_DAY = 1000 * 60 * 60 * 24