Skip to content

fix(store): replace @ts-ignore with ReduxStoreWithManager casting in store.ts #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aryunewaskar77-art wants to merge 10 commits into
base: main
Choose a base branch
from
Open

fix(store): replace @ts-ignore with ReduxStoreWithManager casting in store.ts #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
736c530
fix(store): replace @ts-ignore with ReduxStoreWithManager casting in …
aryunewaskar77-art Apr 24, 2026
dda770e
fix(store): resolve type casting issues in reducer manager
aryunewaskar77-art May 4, 2026
fc7d0a6
fix(store): resolve thunk dispatch type mismatch in store manager
aryunewaskar77-art May 4, 2026
61b9595
fix(store): resolve build failures and improve type safety in store p…
aryunewaskar77-art May 4, 2026
f7ebc87
fix(store): allow undefined state in reducer manager to match Reducer…
aryunewaskar77-art May 4, 2026
d5faadc
Fix notification badge styling
Jul 27, 2026
72f3fa6
fix(wallet): remove unsafe notification badge casts
Jul 27, 2026
f229563
chore: refresh PR merge state
aryunewaskar77-art Jul 27, 2026
a99de3e
fix(web-ui): remove unused Reducer import from store config
aryunewaskar77-art Jul 27, 2026
1e6bfe7
Merge branch 'main' into fix/store-reducer-manager-type-casting
aryunewaskar77-art Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion heka-identity-service-web-ui/src/app/providers/StoreProvider/config/StateSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
EnhancedStore,
Reducer,
ReducersMapObject,
ThunkDispatch,
UnknownAction,
} from '@reduxjs/toolkit';
import { AxiosInstance } from 'axios';
Expand Down Expand Up @@ -29,14 +30,15 @@ export type MountedReducers = OptionalRecord<StateSchemaKey, boolean>;

export interface ReducerManager {
getReducerMap: () => ReducersMapObject<StateSchema>;
reduce: (state: StateSchema, action: UnknownAction) => StateSchema;
reduce: Reducer<StateSchema>;
add: (key: StateSchemaKey, reducer: Reducer) => void;
remove: (key: StateSchemaKey) => void;
getMountedReducers: () => MountedReducers;
}

export interface ReduxStoreWithManager extends EnhancedStore<StateSchema> {
reducerManager: ReducerManager;
dispatch: ThunkDispatch<StateSchema, ThunkExtraArg, UnknownAction>;

@AlexanderShenshin AlexanderShenshin May 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we want to add this type definition?

As far as I see, we're still using type assertion with "unknown assertion" first (as unknown as ReduxStoreWithManager), so can we say that the issue is actually fixed?

@aryunewaskar77-art aryunewaskar77-art May 4, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the issue is actually fixed because we use a cast once in the "factory" (createReduxStore) so that entire codebase can be clean and type-safe.

@AlexanderShenshin AlexanderShenshin May 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say that cast is a problematic solution by itself and we still need to have a TODO or FIXME comment if we're going to rely on the cast...

Is it possible to resolve typecheck errors without a cast in this case?

@aryunewaskar77-art aryunewaskar77-art May 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a fair point, the cast is a workaround since StateSchema has required properties but delete removes them at runtime. Making keys optional would fix it properly but adds null checks everywhere across selectors and components.
Adding a FIXME comment to flag the debt as suggested - let me know if you'd prefer a different approach.

}

export interface ThunkExtraArg {
Expand Down
4 changes: 2 additions & 2 deletions heka-identity-service-web-ui/src/app/providers/StoreProvider/config/reducerManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ export function createReducerManager(
return {
getReducerMap: () => reducers,
getMountedReducers: () => mountedReducers,
reduce: (state: StateSchema, action: UnknownAction) => {
if (keysToRemove.length > 0) {
reduce: (state: StateSchema | undefined, action: UnknownAction) => {
if (state && keysToRemove.length > 0) {
state = { ...state };
keysToRemove.forEach((key) => {
delete (state as Partial<StateSchema>)[key];
Expand Down
8 changes: 3 additions & 5 deletions heka-identity-service-web-ui/src/app/providers/StoreProvider/config/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { configureStore, ReducersMapObject } from '@reduxjs/toolkit';
import { Reducer } from 'redux';

import { connectionReducer } from '@/entities/Connection';
import { credentialReducer } from '@/entities/Credential';
Expand All @@ -12,7 +11,7 @@ import { $agencyDemoApi } from '@/shared/api';
import { $agencyApi, $authApi } from '@/shared/api/config/api';

import { createReducerManager } from './reducerManager';
import { StateSchema, ThunkExtraArg } from './StateSchema';
import { ReduxStoreWithManager, StateSchema, ThunkExtraArg } from './StateSchema';

export function createReduxStore(
initialState?: StateSchema,
Expand All @@ -38,7 +37,7 @@ export function createReduxStore(
};

const store = configureStore({
reducer: reducerManager.reduce as Reducer<StateSchema>,
reducer: reducerManager.reduce,
devTools: __IS_DEV__,
preloadedState: initialState,
middleware: (getDefaultMiddleware) =>
Expand All @@ -47,9 +46,8 @@ export function createReduxStore(
extraArgument: extraArg,
},
}),
});
}) as unknown as ReduxStoreWithManager;

// @ts-ignore
store.reducerManager = reducerManager;

return store;
Expand Down
2 changes: 1 addition & 1 deletion ...tity-service-web-ui/src/shared/lib/components/DynamicModuleLoader/DynamicModuleLoader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ interface DynamicModuleLoaderProps {
export const DynamicModuleLoader = (props: DynamicModuleLoaderProps) => {
const { children, reducers, removeAfterUnmount = true } = props;

const store = useStore() as ReduxStoreWithManager;
const store = useStore() as unknown as ReduxStoreWithManager;
const dispatch = useDispatch();

useEffect(() => {
Expand Down
26 changes: 26 additions & 0 deletions heka-wallet/app/src/navigators/TabStack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,32 @@ export const TabStack: React.FC = () => {
{() => <View />}
</Tab.Screen>
)}
<Tab.Screen
name={BifoldTabStacks.HomeStack}
component={HomeStack}
options={{
tabBarIcon: ({ color, focused }) => (
<TabBarIcon
iconComponent={
<MaterialCommunityIcon name={'view-dashboard-outline'} color={color} size={IconSizes.medium} />
}
label={t('TabStack.Credentials')}
focused={focused}
/>
),
tabBarShowLabel: false,
tabBarAccessibilityLabel: `${t('TabStack.Credentials')} (${notifications.length ?? 0})`,
tabBarBadge: notifications.length || undefined,
tabBarBadgeStyle: {
height: IconSizes.small,
minWidth: IconSizes.small,
marginLeft: leftMarginForDevice(),
textAlign: 'center',
backgroundColor: ColorPallet.brand.highlight,
...styles.notificationsBadgeText,
},
}}
/>
<Tab.Screen
name={TabStacks.BifoldSettingsStack}
component={SettingStack}
Expand Down
6 changes: 2 additions & 4 deletions heka-wallet/app/src/screens/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,9 @@ export const Home: React.FC<HomeProps> = () => {
<Badge
visible={!!notifications.length}
size={NOTIFICATIONS_BADGE_SIZE}
style={{ backgroundColor: ColorPalette.brand.highlight }}
style={[styles.notificationsBadgeText, { backgroundColor: ColorPallet.brand.highlight }]}
>
{/* TODO: Find a way to pass styled text here without @ts-ignore */}
{/* @ts-ignore */}
<Text style={styles.notificationsBadgeText}>{notifications.length}</Text>
{notifications.length}
</Badge>
}
emptyListText={t('Home.NotificationsEmpty')}
Expand Down