From d82e4e052ea93648d2e41fa4815186b570197f25 Mon Sep 17 00:00:00 2001 From: Tyler Date: Thu, 19 Dec 2024 21:09:34 -0500 Subject: [PATCH 1/2] turn-on-abacus-ts --- src/state/_store.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/state/_store.ts b/src/state/_store.ts index dc0ae05ef..e390efbde 100644 --- a/src/state/_store.ts +++ b/src/state/_store.ts @@ -1,3 +1,4 @@ +import { storeLifecycles } from '@/abacus-ts/storeLifecycles'; import { Middleware, combineReducers, configureStore } from '@reduxjs/toolkit'; import { persistReducer, persistStore } from 'redux-persist'; import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2'; @@ -5,7 +6,6 @@ import storage from 'redux-persist/lib/storage'; import abacusStateManager from '@/lib/abacus'; import { runFn } from '@/lib/do'; -import { testFlags } from '@/lib/testFlags'; import { accountSlice } from './account'; import { accountUiMemorySlice } from './accountUiMemory'; @@ -98,13 +98,10 @@ export const persistor = persistStore(store); // Set store so (Abacus & v4-Client) classes can getState and dispatch abacusStateManager.setStore(store); -if (testFlags.useAbacusTs) { - runFn(async () => { - const { storeLifecycles } = await import('@/abacus-ts/storeLifecycles'); - // we ignore the cleanups for now since we want these running forever - storeLifecycles.forEach((fn) => fn(store)); - }); -} +runFn(async () => { + // we ignore the cleanups for now since we want these running forever + storeLifecycles.forEach((fn) => fn(store)); +}); export type RootStore = typeof store; export type RootState = ReturnType; From d84d9ce57e241afec1d1c8fc9b01824415516ad6 Mon Sep 17 00:00:00 2001 From: Tyler Date: Mon, 6 Jan 2025 16:42:27 -0500 Subject: [PATCH 2/2] fix --- src/abacus-ts/logs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/abacus-ts/logs.ts b/src/abacus-ts/logs.ts index 7fe963e67..c90594571 100644 --- a/src/abacus-ts/logs.ts +++ b/src/abacus-ts/logs.ts @@ -1,5 +1,5 @@ import { log } from '@/lib/telemetry'; export function logAbacusTsError(source: string, message: string, ...args: any[]) { - log(`${source}: ${message}`, undefined, { context: args }); + log(`bonsai: ${source}: ${message}`, undefined, { context: args }); }