@applicaster/quick-brick-core 14.0.0-alpha.9119252693 → 14.0.0-alpha.9203091422

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/AppStateDecorator/index.tsx

@@ -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,13 @@
-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 = {
@@ -20,23 +19,22 @@ const rivers = {
 const navigator = {
   currentRoute: "/river/A1234",
   replace: 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");
 
-const { usePresentSchemeHandler } = require("../usePresentSchemeHandler");
-
 const onFinish = jest.fn((cb) => {
   cb();
 });
 
+jest.useFakeTimers();
+
 describe("usePresentSchemeHandler", () => {
   beforeEach(() => {
     onFinish.mockClear();
@@ -44,11 +42,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 +53,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 +91,8 @@ describe("usePresentSchemeHandler", () => {
             onFinish,
           }),
         {
-          wrapper,
+          wrapper: WrappedWithProviders,
+          initialProps: { store },
         }
       );
 
@@ -123,7 +119,8 @@ describe("usePresentSchemeHandler", () => {
       )}&show_nav_bar=true`;
 
       renderHook(() => usePresentSchemeHandler({ query, url, onFinish }), {
-        wrapper,
+        wrapper: WrappedWithProviders,
+        initialProps: { store },
       });
 
       expect(onFinish).toBeCalled();
@@ -155,22 +152,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 +177,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 +185,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 +198,6 @@ describe("usePresentSchemeHandler", () => {
 
       storageSpy.mockImplementation(getAllItems);
       axiosGetSpy.mockImplementation(get);
-      zappReduxSpy.mockReturnValue(null);
 
       renderHook(() => usePresentSchemeHandler({ query, url: "", onFinish }), {
         wrapper,
@@ -217,13 +210,6 @@ describe("usePresentSchemeHandler", () => {
           actions?.find(R.propEq("type", "SET_APP_NOT_READY"))
         ).toBeDefined();
 
-        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 +247,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper,
+          wrapper: WrappedWithProviders,
         }
       );
 
@@ -293,7 +279,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper,
+          wrapper: WrappedWithProviders,
         }
       );
 
@@ -325,7 +311,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper,
+          wrapper: WrappedWithProviders,
         }
       );
 
@@ -357,7 +343,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/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/__tests__/__snapshots__/reducer.test.ts.snap

@@ -44,6 +44,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
+        "screenStateStore": [Function],
       },
     },
     "options": {
@@ -79,6 +80,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
       ],
@@ -114,6 +116,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
+        "screenStateStore": [Function],
       },
     },
     "options": {
@@ -149,6 +152,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
         {
@@ -180,6 +184,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
       ],
@@ -215,6 +220,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
+        "screenStateStore": [Function],
       },
     },
     "options": {
@@ -250,6 +256,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
         {
@@ -281,6 +288,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
         {
@@ -312,6 +320,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
       ],
@@ -348,6 +357,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
+        "screenStateStore": undefined,
       },
     },
     "options": {
@@ -383,6 +393,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
         {
@@ -414,6 +425,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
       ],
@@ -449,6 +461,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
+        "screenStateStore": [Function],
       },
     },
     "options": {
@@ -484,6 +497,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
         {
@@ -515,6 +529,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
         {
@@ -546,6 +561,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
       ],
@@ -582,6 +598,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
+        "screenStateStore": undefined,
       },
     },
     "options": {
@@ -617,6 +634,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
         {
@@ -648,6 +666,7 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
+            "screenStateStore": undefined,
           },
         },
       ],

package/App/NavigationProvider/navigator/reducer.ts

@@ -5,6 +5,7 @@ import {
   firstStackEntriesSelector,
   previousStackEntriesSelector,
 } from "./selectors";
+import { create, StoreApi, UseBoundStore } from "zustand";
 
 /* initial state */
 
@@ -120,12 +121,12 @@ export const setNestedContent = (
 
 const navigationEntry = (
   type: ActionValues,
-  { route, screen, entry, key, options }: AnyRecord
+  { route, screen, entry, key, options, screenStateStore }: AnyRecord
 ) => ({
   key,
   action: type,
   route,
-  state: { screen, entry, options },
+  state: { screen, entry, options, screenStateStore },
 });
 
 function updatePopActions(state) {
@@ -274,6 +275,25 @@ function locationReducer(
 ) {
   const { route, key, screen, entry, options } = payload;
 
+  const screenStateStore: UseBoundStore<StoreApi<ScreenStateStore>> =
+    create<ScreenStateStore>((set) => ({
+      data: {},
+      setValue: (key, value) =>
+        set((state) => ({
+          data: {
+            ...state.data,
+            [key]: value,
+          },
+        })),
+      removeValue: (key) =>
+        set((state) => {
+          const newData = { ...state.data };
+          delete newData[key];
+
+          return { data: newData };
+        }),
+    }));
+
   switch (type) {
     case ACTIONS.BACK:
       // eslint-disable-next-line no-case-declarations
@@ -294,14 +314,18 @@ function locationReducer(
     case ACTIONS.REPLACE:
     case ACTIONS.REPLACE_TOP:
     case ACTIONS.BACK_PLAYER_NESTED_CONTENT:
-      return { pathname: route, state: { screen, entry, options }, key };
+      return {
+        pathname: route,
+        state: { screen, entry, options, screenStateStore },
+        key,
+      };
 
     case ACTIONS.SET_NESTED_CONTENT:
       // eslint-disable-next-line no-case-declarations
-      const nestedEntry = navigationEntry(
-        ACTIONS.REPLACE,
-        payload as AnyRecord
-      );
+      const nestedEntry = navigationEntry(ACTIONS.REPLACE, {
+        ...payload,
+        screenStateStore,
+      } as AnyRecord);
 
       return R.assocPath(["state", "nested"], nestedEntry.state, state);
     default:
@@ -405,18 +429,34 @@ export default function navigationReducer(
     case ACTIONS.REPLACE:
     case ACTIONS.REPLACE_TOP:
     case ACTIONS.BACK:
-    case ACTIONS.BACK_PLAYER_NESTED_CONTENT:
-      return R.evolve(
-        {
-          stack: applyReducer(navigationStackReducer, { type, payload }),
-          location: applyReducer(locationReducer, {
-            type,
-            payload,
-            meta: state,
-          }),
-        },
-        state
-      );
+    // eslint-disable-next-line
+    case ACTIONS.BACK_PLAYER_NESTED_CONTENT: {
+      // TODO: Check this solution with Pawel, does not work without it on tvs
+      const screenStateStore: UseBoundStore<StoreApi<ScreenStateStore>> =
+        create<ScreenStateStore>((set) => ({
+          data: {},
+          setValue: (key, value) =>
+            set((s) => ({ data: { ...s.data, [key]: value } })),
+          removeValue: (key) =>
+            set((s) => {
+              const data = { ...s.data };
+              delete data[key];
+
+              return { data };
+            }),
+        }));
+
+      const actionWithStore = {
+        type,
+        payload: { ...payload, screenStateStore },
+        meta: state,
+      };
+
+      const stack = applyReducer(navigationStackReducer, actionWithStore);
+      const location = applyReducer(locationReducer, actionWithStore);
+
+      return R.evolve({ stack, location }, state);
+    }
 
     case ACTIONS.SET_NESTED_CONTENT:
       return R.evolve(

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/appLifeCycleManager/__tests__/appLifeCycleManager.test.tsx

@@ -10,6 +10,15 @@ import { appLifeCycleManager } from "../";
 
 const mock_actions = {};
 
+jest.mock(
+  "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage",
+  () => ({
+    sessionStorage: {
+      getAllItems: jest.fn(() => Promise.resolve(mocked_items)),
+    },
+  })
+);
+
 jest.mock("@applicaster/zapp-react-native-redux/AppData", () => ({
   loadAppData: jest.fn(() => () => Promise.resolve()),
 }));

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "14.0.0-alpha.9119252693",
+  "version": "14.0.0-alpha.9203091422",
   "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.9119252693",
-    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.9119252693",
-    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.9119252693",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.9119252693",
-    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.9119252693",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.9119252693",
-    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.9119252693",
+    "@applicaster/applicaster-types": "14.0.0-alpha.9203091422",
+    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.9203091422",
+    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.9203091422",
+    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.9203091422",
+    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.9203091422",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.9203091422",
+    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.9203091422",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",
@@ -42,7 +42,7 @@
     "md5": "^2.3.0",
     "promise": "^8.3.0",
     "query-string": "7.1.3",
-    "react-redux": "^7.2.1",
+    "react-redux": "9.2.0",
     "redux": "^4.0.4",
     "reselect": "^4.0.0",
     "url": "^0.11.0",
@@ -61,7 +61,6 @@
     "react-native": "*",
     "react-native-fs": "*",
     "react-native-linear-gradient": "*",
-    "react-native-safe-area-context": "*",
     "react-native-svg": "*",
     "react-native-webview": "*",
     "uglify-js": "*",

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,
       });
     }
   }