Update files

packages/app/src/components/add-host-method-modal.tsx

@@ -48,19 +48,16 @@ export function AddHostMethodModal({
   const { theme } = useUnistyles();
 
   const handleDirect = useCallback(() => {
-    onClose();
     onDirectConnection();
-  }, [onClose, onDirectConnection]);
+  }, [onDirectConnection]);
 
   const handleScan = useCallback(() => {
-    onClose();
     onScanQr();
-  }, [onClose, onScanQr]);
+  }, [onScanQr]);
 
   const handlePaste = useCallback(() => {
-    onClose();
     onPasteLink();
-  }, [onClose, onPasteLink]);
+  }, [onPasteLink]);
 
   return (
     <AdaptiveModalSheet title="Add connection" visible={visible} onClose={onClose} testID="add-host-method-modal">

packages/app/src/components/add-host-modal.tsx

@@ -147,10 +147,11 @@ export interface AddHostModalProps {
   visible: boolean;
   onClose: () => void;
   targetServerId?: string;
+  onCancel?: () => void;
   onSaved?: (result: { profile: HostProfile; serverId: string; hostname: string | null; isNewHost: boolean }) => void;
 }
 
-export function AddHostModal({ visible, onClose, onSaved, targetServerId }: AddHostModalProps) {
+export function AddHostModal({ visible, onClose, onCancel, onSaved, targetServerId }: AddHostModalProps) {
   const { theme } = useUnistyles();
   const { daemons, upsertDirectConnection } = useDaemonRegistry();
   const isMobile =
@@ -170,6 +171,13 @@ export function AddHostModal({ visible, onClose, onSaved, targetServerId }: AddH
     onClose();
   }, [isSaving, onClose]);
 
+  const handleCancel = useCallback(() => {
+    if (isSaving) return;
+    setEndpointRaw("");
+    setErrorMessage("");
+    (onCancel ?? onClose)();
+  }, [isSaving, onCancel, onClose]);
+
   const handleSave = useCallback(async () => {
     if (isSaving) return;
 
@@ -256,8 +264,8 @@ export function AddHostModal({ visible, onClose, onSaved, targetServerId }: AddH
       </View>
 
       <View style={styles.actions}>
-        <Pressable style={styles.button} onPress={handleClose} disabled={isSaving}>
-          <Text style={styles.buttonText}>Cancel</Text>
+        <Pressable style={styles.button} onPress={handleCancel} disabled={isSaving}>
+          <Text style={styles.buttonText}>{onCancel ? "Back" : "Cancel"}</Text>
         </Pressable>
         <Pressable
           style={[styles.button, styles.primaryButton, isSaving ? { opacity: 0.7 } : null]}

packages/app/src/components/pair-link-modal.tsx

@@ -69,10 +69,11 @@ export interface PairLinkModalProps {
   visible: boolean;
   onClose: () => void;
   targetServerId?: string;
+  onCancel?: () => void;
   onSaved?: (result: { profile: HostProfile; serverId: string; hostname: string | null; isNewHost: boolean }) => void;
 }
 
-export function PairLinkModal({ visible, onClose, onSaved, targetServerId }: PairLinkModalProps) {
+export function PairLinkModal({ visible, onClose, onCancel, onSaved, targetServerId }: PairLinkModalProps) {
   const { theme } = useUnistyles();
   const { daemons, upsertDaemonFromOfferUrl } = useDaemonRegistry();
   const isMobile =
@@ -90,6 +91,13 @@ export function PairLinkModal({ visible, onClose, onSaved, targetServerId }: Pai
     onClose();
   }, [isSaving, onClose]);
 
+  const handleCancel = useCallback(() => {
+    if (isSaving) return;
+    setOfferUrl("");
+    setErrorMessage("");
+    (onCancel ?? onClose)();
+  }, [isSaving, onCancel, onClose]);
+
   const handleSave = useCallback(async () => {
     if (isSaving) return;
     const raw = offerUrl.trim();
@@ -178,14 +186,14 @@ export function PairLinkModal({ visible, onClose, onSaved, targetServerId }: Pai
       <View style={styles.actions}>
         <Pressable
           style={styles.button}
-          onPress={handleClose}
+          onPress={handleCancel}
           disabled={isSaving}
           testID="pair-link-cancel"
           accessible
           accessibilityRole="button"
           accessibilityLabel="Cancel"
         >
-          <Text style={styles.buttonText}>Cancel</Text>
+          <Text style={styles.buttonText}>{onCancel ? "Back" : "Cancel"}</Text>
         </Pressable>
         <Pressable
           style={[styles.button, styles.primaryButton, isSaving ? { opacity: 0.7 } : null]}