Merge branch 'main' into feat/mobile-phase-8-housekeeping

Author: Shubbu03

bun.lock

@@ -9,14 +9,57 @@
     "userInterfaceStyle": "automatic",
     "plugins": [
       "expo-secure-store",
-      "expo-notifications"
+      "expo-notifications",
+      [
+        "expo-build-properties",
+        {
+          "android": {
+            "minSdkVersion": 24,
+            "compileSdkVersion": 35
+          }
+        }
+      ]
     ],
     "android": {
       "package": "com.enmarch.mobile",
       "adaptiveIcon": {
         "backgroundColor": "#0f172a"
       },
-      "edgeToEdgeEnabled": true
+      "edgeToEdgeEnabled": true,
+      "intentFilters": [
+        {
+          "action": "VIEW",
+          "autoVerify": true,
+          "data": [
+            {
+              "scheme": "enmarch",
+              "host": "invite"
+            },
+            {
+              "scheme": "https",
+              "host": "enmarch.app",
+              "pathPrefix": "/invite"
+            }
+          ],
+          "category": [
+            "BROWSABLE",
+            "DEFAULT"
+          ]
+        }
+      ],
+      "queries": {
+        "intent": [
+          {
+            "action": "VIEW",
+            "category": [
+              "BROWSABLE"
+            ],
+            "data": {
+              "scheme": "solana-wallet"
+            }
+          }
+        ]
+      }
     }
   }
 }

mobile/app.json

@@ -34,6 +34,7 @@
     "expo-notifications": "*",
     "expo-secure-store": "*",
     "expo-clipboard": "*",
+    "expo-build-properties": "~1.0.9",
     "expo-status-bar": "*",
     "nativewind": "^4.2.1",
     "phosphor-react-native": "^3.0.4",

mobile/package.json

@@ -10,6 +10,7 @@ import {
   listConversations,
   saveConversation,
 } from "@/adapters/conversation-store";
+import { extractInviteCode } from "@/lib/invite-links";
 import { messengerKeys } from "@/lib/messenger-query-keys";
 import { useSolanaConnection } from "@/state/solana-connection-context";
 import { readRegisteredXwingPubkey } from "@enmarch/solana-client";
@@ -79,7 +80,7 @@ export function useConversations(input: UseConversationsInput) {
 
       const conversation = importConversationInvite(
         input.walletAddress,
-        inviteCode.trim(),
+        extractInviteCode(inviteCode),
       );
       const registeredPubkey = await readRegisteredXwingPubkey(
         connection,

mobile/src/hooks/use-conversations.ts

@@ -0,0 +1,46 @@
+const CUSTOM_INVITE_PREFIX = "enmarch://invite/";
+const HTTPS_INVITE_PREFIX = "https://enmarch.app/invite/";
+
+function safeDecodeURIComponent(value: string) {
+  try {
+    return decodeURIComponent(value);
+  } catch {
+    return value;
+  }
+}
+
+export function buildInviteDeepLink(inviteCode: string) {
+  return `${CUSTOM_INVITE_PREFIX}${encodeURIComponent(inviteCode)}`;
+}
+
+export function extractInviteCode(input: string) {
+  const trimmed = input.trim();
+
+  if (!trimmed) {
+    return "";
+  }
+
+  const directMatch = trimmed.match(
+    /(enmarch:\/\/invite\/|https:\/\/enmarch\.app\/invite\/)(\S+)/i,
+  );
+
+  if (directMatch?.[2]) {
+    return safeDecodeURIComponent(directMatch[2]);
+  }
+
+  if (trimmed.startsWith(CUSTOM_INVITE_PREFIX)) {
+    return safeDecodeURIComponent(trimmed.slice(CUSTOM_INVITE_PREFIX.length));
+  }
+
+  if (trimmed.startsWith(HTTPS_INVITE_PREFIX)) {
+    return safeDecodeURIComponent(trimmed.slice(HTTPS_INVITE_PREFIX.length));
+  }
+
+  return safeDecodeURIComponent(trimmed);
+}
+
+export function formatInviteShareMessage(inviteCode: string) {
+  const inviteLink = buildInviteDeepLink(inviteCode);
+
+  return `Join my secure room on Enmarch:\n\n${inviteLink}\n\nInvite code:\n${inviteCode}`;
+}

mobile/src/lib/invite-links.ts

@@ -1,20 +1,17 @@
 import {
   DarkTheme,
+  type LinkingOptions,
   NavigationContainer,
   type Theme,
 } from "@react-navigation/native";
 import { createNativeStackNavigator } from "@react-navigation/native-stack";
 
 import { AppTabs } from "@/navigation/tabs";
+import type { RootStackParamList } from "@/navigation/types";
 import { ConnectScreen } from "@/screens/connect-screen";
 import { useAppBootstrap } from "@/state/app-bootstrap-context";
 import { colors } from "@/theme/colors";
 
-type RootStackParamList = {
-  Connect: undefined;
-  AppTabs: undefined;
-};
-
 const RootStack = createNativeStackNavigator<RootStackParamList>();
 
 const navigationTheme: Theme = {
@@ -30,6 +27,27 @@ const navigationTheme: Theme = {
   },
 };
 
+const linking: LinkingOptions<RootStackParamList> = {
+  prefixes: ["enmarch://", "https://enmarch.app"],
+  config: {
+    screens: {
+      Connect: "connect",
+      AppTabs: {
+        screens: {
+          Chats: {
+            screens: {
+              ChatList: "",
+              ChatThread: "room/:conversationId",
+              NewChat: "invite/:code",
+            },
+          },
+          Settings: "settings",
+        },
+      },
+    },
+  },
+};
+
 export function RootNavigator() {
   const { appReady, wallet } = useAppBootstrap();
 
@@ -38,7 +56,7 @@ export function RootNavigator() {
   }
 
   return (
-    <NavigationContainer theme={navigationTheme}>
+    <NavigationContainer linking={linking} theme={navigationTheme}>
       <RootStack.Navigator screenOptions={{ headerShown: false, animation: "fade" }}>
         {appReady ? (
           <RootStack.Screen name="AppTabs" component={AppTabs} />

mobile/src/navigation/root-navigator.tsx

@@ -1,10 +1,17 @@
+import type { NavigatorScreenParams } from "@react-navigation/native";
+
 export type ChatStackParamList = {
   ChatList: undefined;
   ChatThread: { conversationId: string };
-  NewChat: undefined;
+  NewChat: { code?: string } | undefined;
 };
 
 export type AppTabsParamList = {
-  Chats: undefined;
+  Chats: NavigatorScreenParams<ChatStackParamList> | undefined;
   Settings: undefined;
 };
+
+export type RootStackParamList = {
+  Connect: undefined;
+  AppTabs: NavigatorScreenParams<AppTabsParamList> | undefined;
+};

mobile/src/navigation/types.ts

@@ -21,6 +21,7 @@ import { useConversationMessages } from "@/hooks/use-conversation-messages";
 import { getConversationInviteCode } from "@/hooks/use-conversations";
 import { useRelayTransport } from "@/hooks/use-relay-transport";
 import { formatWallet } from "@/lib/format";
+import { formatInviteShareMessage } from "@/lib/invite-links";
 import type { ChatStackParamList } from "@/navigation/types";
 import { colors } from "@/theme/colors";
 
@@ -108,7 +109,7 @@ export function ChatThreadScreen(props: Props) {
 
     Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium);
     await Share.share({
-      message: `Join my secure room on Enmarch:\n\n${getConversationInviteCode(activeConversation)}`,
+      message: formatInviteShareMessage(getConversationInviteCode(activeConversation)),
       title: "Enmarch Invite",
     }).catch(() => null);
   };

mobile/src/screens/chat-thread-screen.tsx

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import {
   ActivityIndicator,
   KeyboardAvoidingView,
@@ -16,6 +16,7 @@ import * as Clipboard from "expo-clipboard";
 import * as Haptics from "expo-haptics";
 
 import { useChatAppState } from "@/hooks/use-chat-app-state";
+import { extractInviteCode, formatInviteShareMessage } from "@/lib/invite-links";
 import type { ChatStackParamList } from "@/navigation/types";
 import { colors } from "@/theme/colors";
 
@@ -27,6 +28,17 @@ export function NewChatScreen(props: Props) {
   const [inviteCode, setInviteCode] = useState("");
   const [error, setError] = useState<string | null>(null);
 
+  useEffect(() => {
+    const routeInviteCode = props.route.params?.code;
+
+    if (!routeInviteCode) {
+      return;
+    }
+
+    setInviteCode(extractInviteCode(routeInviteCode));
+    setError(null);
+  }, [props.route.params?.code]);
+
   const canImport = inviteCode.trim().length > 10;
   const dismiss = () => props.navigation.goBack();
 
@@ -43,7 +55,7 @@ export function NewChatScreen(props: Props) {
       const result = await conversations.createInvite(label);
 
       await Share.share({
-        message: `Join my secure room on Enmarch:\n\n${result.inviteCode}`,
+        message: formatInviteShareMessage(result.inviteCode),
         title: "Enmarch Invite",
       }).catch(() => null);
 
@@ -84,7 +96,7 @@ export function NewChatScreen(props: Props) {
     try {
       const text = await Clipboard.getStringAsync();
       if (text) {
-        setInviteCode(text.trim());
+        setInviteCode(extractInviteCode(text));
         Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
       }
     } catch {
@@ -310,7 +322,7 @@ export function NewChatScreen(props: Props) {
                       setInviteCode(text);
                       setError(null);
                     }}
-                    placeholder="Paste invite code"
+                    placeholder="Paste invite code or deep link"
                     placeholderTextColor={colors.mutedForeground}
                     multiline
                     style={{