AppCheck - Test5 - borked git filter branch caused 1038 commits to show in diff with 28 files changed :/

.gitignore

@@ -24,3 +24,16 @@ ios/Converse.xcworkspace/xcshareddata/swiftpm/Package.resolved
 
 # Reassure output directory
 .reassure
+
+# Firebase Config files
+# Advice from Firebase founding engineer: https://stackoverflow.com/a/44937513/2441420
+# TLDR: safe to commit publicly, but recommended to gitignore
+ios/GoogleService-Info.plist
+ios/GoogleService-Info-preview.plist
+ios/GoogleService-Info-dev.plist
+
+android/google-services.json
+android/google-services-preview.json
+android/google-services-dev.json
+ios/Google Services/GoogleService-Info-prod.plist
+ios/Google Services/GoogleService-Info.plist

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,28 @@ 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.
+
+## Firebase Configuration
+
+Firebase config files are not stored in git for security. New team members need to:
+
+1. Obtain the Firebase config files from the private repository at https://github.com/ephemeraHQ/converse-app-env
+2. Copy them into the correct locations:
+
+iOS:
+
+- ios/Google Services/GoogleService-Info.plist (prod)
+- ios/Google Service-Info-preview.plist (preview)
+- ios/Google Service-Info-prod.plist (dev)
+
+Android:
+
+TODO
+
+These files are required for building the app but are kept secure outside of version control.

app.config.ts

@@ -3,18 +3,18 @@
 
 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"
 );
 
 const isPreview = env.EXPO_ENV === "preview";
 const isProduction = !isDev && !isPreview;
 
 export default ({ config }: ConfigContext): ExpoConfig => ({
   ...config,
   name: isDev ? "Converse DEV" : isPreview ? "Converse PREVIEW" : "Converse",
   scheme: isDev ? "converse-dev" : isPreview ? "converse-preview" : "converse",
@@ -33,19 +33,28 @@
   },
   version: appBuildNumbers.expo.version,
   assetBundlePatterns: ["**/*"],
+  plugins: [
+    "@react-native-firebase/app-check",
+    // https://github.com/invertase/react-native-firebase/issues/6332#issuecomment-1172950523
+    // ["expo-build-properties", { ios: { useFrameworks: "static" } }],
+  ],
   ios: {
     supportsTablet: true,
     buildNumber: appBuildNumbers.expo.ios.buildNumber,
+    bundleIdentifier: "com.converse.dev",
     config: {
       usesNonExemptEncryption: false,
     },
   },
   android: {
+    package: "com.converse.dev",
     adaptiveIcon: {
       foregroundImage: "./assets/adaptive-icon.png",
       backgroundColor: "#FFFFFF",
     },
     versionCode: appBuildNumbers.expo.android.versionCode,
+    // TODO(lustig): dynamically set this based on env in Android PR for AppCheck
+    googleServicesFile: "./android/google-services.json",
   },
   web: {
     favicon: "./assets/favicon.png",

app.json

@@ -2,10 +2,10 @@
   "expo": {
     "version": "2.1.0",
     "ios": {
-      "buildNumber": "40"
+      "buildNumber": "41"
     },
     "android": {
-      "versionCode": 239
+      "versionCode": 240
     }
   }
 }

config.ts

@@ -70,6 +70,9 @@ const ENV = {
     ),
     alphaGroupChatUrl:
       "https://converse.xyz/group-invite/UDv3aYZONQGc6_XPJY6Ch",
+    appCheckDebugToken: isAndroid
+      ? undefined
+      : process.env.EXPO_PUBLIC_FIREBASE_APP_CHECK_DEBUG_TOKEN_IOS,
   },
   preview: {
     ...defaultConfig,
@@ -88,6 +91,7 @@ const ENV = {
     ].flatMap((domain) => [`https://${domain}`, `http://${domain}`, domain]),
     alphaGroupChatUrl:
       "https://converse.xyz/group-invite/eQAvo-WvwrdBTsHINuSMJ",
+    appCheckDebugToken: undefined,
   },
   prod: {
     ...defaultConfig,
@@ -121,10 +125,11 @@ const ENV = {
     },
     alphaGroupChatUrl:
       "https://converse.xyz/group-invite/eQAvo-WvwrdBTsHINuSMJ",
+    appCheckDebugToken: undefined,
   },
 } as const;
 
-const getConfig = () => {
+export const getConfig = () => {
   if (__DEV__) {
     return ENV.dev;
   } else if (Constants.expoConfig?.extra?.ENV === "preview") {

eas.json

@@ -8,9 +8,6 @@
       "developmentClient": true,
       "distribution": "internal",
       "channel": "development",
-      "env": {
-        "EXPO_ENV": "dev"
-      },
       "node": "20.15.1",
       "ios": {
         "cocoapods": "1.14.3"

features/conversation/conversation-message/conversation-message-sender-avatar.tsx

@@ -2,9 +2,6 @@
 import { useCallback, useMemo } from "react";
 import { StyleSheet, TouchableOpacity, View } from "react-native";
 
-import { usePreferredInboxAddress } from "@hooks/usePreferredInboxAddress";
-import { usePreferredInboxName } from "@hooks/usePreferredInboxName";
-import { useInboxProfileSocialsQuery } from "@queries/useInboxProfileSocialsQuery";
 import { useAppTheme } from "@theme/useAppTheme";
 import { InboxId } from "@xmtp/react-native-sdk";
 import { useCurrentAccount } from "../../../data/store/accountsStore";
@@ -79,12 +76,12 @@
   inboxId,
 }: V3MessageSenderAvatarProps) => {
   const currentAccount = useCurrentAccount();
   const { data: senderSocials } = useInboxProfileSocialsQuery(
     currentAccount!,
     inboxId
   );
   const address = usePreferredInboxAddress(inboxId);
   const name = usePreferredInboxName(inboxId);
   const avatarUri = getPreferredInboxAvatar(senderSocials);
 
   const openProfile = useCallback(() => {