chore: Remove notifications + remove ios folder + other small cleanup (#1596)

Author: thierryskoda

.gitignore

@@ -36,6 +36,9 @@ ios/Converse.xcworkspace/xcshareddata/swiftpm/Package.resolved
 # Android
 /android/
 
+# iOS
+/ios/
+
 # System files
 .DS_Store
 *.log

.nvmrc

@@ -1 +1 @@
-v20.18.0
+v20.18.0

.ruby-version

@@ -47,15 +47,15 @@ import {
   useAccountsStore,
 } from "./data/store/accountsStore";
 import { setAuthStatus } from "./data/store/authStore";
-import "./features/notifications/utils";
 import Main from "./screens/Main";
 import { registerBackgroundFetchTask } from "./utils/background";
 import { privySecureStorage } from "./utils/keychain/helpers";
 import { initSentry } from "./utils/sentry";
 import { saveApiURI } from "./utils/sharedData";
-import "./utils/splash/splash";
+import { preventSplashScreenAutoHide } from "./utils/splash/splash";
 import { setupStreamingSubscriptions } from "@/features/streams/streams";
-import { setupTopicNotificationsSubscriptions } from "@/features/notifications/utils/accountTopicSubscription";
+
+preventSplashScreenAutoHide();
 
 LogBox.ignoreLogs([
   "Privy: Expected status code 200, received 400", // Privy
@@ -105,7 +105,6 @@ const App = () => {
   useEffect(() => {
     setupAppAttest();
     setupStreamingSubscriptions();
-    setupTopicNotificationsSubscriptions();
   }, []);
 
   useCoinbaseWalletListener(true, coinbaseUrl);

App.tsx

@@ -10,9 +10,10 @@ type EnvironmentConfig = {
   appDomainGetConverse: string;
   appName: string;
   icon: string;
-  googleServicesFile: string;
   ios: {
     bundleIdentifier: string;
+    associatedDomains: string[];
+    googleServicesFile: string;
   };
   android: {
     package: string;
@@ -25,52 +26,64 @@ const settings: Record<Environment, EnvironmentConfig> = {
     scheme: "converse-dev",
     ios: {
       bundleIdentifier: "com.converse.dev",
+      associatedDomains: [
+        "applinks:dev.converse.xyz",
+        "applinks:dev.getconverse.app",
+        "webcredentials:dev.converse.xyz",
+      ],
+      googleServicesFile: "./google-services/ios/development.plist",
     },
     android: {
       package: "com.converse.dev",
-      googleServicesFile: "./scripts/build/android/google-services/dev.json",
+      googleServicesFile: "./google-services/android/development.json",
     },
     androidPackage: "com.converse.dev",
     appDomainConverse: "dev.converse.xyz",
     appDomainGetConverse: "dev.getconverse.app",
     appName: "Converse DEV",
     icon: "./assets/icon-preview.png",
-    googleServicesFile: "./scripts/build/android/google-services/dev.json",
   },
   preview: {
     scheme: "converse-preview",
     ios: {
       bundleIdentifier: "com.converse.preview",
+      associatedDomains: [
+        "applinks:preview.converse.xyz",
+        "applinks:preview.getconverse.app",
+        "webcredentials:preview.converse.xyz",
+      ],
+      googleServicesFile: "./google-services/ios/preview.plist",
     },
     android: {
       package: "com.converse.preview",
-      googleServicesFile:
-        "./scripts/build/android/google-services/preview.json",
+      googleServicesFile: "./google-services/android/preview.json",
     },
     androidPackage: "com.converse.preview",
     appDomainConverse: "preview.converse.xyz",
     appDomainGetConverse: "preview.getconverse.app",
     appName: "Converse PREVIEW",
     icon: "./assets/icon-preview.png",
-    googleServicesFile: "./scripts/build/android/google-services/preview.json",
   },
   production: {
     scheme: "converse",
     ios: {
       bundleIdentifier: "com.converse.native",
+      associatedDomains: [
+        "applinks:converse.xyz",
+        "applinks:getconverse.app",
+        "webcredentials:converse.xyz",
+      ],
+      googleServicesFile: "./google-services/ios/production.plist",
     },
     android: {
       package: "com.converse.prod",
-      googleServicesFile:
-        "./scripts/build/android/google-services/production.json",
+      googleServicesFile: "./google-services/android/production.json",
     },
     androidPackage: "com.converse.prod",
     appDomainConverse: "converse.xyz",
     appDomainGetConverse: "getconverse.app",
     appName: "Converse",
     icon: "./assets/icon.png",
-    googleServicesFile:
-      "./scripts/build/android/google-services/production.json",
   },
 };
 
@@ -89,42 +102,42 @@ export default (): ExpoConfig => {
     userInterfaceStyle: "automatic",
     version: version,
     assetBundlePatterns: ["**/*"],
+    runtimeVersion: version,
     updates: {
       fallbackToCacheTimeout: 0,
       url: "https://u.expo.dev/49a65fae-3895-4487-8e8a-5bd8bee3a401",
     },
-    runtimeVersion: version,
+    extra: {
+      expoEnv,
+      eas: {
+        projectId: "49a65fae-3895-4487-8e8a-5bd8bee3a401",
+      },
+    },
     ios: {
-      // bundleIdentifier: config.ios.bundleIdentifier, // Not needed since we have ios folder already specifying it
+      bundleIdentifier: config.ios.bundleIdentifier,
       supportsTablet: true,
       config: {
         usesNonExemptEncryption: false,
       },
-    },
-    extra: {
-      expoEnv,
-      eas: {
-        projectId: "49a65fae-3895-4487-8e8a-5bd8bee3a401",
+      associatedDomains: config.ios.associatedDomains,
+      googleServicesFile: config.ios.googleServicesFile,
+      infoPlist: {
+        LSApplicationQueriesSchemes: [
+          "cbwallet",
+          "ledgerlive",
+          "rainbow",
+          "metamask",
+          "trust",
+          "uniswap",
+          "zerion",
+          "exodus",
+          "oneinch",
+        ],
       },
     },
     android: {
       package: config.android.package,
       googleServicesFile: config.android.googleServicesFile,
-      permissions: [
-        "INTERNET",
-        "READ_EXTERNAL_STORAGE",
-        "SYSTEM_ALERT_WINDOW",
-        "VIBRATE",
-        "POST_NOTIFICATIONS",
-        "READ_CONTACTS",
-        "RECEIVE_BOOT_COMPLETED",
-        "WRITE_EXTERNAL_STORAGE",
-        "WAKE_LOCK",
-        "USE_FINGERPRINT",
-        "USE_BIOMETRIC",
-        "READ_MEDIA_IMAGES",
-        "READ_MEDIA_VIDEO",
-      ],
       intentFilters: [
         {
           action: "VIEW",
@@ -191,9 +204,19 @@ export default (): ExpoConfig => {
       ],
     },
     plugins: [
+      ["expo-notifications"],
+      ["expo-local-authentication"],
       [
         "expo-build-properties",
         {
+          ios: {
+            // To fix error "The Swift pod `FirebaseCoreInternal` depends upon `GoogleUtilities`,
+            // which does not define modules. To opt into those targets generating module maps
+            // (which is necessary to import them from Swift when building as static libraries),
+            // you may set `use_modular_headers!` globally in your Podfile,
+            // or specify `:modular_headers => true` for particular dependencies"
+            useFrameworks: "static",
+          },
           android: {
             compileSdkVersion: 35,
             targetSdkVersion: 34,
@@ -273,6 +296,15 @@ export default (): ExpoConfig => {
           },
         },
       ],
+      [
+        "expo-image-picker",
+        {
+          photosPermission:
+            "We need this so that you can share photos from your library.",
+          cameraPermission:
+            "We need this so that you can take photos to share.",
+        },
+      ],
       "expo-secure-store",
       [
         "expo-splash-screen",
@@ -283,10 +315,8 @@ export default (): ExpoConfig => {
             image: "./assets/splash-dark.png",
             backgroundColor: "#000000",
           },
-          imageWidth: 300,
         },
       ],
-      "expo-secure-store",
       [
         "@sentry/react-native/expo",
         {
@@ -295,10 +325,8 @@ export default (): ExpoConfig => {
           url: "https://sentry.io/",
         },
       ],
+      ["@react-native-firebase/app"],
       ["@react-native-firebase/app-check"],
-      "./scripts/build/android/notifeeExpoPlugin.js", // See https://github.com/invertase/notifee/issues/350
-      "./scripts/build/android/androidDependenciesExpoPlugin.js", // Handle some conflicting dependencies manually
-      "./scripts/build/android/buildGradleProperties.js", // Increase memory for building android in EAS
     ],
   };
 };

app.config.ts

@@ -8,7 +8,6 @@ import {
   textSecondaryColor,
 } from "@styles/colors";
 import { PictoSizes } from "@styles/sizes";
-import * as Linking from "expo-linking";
 import React, { useCallback } from "react";
 import {
   Keyboard,
@@ -21,8 +20,6 @@ import { invalidateProfileSocialsQuery } from "@/queries/useProfileSocialsQuery"
 import { useAccountsStore } from "../data/store/accountsStore";
 import { useAppStore } from "../data/store/appStore";
 import { useSelect } from "../data/store/storeHelpers";
-import { NotificationPermissionStatus } from "../features/notifications/types/Notifications.types";
-import { requestPushNotificationsPermissions } from "../features/notifications/utils/requestPushNotificationsPermissions";
 import { useRouter } from "../navigation/useNavigation";
 import { navigate } from "../utils/navigation";
 import Picto from "./Picto/Picto";
@@ -72,31 +69,7 @@ export default function AccountSettingsButton({ account }: Props) {
         Clipboard.setString(account || "");
       },
       [translate("turn_on_notifications")]: () => {
-        // @todo => move that to a helper because also used in Profile
-        if (notificationsPermissionStatus === "denied") {
-          if (Platform.OS === "android") {
-            // Android 13 is always denied first so let's try to show
-            requestPushNotificationsPermissions().then(
-              (newStatus: NotificationPermissionStatus | undefined) => {
-                if (newStatus === "denied") {
-                  Linking.openSettings();
-                } else if (newStatus) {
-                  setNotificationsPermissionStatus(newStatus);
-                }
-              }
-            );
-          } else {
-            Linking.openSettings();
-          }
-        } else if (notificationsPermissionStatus === "undetermined") {
-          // Open popup
-          requestPushNotificationsPermissions().then(
-            (newStatus: NotificationPermissionStatus | undefined) => {
-              if (!newStatus) return;
-              setNotificationsPermissionStatus(newStatus);
-            }
-          );
-        }
+        // TODO
       },
       [translate("disconnect_this_account")]: () =>
         showDisconnectActionSheet(colorScheme),
@@ -148,7 +121,6 @@ export default function AccountSettingsButton({ account }: Props) {
     notificationsPermissionStatus,
     colorScheme,
     setCurrentAccount,
-    setNotificationsPermissionStatus,
     showDisconnectActionSheet,
   ]);
 

components/AccountSettingsButton.tsx

@@ -1,4 +1,3 @@
-import { subscribeToNotifications } from "@/features/notifications/utils/subscribeToNotifications";
 import { prefetchConversationMetadataQuery } from "@/queries/conversation-metadata-query";
 import { fetchAllowedConsentConversationsQuery } from "@/queries/conversations-allowed-consent-query";
 import { ensureInboxId } from "@/queries/inbox-id-query";
@@ -35,9 +34,7 @@ export default function HydrationStateHandler() {
           })
         );
       } catch (error) {
-        logger.debug(
-          `[Hydration] Error during inboxId initialization: ${error.message}`
-        );
+        captureError(error);
       }
 
       // Non critical queries
@@ -53,10 +50,6 @@ export default function HydrationStateHandler() {
                 conversation.topic
               ).catch(captureError);
             }
-            subscribeToNotifications({
-              conversations,
-              account,
-            });
           })
           .catch(captureError);
       }

components/StateHandlers/HydrationStateHandler.tsx

@@ -44,7 +44,6 @@ export type IConfig = {
   xmtpEnv: IXmtpEnv;
   apiURI: string;
   bundleId: string;
-  appleAppGroup: string;
   scheme: string;
   websiteDomain: string;
   usernameSuffix: string;

config/config.types.ts

@@ -2,11 +2,10 @@ import { IConfig } from "@/config/config.types";
 import { Platform } from "react-native";
 import { shared } from "./shared";
 
-export const devConfig: IConfig = {
+export const developmentConfig: IConfig = {
   ...shared,
   debugMenu: true,
   bundleId: "com.converse.dev",
-  appleAppGroup: "group.com.converse.dev",
   scheme: "converse-dev",
   websiteDomain: "dev.converse.xyz",
   usernameSuffix: ".conversedev.eth",

config/dev.ts config/development.ts

@@ -1,12 +1,12 @@
 import { isDev, isPreview } from "@/utils/getEnv";
-import { devConfig } from "./dev";
-import { prodConfig } from "./prod";
+import { developmentConfig } from "./development";
+import { productionConfig } from "./production";
 import { previewConfig } from "./preview";
 
 export const getConfig = () => {
-  if (isDev) return devConfig;
+  if (isDev) return developmentConfig;
   if (isPreview) return previewConfig;
-  return prodConfig;
+  return productionConfig;
 };
 
 export const config = getConfig();

config/index.ts

@@ -5,7 +5,6 @@ export const previewConfig: IConfig = {
   ...shared,
   debugMenu: true,
   bundleId: "com.converse.preview",
-  appleAppGroup: "group.com.converse.preview",
   scheme: "converse-preview",
   websiteDomain: "preview.converse.xyz",
   usernameSuffix: ".conversedev.eth",

config/preview.ts

@@ -2,11 +2,10 @@ import { IConfig } from "@/config/config.types";
 import { Platform } from "react-native";
 import { shared } from "./shared";
 
-export const prodConfig: IConfig = {
+export const productionConfig: IConfig = {
   ...shared,
   bundleId:
     Platform.OS === "android" ? "com.converse.prod" : "com.converse.native",
-  appleAppGroup: "group.com.converse.native",
   scheme: "converse",
   websiteDomain: "converse.xyz",
   usernameSuffix: ".converse.xyz",