pr feedback

ephemeraHQ · Dec 17, 2024 · b684f7e · b684f7e
1 parent 2e30ce9
commit b684f7e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 29 deletions.
diff --git a/eas.json b/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"

diff --git a/ios/Converse.xcodeproj/project.pbxproj b/ios/Converse.xcodeproj/project.pbxproj
@@ -665,7 +665,7 @@
 					"FB_SONARKIT_ENABLED=1",
 				);
 				INFOPLIST_FILE = Converse/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -703,7 +703,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = Q6W2FLK8DM;
 				INFOPLIST_FILE = Converse/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -748,7 +748,7 @@
 				INFOPLIST_FILE = ConverseNotificationExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ConverseNotificationExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -793,7 +793,7 @@
 				INFOPLIST_FILE = ConverseNotificationExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ConverseNotificationExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/ios/Converse.xcodeproj/xcshareddata/xcschemes/Converse.xcscheme b/ios/Converse.xcodeproj/xcshareddata/xcschemes/Converse.xcscheme
@@ -60,16 +60,6 @@
             ReferencedContainer = "container:Converse.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-         <CommandLineArgument
-            argument = "FIRDebugEnabled"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-FIRDebugEnabled"
-            isEnabled = "YES">
-         </CommandLineArgument>
-      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/screens/Navigation/Navigation.tsx b/screens/Navigation/Navigation.tsx
@@ -242,7 +242,7 @@ export function SignedOutNavigation() {
             ...authScreensSharedScreenOptions,
           }}
         >
-          {/* <NativeStack.Screen
+          {/* __DEV__ && <NativeStack.Screen
             name="TestAppCheck"
             component={TestAppCheckScreen}
           /> */}

diff --git a/scripts/build/build.utils.js b/scripts/build/build.utils.js
@@ -19,6 +19,7 @@ const findGoogleServiceFiles = () => {
     });
     return result.split("\n").filter(Boolean);
   } catch (error) {
+    console.warn(`Failed to find GoogleService-Info files: ${error.message}`);
     return [];
   }
 };

diff --git a/utils/api.ts b/utils/api.ts
@@ -218,8 +218,6 @@ our application on a device that has not been tampered with.
 `);
   }
 
-  logger.info("App Check Token", appCheckToken);
-
   if (!accessToken) {
     const installationKeySignature =
       xmtpSignatureByAccount[account] ||

diff --git a/utils/appCheck.ts b/utils/appCheck.ts
@@ -8,9 +8,11 @@ const appCheck = firebase.appCheck();
 export const tryGetAppCheckToken = async () => {
   logger.debug("Getting token");
   try {
-    // Open Questions:
-    // Do we need to use the limited use token?
-    // What endpoints are we going to protect with app check?
+    // App Check FAQ:
+    // Do we need/want to use the limited use token?
+
+    // What endpoints are protected with app check?
+    // @see https://github.com/ephemeraHQ/converse-backend/blob/main/api/middlewares.ts#L27
     const { token } = await appCheck.getLimitedUseToken();
     // const { token } = await appCheck.getToken();
     return token;

diff --git a/utils/logout/index.tsx b/utils/logout/index.tsx
@@ -13,11 +13,7 @@ import {
 import { setAuthStatus } from "../../data/store/authStore";
 import { deleteSecureItemAsync } from "../keychain";
 import { deleteAccountEncryptionKey, deleteXmtpKey } from "../keychain/helpers";
-import mmkv, {
-  authMMKVStorage,
-  clearSecureMmkvForAccount,
-  secureMmkvByAccount,
-} from "../mmkv";
+import mmkv, { clearSecureMmkvForAccount, secureMmkvByAccount } from "../mmkv";
 
 import { useDisconnectFromPrivy } from "./privy";
 import { deleteXmtpClient, getXmtpClient } from "../xmtpRN/sync";
@@ -235,7 +231,7 @@ export const logoutAccount = async (
   saveLogoutTask(account, apiHeaders, [], pkPath);
 
   setTimeout(() => {
-    executeLogoutTasks().then(authMMKVStorage.clear);
+    executeLogoutTasks();
   }, 500);
 };