Merge branch 'develop' into debug/logs

Author: jaymalve

packages/state/src/state/persist/createPoolActions.ts

@@ -116,9 +116,6 @@ async function getPoolDetails(poolAddress: string, poolIndex: Buffer) {
 
 export function createPoolActions(): PoolActions {
   const initialState: PoolState = {
-    loading: false,
-    error: null,
-
     pools: [],
     poolsByTokens: {},
     lastUpdated: 0,
@@ -189,8 +186,6 @@ export function createPoolActions(): PoolActions {
         }, {});
 
         const newState: PoolState = {
-          loading: false,
-          error: null,
           pools: poolsFiltered,
           poolsByTokens,
           lastUpdated: now,
@@ -242,8 +237,6 @@ export function createPoolActions(): PoolActions {
           }, {});
 
           const newState: PoolState = {
-            loading: false,
-            error: null,
             pools: poolsFiltered,
             poolsByTokens,
             lastUpdated: Date.now(),

packages/state/src/state/store.ts

@@ -1,7 +1,7 @@
 import { create } from 'zustand';
 import { createTokenActions } from './persist/createTokenActions';
 import { persist } from 'zustand/middleware';
-import { AppStore, AppStorePersist, AppStorePersistV1 } from '@normalfinance/types';
+import { AppStore, AppStorePersist } from '@normalfinance/types';
 import { createConnectWalletActions } from './persist/createConnectWalletActions';
 import { createDisclaimerAction } from './persist/createDisclaimerActions';
 import { createLoadingActions } from './loading/actions';
@@ -56,35 +56,14 @@ export const usePersistStore = create<AppStorePersist>()(
     },
     {
       name: 'just-some-normal-storage',
-      version: 2,
+      version: 3,
       migrate: (persistedState, version) => {
         if (!persistedState) return {};
 
-        // Upgrade from v0 → v1 schema
-        if (version === 0) {
-          const oldState = persistedState as AppStorePersistV1;
-
-          oldState.poolState['lastUpdated'] = 0;
-          oldState.poolState.error = null;
-          oldState.poolState.loading = false;
-
-          oldState.tokenState['lastUpdated'] = 0;
-
-          return oldState;
-        }
-
-        // Upgrade from v1 → v2 schema
-        if (version === 1) {
-          const oldState = persistedState as AppStorePersistV1;
-
-          oldState.poolState.pools = [];
-          oldState.poolState.poolsByTokens = {};
-          oldState.poolState.lastUpdated = 0;
-
-          return oldState;
+        // Upgrade from v0, v1, v2 → v3 schema
+        if (version < 3) {
+          return {};
         }
-
-        return persistedState as AppStorePersistV1;
       },
     }
   )

packages/types/src/state/pool.ts

@@ -1,8 +1,5 @@
 import { Pool } from '../contracts';
 export interface PoolState {
-  loading: boolean;
-  error: string | null;
-
   pools: Pool[];
   poolsByTokens: Record<string, Pool[]>;
   lastUpdated: number;