🐛 onesignal: fix onesignal web being imported on android

exactly · Jan 9, 2024 · 35c7539 · 35c7539
1 parent ec111c5
commit 35c7539
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 75 deletions.
diff --git a/app/_layout.tsx b/app/_layout.tsx
@@ -53,6 +53,8 @@ export default function RootLayout() {
     ...FontAwesome.font,
   });
 
+  useOneSignal({});
+
   useEffect(() => {
     if (error) throw error;
   }, [error]);
@@ -65,9 +67,7 @@ export default function RootLayout() {
     reconnect(wagmiConfig).catch(handleError);
   }, []);
 
-  const initialized = useOneSignal({});
-
-  if (!loaded || !initialized) return;
+  if (!loaded) return;
 
   return (
     <>

diff --git a/utils/onesignal.native.ts b/utils/onesignal.native.ts
@@ -0,0 +1,47 @@
+import { useState, useEffect, useRef } from "react";
+import { OneSignal as RNOneSignal } from "react-native-onesignal";
+
+import { oneSignalAPPId } from "./constants";
+
+type OneSignalProperties = {
+  userId?: string;
+};
+
+type Instance = typeof RNOneSignal;
+
+export default function useOneSignal({ userId }: OneSignalProperties) {
+  const instance = useRef<Instance | null>(null);
+  const [initialized, setInitialized] = useState(false);
+
+  useEffect(() => {
+    const load = function () {
+      if (!oneSignalAPPId) {
+        setInitialized(true);
+        return;
+      }
+
+      if (!initialized) {
+        RNOneSignal.initialize(oneSignalAPPId);
+        instance.current = RNOneSignal;
+
+        setInitialized(true);
+      }
+
+      if (instance.current && userId) {
+        instance.current.login(userId);
+      }
+    };
+
+    load();
+
+    return () => {
+      if (!userId || !instance.current) {
+        return;
+      }
+
+      instance.current.logout();
+
+      setInitialized(false);
+    };
+  }, [userId, initialized]);
+}
diff --git a/utils/onesignal.ts b/utils/onesignal.ts
@@ -1,78 +1,18 @@
-import { useState, useEffect, useRef } from "react";
 import { Platform } from "react-native";
-import { OneSignal as RNOneSignal } from "react-native-onesignal";
-import ROneSignal from "react-onesignal";
-
-import { oneSignalAPPId } from "./constants";
 
 type OneSignalProperties = {
   userId?: string;
 };
 
-type Instance =
-  | {
-      type: "native";
-      value: typeof RNOneSignal;
-    }
-  | {
-      type: "web";
-      value: typeof ROneSignal;
-    };
-
-export default function useOneSignal({ userId }: OneSignalProperties) {
-  const instance = useRef<Instance | null>(null);
-  const [initialized, setInitialized] = useState(false);
-
-  useEffect(() => {
-    const load = async function () {
-      if (!oneSignalAPPId) {
-        setInitialized(true);
-        return;
-      }
-
-      if (!initialized) {
-        switch (Platform.OS) {
-          case "web": {
-            await ROneSignal.init({
-              appId: oneSignalAPPId,
-              allowLocalhostAsSecureOrigin: true,
-            });
-            instance.current = { type: "web", value: ROneSignal };
-            break;
-          }
-          case "ios":
-          case "android": {
-            RNOneSignal.initialize(oneSignalAPPId);
-            instance.current = { type: "native", value: RNOneSignal };
-            break;
-          }
-        }
-
-        setInitialized(true);
-      }
-
-      if (instance.current && userId) {
-        await instance.current.value.login(userId);
-      }
-    };
-
-    load().catch(() => {
-      setInitialized(true);
-    });
-
-    return () => {
-      if (!userId || !instance.current) {
-        return;
-      }
-
-      const logout = instance.current.value.logout();
-      if (logout instanceof Promise) {
-        logout.catch(() => {
-          // ignore
-        });
-      }
-    };
-  }, [userId, initialized]);
-
-  return initialized;
-}
+type OneSignal = (parameters: OneSignalProperties) => void;
+
+export default Platform.select<OneSignal>({
+  // eslint-disable-next-line @typescript-eslint/no-var-requires, unicorn/prefer-module
+  web: require("./onesignal.web") as OneSignal,
+  // eslint-disable-next-line @typescript-eslint/no-var-requires, unicorn/prefer-module
+  android: require("./onesignal.native") as OneSignal,
+  // eslint-disable-next-line @typescript-eslint/no-var-requires, unicorn/prefer-module
+  ios: require("./onesignal.native") as OneSignal,
+  // eslint-disable-next-line @typescript-eslint/no-var-requires, unicorn/prefer-module
+  default: require("./onesignal.native") as OneSignal,
+});
diff --git a/utils/onesignal.web.ts b/utils/onesignal.web.ts
@@ -0,0 +1,48 @@
+import { useState, useEffect, useRef } from "react";
+import OneSignal from "react-onesignal";
+
+import { oneSignalAPPId } from "./constants";
+
+type OneSignalProperties = {
+  userId?: string;
+};
+
+type Instance = typeof OneSignal;
+
+export default function useOneSignal({ userId }: OneSignalProperties) {
+  const instance = useRef<Instance | null>(null);
+  const [initialized, setInitialized] = useState(false);
+
+  useEffect(() => {
+    const load = async function () {
+      if (!oneSignalAPPId) {
+        setInitialized(true);
+        return;
+      }
+
+      if (!initialized) {
+        await OneSignal.init({
+          appId: oneSignalAPPId,
+          allowLocalhostAsSecureOrigin: true,
+        });
+        instance.current = OneSignal;
+
+        setInitialized(true);
+      }
+
+      if (instance.current && userId) {
+        await instance.current.login(userId);
+      }
+    };
+
+    load().catch(() => {});
+
+    return () => {
+      if (!userId || !instance.current) {
+        return;
+      }
+
+      instance.current.logout().catch(() => {});
+    };
+  }, [userId, initialized]);
+}