@applicaster/quick-brick-core 14.0.0-alpha.3881160800 → 14.0.0-alpha.4009339136

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/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/__tests__/useOpenSchemeHandler.test.tsx

@@ -16,7 +16,7 @@ import {
 } from "../useOpenSchemeHandler/const";
 import { withInitialPlayerState } from "../useOpenSchemeHandler/utils";
 
-import { log_warning } from "../../../logger";
+const { log_warning } = require("../../../logger");
 
 const rivers: Record<string, Partial<ZappRiver>> = {
   A1234: {
@@ -53,10 +53,13 @@ const navigator = {
   replace: jest.fn(),
   push: jest.fn(),
   goHome: jest.fn(),
-} as any;
+};
 
 const mockStore = configureStore();
-jest.spyOn(useNavigationHooks, "useNavigation").mockReturnValue(navigator);
+
+jest
+  .spyOn(useNavigationHooks, "useNavigation")
+  .mockImplementation(() => navigator);
 
 const helperSpy = jest.spyOn(helpers, "handlePresentNavigation");
 const feedLoaderSpy = jest.spyOn(feedLoader, "useFeedLoader");
@@ -69,7 +72,7 @@ jest.doMock("@applicaster/zapp-react-native-ui-components/Contexts", () => ({
   },
 }));
 
-jest.mock("../../../logger", () => ({
+jest.doMock("../../../logger", () => ({
   log_info: jest.fn(),
   log_error: jest.fn(),
   log_warning: jest.fn(),
@@ -77,6 +80,10 @@ jest.mock("../../../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");
 
@@ -185,6 +192,7 @@ 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,13 +1,14 @@
+import * as React from "react";
 import * as R from "ramda";
 import axios from "axios";
-import { renderHook } from "@testing-library/react-native";
+import { renderHook } from "@testing-library/react-hooks";
 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 = {
@@ -19,22 +20,23 @@ const rivers = {
 const navigator = {
   currentRoute: "/river/A1234",
   replace: jest.fn(),
-  goHome: jest.fn(),
-} as any;
+};
 
 const mockStore = configureStore();
 
-jest.spyOn(useNavigationHooks, "useNavigation").mockReturnValue(navigator);
+jest
+  .spyOn(useNavigationHooks, "useNavigation")
+  .mockImplementation(() => 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();
@@ -42,7 +44,11 @@ describe("usePresentSchemeHandler", () => {
     navigator.replace.mockClear();
   });
 
-  const store = { test: "test", rivers };
+  const store = mockStore({ test: "test", rivers });
+
+  const wrapper: React.FC<any> = ({ children }) => (
+    <Provider store={store}>{children}</Provider>
+  );
 
   describe("loading link url", () => {
     const query = { link_url: "http://applicaster.com" };
@@ -53,11 +59,10 @@ describe("usePresentSchemeHandler", () => {
 
     it("opens the link entry", () => {
       renderHook(() => usePresentSchemeHandler({ query, url, onFinish }), {
-        wrapper: WrappedWithProviders,
-        initialProps: { store },
+        wrapper,
       });
 
-      expect(onFinish).toHaveBeenCalled();
+      expect(onFinish).toBeCalled();
 
       expect(helperSpy).toBeCalledWith(
         expect.objectContaining({
@@ -91,8 +96,7 @@ describe("usePresentSchemeHandler", () => {
             onFinish,
           }),
         {
-          wrapper: WrappedWithProviders,
-          initialProps: { store },
+          wrapper,
         }
       );
 
@@ -119,8 +123,7 @@ describe("usePresentSchemeHandler", () => {
       )}&show_nav_bar=true`;
 
       renderHook(() => usePresentSchemeHandler({ query, url, onFinish }), {
-        wrapper: WrappedWithProviders,
-        initialProps: { store },
+        wrapper,
       });
 
       expect(onFinish).toBeCalled();
@@ -152,22 +155,22 @@ describe("usePresentSchemeHandler", () => {
       )}&screen_id=${screen_id}`;
 
       renderHook(() => usePresentSchemeHandler({ query, url, onFinish }), {
-        wrapper: WrappedWithProviders,
-        initialProps: { store },
+        wrapper,
       });
 
       expect(onFinish).toBeCalled();
 
-      expect(helperSpy).toHaveBeenCalledWith(
+      expect(helperSpy).toBeCalledWith(
         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: expect.anything(),
-          pushScreen: "http://applicaster.com",
+          navigator,
+          pushScreen: expect.anything(),
         })
       );
     });
@@ -177,7 +180,9 @@ 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 = WrappedWithProviders;
+      const wrapper: React.FC<any> = ({ children }) => (
+        <Provider store={store}>{children}</Provider>
+      );
 
       const query = {
         rivers_configuration_id: "test",
@@ -185,6 +190,7 @@ 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",
@@ -198,6 +204,7 @@ describe("usePresentSchemeHandler", () => {
 
       storageSpy.mockImplementation(getAllItems);
       axiosGetSpy.mockImplementation(get);
+      zappReduxSpy.mockReturnValue(null);
 
       renderHook(() => usePresentSchemeHandler({ query, url: "", onFinish }), {
         wrapper,
@@ -210,6 +217,13 @@ 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({});
       };
     });
@@ -247,7 +261,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper: WrappedWithProviders,
+          wrapper,
         }
       );
 
@@ -279,7 +293,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper: WrappedWithProviders,
+          wrapper,
         }
       );
 
@@ -311,7 +325,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper: WrappedWithProviders,
+          wrapper,
         }
       );
 
@@ -343,7 +357,7 @@ describe("usePresentSchemeHandler", () => {
             },
           }),
         {
-          wrapper: WrappedWithProviders,
+          wrapper,
         }
       );
 

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";
 
-import { log_warning } from "../../../logger";
+const { log_warning } = require("../../../logger");
 
 const mockStore = configureStore();
 

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

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

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

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

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

@@ -10,15 +10,6 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "14.0.0-alpha.3881160800",
+  "version": "14.0.0-alpha.4009339136",
   "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.3881160800",
-    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.3881160800",
-    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.3881160800",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.3881160800",
-    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.3881160800",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.3881160800",
-    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.3881160800",
+    "@applicaster/applicaster-types": "14.0.0-alpha.4009339136",
+    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.4009339136",
+    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.4009339136",
+    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.4009339136",
+    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.4009339136",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.4009339136",
+    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.4009339136",
     "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": "9.2.0",
+    "react-redux": "^7.2.1",
     "redux": "^4.0.4",
     "reselect": "^4.0.0",
     "url": "^0.11.0",
@@ -62,6 +62,7 @@
     "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": "*",