Merge pull request #43 from CX-Box/fix/CXBOX-190

CXBOX-190 | fixed page change for showViewPopup
CX-Box · Dec 4, 2023 · 19aac7c · 19aac7c
2 parents 621199b + 85fa591
commit 19aac7c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/reducers/screen.ts b/src/reducers/screen.ts
@@ -412,6 +412,8 @@ export function screen(state = initialState, action: AnyAction, store: Store): S
             }
         }
         case types.showViewPopup: {
+            const currentPage = state.bo.bc[action.payload.bcName]?.page ?? 1
+
             return {
                 ...state,
                 bo: {
@@ -420,7 +422,7 @@ export function screen(state = initialState, action: AnyAction, store: Store): S
                         ...state.bo.bc,
                         [action.payload.bcName]: {
                             ...state.bo.bc[action.payload.bcName],
-                            page: 1,
+                            page: action.payload.bcName === action.payload.calleeBCName ? currentPage : 1,
                             loading: action.payload.bcName !== action.payload.calleeBCName
                         }
                     }