@applicaster/quick-brick-core 15.0.0-alpha.8680244503 → 15.0.0-alpha.9102777840

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

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react-native";
 import * as URLHandlersMap from "..";
 
 import { Provider } from "react-redux";

package/App/ErrorBoundary/__tests__/store.test.js

@@ -1,4 +1,4 @@
-import { act, renderHook } from "@testing-library/react-hooks";
+import { act, renderHook } from "@testing-library/react-native";
 import { useErrorStore } from "../store";
 
 describe("Error Store", () => {

package/App/NavigationProvider/NavigationProvider.tsx

@@ -7,7 +7,7 @@ import {
   getTargetRoute,
   usesVideoModal,
 } from "@applicaster/zapp-react-native-utils/navigationUtils";
-import { last } from "@applicaster/zapp-react-native-utils/utils";
+import { clone, last } from "@applicaster/zapp-react-native-utils/utils";
 import {
   allowedOrientationsForScreen,
   useGetScreenOrientation,
@@ -223,6 +223,7 @@ export function NavigationProvider({ children }: Props) {
   };
 
   const isVideoModalDocked = () =>
+    state?.options.videoModal.visible &&
     state?.options.videoModal.mode === "MINIMIZED";
 
   // TODO: Remove as it's using a concept of "current" route.
@@ -245,22 +246,24 @@ export function NavigationProvider({ children }: Props) {
     const screen = rivers[screenId];
     const parent = findParent(context, navigator.currentRoute);
 
+    const entryClone = clone(entry);
+
     if (!screen) {
       logger.warn({
         message: `Cannot resolve type mapping for ${screenId} id`,
-        data: { entry, screenId },
+        data: { entry: entryClone, screenId },
       });
 
       return;
     }
 
     if (parent) {
-      entry.parent = parent?.data;
+      entryClone.parent = parent?.data;
 
-      entry.parentId = parent?.id;
+      entryClone.parentId = parent?.id;
     }
 
-    dispatch(setNestedContent(pathname, entry, screen));
+    dispatch(setNestedContent(pathname, entryClone, screen));
   };
 
   const pushItem = (item, options = {}) => {

package/App/NavigationProvider/__tests__/navigationProvider.test.tsx

@@ -450,4 +450,56 @@ describe("<NavigationProvider />", () => {
       });
     });
   });
+
+  describe("setNestedScreenContent", () => {
+    it("should clone the entry object before modifying it", () => {
+      const originalEntry = {
+        id: "test-entry",
+        type: {
+          value: "feed",
+        },
+        title: "Test Entry",
+      };
+
+      const entryBeforeCall = structuredClone(originalEntry);
+
+      act(() => {
+        const view = getByTestId(wrapper, "WrapperView");
+        view.props.navigator.setNestedScreenContent(originalEntry, "A1234");
+      });
+
+      // Verify that the original entry object has not been modified
+      expect(originalEntry).toEqual(entryBeforeCall);
+      expect(originalEntry.parent).toBeUndefined();
+      expect(originalEntry.parentId).toBeUndefined();
+    });
+
+    it("should not mutate the original entry when parent exists", () => {
+      // First push a route to create a parent context
+      act(() => {
+        const view = getByTestId(wrapper, "WrapperView");
+        view.props.navigator.push(rivers.A1234);
+      });
+
+      const originalEntry = {
+        id: "test-entry",
+        type: {
+          value: "feed",
+        },
+        title: "Test Entry",
+      };
+
+      const entryBeforeCall = structuredClone(originalEntry);
+
+      act(() => {
+        const view = getByTestId(wrapper, "WrapperView");
+        view.props.navigator.setNestedScreenContent(originalEntry, "B4567");
+      });
+
+      // Verify that the original entry object has not been modified
+      expect(originalEntry).toEqual(entryBeforeCall);
+      expect(originalEntry.parent).toBeUndefined();
+      expect(originalEntry.parentId).toBeUndefined();
+    });
+  });
 });

package/App/NavigationProvider/navigator/selectors.ts

@@ -60,7 +60,7 @@ export const previousStackEntriesSelector = createSelector(
 export const lastEntrySelector = createSelector(
   navigationStackSelector,
   R.compose(R.last, R.when(R.has("mainStack"), R.prop("mainStack")))
-) as (state: any) => any; // TODO: tighten type to NavigationScreenState
+) as (state: any) => NavigationScreenState | undefined;
 
 // Selector extracting identifiers of plugins requiring startup execution
 export const startUpHookPluginIdentifiersSelector = createSelector(

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

@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as R from "ramda";
-import { renderHook, act } from "@testing-library/react-hooks";
+import { renderHook, act } from "@testing-library/react-native";
 import { NetworkStatusContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NetworkStatusContext";
 import { NetworkStatusProvider } from "../NetworkStatusProvider";
 import { WrappedWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
@@ -52,7 +52,7 @@ describe("NetworkStatusProvider", function () {
     expect(result.current).toStrictEqual(NetInfoMock);
   });
 
-  it("should call onConnectionLost callback when connection type changes to none", function () {
+  it("should call onConnectionLost callback when connection type changes to none", async function () {
     const onConnectionLost = jest.fn();
 
     const store = {
@@ -79,7 +79,7 @@ describe("NetworkStatusProvider", function () {
     expect(onConnectionLost).toBeCalledTimes(1);
   });
 
-  it("should call onConnectionRestored callback when connection type switches from none", function () {
+  it("should call onConnectionRestored callback when connection type switches from none", async function () {
     const onConnectionRestored = jest.fn();
 
     const store = {
@@ -116,7 +116,7 @@ describe("NetworkStatusProvider", function () {
     expect(onConnectionRestored).toBeCalledTimes(1);
   });
 
-  it("should call onConnectionTypeChanged callback when connection type changes", function () {
+  it("should call onConnectionTypeChanged callback when connection type changes", async function () {
     const onConnectionTypeChanged = jest.fn();
 
     const store = {

package/App/ThemeManager/index.tsx

@@ -9,6 +9,7 @@ import {
   partitionByKeys,
 } from "@applicaster/zapp-react-native-utils/objectUtils";
 import { getLocalizations } from "@applicaster/zapp-react-native-utils/appUtils/localizationsHelper";
+import { saveNetworkStatusLocalizations } from "./utils";
 
 type Props = {
   children: React.ReactNode;
@@ -104,6 +105,14 @@ function ThemeManagerComponent({ children, plugins }: Props) {
   const [selectedThemeId, setSelectedThemeId] =
     React.useState(DEFAULT_THEME_ID);
 
+  React.useEffect(() => {
+    const selectedTheme = themes[selectedThemeId];
+
+    if (selectedTheme) {
+      saveNetworkStatusLocalizations(selectedTheme);
+    }
+  }, [themes, selectedThemeId]);
+
   return (
     <MemoizedThemeContextProvider
       themes={themes}

package/App/ThemeManager/utils.ts

@@ -0,0 +1,54 @@
+import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
+
+const NETWORK_STATUS_LOCALIZATIONS_KEY = "network_status_localizations";
+const THEME_STORAGE_NAMESPACE = "quick-brick-theme";
+
+const DEFAULT_NETWORK_STATUS_LOCALIZATIONS: Record<string, string> = {
+  offline_notification_title: "No internet connection",
+  offline_notification_subtitle: "Please check your connection",
+  online_notification_title: "You are back online",
+  online_notification_subtitle: "Feel free to continue where you left off",
+};
+
+const NETWORK_STATUS_KEYS = Object.keys(
+  DEFAULT_NETWORK_STATUS_LOCALIZATIONS
+) as (keyof typeof DEFAULT_NETWORK_STATUS_LOCALIZATIONS)[];
+
+export async function saveNetworkStatusLocalizations(
+  themeOrLocalizations: Record<string, unknown>
+) {
+  try {
+    const storedLocalizations = await sessionStorage.getItem(
+      NETWORK_STATUS_LOCALIZATIONS_KEY,
+      THEME_STORAGE_NAMESPACE
+    );
+
+    if (storedLocalizations) {
+      return;
+    }
+
+    const networkStatusLocalizations = NETWORK_STATUS_KEYS.reduce(
+      (acc, key) => {
+        const value = themeOrLocalizations[key];
+
+        acc[key] =
+          typeof value === "string"
+            ? value
+            : DEFAULT_NETWORK_STATUS_LOCALIZATIONS[key];
+
+        return acc;
+      },
+      {} as Record<string, string>
+    );
+
+    if (Object.keys(networkStatusLocalizations).length > 0) {
+      await sessionStorage.setItem(
+        NETWORK_STATUS_LOCALIZATIONS_KEY,
+        JSON.stringify(networkStatusLocalizations),
+        THEME_STORAGE_NAMESPACE
+      );
+    }
+  } catch (error) {
+    console.error("Error saving network status localizations", error);
+  }
+}

package/App/__tests__/createQuickBrickApp.test.js

@@ -2,7 +2,7 @@
 import * as React from "react";
 import { render } from "@testing-library/react-native";
 import { Provider } from "react-redux";
-import thunk from "redux-thunk";
+import { thunk } from "redux-thunk";
 import configureStore from "redux-mock-store";
 
 jest.mock(

package/App/appRemoteDataLoader/index.tsx

@@ -3,7 +3,7 @@ import * as React from "react";
 import { getRemoteContextData } from "../remoteContextReloader/getRemoteContextData";
 
 import { coreAppLogger } from "../logger";
-import { AnyAction, Dispatch } from "@reduxjs/toolkit";
+import { UnknownAction, Dispatch } from "@reduxjs/toolkit";
 import { isAndroidPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
 
 const logger = coreAppLogger.addSubsystem("AppRemoteDataLoader");
@@ -27,7 +27,7 @@ export function appRemoteDataLoader(Component: ReactComponent<any>) {
     const [isDataLoaded, setIsDataLoaded] = React.useState(false);
 
     const loadRemoteConfigurationJSONs = async (
-      dispatch: Dispatch<AnyAction>,
+      dispatch: Dispatch<UnknownAction>,
       state
     ) => {
       if (!__DEV__ || process.env.ENABLE_REMOTE_DATA_IN_DEV === "true") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "15.0.0-alpha.8680244503",
+  "version": "15.0.0-alpha.9102777840",
   "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": "15.0.0-alpha.8680244503",
-    "@applicaster/quick-brick-core-plugins": "15.0.0-alpha.8680244503",
-    "@applicaster/zapp-pipes-v2-client": "15.0.0-alpha.8680244503",
-    "@applicaster/zapp-react-native-bridge": "15.0.0-alpha.8680244503",
-    "@applicaster/zapp-react-native-redux": "15.0.0-alpha.8680244503",
-    "@applicaster/zapp-react-native-ui-components": "15.0.0-alpha.8680244503",
-    "@applicaster/zapp-react-native-utils": "15.0.0-alpha.8680244503",
+    "@applicaster/applicaster-types": "15.0.0-alpha.9102777840",
+    "@applicaster/quick-brick-core-plugins": "15.0.0-alpha.9102777840",
+    "@applicaster/zapp-pipes-v2-client": "15.0.0-alpha.9102777840",
+    "@applicaster/zapp-react-native-bridge": "15.0.0-alpha.9102777840",
+    "@applicaster/zapp-react-native-redux": "15.0.0-alpha.9102777840",
+    "@applicaster/zapp-react-native-ui-components": "15.0.0-alpha.9102777840",
+    "@applicaster/zapp-react-native-utils": "15.0.0-alpha.9102777840",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",