diff --git a/client/scripts/theme-baseline.json b/client/scripts/theme-baseline.json
index 3a2cbb297..3e7cb2314 100644
--- a/client/scripts/theme-baseline.json
+++ b/client/scripts/theme-baseline.json
@@ -190,7 +190,7 @@
"mobile/screens/journey/MJourneyCreateSheet.tsx": 10,
"mobile/screens/journey/MJourneyDetail.tsx": 6,
"mobile/screens/journey/MJourneyEntrySheet.tsx": 52,
- "mobile/screens/journey/MJourneySettingsSheet.tsx": 31,
+ "mobile/screens/journey/MJourneySettingsSheet.tsx": 29,
"mobile/screens/journey/mobileJourneyMeta.ts": 4,
"mobile/screens/notifications/MNotificationRow.tsx": 4,
"mobile/screens/notifications/MNotifications.tsx": 3,
diff --git a/client/src/mobile/components/MLinkField.tsx b/client/src/mobile/components/MLinkField.tsx
new file mode 100644
index 000000000..af9788b67
--- /dev/null
+++ b/client/src/mobile/components/MLinkField.tsx
@@ -0,0 +1,45 @@
+import { Check, Copy, Share as ShareIcon } from 'lucide-react';
+import { canShareLink, shareLink } from '../../native/shareLink';
+
+/** The round icon buttons next to the link: copy and share, the same size. */
+const ACTION = 'flex h-[34px] w-[34px] flex-none items-center justify-center rounded-full bg-m-act text-m-actfg';
+
+/**
+ * A link to hand on, read-only, with copy and (where the system has a share
+ * sheet) share next to it: the trip's share and invite links and a journey's
+ * public link all look the same.
+ */
+export default function MLinkField({
+ url,
+ copied,
+ onCopy,
+ copyLabel,
+ copiedLabel,
+ shareLabel,
+}: {
+ url: string;
+ copied: boolean;
+ onCopy: () => void;
+ copyLabel: string;
+ copiedLabel: string;
+ shareLabel: string;
+}) {
+ return (
+
+
+
+ {canShareLink() && (
+
+ )}
+
+ );
+}
diff --git a/client/src/mobile/screens/collections/MCollections.tsx b/client/src/mobile/screens/collections/MCollections.tsx
index 3e7a8d7b4..2a37f8941 100644
--- a/client/src/mobile/screens/collections/MCollections.tsx
+++ b/client/src/mobile/screens/collections/MCollections.tsx
@@ -73,16 +73,25 @@ export default function MCollections() {
// The bottom-nav "+" hands off via the ?create= contract.
const [searchParams, setSearchParams] = useSearchParams()
const createParam = searchParams.get('create')
- const { activeId, canEdit, setShowAddPlace, ownedLists } = c
+ const { activeId, canEdit, setShowAddPlace, ownedLists, setEditorTarget } = c
+ const listCount = c.collections.length
+ const listsLoading = c.loading
useEffect(() => {
if (createParam !== 'place' && createParam !== '1') return
+ // Wait for the lists: whether there is one decides what "+" means.
+ if (listsLoading) return
const next = new URLSearchParams(searchParams)
next.delete('create')
setSearchParams(next, { replace: true })
+ // Without a list yet, "+" starts the first one; places come after.
+ if (listCount === 0) {
+ setEditorTarget('new')
+ return
+ }
// Open whenever the user can add somewhere: an editable active list, or at
// least one owned list to pick as the target in the sheet.
if ((typeof activeId === 'number' && canEdit) || ownedLists.length > 0) setShowAddPlace(true)
- }, [createParam, searchParams, setSearchParams, activeId, canEdit, ownedLists.length, setShowAddPlace])
+ }, [createParam, searchParams, setSearchParams, activeId, canEdit, ownedLists.length, setShowAddPlace, listsLoading, listCount, setEditorTarget])
// Close transient popovers when the active list changes under them.
useEffect(() => {
@@ -219,12 +228,8 @@ export default function MCollections() {
) : noLists ? (
+ {/* The dock's "+" starts the first list (see the ?create= handoff above). */}
-
-
- {t('collections.newList')}
-
-
) : (
<>
diff --git a/client/src/mobile/screens/journey/MJourneySettingsSheet.tsx b/client/src/mobile/screens/journey/MJourneySettingsSheet.tsx
index d6d55eb99..4d80a9cb0 100644
--- a/client/src/mobile/screens/journey/MJourneySettingsSheet.tsx
+++ b/client/src/mobile/screens/journey/MJourneySettingsSheet.tsx
@@ -1,6 +1,6 @@
import { useRef, useState } from 'react'
-import { X, Image, Plus, Trash2, UserPlus, Link as LinkIcon, List, Grid3x3, MapPin, Route, Archive, ArchiveRestore, Undo2, Link2, ListChecks, RefreshCw, Share as ShareIcon, Copy, Check } from 'lucide-react'
-import { canShareLink, shareLink } from '../../../native/shareLink'
+import { X, Image, Plus, Trash2, UserPlus, Link as LinkIcon, List, Grid3x3, MapPin, Route, Archive, ArchiveRestore, Undo2, Link2, ListChecks, RefreshCw } from 'lucide-react'
+import MLinkField from '../../components/MLinkField'
import MSheet from '../../components/MSheet'
import MIconBtn from '../../components/MIconBtn'
import MToggle from '../../components/MToggle'
@@ -257,28 +257,16 @@ export default function MJourneySettingsSheet({
) : (
<>
-