appcheck

.gitignore

@@ -27,3 +27,4 @@ ios/Converse.xcworkspace/xcshareddata/swiftpm/Package.resolved
 
 # Android
 /android/
+build-*.apk

App.tsx

@@ -42,6 +42,7 @@
 import { initSentry } from "./utils/sentry";
 import "./utils/splash/splash";
 import "./features/notifications/utils";
+import { setupAppAttest } from "@utils/appCheck";
 
 LogBox.ignoreLogs([
   "Privy: Expected status code 200, received 400", // Privy
@@ -65,6 +66,10 @@
   const styles = useStyles();
   const debugRef = useRef();
 
+  useEffect(() => {
+    setupAppAttest();
+  }, []);
+
   useCoinbaseWalletListener(true, coinbaseUrl);
 
   useEffect(() => {
@@ -72,10 +77,10 @@
   }, []);
 
   const showDebugMenu = useCallback(() => {
     if (!debugRef.current || !(debugRef.current as any).showDebugMenu) {
       return;
     }
     (debugRef.current as any).showDebugMenu();
   }, []);
 
   useEffect(() => {
@@ -119,7 +124,7 @@
 const AppKeyboardProvider =
   Platform.OS === "ios" ? KeyboardProvider : React.Fragment;
 
 export default function AppWithProviders() {
   const colorScheme = useColorScheme();
 
   const paperTheme = useMemo(() => {
@@ -137,7 +142,7 @@
             <ActionSheetProvider>
               <ThemeProvider value={{ themeScheme, setThemeContextOverride }}>
                 <PaperProvider theme={paperTheme}>
                   <GestureHandlerRootView style={{ flex: 1 }}>
                     <BottomSheetModalProvider>
                       <PortalProvider>
                         <App />

README.md

@@ -49,11 +49,13 @@ Until then Converse web will only show 1 to 1 conversations and the majority of
 Web support is an end goal and the team is happy to fix any issues that are reported
 
 ### Install JS/React Native Dependencies
+
 ```
 yarn
 ```
 
 ### Building the Web App
+
 ```
 yarn start
 ```
@@ -72,13 +74,15 @@ yarn start
 ```
 
 # Linting
+
 ```
 yarn lint
 ```
 
 # Testing
 
 ## Running Jest tests
+
 Before running the tests make sure that you have a `.env` file setup with the variables variable set
 
 ```sh
@@ -88,13 +92,15 @@ yarn test
 ## Running Performance Tests
 
 Capture baselines for performance tests
+
 ```sh
 yarn test:perf:baseline
 ```
 
 Make changes to the code to see the performance impact
 
 Run the performance tests again to see the changes
+
 ```sh
 yarn test:perf
 ```
@@ -103,22 +109,22 @@ yarn test:perf
 
 Frames are expected to follow the Open Frames Standard https://github.com/open-frames/standard
 
-
-
 # Release Processes
 
 ### Main Branch
+
 Represents the current production code.
 
 ### Release Branches
+
 Each release branch is based off of `main` or the release branch before it. It is used to prepare and stabilize the code for a specific release version (e.g., `release/2.0.8`).
 
 ### Feature Branches
+
 Feature branches are longer-lived features or refactors expected to take additional time. They should be based off of the targeted feature release branch.
 
 This structure allows code to flow **from `main` to release branches to feature branches**.
 
-
 ![Merge Diagram](docs/image.png)
 
 ---
@@ -128,6 +134,7 @@ This structure allows code to flow **from `main` to release branches to feature
 Assuming your branch is `feature/scw`, and your feature is targeted for release `2.1.0`, follow these steps to rebase:
 
 1. First, checkout the feature branch:
+
    ```bash
    git fetch origin
    git branch feature/scw -D
@@ -141,7 +148,9 @@ Assuming your branch is `feature/scw`, and your feature is targeted for release
    ```
 
 ### Exceptions
+
 There are certain times where this flow does not work as intended. For example:
-* Build scripts: These may need to be run off of the default main branch instead of feature or release branches.
-* Read me updates: These are not required to be on a branch and can be committed directly to main.
-* Bug fixes that can be OTA updated: These can be committed directly to main to perform an OTA update.
+
+- Build scripts: These may need to be run off of the default main branch instead of feature or release branches.
+- Read me updates: These are not required to be on a branch and can be committed directly to main.
+- Bug fixes that can be OTA updated: These can be committed directly to main to perform an OTA update.

app.config.ts

@@ -5,11 +5,11 @@
 
 import appBuildNumbers from "./app.json";
 
 const env = process.env as any;
 const isDev = env.EXPO_ENV === "dev";
 
 warnOnce(
   isDev && !(process.env as any).EXPO_PUBLIC_DEV_API_URI,
   "\n\n🚧 Running the app without EXPO_PUBLIC_DEV_API_URI setup\n\n"
 );
 
@@ -36,7 +36,7 @@
     ? "preview.getconverse.app"
     : "getconverse.app";
 
 export default ({ config }: ConfigContext): ExpoConfig => ({
   ...config,
   name: isDev ? "Converse DEV" : isPreview ? "Converse PREVIEW" : "Converse",
   scheme: isDev ? "converse-dev" : isPreview ? "converse-preview" : "converse",
@@ -233,6 +233,8 @@
         url: "https://sentry.io/",
       },
     ],
+    ["@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

config.ts

@@ -1,8 +1,9 @@
 import { DEFAULT_SUPPORTED_CHAINS } from "@utils/evm/wallets";
 import { XmtpEnv } from "@xmtp/xmtp-js";
-import Constants from "expo-constants";
 import { Platform } from "react-native";
 import { base, baseSepolia } from "wagmi/chains";
+import { getApiUri } from "./utils/apiConfig";
+import { Environments, isDev, isPreview } from "./utils/getEnv";
 
 declare const process: {
   env: {
@@ -53,12 +54,14 @@ const defaultConfig = {
 
 const isAndroid = Platform.OS === "android";
 
+const apiURI = getApiUri();
+
 const ENV = {
   dev: {
     ...defaultConfig,
-    env: "dev",
+    apiURI,
+    env: Environments.dev,
     xmtpEnv: (process.env.EXPO_PUBLIC_DEV_XMTP_ENV || "dev") as XmtpEnv,
-    apiURI: process.env.EXPO_PUBLIC_DEV_API_URI || "",
     debugMenu: true,
     bundleId: "com.converse.dev",
     appleAppGroup: "group.com.converse.dev",
@@ -70,10 +73,13 @@ const ENV = {
     ),
     alphaGroupChatUrl:
       "https://converse.xyz/group-invite/UDv3aYZONQGc6_XPJY6Ch",
+    appCheckDebugToken: isAndroid
+      ? process.env.EXPO_PUBLIC_FIREBASE_APP_CHECK_DEBUG_TOKEN_ANDROID
+      : process.env.EXPO_PUBLIC_FIREBASE_APP_CHECK_DEBUG_TOKEN_IOS,
   },
   preview: {
     ...defaultConfig,
-    env: "preview",
+    env: Environments.preview,
     xmtpEnv: "dev",
     apiURI: "https://backend-staging.converse.xyz",
     debugMenu: true,
@@ -88,10 +94,11 @@ const ENV = {
     ].flatMap((domain) => [`https://${domain}`, `http://${domain}`, domain]),
     alphaGroupChatUrl:
       "https://converse.xyz/group-invite/eQAvo-WvwrdBTsHINuSMJ",
+    appCheckDebugToken: undefined,
   },
   prod: {
     ...defaultConfig,
-    env: "prod",
+    env: Environments.prod,
     xmtpEnv: "production",
     apiURI: "https://backend-prod.converse.xyz",
     debugMenu: false,
@@ -121,13 +128,14 @@ const ENV = {
     },
     alphaGroupChatUrl:
       "https://converse.xyz/group-invite/eQAvo-WvwrdBTsHINuSMJ",
+    appCheckDebugToken: undefined,
   },
 } as const;
 
-const getConfig = () => {
-  if (__DEV__) {
+export const getConfig = () => {
+  if (isDev) {
     return ENV.dev;
-  } else if (Constants.expoConfig?.extra?.ENV === "preview") {
+  } else if (isPreview) {
     return ENV.preview;
   } else {
     return ENV.prod;

eas.json

@@ -13,7 +13,7 @@
       },
       "node": "20.15.1",
       "ios": {
-        "cocoapods": "1.14.3"
+        "cocoapods": "1.16.2"
       },
       "android": {
         "resourceClass": "medium"
@@ -29,7 +29,7 @@
       "node": "20.15.1",
       "ios": {
         "resourceClass": "large",
-        "cocoapods": "1.14.3"
+        "cocoapods": "1.16.2"
       }
     },
     "production-android": {

features/GroupInvites/joinGroup/JoinGroup.client.ts

@@ -1,7 +1,6 @@
 import { IGroupConsentOptions } from "@hooks/useGroupConsent";
 import { createGroupJoinRequest, getGroupJoinRequest } from "@utils/api";
 import { GroupInvite } from "@utils/api.types";
-// import { getGroupIdFromTopic } from "@utils/groupUtils/groupId";
 import { getV3IdFromTopic } from "@/utils/groupUtils/groupId";
 import logger from "@utils/logger";
 import {