feat: reduce store use (#70)

* fix: change store usage to correctly create it
* chore: remove store usage where we can
* chore: tweak next round handling

Author: neilcampbell

src/App.tsx

@@ -2,17 +2,17 @@ import './App.css'
 import { routes } from './App.routes'
 import { RouterProvider, createBrowserRouter } from 'react-router-dom'
 import { TooltipProvider } from './features/common/components/tooltip'
-import { SettingsProvider } from './features/settings/components/settings-provider'
+import { DataProvider } from './features/common/components/data-provider'
 
 const router = createBrowserRouter(routes)
 
 function App() {
   return (
-    <SettingsProvider>
+    <DataProvider>
       <TooltipProvider>
         <RouterProvider router={router} />
       </TooltipProvider>
-    </SettingsProvider>
+    </DataProvider>
   )
 }
 

src/features/accounts/data/account-result.ts

@@ -1,7 +1,7 @@
 import { atom } from 'jotai'
 import { AccountResult, Address } from './types'
 import { algod } from '@/features/common/data'
-import { atomsInAtom } from '@/features/common/data/atoms-in-atom'
+import { atomsInAtom } from '@/features/common/data'
 import { assetResultsAtom } from '@/features/assets/data'
 import { applicationResultsAtom } from '@/features/applications/data'
 

src/features/accounts/data/account-transaction-history.ts

@@ -56,10 +56,10 @@ const createAccountTransactionResultsAtom = (address: Address, nextPageToken?: s
 export const createLoadableAccountTransactionsPage = (address: Address) => {
   return createLoadableViewModelPageAtom({
     fetchRawData: (nextPageToken?: string) => createAccountTransactionResultsAtom(address, nextPageToken),
-    createViewModelPageAtom: (store, rawDataPage) =>
+    createViewModelPageAtom: (rawDataPage) =>
       atom((get) => {
         return {
-          items: get(createTransactionsAtom(store, rawDataPage.items)),
+          items: get(createTransactionsAtom(rawDataPage.items)),
           hasNextPage: rawDataPage.hasNextPage,
         }
       }),

src/features/accounts/data/account.ts

@@ -1,25 +1,22 @@
-import { atom, useAtomValue, useStore } from 'jotai'
+import { atom, useAtomValue } from 'jotai'
 import { Address } from './types'
 import { loadable } from 'jotai/utils'
-import { JotaiStore } from '@/features/common/data/types'
 import { useMemo } from 'react'
 import { asAccount } from '../mappers'
 import { getAccountResultAtom } from './account-result'
-import { createAssetResolver } from '@/features/assets/data'
+import { assetSummaryResolver } from '@/features/assets/data'
 
-const createAccountAtom = (store: JotaiStore, address: Address) => {
+const createAccountAtom = (address: Address) => {
   return atom(async (get) => {
-    const accountResult = await get(getAccountResultAtom(store, address))
-    return asAccount(accountResult, createAssetResolver(store))
+    const accountResult = await get(getAccountResultAtom(address))
+    return asAccount(accountResult, assetSummaryResolver)
   })
 }
 
 const useAccountAtom = (address: Address) => {
-  const store = useStore()
-
   return useMemo(() => {
-    return createAccountAtom(store, address)
-  }, [store, address])
+    return createAccountAtom(address)
+  }, [address])
 }
 
 export const useLoadableAccountAtom = (address: Address) => {

src/features/applications/data/application-boxes.ts

@@ -51,6 +51,6 @@ export const useLoadableApplicationBox = (applicationId: ApplicationId, boxName:
 export const createLoadableApplicationBoxesPage = (applicationId: ApplicationId) => {
   return createLoadableViewModelPageAtom({
     fetchRawData: (nextPageToken?: string) => createApplicationBoxResultsAtom(applicationId, nextPageToken),
-    createViewModelPageAtom: (_, rawDataPage) => atom(() => rawDataPage),
+    createViewModelPageAtom: (rawDataPage) => atom(() => rawDataPage),
   })
 }

src/features/applications/data/application-metadata.ts

@@ -1,4 +1,4 @@
-import { atomsInAtom } from '@/features/common/data/atoms-in-atom'
+import { atomsInAtom } from '@/features/common/data'
 import { ApplicationMetadataResult, ApplicationResult } from './types'
 import { indexer } from '@/features/common/data'
 import { flattenTransactionResult } from '@/features/transactions/utils/flatten-transaction-result'

src/features/applications/data/application-result.ts

@@ -1,6 +1,6 @@
 import { algod, indexer } from '@/features/common/data'
 import { ApplicationId, ApplicationResult } from './types'
-import { atomsInAtom } from '@/features/common/data/atoms-in-atom'
+import { atomsInAtom } from '@/features/common/data'
 import { asError, is404 } from '@/utils/error'
 
 const getApplicationResult = async (applicationId: ApplicationId) => {

src/features/applications/data/application-summary.ts

@@ -1,12 +1,11 @@
-import { JotaiStore } from '@/features/common/data/types'
 import { ApplicationId } from './types'
 import { atom } from 'jotai'
 import { getApplicationResultAtom } from './application-result'
 import { asApplicationSummary } from '../mappers'
 
-export const createApplicationSummaryAtom = (store: JotaiStore, applicationId: ApplicationId) => {
+export const createApplicationSummaryAtom = (applicationId: ApplicationId) => {
   return atom(async (get) => {
-    const applicationResult = await get(getApplicationResultAtom(store, applicationId))
+    const applicationResult = await get(getApplicationResultAtom(applicationId))
     return asApplicationSummary(applicationResult)
   })
 }

src/features/applications/data/application-transaction-history.ts

@@ -56,10 +56,10 @@ const createApplicationTransactionResultsAtom = (applicationID: ApplicationId, n
 export const createLoadableApplicationTransactionsPage = (applicationID: ApplicationId) => {
   return createLoadableViewModelPageAtom({
     fetchRawData: (nextPageToken?: string) => createApplicationTransactionResultsAtom(applicationID, nextPageToken),
-    createViewModelPageAtom: (store, rawDataPage) =>
+    createViewModelPageAtom: (rawDataPage) =>
       atom((get) => {
         return {
-          items: get(createTransactionsAtom(store, rawDataPage.items)),
+          items: get(createTransactionsAtom(rawDataPage.items)),
           hasNextPage: rawDataPage.hasNextPage,
         }
       }),

src/features/applications/data/application.ts

@@ -1,26 +1,23 @@
-import { JotaiStore } from '@/features/common/data/types'
-import { atom, useAtomValue, useStore } from 'jotai'
+import { atom, useAtomValue } from 'jotai'
 import { asApplication } from '../mappers'
 import { useMemo } from 'react'
 import { loadable } from 'jotai/utils'
 import { ApplicationId } from './types'
 import { getApplicationResultAtom } from './application-result'
 import { getApplicationMetadataResultAtom } from './application-metadata'
 
-export const createApplicationAtom = (store: JotaiStore, applicationId: ApplicationId) => {
+export const createApplicationAtom = (applicationId: ApplicationId) => {
   return atom(async (get) => {
-    const applicationResult = await get(getApplicationResultAtom(store, applicationId))
-    const applicationMetadata = await get(getApplicationMetadataResultAtom(store, applicationResult))
+    const applicationResult = await get(getApplicationResultAtom(applicationId))
+    const applicationMetadata = await get(getApplicationMetadataResultAtom(applicationResult))
     return asApplication(applicationResult, applicationMetadata)
   })
 }
 
 const useApplicationAtom = (applicationId: ApplicationId) => {
-  const store = useStore()
-
   return useMemo(() => {
-    return createApplicationAtom(store, applicationId)
-  }, [store, applicationId])
+    return createApplicationAtom(applicationId)
+  }, [applicationId])
 }
 
 export const useLoadableApplication = (applicationId: ApplicationId) => {