@applicaster/quick-brick-core 14.0.0-alpha.5071825192 → 14.0.0-alpha.5219335081

package/App/ActionSetters/index.ts

@@ -12,7 +12,6 @@ const debugActions = (actions) =>
     message: `useSubscribeToActionProviders - available actions count: ${
       Object.keys(actions).length
     }`,
-    data: { actions },
   });
 
 const warnUndefinedContext = (context) =>

package/App/ActionsProvider/__tests__/__snapshots__/ActionsProvider.test.js.snap

@@ -12,18 +12,18 @@ exports[`Actions Provider renders children 1`] = `
             "$$typeof": Symbol(react.context),
             "Consumer": {
               "$$typeof": Symbol(react.context),
-              "_calculateChangedBits": null,
               "_context": [Circular],
             },
             "Provider": {
               "$$typeof": Symbol(react.provider),
               "_context": [Circular],
             },
-            "_calculateChangedBits": null,
             "_currentRenderer": null,
             "_currentRenderer2": {},
             "_currentValue": null,
             "_currentValue2": null,
+            "_defaultValue": null,
+            "_globalName": null,
             "_threadCount": 0,
           },
           "contextProvider": [Function],

package/App/ActionsProvider/index.js

@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as R from "ramda";
 
-import { connectToStore } from "@applicaster/zapp-react-native-redux";
+import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
 
 import { ActionsProvider as ActionsProviderComponent } from "./ActionsProvider";
 

package/App/AppStateDecorator/index.tsx

@@ -2,9 +2,9 @@ import * as React from "react";
 import { AppState, AppStateStatus } from "react-native";
 import * as R from "ramda";
 
-import { connectToStore } from "@applicaster/zapp-react-native-redux";
+import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
 import { setAppState } from "@applicaster/zapp-react-native-redux/appState";
-import { Dispatch } from "redux";
+import { Dispatch } from "@reduxjs/toolkit";
 
 type Props = {
   Component: () => React.ComponentType<any>;
@@ -19,6 +19,7 @@ function withAppManagerDecorator(
     currentState: AppStateStatus;
     isAvailable: boolean;
     plugins: QuickBrickPlugin[];
+    appStateListener: ReturnType<typeof AppState.addEventListener>;
 
     constructor(props: Props) {
       super(props);
@@ -30,11 +31,15 @@ function withAppManagerDecorator(
 
     componentDidMount() {
       this.plugins = this.getAppStatePlugins();
-      AppState.addEventListener("change", this.onChange);
+
+      this.appStateListener = AppState.addEventListener(
+        "change",
+        this.onChange
+      );
     }
 
     componentWillUnmount() {
-      AppState.removeEventListener("change", this.onChange);
+      this.appStateListener.remove();
     }
 
     dispatchAction(nextState: AppStateStatus, eventType) {

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/__tests__/useOpenSchemeHandler.test.tsx

@@ -16,7 +16,7 @@ import {
 } from "../useOpenSchemeHandler/const";
 import { withInitialPlayerState } from "../useOpenSchemeHandler/utils";
 
-const { log_warning } = require("../../../logger");
+import { log_warning } from "../../../logger";
 
 const rivers: Record<string, Partial<ZappRiver>> = {
   A1234: {
@@ -53,13 +53,10 @@ const navigator = {
   replace: jest.fn(),
   push: jest.fn(),
   goHome: jest.fn(),
-};
+} as any;
 
 const mockStore = configureStore();
-
-jest
-  .spyOn(useNavigationHooks, "useNavigation")
-  .mockImplementation(() => navigator);
+jest.spyOn(useNavigationHooks, "useNavigation").mockReturnValue(navigator);
 
 const helperSpy = jest.spyOn(helpers, "handlePresentNavigation");
 const feedLoaderSpy = jest.spyOn(feedLoader, "useFeedLoader");
@@ -72,7 +69,7 @@ jest.doMock("@applicaster/zapp-react-native-ui-components/Contexts", () => ({
   },
 }));
 
-jest.doMock("../../../logger", () => ({
+jest.mock("../../../logger", () => ({
   log_info: jest.fn(),
   log_error: jest.fn(),
   log_warning: jest.fn(),
@@ -80,10 +77,6 @@ jest.doMock("../../../logger", () => ({
   log_debug: jest.fn(),
 }));
 
-jest.useFakeTimers({
-  legacyFakeTimers: true,
-});
-
 // to use import instead of require it's required to use jest.mock above
 const { useOpenSchemeHandler } = require("../useOpenSchemeHandler");
 
@@ -192,7 +185,6 @@ describe("useOpenSchemeHandler", () => {
     it("doesn't log a warning", async () => {
       const tests = () => {
         expect(log_warning).not.toHaveBeenCalled();
-        expect.assertions(1);
       };
 
       await testHook({ url, query, tests });

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/__tests__/usePresentSchemeHandler.test.tsx

@@ -1,14 +1,12 @@
-import * as React from "react";
 import * as R from "ramda";
 import axios from "axios";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react-native";
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
-import * as zappRedux from "@applicaster/zapp-react-native-redux";
 import * as helpers from "../../../helpers";
 import * as feedLoader from "@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedLoader";
-import * as useNavigationHooks from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
+import { WrappedWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
+import { usePresentSchemeHandler } from "../usePresentSchemeHandler";
 
-import { Provider } from "react-redux";
 import configureStore from "redux-mock-store";
 
 const rivers = {
@@ -17,26 +15,31 @@ const rivers = {
   },
 };
 
-const navigator = {
+const mock_navigator = {
   currentRoute: "/river/A1234",
   replace: jest.fn(),
-};
+  goHome: jest.fn(),
+} as any;
 
-const mockStore = configureStore();
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation",
+  () => ({
+    useNavigation: jest.fn(() => mock_navigator),
+  })
+);
 
-jest
-  .spyOn(useNavigationHooks, "useNavigation")
-  .mockImplementation(() => navigator);
+const mockStore = configureStore();
 
 const helperSpy = jest.spyOn(helpers, "handlePresentNavigation");
 const feedLoaderSpy = jest.spyOn(feedLoader, "useFeedLoader");
 
-const { usePresentSchemeHandler } = require("../usePresentSchemeHandler");
-
 const onFinish = jest.fn((cb) => {
   cb();
 });
 
+const navigator = mock_navigator;
+jest.useFakeTimers();
+
 describe("usePresentSchemeHandler", () => {
   beforeEach(() => {
     onFinish.mockClear();
@@ -44,11 +47,7 @@ describe("usePresentSchemeHandler", () => {
     navigator.replace.mockClear();
   });
 
-  const store = mockStore({ test: "test", rivers });
-
-  const wrapper: React.FC<any> = ({ children }) => (
-    <Provider store={store}>{children}</Provider>
-  );
+  const store = { test: "test", rivers };
 
   describe("loading link url", () => {
     const query = { link_url: "http://applicaster.com" };
@@ -59,10 +58,11 @@ describe("usePresentSchemeHandler", () => {
 
     it("opens the link entry", () => {
       renderHook(() => usePresentSchemeHandler({ query, url, onFinish }), {
-        wrapper,
+        wrapper: WrappedWithProviders,
+        initialProps: { store },
       });
 
-      expect(onFinish).toBeCalled();
+      expect(onFinish).toHaveBeenCalled();
 
       expect(helperSpy).toBeCalledWith(
         expect.objectContaining({
@@ -96,7 +96,8 @@ describe("usePresentSchemeHandler", () => {
             onFinish,
           }),
         {
-          wrapper,
+          wrapper: WrappedWithProviders,
+          initialProps: { store },
         }
       );
 
@@ -123,7 +124,8 @@ describe("usePresentSchemeHandler", () => {
       )}&show_nav_bar=true`;
 
       renderHook(() => usePresentSchemeHandler({ query, url, onFinish }), {
-        wrapper,
+        wrapper: WrappedWithProviders,
+        initialProps: { store },
       });
 
       expect(onFinish).toBeCalled();
@@ -155,22 +157,22 @@ describe("usePresentSchemeHandler", () => {
       )}&screen_id=${screen_id}`;
 
       renderHook(() => usePresentSchemeHandler({ query, url, onFinish }), {
-        wrapper,
+        wrapper: WrappedWithProviders,
+        initialProps: { store },
       });
 
       expect(onFinish).toBeCalled();
 
-      expect(helperSpy).toBeCalledWith(
+      expect(helperSpy).toHaveBeenCalledWith(
         expect.objectContaining({
           data: {
             id: "url_scheme_entry",
             type: { value: "link" },
-            screen_type: screen_id,
             link: { href: query.link_url, type: "text/html" },
             extensions: { showNavBar: false },
           },
-          navigator,
-          pushScreen: expect.anything(),
+          navigator: expect.anything(),
+          pushScreen: "http://applicaster.com",
         })
       );
     });
@@ -180,9 +182,7 @@ describe("usePresentSchemeHandler", () => {
     it("Re-sets app ready state and calls loadAppContextData with new river and cellStyles data", async () => {
       const store = mockStore({ test: "test" });
 
-      const wrapper: React.FC<any> = ({ children }) => (
-        <Provider store={store}>{children}</Provider>
-      );
+      const wrapper = WrappedWithProviders;
 
       const query = {
         rivers_configuration_id: "test",
@@ -190,7 +190,6 @@ describe("usePresentSchemeHandler", () => {
 
       const storageSpy = jest.spyOn(sessionStorage, "getAllItems");
       const axiosGetSpy = jest.spyOn(axios, "get");
-      const zappReduxSpy = jest.spyOn(zappRedux, "loadAppContextData");
 
       const getAllItems = jest.fn().mockResolvedValue({
         accountsAccountId: "accountsAccountId",
@@ -204,7 +203,6 @@ describe("usePresentSchemeHandler", () => {
 
       storageSpy.mockImplementation(getAllItems);
       axiosGetSpy.mockImplementation(get);
-      zappReduxSpy.mockReturnValue(null);
 
       renderHook(() => usePresentSchemeHandler({ query, url: "", onFinish }), {
         wrapper,
@@ -219,11 +217,6 @@ describe("usePresentSchemeHandler", () => {
 
         expect(actions?.find(R.propEq("type", "SET_APP_READY"))).toBeDefined();
 
-        expect(zappReduxSpy).toBeCalledWith(expect.any(Function), {
-          cellStyles: "url",
-          rivers: "url",
-        });
-
         expect(navigator.replace).toBeCalledWith({});
       };
     });
@@ -261,7 +254,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper,
+          wrapper: WrappedWithProviders,
         }
       );
 
@@ -293,7 +286,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper,
+          wrapper: WrappedWithProviders,
         }
       );
 
@@ -325,7 +318,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper,
+          wrapper: WrappedWithProviders,
         }
       );
 
@@ -357,7 +350,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper,
+          wrapper: WrappedWithProviders,
         }
       );
 

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/__tests__/useUrlSchemeHandler.test.tsx

@@ -5,7 +5,7 @@ import * as URLHandlersMap from "..";
 import { Provider } from "react-redux";
 import configureStore from "redux-mock-store";
 
-const { log_warning } = require("../../../logger");
+import { log_warning } from "../../../logger";
 
 const mockStore = configureStore();
 

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/useOpenSchemeHandler/index.ts

@@ -1,4 +1,8 @@
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import {
+  useAppSelector,
+  selectContentTypes,
+  selectRivers,
+} from "@applicaster/zapp-react-native-redux";
 import { ZappPipesEntryContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
 import { useEffect } from "react";
@@ -97,7 +101,8 @@ async function handleQuery({
 }
 
 export function useOpenSchemeHandler({ query, url, onFinish }) {
-  const { rivers, contentTypes } = usePickFromState(["rivers", "contentTypes"]);
+  const rivers = useAppSelector(selectRivers);
+  const contentTypes = useAppSelector(selectContentTypes);
   const navigator = useNavigation();
   const homeId = getHomeScreenId(rivers);
   const homeRoute = `/river/${homeId}`;

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/usePresentSchemeHandler.ts

@@ -1,15 +1,17 @@
-import { useActions } from "@applicaster/zapp-react-native-redux/hooks";
+import {
+  loadAppContextData,
+  useAppDispatch,
+  useActions,
+} from "@applicaster/zapp-react-native-redux";
 import * as R from "ramda";
 import * as React from "react";
 import axios from "axios";
-import { useDispatch } from "react-redux";
 
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
 
 import { useFeedLoader } from "@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedLoader";
 
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
-import { loadAppContextData } from "@applicaster/zapp-react-native-redux";
 import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 
 import {
@@ -60,7 +62,7 @@ export function usePresentSchemeHandler({
 
   const rivers = useRivers();
   const screenRiver = findRiver({ screen_id, rivers });
-  const dispatch = useDispatch();
+  const dispatch = useAppDispatch();
 
   const actions = useActions({
     setAppReady,

package/App/DeepLinking/URLSchemeHandler/__tests__/URLSchemeHandler.test.tsx

@@ -6,16 +6,16 @@ const theme = {
   app_background_color: "white",
 };
 
-const plugins = [];
-
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation");
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation"
+);
 
 jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
   useTheme: jest.fn(() => theme),
 }));
 
 jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
-  usePickFromState: jest.fn(() => plugins),
+  usePickFromState: jest.fn(() => ({})),
 }));
 
 const { URLSchemeHandler } = require("../URLSchemeHandler");

package/App/ErrorBoundary/index.tsx

@@ -60,6 +60,10 @@ export class ErrorBoundary extends React.Component<Props> {
     useErrorStore.getState().setError(error, info, recoverable);
   }
 
+  static getDerivedStateFromError(_error) {
+    return { hasError: true };
+  }
+
   render() {
     return <ErrorBoundaryContent>{this.props.children}</ErrorBoundaryContent>;
   }

package/App/ModalProvider/ModalBottomSheet/ModalBottomSheetFrame.tsx

@@ -47,7 +47,7 @@ const getSheetHeight = ({ height, bottomOffset, maxHeight }) => {
     ios: height - bottomOffset,
     default:
       (height || maxHeight) -
-      (!isAndroidVersionAtLeast(35) && isAndroidPlatform() ? bottomOffset : 0),
+      (isAndroidPlatform() && !isAndroidVersionAtLeast(35) ? bottomOffset : 0),
   });
 };
 

package/App/NavigationProvider/navigator/selectors.ts

@@ -1,5 +1,5 @@
 import * as R from "ramda";
-import { createSelector } from "reselect";
+import { createSelector } from "@reduxjs/toolkit";
 
 import { getPathAttributes } from "@applicaster/zapp-react-native-utils/navigationUtils";
 
@@ -7,6 +7,7 @@ const riverSelector = R.prop("rivers");
 const pathnameSelector = R.prop("pathname");
 const navigationStackSelector = R.prop("stack");
 
+// @TODO extract to zapp-react-native-redux/selectors, remove ramda
 export const homeRiverSelector = createSelector(
   riverSelector,
   R.compose(R.find(R.propEq("home", true)), R.values)

package/App/NetworkStatusProvider/__tests__/NetworkStatusProvider.test.tsx

@@ -1,15 +1,11 @@
 import * as React from "react";
 import * as R from "ramda";
 import { renderHook, act } from "@testing-library/react-hooks";
-import configureStore from "redux-mock-store";
-import thunk from "redux-thunk";
 import { NetworkStatusContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NetworkStatusContext";
 import { NetworkStatusProvider } from "../NetworkStatusProvider";
-import { Provider } from "react-redux";
+import { WrappedWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 import NetInfo from "@react-native-community/netinfo";
 
-const mockStore = configureStore([thunk]);
-
 const NetInfoMock = {
   type: "cellular",
   details: {
@@ -24,9 +20,9 @@ const NetInfoMock = {
 const getWrapper = (store) => ({
   // eslint-disable-next-line react/prop-types,react/display-name
   wrapper: ({ children }) => (
-    <Provider store={store}>
+    <WrappedWithProviders store={store}>
       <NetworkStatusProvider>{children}</NetworkStatusProvider>
-    </Provider>
+    </WrappedWithProviders>
   ),
 });
 
@@ -41,9 +37,9 @@ const useNetInfoMock = () => {
 
 describe("NetworkStatusProvider", function () {
   it("should return netInfoData", function () {
-    const store = mockStore({
+    const store = {
       plugins: [{}],
-    });
+    };
 
     // @ts-ignore
     jest.spyOn(NetInfo, "useNetInfo").mockImplementation(useNetInfoMock);
@@ -59,9 +55,9 @@ describe("NetworkStatusProvider", function () {
   it("should call onConnectionLost callback when connection type changes to none", function () {
     const onConnectionLost = jest.fn();
 
-    const store = mockStore({
+    const store = {
       plugins: [{ module: { networkHooks: { onConnectionLost } } }],
-    });
+    };
 
     // @ts-ignore
     jest.spyOn(NetInfo, "useNetInfo").mockImplementation(useNetInfoMock);
@@ -86,9 +82,9 @@ describe("NetworkStatusProvider", function () {
   it("should call onConnectionRestored callback when connection type switches from none", function () {
     const onConnectionRestored = jest.fn();
 
-    const store = mockStore({
+    const store = {
       plugins: [{ module: { networkHooks: { onConnectionRestored } } }],
-    });
+    };
 
     // @ts-ignore
     jest.spyOn(NetInfo, "useNetInfo").mockImplementation(useNetInfoMock);
@@ -123,9 +119,9 @@ describe("NetworkStatusProvider", function () {
   it("should call onConnectionTypeChanged callback when connection type changes", function () {
     const onConnectionTypeChanged = jest.fn();
 
-    const store = mockStore({
+    const store = {
       plugins: [{ module: { networkHooks: { onConnectionTypeChanged } } }],
-    });
+    };
 
     // @ts-ignore
     jest.spyOn(NetInfo, "useNetInfo").mockImplementation(useNetInfoMock);

package/App/StoreConnector/__tests__/storeConnector.test.js

@@ -1,11 +1,9 @@
 import * as React from "react";
 import * as ReactIs from "react-is";
 import { View, Text } from "react-native";
-import { render } from "@testing-library/react-native";
-import configureStore from "redux-mock-store";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 
 import { storeConnector } from "../index";
-import { Provider } from "react-redux";
 
 const styles = { foo: "bar" };
 const components = { grid: jest.fn() };
@@ -18,12 +16,12 @@ const Component = (props) => (
   </View>
 );
 
-const store = configureStore()({
+const store = {
   styles,
   components,
   rivers,
   appSettings,
-});
+};
 
 describe("storeConnector", () => {
   it("returns a Component", () => {
@@ -41,10 +39,9 @@ describe("storeConnector", () => {
   it("passes the props to the component", () => {
     const WrappedComponent = storeConnector(Component);
 
-    const { getByText, getByTestId } = render(
-      <Provider store={store}>
-        <WrappedComponent />
-      </Provider>
+    const { getByText, getByTestId } = renderWithProviders(
+      <WrappedComponent />,
+      store
     );
 
     expect(getByText("I'm a component")).toBeTruthy();

package/App/StoreConnector/index.ts

@@ -1,5 +1,5 @@
 import * as R from "ramda";
-import { connectToStore } from "@applicaster/zapp-react-native-redux";
+import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
 
 const REDUX_STORE_PROPS = [
   "components",

package/App/__tests__/createQuickBrickApp.test.js

@@ -42,9 +42,12 @@ jest.mock("../AppStateDecorator", () => ({
   withAppManager: (Comp) => Comp,
 }));
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
-  useDimensions: jest.fn(() => ({ width: 375, height: 800 })),
-}));
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/layout/useDimensions",
+  () => ({
+    useDimensions: jest.fn(() => ({ width: 375, height: 800 })),
+  })
+);
 
 jest.mock("react-native", () => {
   const RNMock = jest.genMockFromModule("react-native");

package/App/appLifeCycleManager/__tests__/appLifeCycleManager.test.tsx

@@ -1,8 +1,8 @@
 import * as React from "react";
 import { View, Text } from "react-native";
-import { render, waitFor } from "@testing-library/react-native";
-import thunk from "redux-thunk";
-import configureStore from "redux-mock-store";
+import { waitFor } from "@testing-library/react-native";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
+import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
 
 let mocked_items: Record<string, any> = {};
 
@@ -10,10 +10,22 @@ import { appLifeCycleManager } from "../";
 
 const mock_actions = {};
 
-jest.mock("@applicaster/zapp-react-native-redux/AppData", () => ({
-  loadAppData: jest.fn(() => () => Promise.resolve()),
+jest.mock("@applicaster/zapp-react-native-redux", () => ({
+  ...jest.requireActual("@applicaster/zapp-react-native-redux"),
+  AppData: {
+    loadAppData: jest.fn(() => () => Promise.resolve()),
+  },
 }));
 
+jest.mock(
+  "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage",
+  () => ({
+    sessionStorage: {
+      getAllItems: jest.fn(() => Promise.resolve(mocked_items)),
+    },
+  })
+);
+
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/actions", () => ({
   useActions: jest.fn(() => ({ actions: mock_actions })),
 }));
@@ -22,6 +34,9 @@ jest.mock(
   "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage",
   () => ({
     localStorage: {
+      ...jest.requireActual(
+        "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage"
+      ).localStorage,
       getAllItems: jest.fn(() => Promise.resolve(mocked_items)),
       setItem: jest.fn((key, value) => {
         mocked_items[key] = JSON.stringify(value);
@@ -64,12 +79,8 @@ const appLoader = jest.fn((_dispatch, _getState) => {
   return Promise.resolve();
 });
 
-const store = configureStore([thunk])({});
-const dispatch = store.dispatch;
-
 const state = {
-  rivers: {},
-  plugins: {},
+  plugins: {} as QuickBrickPlugin[],
   appSettings: { runtimeConfigurationUrls: { rivers: "http://rivers.url" } },
 };
 
@@ -91,19 +102,16 @@ describe("appLifeCycleManager", () => {
   it("runs the loaders, then sends quickBrickReady event", async () => {
     const testCallback = jest.fn(() => {});
 
-    render(
-      <DecoratedComponent
-        dispatch={dispatch}
-        {...state}
-        testCallback={testCallback}
-      />
+    renderWithProviders(
+      <DecoratedComponent {...state} testCallback={testCallback} />,
+      state
     );
 
     await waitFor(() => {
       return expect(testCallback).toHaveBeenCalled();
     });
 
-    const actions = store.getActions();
+    const actions = appStore.testStore.getActions();
 
     expect(actions[0]).toMatchObject({ type: "SET_APP_READY" });
 
@@ -117,16 +125,12 @@ describe("appLifeCycleManager", () => {
   it("sends the quickBrickReady event when a loader doesn't resolves", async () => {
     const testCallback = jest.fn(() => {});
 
-    render(
-      <DecoratedComponent
-        dispatch={dispatch}
-        {...state}
-        shouldFail
-        testCallback={testCallback}
-      />
+    renderWithProviders(
+      <DecoratedComponent {...state} shouldFail testCallback={testCallback} />,
+      state
     );
 
-    const actions = store.getActions();
+    const actions = appStore.testStore.getActions();
 
     await waitFor(() => {
       return expect(testCallback).toHaveBeenCalled();

package/App/appLifeCycleManager/index.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import * as R from "ramda";
 
 import { sendLaunchEvent } from "@applicaster/zapp-react-native-utils/analyticsUtils";
-import { loadAppData } from "@applicaster/zapp-react-native-redux/AppData";
+import { AppData, useAppDispatch } from "@applicaster/zapp-react-native-redux";
 import {
   setAppLaunched,
   setAppReady,
@@ -13,7 +13,6 @@ import { networkStatusReady } from "../NetworkStatusProvider/networkStatusReady"
 import { updateSessionNumber } from "../SessionCounter/sessionCounter";
 
 import { coreAppLogger } from "../logger";
-import { Dispatch } from "@reduxjs/toolkit";
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
 import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { requiredSessionKeys } from "../../const";
@@ -24,7 +23,6 @@ const logger = coreAppLogger.addSubsystem("AppLifeCycleManager");
 const isAndroid = isAndroidPlatform();
 
 type Props = {
-  dispatch: Dispatch;
   testCallback: () => void;
   plugins: QuickBrickPlugin[];
   appSettings: { runtimeConfigurationUrls: { [key in string]: string } };
@@ -35,6 +33,7 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
     // this function is not called until React View is mounted to activity(ie quickBrickReady event sent)
     return function AppLifeCycleManagerRenderer(props: Props) {
       const actionsInitialStateSetters = useActionSetters();
+      const dispatch = useAppDispatch();
       // using useLayoutEffect to call the loader just after the DOM render to mimic componentDidMount timing
 
       async function setUpdateSessionNumber(results: unknown[]) {
@@ -93,7 +92,7 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
       }
 
       function makeAppReady() {
-        const { dispatch, testCallback } = props;
+        const { testCallback } = props;
 
         dispatch(setAppReady());
         dispatch(setAppLaunched());
@@ -153,14 +152,14 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
 
       const prepareApp = async () => {
         // eslint-disable-next-line unused-imports/no-unused-vars
-        const { dispatch, testCallback, ...state } = props;
+        const { testCallback, ...state } = props;
 
         try {
           const getState = () => state;
 
           const loaders = [
             appLoader(dispatch, getState),
-            dispatch<any>(loadAppData()),
+            dispatch<any>(AppData.loadAppData()),
             networkStatusReady(),
           ];
 

package/App/index.tsx

@@ -76,7 +76,10 @@ const App = ({
               <LoadingOverlay />
             </ErrorBoundary>
             <LogicAggregatorContainer
-              components={[InteractionManager, ApplyScreenHooks]}
+              components={React.useMemo(
+                () => [InteractionManager, ApplyScreenHooks],
+                [InteractionManager, ApplyScreenHooks]
+              )}
             />
           </AppContainer>
         </SafeAreaProvider>

package/App/remoteContextReloader/__tests__/getRemoteContextData.test.js

@@ -1,10 +1,16 @@
-import * as ReduxModule from "@applicaster/zapp-react-native-redux";
 import nock from "nock";
 
 jest.mock("../../AssetCache", () => ({
   cacheAssets: jest.fn((x) => x),
 }));
 
+const mockLoadAppContextData = jest.fn(() => ({}));
+
+jest.mock("@applicaster/zapp-react-native-redux", () => ({
+  ...jest.requireActual("@applicaster/zapp-react-native-redux"),
+  loadAppContextData: mockLoadAppContextData,
+}));
+
 const uuid = "342ee911-03b6-4a16-adde-ece5ef739feb";
 
 const { getRemoteContextData } = require("../getRemoteContextData");
@@ -100,11 +106,12 @@ const failingRuntimeConfigurationUrls = {
   remote_configurations_url: "http://zapp.com/failing.json",
 };
 
-let reduxLoaderSpy;
 const dispatch = jest.fn();
 
 describe("getRemoteContextData", () => {
   beforeEach(() => {
+    mockLoadAppContextData.mockClear();
+
     nock("http://zapp.com").persist().get("/layout.json").reply(200, layout);
 
     nock("http://zapp.com")
@@ -120,20 +127,12 @@ describe("getRemoteContextData", () => {
     nock("http://zapp.com")
       .get("/failing.json")
       .reply(Math.floor(Math.random() * 200 + 400), 0);
-
-    reduxLoaderSpy = jest
-      .spyOn(ReduxModule, "loadAppContextData")
-      .mockImplementation(() => ({}));
-  });
-
-  afterEach(() => {
-    reduxLoaderSpy.mockRestore();
   });
 
   it("returns a map of context data with the result of the matched urls", async () => {
     await getRemoteContextData(dispatch, runtimeConfigurationUrls, plugins);
 
-    return expect(reduxLoaderSpy).toHaveBeenCalledWith(
+    return expect(mockLoadAppContextData).toHaveBeenCalledWith(
       dispatch,
       expect.objectContaining({
         pluginConfigurations,
@@ -147,7 +146,7 @@ describe("getRemoteContextData", () => {
   });
 
   it("skips the context data if it cannot be retrieved", async () => {
-    expect(reduxLoaderSpy).not.toHaveBeenCalled();
+    expect(mockLoadAppContextData).not.toHaveBeenCalled();
 
     return expect(
       getRemoteContextData(dispatch, failingRuntimeConfigurationUrls, plugins)

package/App/remoteContextReloader/getRemoteContextData/getNativeRemoteContextData.ts

@@ -1,12 +1,14 @@
 import * as R from "ramda";
 import isEmpty from "lodash/isEmpty";
 import { Dimensions, NativeModules } from "react-native";
-import { loadAppContextData } from "@applicaster/zapp-react-native-redux";
+import {
+  loadAppContextData,
+  AppData,
+} from "@applicaster/zapp-react-native-redux";
 import { isTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { mapPromises } from "@applicaster/zapp-react-native-utils/arrayUtils";
 import { fetchPluginConfiguration, getPromiseForType } from "../helpers";
 import { cacheAssets } from "../../AssetCache";
-import { actions as appDataActions } from "@applicaster/zapp-react-native-redux/AppData";
 import { logger } from "@applicaster/zapp-react-native-utils/logger";
 import { ACTIVE_LAYOUT_ID_STORAGE_KEY } from "../consts";
 const { AppLoaderBridge } = NativeModules;
@@ -74,7 +76,7 @@ export async function getNativeRemoteContextData(
 
   const apiVersion = layout?.layout?.["api_version"]; // Taken from remote configuration
 
-  dispatch(appDataActions.merge({ layoutVersion: apiVersion || "v1" }));
+  dispatch(AppData.actions.merge({ layoutVersion: apiVersion || "v1" }));
 
   const resolvedPromises = await mapPromises(getPromiseForType, ["cellStyles"]);
 

package/README.md

@@ -42,10 +42,6 @@ Creates a Zapp App with the provided options :
   - `module`: the plugin's callable function / React component
   - `name`: the name of the plugin - should match the `PascalCase`'d identifier of the plugin. If your plugin's identifier is `react-native-article`, the name should be `ReactNativeArticle`
   - `type`: the type of the plugin, as it is defined in the plugin's manifest in Zapp
-- `reduxStoreOptions`: (optional)
-  - `additionalReducers`: map of reducers to load in the redux store, on top of the existing ones. See available reducers' names to avoid name collision which would override your own custom reducers
-  - `additionalMiddlewares`: array of additional middlewares to load - by default, the ZappApp will have the `thunk` middleware, but others can be added
-  - `initialState`: optional initial state for the redux store
 - `pluginConfigurations`: the remote configuration options for plugins, as coming from Zapp
 - `remoteConfigurations`: Zapp's remote configurations
 - `appSettings`: arbitrary app settings which will be stored in the redux store.

package/createZappApp/index.tsx

@@ -12,9 +12,10 @@ import {
   isNotNil,
 } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
 
+import { createZappReduxStore } from "@applicaster/zapp-react-native-redux/utils/createZappReduxStore";
 import {
-  createZappReduxStore,
   loadAppContextData,
+  AppData,
 } from "@applicaster/zapp-react-native-redux";
 
 import { coreLogger } from "@applicaster/zapp-react-native-utils/logger";
@@ -26,7 +27,6 @@ import { Provider } from "react-redux";
 import { EmptyZappApp } from "../defaults";
 import { mergeUiComponentPlugins } from "../helpers";
 import { isTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
-import { actions as appDataActions } from "@applicaster/zapp-react-native-redux/AppData";
 import { remoteDataLoader } from "../App/appRemoteDataLoader/remoteDataLoader";
 import * as QuickBrickManager from "@applicaster/zapp-react-native-bridge/QuickBrick";
 import { isAndroidPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
@@ -51,7 +51,6 @@ export function createZappApp(zappAppConfig: ZappAppConfig) {
     remoteConfigurations = {},
     layout = {},
     tabletLayout = {},
-    reduxStoreOptions = {},
     appSettings = {},
     ZappApp = EmptyZappApp,
     presetsMapping = {},
@@ -89,7 +88,7 @@ export function createZappApp(zappAppConfig: ZappAppConfig) {
     injectCorePlugins
   )(plugins);
 
-  const store = createZappReduxStore(reduxStoreOptions);
+  const store = createZappReduxStore();
 
   const appComponents = mergeUiComponentPlugins(components, plugins);
 
@@ -113,7 +112,7 @@ export function createZappApp(zappAppConfig: ZappAppConfig) {
     // Handle case when layout is backed in as part of the environment, dev only
     // TODO: Handle it inside getNativeRemoteContextData
     store.dispatch(
-      appDataActions.merge({
+      AppData.actions.merge({
         layoutVersion: layout?.api_version ? layout.api_version : "v1",
       })
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "14.0.0-alpha.5071825192",
+  "version": "14.0.0-alpha.5219335081",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,13 +28,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "14.0.0-alpha.5071825192",
-    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.5071825192",
-    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.5071825192",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.5071825192",
-    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.5071825192",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.5071825192",
-    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.5071825192",
+    "@applicaster/applicaster-types": "14.0.0-alpha.5219335081",
+    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.5219335081",
+    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.5219335081",
+    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.5219335081",
+    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.5219335081",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.5219335081",
+    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.5219335081",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",
@@ -42,9 +42,6 @@
     "md5": "^2.3.0",
     "promise": "^8.3.0",
     "query-string": "7.1.3",
-    "react-redux": "^7.2.1",
-    "redux": "^4.0.4",
-    "reselect": "^4.0.0",
     "url": "^0.11.0",
     "uuid": "3.3.2"
   },
@@ -56,23 +53,14 @@
     "@applicaster/zapp-react-native-tvos-ui-components": "*",
     "@babel/runtime": "*",
     "@react-native-community/netinfo": "*",
-    "immer": "*",
     "react": "*",
     "react-native": "*",
     "react-native-fs": "*",
-    "react-native-gesture-handler": "*",
     "react-native-linear-gradient": "*",
-    "react-native-safe-area-context": "*",
     "react-native-svg": "*",
-    "react-native-web": "*",
     "react-native-webview": "*",
     "uglify-js": "*",
     "validate-color": "*",
     "zustand": "*"
-  },
-  "devDependencies": {
-    "nock": "^10.0.0",
-    "redux-mock-store": "^1.5.3"
-  },
-  "gitHead": "a473487564142c55cdb50f02505cf0b60fe75658"
+  }
 }

package/renderZappApp/index.js

@@ -19,7 +19,7 @@
  * @param {React.ComponentType<any>} App component to start
  */
 export function renderZappApp(options) {
-  const { App, AppRegistry, appMountId } = options;
+  const { App, AppRegistry, appMountId, mode } = options;
 
   if (!App) {
     throw new Error("No App Component provided, nothing to render");
@@ -37,6 +37,7 @@ export function renderZappApp(options) {
     if (appMountId) {
       AppRegistry.runApplication("QuickBrickApp", {
         rootTag: document.getElementById(appMountId),
+        mode,
       });
     }
   }