From b9a5eaa3dcb791a2f95fd74e9d51ab77bf8e1bbd Mon Sep 17 00:00:00 2001
From: Nic <nic@nics-mbp.home>
Date: Tue, 14 Jul 2026 12:21:42 +0100
Subject: [PATCH] feat(files): unified download dialog, public-upload fix, and
 upload UX polish
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Download:
- Merge "Download by Address" and "Download by Datamap" into one Download
  dialog with a smart input that auto-detects a hex address, an autonomi://
  link, a local .datamap path, or an http(s) .datamap URL, plus a drop zone
  and an auto-filled save-as name.
- Require a full 64-hex address (was >=8 chars, which enabled the button then
  failed in the backend).
- Parse autonomi:// links for name / filename+filetype.
- Fetch a datamap from an http(s) URL (read_datamap_url; reqwest with a 15s
  timeout and a 5 MiB streamed cap).

Upload:
- Fix: public uploads in direct-key mode (devnet / imported key) were silently
  stored private — wallet_upload now takes visibility and returns
  public_address, so the PUBLIC badge and shareable address show.
- Already-on-network files no longer auto-dismiss the confirm dialog; the
  private (get datamap) vs public (publish) choice is preserved, the approve
  gate counts them, and the button reads "Get Datamap" for already-stored +
  private.
- Remove the redundant "Already stored" badge that crowded the filename.

Table:
- Address column truncates to the column width (full address when it fits) and
  never truncates the PUBLIC tag.
- Vertically centre the status column.

i18n: new/updated download and upload strings across all 18 locales
(machine-generated best guess for non-English; will refine with feedback).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 components/files/DatamapSaveAsDialog.vue     |  84 --------
 components/files/DownloadByDatamapDialog.vue |  96 ---------
 components/files/DownloadDialog.vue          | 140 ++++++++-----
 components/files/UploadConfirmDialog.vue     |  23 +--
 locales/ar.json                              |  15 +-
 locales/bg.json                              |  15 +-
 locales/de.json                              |  15 +-
 locales/en.json                              |  13 +-
 locales/es.json                              |  15 +-
 locales/fr.json                              |  15 +-
 locales/he.json                              |  15 +-
 locales/id.json                              |  15 +-
 locales/ja.json                              |  15 +-
 locales/ko.json                              |  15 +-
 locales/nl.json                              |  15 +-
 locales/pt-BR.json                           |  15 +-
 locales/ru.json                              |  15 +-
 locales/tr.json                              |  15 +-
 locales/uk.json                              |  15 +-
 locales/vi.json                              |  15 +-
 locales/zh-CN.json                           |  15 +-
 locales/zh-TW.json                           |  15 +-
 pages/files.vue                              | 198 ++++++-------------
 src-tauri/src/autonomi_ops.rs                |  92 ++++++++-
 src-tauri/src/lib.rs                         |   1 +
 stores/files.ts                              |  58 +++++-
 utils/validators.ts                          | 125 +++++++++++-
 27 files changed, 619 insertions(+), 466 deletions(-)
 delete mode 100644 components/files/DatamapSaveAsDialog.vue
 delete mode 100644 components/files/DownloadByDatamapDialog.vue

diff --git a/components/files/DatamapSaveAsDialog.vue b/components/files/DatamapSaveAsDialog.vue
deleted file mode 100644
index 124a9e7..0000000
--- a/components/files/DatamapSaveAsDialog.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <Teleport to="body">
-    <div
-      v-if="open"
-      class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
-      @click.self="$emit('close')"
-    >
-      <div role="dialog" aria-modal="true" aria-labelledby="datamap-saveas-title" class="w-[26rem] rounded-lg border border-autonomi-border bg-autonomi-dark p-6 shadow-xl">
-        <h2 id="datamap-saveas-title" class="mb-4 text-lg font-medium">{{ $t('files.datamap_saveas.title') }}</h2>
-
-        <div class="mb-4">
-          <label class="mb-1 block text-xs text-autonomi-muted">{{ $t('files.datamap_saveas.filename_label') }}</label>
-          <input
-            ref="inputEl"
-            v-model="filename"
-            type="text"
-            :placeholder="$t('files.datamap_saveas.filename_placeholder')"
-            :class="[
-              'w-full rounded-md border bg-autonomi-surface px-3 py-2 text-sm text-autonomi-text focus:outline-none',
-              filenameError ? 'border-red-500 focus:border-red-500' : 'border-autonomi-border focus:border-autonomi-blue',
-            ]"
-            @keyup.enter="confirm"
-            @keyup.escape="$emit('close')"
-          />
-          <p v-if="filenameError" class="mt-1 text-xs text-red-400">{{ $t(filenameError) }}</p>
-        </div>
-
-        <div class="flex justify-end gap-2">
-          <button
-            class="rounded-md border border-autonomi-border px-3 py-1.5 text-sm text-autonomi-muted hover:text-autonomi-text"
-            @click="$emit('close')"
-          >
-            {{ $t('common.cancel') }}
-          </button>
-          <button
-            class="rounded-md bg-autonomi-blue px-3 py-1.5 text-sm font-medium text-white hover:opacity-90 disabled:opacity-50"
-            :disabled="!valid"
-            @click="confirm"
-          >
-            {{ $t('common.download') }}
-          </button>
-        </div>
-      </div>
-    </div>
-  </Teleport>
-</template>
-
-<script setup lang="ts">
-const props = defineProps<{
-  open: boolean
-  defaultName: string
-}>()
-
-const emit = defineEmits<{
-  close: []
-  confirm: [filename: string]
-}>()
-
-import { filenameError as checkFilename } from '~/utils/validators'
-
-const inputEl = ref<HTMLInputElement | null>(null)
-const filename = ref('')
-
-const filenameError = computed(() => checkFilename(filename.value))
-
-const valid = computed(
-  () => filename.value.trim().length > 0 && filenameError.value === null,
-)
-
-watch(() => props.open, (val) => {
-  if (val) {
-    filename.value = props.defaultName
-    nextTick(() => {
-      inputEl.value?.focus()
-      inputEl.value?.select()
-    })
-  }
-})
-
-function confirm() {
-  if (!valid.value) return
-  emit('confirm', filename.value.trim())
-}
-</script>
diff --git a/components/files/DownloadByDatamapDialog.vue b/components/files/DownloadByDatamapDialog.vue
deleted file mode 100644
index 12cdf5d..0000000
--- a/components/files/DownloadByDatamapDialog.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-  <Teleport to="body">
-    <div
-      v-if="open"
-      class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
-      @click.self="$emit('close')"
-    >
-      <div role="dialog" aria-modal="true" aria-labelledby="datamap-download-title" class="w-[32rem] rounded-lg border border-autonomi-border bg-autonomi-dark p-6 shadow-xl">
-        <h2 id="datamap-download-title" class="mb-1 text-lg font-medium">{{ $t('files.download_by_datamap') }}</h2>
-        <p class="mb-4 text-xs text-autonomi-muted">
-          {{ $t('files.datamap_picker.description') }}
-        </p>
-
-        <div v-if="candidates.length" class="mb-4 max-h-72 overflow-y-auto rounded-md border border-autonomi-border">
-          <ul class="divide-y divide-autonomi-border">
-            <li
-              v-for="c in candidates"
-              :key="c.data_map_file"
-              class="flex cursor-pointer items-center justify-between px-3 py-2 text-sm hover:bg-autonomi-surface/70"
-              @click="select(c.data_map_file, c.name)"
-            >
-              <div class="min-w-0">
-                <div class="truncate text-autonomi-text">{{ c.name }}</div>
-                <div class="truncate font-mono text-[11px] text-autonomi-muted">
-                  {{ basename(c.data_map_file) }}
-                </div>
-              </div>
-              <div class="ml-3 shrink-0 text-right text-[11px] text-autonomi-muted">
-                <div>{{ c.size_bytes ? formatBytes(c.size_bytes) : '-' }}</div>
-                <div>{{ formatShortDate(c.date) }}</div>
-              </div>
-            </li>
-          </ul>
-        </div>
-        <div v-else class="mb-4 rounded-md border border-dashed border-autonomi-border px-3 py-6 text-center text-xs text-autonomi-muted">
-          {{ $t('files.datamap_picker.empty') }}
-        </div>
-
-        <div class="flex items-center justify-between gap-2">
-          <button
-            class="rounded-md border border-autonomi-border px-3 py-1.5 text-sm text-autonomi-muted hover:text-autonomi-text"
-            @click="$emit('browse')"
-          >
-            {{ $t('files.datamap_picker.browse_button') }}
-          </button>
-          <button
-            class="rounded-md border border-autonomi-border px-3 py-1.5 text-sm text-autonomi-muted hover:text-autonomi-text"
-            @click="$emit('close')"
-          >
-            {{ $t('common.cancel') }}
-          </button>
-        </div>
-      </div>
-    </div>
-  </Teleport>
-</template>
-
-<script setup lang="ts">
-import { useI18n } from 'vue-i18n'
-import { formatBytes } from '~/utils/formatters'
-
-const { locale } = useI18n()
-
-defineProps<{
-  open: boolean
-  candidates: Array<{
-    name: string
-    data_map_file: string
-    date: string
-    size_bytes: number
-  }>
-}>()
-
-const emit = defineEmits<{
-  close: []
-  browse: []
-  select: [dataMapPath: string, suggestedName: string]
-}>()
-
-function select(path: string, suggestedName: string) {
-  emit('select', path, suggestedName)
-  emit('close')
-}
-
-function basename(path: string): string {
-  return path.split(/[\\/]/).pop() ?? path
-}
-
-function formatShortDate(iso: string): string {
-  try {
-    return new Date(iso).toLocaleDateString(locale.value, { month: 'short', day: 'numeric' })
-  } catch {
-    return iso
-  }
-}
-</script>
diff --git a/components/files/DownloadDialog.vue b/components/files/DownloadDialog.vue
index 9e1870f..3536176 100644
--- a/components/files/DownloadDialog.vue
+++ b/components/files/DownloadDialog.vue
@@ -5,14 +5,15 @@
       class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
       @click.self="$emit('close')"
     >
-      <div role="dialog" aria-modal="true" aria-labelledby="download-title" class="w-[28rem] rounded-lg border border-autonomi-border bg-autonomi-dark p-6 shadow-xl">
-        <h2 id="download-title" class="mb-4 text-lg font-medium">{{ $t('files.download_dialog.title') }}</h2>
+      <div role="dialog" aria-modal="true" aria-labelledby="download-title" class="w-[32rem] rounded-lg border border-autonomi-border bg-autonomi-dark p-6 shadow-xl">
+        <h2 id="download-title" class="mb-1 text-lg font-medium">{{ $t('files.download_dialog.title') }}</h2>
+        <p class="mb-4 text-xs text-autonomi-muted">{{ $t('files.download_dialog.subtitle') }}</p>
 
-        <div class="mb-4">
-          <label class="mb-1 block text-xs text-autonomi-muted">{{ $t('files.download_dialog.address_label') }}</label>
+        <!-- Smart input -->
+        <div class="mb-1">
           <input
             ref="inputEl"
-            v-model="address"
+            v-model="input"
             type="text"
             :placeholder="$t('files.download_dialog.address_placeholder')"
             class="w-full rounded-md border border-autonomi-border bg-autonomi-surface px-3 py-2 font-mono text-sm text-autonomi-text placeholder-autonomi-muted placeholder:opacity-70 focus:border-autonomi-blue focus:outline-none"
@@ -21,6 +22,31 @@
           />
         </div>
 
+        <!-- Accepted-input hints. The active kind is highlighted so the user
+             sees what the app detected from what they entered/dropped. -->
+        <p class="mb-1 mt-2 text-[11px] text-autonomi-muted">{{ $t('files.download_dialog.paste_intro') }}</p>
+        <ul class="mb-3 space-y-0.5 text-[11px] text-autonomi-muted">
+          <li :class="detectedKind === 'address' && !isLink ? 'text-autonomi-blue' : ''">• {{ $t('files.download_dialog.accept_address') }}</li>
+          <li :class="isLink ? 'text-autonomi-blue' : ''">• {{ $t('files.download_dialog.accept_link') }}</li>
+          <li :class="detectedKind === 'datamap' || detectedKind === 'url' ? 'text-autonomi-blue' : ''">• {{ $t('files.download_dialog.accept_datamap') }}</li>
+        </ul>
+
+        <!-- Drop zone for a .datamap file -->
+        <button
+          type="button"
+          class="mb-4 flex w-full flex-col items-center justify-center rounded-md border border-dashed px-3 py-4 text-center text-xs transition-colors"
+          :class="dragActive
+            ? 'border-autonomi-blue bg-autonomi-blue/10 text-autonomi-blue'
+            : 'border-autonomi-border text-autonomi-muted hover:border-autonomi-blue/60 hover:text-autonomi-text'"
+          @click="$emit('browse')"
+        >
+          <svg class="mb-1 h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5" aria-hidden="true">
+            <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
+          </svg>
+          {{ $t('files.download_dialog.drop_datamap') }}
+        </button>
+
+        <!-- Save-as -->
         <div class="mb-4">
           <label class="mb-1 block text-xs text-autonomi-muted">{{ $t('files.download_dialog.filename_label') }}</label>
           <input
@@ -59,93 +85,107 @@
 
 <script setup lang="ts">
 import { useFilesStore } from '~/stores/files'
-import { filenameError as checkFilename } from '~/utils/validators'
+import { filenameError as checkFilename, classifyDownloadInput } from '~/utils/validators'
 
 const props = defineProps<{
   open: boolean
-  /** When the dialog is opened via a deep link, the address arrives prefilled.
-   *  Empty/undefined for the manual "Download by address" button. */
+  /** Prefill for the smart input — set from a deep link, a dropped datamap
+   *  path, or the Browse picker. Empty for the plain "Download" button. */
   prefillAddress?: string
-  /** Optional filename prefill from the deep link's `?name=`. */
+  /** Optional filename prefill (deep link `?name=`). */
   prefillFilename?: string
+  /** True while a file is being dragged over the window and this dialog is
+   *  open — highlights the drop zone. */
+  dragActive?: boolean
 }>()
 const emit = defineEmits<{
   close: []
-  download: [address: string, filename: string]
+  browse: []
+  download: [target: { kind: 'address' | 'datamap' | 'url'; value: string; filename: string }]
 }>()
 
 const filesStore = useFilesStore()
 
 const inputEl = ref<HTMLInputElement | null>(null)
-const address = ref('')
+const input = ref('')
 const filename = ref('')
-/** Tracks whether the user has edited the filename since the last prefill,
- *  so a subsequent address change doesn't clobber their typing. */
+/** True once the user edits the filename, so auto-fill won't clobber it. */
 const filenameDirty = ref(false)
 
 const filenameError = computed(() => checkFilename(filename.value))
 
-const valid = computed(() => {
-  const addr = address.value.trim()
-  const isHex = /^(0x)?[0-9a-fA-F]{8,}$/.test(addr)
-  return isHex && filename.value.trim().length > 0 && filenameError.value === null
-})
+/** What the current input resolves to — an address, a datamap path, or nothing. */
+const target = computed(() => classifyDownloadInput(input.value))
+const detectedKind = computed(() => target.value.kind)
+const isLink = computed(() => /^autonomi:/i.test(input.value.trim()))
 
-/** Prior upload that matches the currently-typed address, if any. Drives
- *  both the filename prefill and the extension-append fallback on submit. */
+const valid = computed(() =>
+  target.value.kind !== 'invalid'
+  && filename.value.trim().length > 0
+  && filenameError.value === null,
+)
+
+/** Prior upload matching an address input — supplies its real name (with
+ *  extension) for the filename prefill and the extension-append fallback. */
 const matchedEntry = computed(() => {
-  const addr = address.value.trim()
-  if (!/^(0x)?[0-9a-fA-F]{8,}$/.test(addr)) return undefined
-  return filesStore.findUploadByAddress(addr)
+  if (target.value.kind !== 'address') return undefined
+  return filesStore.findUploadByAddress(target.value.address)
+})
+
+/** Best filename we can suggest from the current input, if any. A local upload
+ *  match wins (authoritative name); otherwise the link/datamap-derived name. */
+const suggestedName = computed<string | undefined>(() => {
+  const t = target.value
+  if (t.kind === 'address') return matchedEntry.value?.name ?? t.name
+  if (t.kind === 'datamap' || t.kind === 'url') return t.name
+  return undefined
+})
+
+watch(suggestedName, (name) => {
+  if (!name || filenameDirty.value) return
+  filename.value = name
 })
 
-// `immediate` so the prefill applies even when the dialog mounts already-open
-// (deep-link first-attempt: the Files page navigates in with the dialog open
-// from the start, so there's no false→true transition to catch). Also watch
-// `prefillAddress` so a deep link arriving while the dialog is already open
-// refreshes the fields.
+// `immediate` so a prefill applies even when the dialog mounts already-open,
+// and re-applies when a new prefill (drop / browse / deep link) arrives while
+// it's open.
 watch(
   [() => props.open, () => props.prefillAddress],
-  ([val]) => {
-    if (!val) return
-    address.value = props.prefillAddress ?? ''
+  ([openNow]) => {
+    if (!openNow) return
+    input.value = props.prefillAddress ?? ''
     filename.value = props.prefillFilename ?? ''
-    // Treat a deep-link-provided name as user-set so the history-match
-    // auto-prefill doesn't clobber it.
     filenameDirty.value = !!props.prefillFilename
     nextTick(() => inputEl.value?.focus())
   },
   { immediate: true },
 )
 
-watch(matchedEntry, (match) => {
-  if (!match) return
-  if (filenameDirty.value) return
-  filename.value = match.name
-})
-
 function onFilenameInput() {
   filenameDirty.value = true
 }
 
 function confirm() {
   if (!valid.value) return
+  const t = target.value
+  if (t.kind === 'invalid') return
   const typed = filename.value.trim()
-  const final = appendExtensionIfNeeded(typed, matchedEntry.value?.name)
-  emit('download', address.value.trim(), final)
+  if (t.kind === 'datamap') {
+    emit('download', { kind: 'datamap', value: t.path, filename: appendExtensionIfNeeded(typed, t.name) })
+  } else if (t.kind === 'url') {
+    emit('download', { kind: 'url', value: t.url, filename: appendExtensionIfNeeded(typed, t.name) })
+  } else {
+    emit('download', { kind: 'address', value: t.address, filename: appendExtensionIfNeeded(typed, matchedEntry.value?.name ?? t.name) })
+  }
   emit('close')
 }
 
-/** If the user typed a filename without an extension and we know the
- *  original extension from a history match, append it silently. Keeps
- *  "screenshot" → "screenshot.png" without nagging, while leaving
- *  deliberate unextensioned names alone when there's no match to copy from. */
+/** If the user typed a name without an extension and we know the original from
+ *  a match/link/datamap, append it silently (e.g. "photo" → "photo.png"). */
 function appendExtensionIfNeeded(typed: string, originalName?: string): string {
-  if (!originalName) return typed
-  if (hasExtension(typed)) return typed
-  const origExt = extensionOf(originalName)
-  if (!origExt) return typed
-  return `${typed}.${origExt}`
+  if (!originalName || hasExtension(typed)) return typed
+  const ext = extensionOf(originalName)
+  return ext ? `${typed}.${ext}` : typed
 }
 
 function hasExtension(name: string): boolean {
diff --git a/components/files/UploadConfirmDialog.vue b/components/files/UploadConfirmDialog.vue
index 748b31b..e37eda0 100644
--- a/components/files/UploadConfirmDialog.vue
+++ b/components/files/UploadConfirmDialog.vue
@@ -27,13 +27,7 @@
               class="flex items-center justify-between text-sm"
             >
               <span class="flex min-w-0 items-center gap-2">
-                <span class="max-w-[200px] truncate">{{ entry.name }}</span>
-                <span
-                  v-if="entry.alreadyStored"
-                  class="shrink-0 rounded bg-green-500/10 px-1.5 py-0.5 text-[10px] font-medium uppercase tracking-wider text-green-400"
-                >
-                  {{ $t('files.upload_confirm.already_stored_badge') }}
-                </span>
+                <span class="truncate">{{ entry.name }}</span>
               </span>
               <span class="text-autonomi-muted">{{ entry.size_bytes ? formatBytes(entry.size_bytes) : '-' }}</span>
             </div>
@@ -269,11 +263,12 @@ const someAlreadyStored = computed(() =>
 const anyQuoting = computed(() =>
   entries.value.some(e => e.status === 'quoting' || e.status === 'queued_for_quote'),
 )
-/** Entries that still require a user decision — already-stored files auto-
- *  process through the scheduler and never see `awaiting_approval`, so they
- *  don't count toward the approve gate. */
+/** Entries that require a user decision. Every selected entry does — even an
+ *  already-stored file still needs its private/public visibility confirmed
+ *  (private returns the DataMap, public publishes it), so none are exempt from
+ *  the approve gate. */
 const needsApprovalEntries = computed(() =>
-  entries.value.filter(e => !e.alreadyStored),
+  entries.value,
 )
 const readyCount = computed(() =>
   needsApprovalEntries.value.filter(e => e.status === 'awaiting_approval').length,
@@ -343,6 +338,12 @@ watch(visibility, (val) => {
 })
 
 const approveButtonLabel = computed(() => {
+  // Already-stored + private: nothing is uploaded — the action just returns the
+  // DataMap for retrieval — so the button reads "Get Datamap". Public still
+  // publishes the DataMap on-network, so it stays a normal Approve.
+  if (allAlreadyStored.value && visibility.value === 'private') {
+    return t('files.upload_confirm.get_datamap_button')
+  }
   const n = needsApprovalEntries.value.length
   if (n <= 1) return t('files.upload_confirm.approve_button_one')
   return t('files.upload_confirm.approve_button_many', { count: n })
diff --git a/locales/ar.json b/locales/ar.json
index 1a91f28..93961d4 100644
--- a/locales/ar.json
+++ b/locales/ar.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "تنزيل ملف",
-      "address_label": "عنوان الملف",
-      "address_placeholder": "عنوان الملف (سداسي عشري)",
+      "subtitle": "جلب ملف من شبكة Autonomi",
+      "address_placeholder": "عنوان 0x… أو رابط autonomi:// أو مسار / رابط datamap",
+      "paste_intro": "يمكنك لصق أي مما يلي:",
+      "accept_address": "عنوان شبكة (0x… / 64 حرفًا ست عشريًا)",
+      "accept_link": "رابط مشاركة autonomi:// (يتضمن اسم الملف)",
+      "accept_datamap": "ملف datamap — الصق مسارًا محليًا أو رابطًا، أو أفلِت / تصفّح بالأسفل",
+      "drop_datamap": "أفلِت ملف .datamap هنا، أو انقر للتصفح",
       "filename_label": "حفظ باسم",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "إلغاء الرفع",
       "ready_count": "جاهز: {ready} من {total}",
       "approve_button_one": "الموافقة على الرفع",
-      "approve_button_many": "الموافقة على {count} عمليات رفع"
-    }
+      "approve_button_many": "الموافقة على {count} عمليات رفع",
+      "get_datamap_button": "الحصول على datamap"
+    },
+    "download_button": "تنزيل"
   },
   "wallet": {
     "earnings_heading": "عنوان الأرباح",
diff --git a/locales/bg.json b/locales/bg.json
index b943bc6..6fd54fc 100644
--- a/locales/bg.json
+++ b/locales/bg.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Изтегляне на файл",
-      "address_label": "Адрес на файла",
-      "address_placeholder": "Адрес на файла (hex)",
+      "subtitle": "Извличане на файл от мрежата Autonomi",
+      "address_placeholder": "Адрес 0x…, връзка autonomi:// или път / URL на datamap",
+      "paste_intro": "Можете да поставите някое от следните:",
+      "accept_address": "Мрежов адрес (0x… / 64 hex знака)",
+      "accept_link": "Връзка за споделяне autonomi:// (съдържа името на файла)",
+      "accept_datamap": "Datamap — поставете локален път или URL, или пуснете / прегледайте по-долу",
+      "drop_datamap": "Пуснете .datamap файл тук или щракнете за преглед",
       "filename_label": "Запазване като име на файл",
       "filename_placeholder": "moifail.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Отказ на качването",
       "ready_count": "Готови: {ready} от {total}",
       "approve_button_one": "Одобряване на качването",
-      "approve_button_many": "Одобряване на {count} качвания"
-    }
+      "approve_button_many": "Одобряване на {count} качвания",
+      "get_datamap_button": "Вземи datamap"
+    },
+    "download_button": "Изтегляне"
   },
   "wallet": {
     "earnings_heading": "Адрес за приходи",
diff --git a/locales/de.json b/locales/de.json
index 1db426b..ec44468 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Datei herunterladen",
-      "address_label": "Dateiadresse",
-      "address_placeholder": "Dateiadresse (hex)",
+      "subtitle": "Eine Datei aus dem Autonomi-Netzwerk abrufen",
+      "address_placeholder": "0x…-Adresse, autonomi://-Link oder Datamap-Pfad / URL",
+      "paste_intro": "Sie können Folgendes einfügen:",
+      "accept_address": "Eine Netzwerkadresse (0x… / 64 Hex-Zeichen)",
+      "accept_link": "Ein autonomi://-Freigabelink (enthält den Dateinamen)",
+      "accept_datamap": "Eine Datamap – lokalen Pfad oder URL einfügen oder unten ablegen / durchsuchen",
+      "drop_datamap": "Eine .datamap-Datei hier ablegen oder zum Durchsuchen klicken",
       "filename_label": "Speichern unter",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Upload abbrechen",
       "ready_count": "Bereit: {ready} von {total}",
       "approve_button_one": "Upload genehmigen",
-      "approve_button_many": "{count} Uploads genehmigen"
-    }
+      "approve_button_many": "{count} Uploads genehmigen",
+      "get_datamap_button": "Datamap abrufen"
+    },
+    "download_button": "Herunterladen"
   },
   "wallet": {
     "earnings_heading": "Einnahmenadresse",
diff --git a/locales/en.json b/locales/en.json
index 1280d02..99811e1 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -276,6 +276,7 @@
   "files": {
     "upload_button": "Upload File(s)",
     "estimate_button": "Estimate Cost",
+    "download_button": "Download",
     "download_by_address": "Download by Address",
     "download_by_datamap": "Download by Datamap",
     "uploads_heading": "Uploads",
@@ -360,8 +361,13 @@
     },
     "download_dialog": {
       "title": "Download File",
-      "address_label": "File address",
-      "address_placeholder": "File address (hex)",
+      "subtitle": "Fetch a file from the Autonomi Network",
+      "address_placeholder": "0x… address, autonomi:// link, or datamap path / URL",
+      "paste_intro": "You can paste in any of the following:",
+      "accept_address": "A network address (0x… / 64 hex chars)",
+      "accept_link": "An autonomi:// share link (carries the filename)",
+      "accept_datamap": "A datamap — paste a local path or URL, or drop / browse below",
+      "drop_datamap": "Drop a .datamap file here, or click to browse",
       "filename_label": "Save as filename",
       "filename_placeholder": "myfile.dat"
     },
@@ -402,7 +408,8 @@
       "cancel_upload": "Cancel Upload",
       "ready_count": "Ready: {ready} of {total}",
       "approve_button_one": "Approve Upload",
-      "approve_button_many": "Approve {count} Uploads"
+      "approve_button_many": "Approve {count} Uploads",
+      "get_datamap_button": "Get Datamap"
     }
   },
   "wallet": {
diff --git a/locales/es.json b/locales/es.json
index fefca2d..5729700 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Descargar archivo",
-      "address_label": "Dirección del archivo",
-      "address_placeholder": "Dirección del archivo (hex)",
+      "subtitle": "Obtener un archivo de la red Autonomi",
+      "address_placeholder": "Dirección 0x…, enlace autonomi:// o ruta / URL de datamap",
+      "paste_intro": "Puedes pegar cualquiera de los siguientes:",
+      "accept_address": "Una dirección de red (0x… / 64 caracteres hex)",
+      "accept_link": "Un enlace autonomi:// para compartir (incluye el nombre del archivo)",
+      "accept_datamap": "Un datamap: pega una ruta local o URL, o suelta / examina abajo",
+      "drop_datamap": "Suelta un archivo .datamap aquí, o haz clic para examinar",
       "filename_label": "Guardar como",
       "filename_placeholder": "miarchivo.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Cancelar subida",
       "ready_count": "Listos: {ready} de {total}",
       "approve_button_one": "Aprobar subida",
-      "approve_button_many": "Aprobar {count} subidas"
-    }
+      "approve_button_many": "Aprobar {count} subidas",
+      "get_datamap_button": "Obtener datamap"
+    },
+    "download_button": "Descargar"
   },
   "wallet": {
     "earnings_heading": "Dirección de ingresos",
diff --git a/locales/fr.json b/locales/fr.json
index bb3f4de..d973a06 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Télécharger le fichier",
-      "address_label": "Adresse du fichier",
-      "address_placeholder": "Adresse du fichier (hex)",
+      "subtitle": "Récupérer un fichier depuis le réseau Autonomi",
+      "address_placeholder": "Adresse 0x…, lien autonomi:// ou chemin / URL de datamap",
+      "paste_intro": "Vous pouvez coller l'un des éléments suivants :",
+      "accept_address": "Une adresse réseau (0x… / 64 caractères hex)",
+      "accept_link": "Un lien de partage autonomi:// (contient le nom du fichier)",
+      "accept_datamap": "Un datamap — collez un chemin local ou une URL, ou déposez / parcourez ci-dessous",
+      "drop_datamap": "Déposez un fichier .datamap ici, ou cliquez pour parcourir",
       "filename_label": "Enregistrer sous",
       "filename_placeholder": "monfichier.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Annuler le téléversement",
       "ready_count": "Prêt : {ready} sur {total}",
       "approve_button_one": "Approuver le téléversement",
-      "approve_button_many": "Approuver {count} téléversements"
-    }
+      "approve_button_many": "Approuver {count} téléversements",
+      "get_datamap_button": "Obtenir le datamap"
+    },
+    "download_button": "Télécharger"
   },
   "wallet": {
     "earnings_heading": "Adresse de gains",
diff --git a/locales/he.json b/locales/he.json
index 3d556ac..d3163d3 100644
--- a/locales/he.json
+++ b/locales/he.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "הורד קובץ",
-      "address_label": "כתובת קובץ",
-      "address_placeholder": "כתובת קובץ (hex)",
+      "subtitle": "אחזור קובץ מרשת Autonomi",
+      "address_placeholder": "כתובת 0x…, קישור autonomi:// או נתיב / כתובת URL של datamap",
+      "paste_intro": "אפשר להדביק כל אחד מהבאים:",
+      "accept_address": "כתובת רשת (0x… / 64 תווים הקסדצימליים)",
+      "accept_link": "קישור שיתוף autonomi:// (כולל את שם הקובץ)",
+      "accept_datamap": "datamap — הדביקו נתיב מקומי או כתובת URL, או גררו / עיינו למטה",
+      "drop_datamap": "גררו לכאן קובץ .datamap, או לחצו כדי לעיין",
       "filename_label": "שמור בשם",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "בטל העלאה",
       "ready_count": "מוכן: {ready} מתוך {total}",
       "approve_button_one": "אשר העלאה",
-      "approve_button_many": "אשר {count} העלאות"
-    }
+      "approve_button_many": "אשר {count} העלאות",
+      "get_datamap_button": "קבל datamap"
+    },
+    "download_button": "הורדה"
   },
   "wallet": {
     "earnings_heading": "כתובת רווחים",
diff --git a/locales/id.json b/locales/id.json
index 4252768..a4f50cd 100644
--- a/locales/id.json
+++ b/locales/id.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Unduh file",
-      "address_label": "Alamat file",
-      "address_placeholder": "Alamat file (hex)",
+      "subtitle": "Ambil berkas dari Jaringan Autonomi",
+      "address_placeholder": "Alamat 0x…, tautan autonomi://, atau jalur / URL datamap",
+      "paste_intro": "Anda dapat menempelkan salah satu dari berikut:",
+      "accept_address": "Alamat jaringan (0x… / 64 karakter hex)",
+      "accept_link": "Tautan berbagi autonomi:// (berisi nama berkas)",
+      "accept_datamap": "Datamap — tempelkan jalur lokal atau URL, atau letakkan / telusuri di bawah",
+      "drop_datamap": "Letakkan berkas .datamap di sini, atau klik untuk menelusuri",
       "filename_label": "Simpan sebagai",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Batalkan unggahan",
       "ready_count": "Siap: {ready} dari {total}",
       "approve_button_one": "Setujui unggahan",
-      "approve_button_many": "Setujui {count} unggahan"
-    }
+      "approve_button_many": "Setujui {count} unggahan",
+      "get_datamap_button": "Dapatkan datamap"
+    },
+    "download_button": "Unduh"
   },
   "wallet": {
     "earnings_heading": "Alamat penghasilan",
diff --git a/locales/ja.json b/locales/ja.json
index 3fe7e7a..4afc100 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "ファイルをダウンロード",
-      "address_label": "ファイルアドレス",
-      "address_placeholder": "ファイルアドレス (16 進)",
+      "subtitle": "Autonomi ネットワークからファイルを取得",
+      "address_placeholder": "0x… アドレス、autonomi:// リンク、または datamap のパス / URL",
+      "paste_intro": "以下のいずれかを貼り付けできます:",
+      "accept_address": "ネットワークアドレス（0x… / 64桁の16進数）",
+      "accept_link": "autonomi:// 共有リンク（ファイル名を含む）",
+      "accept_datamap": "datamap — ローカルパスまたは URL を貼り付け、または下にドロップ / 参照",
+      "drop_datamap": "​.datamap ファイルをここにドロップ、またはクリックして参照",
       "filename_label": "保存ファイル名",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "アップロードをキャンセル",
       "ready_count": "準備完了: {total} 件中 {ready} 件",
       "approve_button_one": "アップロードを承認",
-      "approve_button_many": "{count} 件のアップロードを承認"
-    }
+      "approve_button_many": "{count} 件のアップロードを承認",
+      "get_datamap_button": "datamap を取得"
+    },
+    "download_button": "ダウンロード"
   },
   "wallet": {
     "earnings_heading": "報酬アドレス",
diff --git a/locales/ko.json b/locales/ko.json
index 6f7ccec..36704a6 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "파일 다운로드",
-      "address_label": "파일 주소",
-      "address_placeholder": "파일 주소 (16진수)",
+      "subtitle": "Autonomi 네트워크에서 파일 가져오기",
+      "address_placeholder": "0x… 주소, autonomi:// 링크 또는 datamap 경로 / URL",
+      "paste_intro": "다음 중 하나를 붙여넣을 수 있습니다:",
+      "accept_address": "네트워크 주소 (0x… / 64자리 16진수)",
+      "accept_link": "autonomi:// 공유 링크 (파일 이름 포함)",
+      "accept_datamap": "datamap — 로컬 경로나 URL을 붙여넣거나 아래에 놓기 / 찾아보기",
+      "drop_datamap": ".datamap 파일을 여기에 놓거나 클릭하여 찾아보기",
       "filename_label": "저장할 파일 이름",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "업로드 취소",
       "ready_count": "준비됨: {total}개 중 {ready}개",
       "approve_button_one": "업로드 승인",
-      "approve_button_many": "{count}개 업로드 승인"
-    }
+      "approve_button_many": "{count}개 업로드 승인",
+      "get_datamap_button": "datamap 가져오기"
+    },
+    "download_button": "다운로드"
   },
   "wallet": {
     "earnings_heading": "수익 주소",
diff --git a/locales/nl.json b/locales/nl.json
index ca1ea21..f9fc6a6 100644
--- a/locales/nl.json
+++ b/locales/nl.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Bestand downloaden",
-      "address_label": "Bestandsadres",
-      "address_placeholder": "Bestandsadres (hex)",
+      "subtitle": "Een bestand ophalen van het Autonomi-netwerk",
+      "address_placeholder": "0x…-adres, autonomi://-link of datamap-pad / URL",
+      "paste_intro": "Je kunt een van de volgende plakken:",
+      "accept_address": "Een netwerkadres (0x… / 64 hex-tekens)",
+      "accept_link": "Een autonomi://-deellink (bevat de bestandsnaam)",
+      "accept_datamap": "Een datamap — plak een lokaal pad of URL, of sleep / blader hieronder",
+      "drop_datamap": "Sleep hier een .datamap-bestand naartoe, of klik om te bladeren",
       "filename_label": "Opslaan als bestandsnaam",
       "filename_placeholder": "mijnbestand.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Upload annuleren",
       "ready_count": "Klaar: {ready} van {total}",
       "approve_button_one": "Upload goedkeuren",
-      "approve_button_many": "{count} uploads goedkeuren"
-    }
+      "approve_button_many": "{count} uploads goedkeuren",
+      "get_datamap_button": "Datamap ophalen"
+    },
+    "download_button": "Downloaden"
   },
   "wallet": {
     "earnings_heading": "Verdienstenadres",
diff --git a/locales/pt-BR.json b/locales/pt-BR.json
index 4d7b4af..8dbb891 100644
--- a/locales/pt-BR.json
+++ b/locales/pt-BR.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Baixar arquivo",
-      "address_label": "Endereço do arquivo",
-      "address_placeholder": "Endereço do arquivo (hex)",
+      "subtitle": "Obter um arquivo da rede Autonomi",
+      "address_placeholder": "Endereço 0x…, link autonomi:// ou caminho / URL de datamap",
+      "paste_intro": "Você pode colar qualquer um dos seguintes:",
+      "accept_address": "Um endereço de rede (0x… / 64 caracteres hex)",
+      "accept_link": "Um link de compartilhamento autonomi:// (contém o nome do arquivo)",
+      "accept_datamap": "Um datamap — cole um caminho local ou URL, ou solte / procure abaixo",
+      "drop_datamap": "Solte um arquivo .datamap aqui, ou clique para procurar",
       "filename_label": "Salvar como",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Cancelar upload",
       "ready_count": "Prontos: {ready} de {total}",
       "approve_button_one": "Aprovar upload",
-      "approve_button_many": "Aprovar {count} uploads"
-    }
+      "approve_button_many": "Aprovar {count} uploads",
+      "get_datamap_button": "Obter datamap"
+    },
+    "download_button": "Baixar"
   },
   "wallet": {
     "earnings_heading": "Endereço de recebimento",
diff --git a/locales/ru.json b/locales/ru.json
index d23084e..3cff23d 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Скачать файл",
-      "address_label": "Адрес файла",
-      "address_placeholder": "Адрес файла (hex)",
+      "subtitle": "Получить файл из сети Autonomi",
+      "address_placeholder": "Адрес 0x…, ссылка autonomi:// или путь / URL датамапа",
+      "paste_intro": "Можно вставить любое из следующего:",
+      "accept_address": "Сетевой адрес (0x… / 64 hex-символа)",
+      "accept_link": "Ссылка autonomi:// для обмена (содержит имя файла)",
+      "accept_datamap": "Датамап — вставьте локальный путь или URL, либо перетащите / выберите ниже",
+      "drop_datamap": "Перетащите сюда файл .datamap или нажмите, чтобы выбрать",
       "filename_label": "Сохранить как",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Отменить загрузку",
       "ready_count": "Готово: {ready} из {total}",
       "approve_button_one": "Одобрить загрузку",
-      "approve_button_many": "Одобрить {count} загрузок"
-    }
+      "approve_button_many": "Одобрить {count} загрузок",
+      "get_datamap_button": "Получить датамап"
+    },
+    "download_button": "Скачать"
   },
   "wallet": {
     "earnings_heading": "Адрес для вознаграждений",
diff --git a/locales/tr.json b/locales/tr.json
index a645873..3572891 100644
--- a/locales/tr.json
+++ b/locales/tr.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Dosyayı indir",
-      "address_label": "Dosya adresi",
-      "address_placeholder": "Dosya adresi (hex)",
+      "subtitle": "Autonomi Ağı'ndan bir dosya getir",
+      "address_placeholder": "0x… adresi, autonomi:// bağlantısı veya datamap yolu / URL",
+      "paste_intro": "Aşağıdakilerden herhangi birini yapıştırabilirsiniz:",
+      "accept_address": "Bir ağ adresi (0x… / 64 hex karakter)",
+      "accept_link": "Bir autonomi:// paylaşım bağlantısı (dosya adını içerir)",
+      "accept_datamap": "Bir datamap — yerel bir yol veya URL yapıştırın ya da aşağıya bırakın / göz atın",
+      "drop_datamap": "Bir .datamap dosyasını buraya bırakın veya göz atmak için tıklayın",
       "filename_label": "Farklı kaydet",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Yüklemeyi iptal et",
       "ready_count": "Hazır: {total} içinden {ready}",
       "approve_button_one": "Yüklemeyi onayla",
-      "approve_button_many": "{count} yüklemeyi onayla"
-    }
+      "approve_button_many": "{count} yüklemeyi onayla",
+      "get_datamap_button": "Datamap al"
+    },
+    "download_button": "İndir"
   },
   "wallet": {
     "earnings_heading": "Kazanç adresi",
diff --git a/locales/uk.json b/locales/uk.json
index c200c92..665d287 100644
--- a/locales/uk.json
+++ b/locales/uk.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Скачати файл",
-      "address_label": "Адреса файлу",
-      "address_placeholder": "Адреса файлу (hex)",
+      "subtitle": "Отримати файл із мережі Autonomi",
+      "address_placeholder": "Адреса 0x…, посилання autonomi:// або шлях / URL датамапу",
+      "paste_intro": "Можна вставити будь-що з наведеного:",
+      "accept_address": "Мережева адреса (0x… / 64 hex-символи)",
+      "accept_link": "Посилання autonomi:// для обміну (містить назву файлу)",
+      "accept_datamap": "Датамап — вставте локальний шлях або URL, або перетягніть / оберіть нижче",
+      "drop_datamap": "Перетягніть сюди файл .datamap або натисніть, щоб обрати",
       "filename_label": "Зберегти як",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Скасувати завантаження",
       "ready_count": "Готово: {ready} з {total}",
       "approve_button_one": "Схвалити завантаження",
-      "approve_button_many": "Схвалити {count} завантажень"
-    }
+      "approve_button_many": "Схвалити {count} завантажень",
+      "get_datamap_button": "Отримати датамап"
+    },
+    "download_button": "Завантажити"
   },
   "wallet": {
     "earnings_heading": "Адреса винагород",
diff --git a/locales/vi.json b/locales/vi.json
index 67d95bb..ba25e6e 100644
--- a/locales/vi.json
+++ b/locales/vi.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "Tải xuống tệp",
-      "address_label": "Địa chỉ tệp",
-      "address_placeholder": "Địa chỉ tệp (hex)",
+      "subtitle": "Lấy tệp từ Mạng Autonomi",
+      "address_placeholder": "Địa chỉ 0x…, liên kết autonomi:// hoặc đường dẫn / URL datamap",
+      "paste_intro": "Bạn có thể dán bất kỳ mục nào sau đây:",
+      "accept_address": "Một địa chỉ mạng (0x… / 64 ký tự hex)",
+      "accept_link": "Một liên kết chia sẻ autonomi:// (chứa tên tệp)",
+      "accept_datamap": "Một datamap — dán đường dẫn cục bộ hoặc URL, hoặc thả / duyệt bên dưới",
+      "drop_datamap": "Thả tệp .datamap vào đây, hoặc nhấp để duyệt",
       "filename_label": "Lưu thành",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "Hủy tải lên",
       "ready_count": "Sẵn sàng: {ready} / {total}",
       "approve_button_one": "Phê duyệt tải lên",
-      "approve_button_many": "Phê duyệt {count} tải lên"
-    }
+      "approve_button_many": "Phê duyệt {count} tải lên",
+      "get_datamap_button": "Lấy datamap"
+    },
+    "download_button": "Tải xuống"
   },
   "wallet": {
     "earnings_heading": "Địa chỉ thu nhập",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index d3587d6..050a1b7 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "下载文件",
-      "address_label": "文件地址",
-      "address_placeholder": "文件地址(hex)",
+      "subtitle": "从 Autonomi 网络获取文件",
+      "address_placeholder": "0x… 地址、autonomi:// 链接或 datamap 路径 / URL",
+      "paste_intro": "您可以粘贴以下任意内容:",
+      "accept_address": "网络地址（0x… / 64 位十六进制）",
+      "accept_link": "autonomi:// 分享链接（包含文件名）",
+      "accept_datamap": "datamap — 粘贴本地路径或 URL，或在下方拖放 / 浏览",
+      "drop_datamap": "将 .datamap 文件拖放到此处，或点击浏览",
       "filename_label": "另存为",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "取消上传",
       "ready_count": "就绪:{ready} / {total}",
       "approve_button_one": "批准上传",
-      "approve_button_many": "批准 {count} 个上传"
-    }
+      "approve_button_many": "批准 {count} 个上传",
+      "get_datamap_button": "获取 datamap"
+    },
+    "download_button": "下载"
   },
   "wallet": {
     "earnings_heading": "收益地址",
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index dfe718d..9b53845 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -332,8 +332,13 @@
     },
     "download_dialog": {
       "title": "下載檔案",
-      "address_label": "檔案位址",
-      "address_placeholder": "檔案位址(hex)",
+      "subtitle": "從 Autonomi 網路取得檔案",
+      "address_placeholder": "0x… 位址、autonomi:// 連結或 datamap 路徑 / URL",
+      "paste_intro": "您可以貼上以下任一項目:",
+      "accept_address": "網路位址（0x… / 64 位十六進位）",
+      "accept_link": "autonomi:// 分享連結（包含檔案名稱）",
+      "accept_datamap": "datamap — 貼上本機路徑或 URL，或在下方拖放 / 瀏覽",
+      "drop_datamap": "將 .datamap 檔案拖放到此處，或點擊瀏覽",
       "filename_label": "另存為",
       "filename_placeholder": "myfile.dat"
     },
@@ -374,8 +379,10 @@
       "cancel_upload": "取消上傳",
       "ready_count": "就緒:{ready} / {total}",
       "approve_button_one": "核准上傳",
-      "approve_button_many": "核准 {count} 個上傳"
-    }
+      "approve_button_many": "核准 {count} 個上傳",
+      "get_datamap_button": "取得 datamap"
+    },
+    "download_button": "下載"
   },
   "wallet": {
     "earnings_heading": "收益位址",
diff --git a/pages/files.vue b/pages/files.vue
index 7499a48..165bb2f 100644
--- a/pages/files.vue
+++ b/pages/files.vue
@@ -20,15 +20,9 @@
       <div class="flex items-center gap-2">
         <button
           class="rounded-md border border-autonomi-border px-3 py-1.5 text-sm text-autonomi-muted hover:text-autonomi-text"
-          @click="openDownloadByAddress"
+          @click="openDownload"
         >
-          {{ $t('files.download_by_address') }}
-        </button>
-        <button
-          class="rounded-md border border-autonomi-border px-3 py-1.5 text-sm text-autonomi-muted hover:text-autonomi-text"
-          @click="openDownloadByDatamap"
-        >
-          {{ $t('files.download_by_datamap') }}
+          {{ $t('files.download_button') }}
         </button>
       </div>
     </div>
@@ -54,7 +48,7 @@
           leave-to-class="opacity-0"
         >
           <div
-            v-if="dragging"
+            v-if="dragging && !showDownloadDialog"
             class="absolute inset-0 z-10 flex items-center justify-center rounded-lg border-2 border-dashed border-autonomi-blue bg-autonomi-dark/90"
           >
             <div class="text-center">
@@ -121,7 +115,7 @@
                     />
                   </div>
                 </td>
-                <td class="px-4 py-2.5 align-top">
+                <td class="px-4 py-2.5 align-middle">
                   <div><StatusBadge :status="statusLabel(file)" /></div>
                   <div v-if="showsProgressBar(file) && stageDetail(file)" class="mt-1 text-[10px] leading-tight text-autonomi-muted">
                     {{ stageDetail(file) }}
@@ -138,22 +132,22 @@
                   </template>
                 </td>
                 <td class="px-4 py-2.5 text-autonomi-muted">{{ formatDate(file.date) }}</td>
-                <td class="px-4 py-2.5">
+                <td class="px-4 py-2.5 w-full max-w-0">
                   <span
                     v-if="file.public_address"
-                    class="inline-flex cursor-pointer items-center gap-1.5 font-mono text-xs text-autonomi-blue hover:text-autonomi-blue/80"
+                    class="flex min-w-0 cursor-pointer items-center gap-1.5 font-mono text-xs text-autonomi-blue hover:text-autonomi-blue/80"
                     :title="$t('files.row.public_tooltip')"
                     @click.stop="copyPublicAddress(file.public_address)"
                   >
-                    <span class="rounded bg-autonomi-blue/15 px-1 py-px text-[9px] font-sans uppercase tracking-wider">{{ $t('files.row.public_badge') }}</span>
-                    {{ truncateAddress(file.public_address, 8, 6) }}
+                    <span class="shrink-0 rounded bg-autonomi-blue/15 px-1 py-px text-[9px] font-sans uppercase tracking-wider">{{ $t('files.row.public_badge') }}</span>
+                    <span class="truncate">{{ file.public_address }}</span>
                   </span>
                   <div
                     v-else-if="file.data_map_file"
-                    class="flex items-center gap-1.5"
+                    class="flex min-w-0 items-center gap-1.5"
                   >
                     <span
-                      class="cursor-pointer font-mono text-xs text-autonomi-muted hover:text-autonomi-blue hover:underline"
+                      class="truncate cursor-pointer font-mono text-xs text-autonomi-muted hover:text-autonomi-blue hover:underline"
                       :title="$t('files.row.reveal_datamap_tooltip')"
                       @click.stop="openFolder(file.data_map_file)"
                     >
@@ -161,7 +155,7 @@
                     </span>
                     <button
                       type="button"
-                      class="rounded p-0.5 text-autonomi-muted/60 hover:text-autonomi-blue hover:bg-autonomi-surface"
+                      class="shrink-0 rounded p-0.5 text-autonomi-muted/60 hover:text-autonomi-blue hover:bg-autonomi-surface"
                       :title="$t('files.row.copy_datamap_tooltip')"
                       @click.stop="copyDatamapPath(file.data_map_file!)"
                     >
@@ -173,11 +167,11 @@
                   </div>
                   <span
                     v-else-if="file.address"
-                    class="cursor-pointer font-mono text-xs text-autonomi-muted hover:text-autonomi-blue"
+                    class="block truncate cursor-pointer font-mono text-xs text-autonomi-muted hover:text-autonomi-blue"
                     :title="$t('files.row.copy_address_tooltip')"
                     @click.stop="copyAddress(file.address)"
                   >
-                    {{ truncateAddress(file.address, 8, 6) }}
+                    {{ file.address }}
                   </span>
                   <span v-else class="text-autonomi-muted">-</span>
                 </td>
@@ -304,23 +298,10 @@
       :open="showDownloadDialog"
       :prefill-address="downloadPrefillAddress"
       :prefill-filename="downloadPrefillFilename"
+      :drag-active="dragging && showDownloadDialog"
       @close="showDownloadDialog = false; downloadPrefillAddress = ''; downloadPrefillFilename = ''"
-      @download="handleDownload"
-    />
-
-    <FilesDownloadByDatamapDialog
-      :open="showDatamapDialog"
-      :candidates="datamapCandidates"
-      @close="showDatamapDialog = false"
       @browse="browseForDatamap"
-      @select="onDatamapPicked"
-    />
-
-    <FilesDatamapSaveAsDialog
-      :open="showDatamapSaveAs"
-      :default-name="pendingDatamap?.defaultName ?? ''"
-      @close="cancelDatamapSaveAs"
-      @confirm="startDatamapDownload"
+      @download="handleDownload"
     />
 
     <FilesUploadConfirmDialog
@@ -348,7 +329,7 @@ import { open as openFileDialog } from '@tauri-apps/plugin-dialog'
 import { revealItemInDir } from '@tauri-apps/plugin-opener'
 import { useI18n } from 'vue-i18n'
 import { useFilesStore, type FileEntry } from '~/stores/files'
-import { formatBytes, truncateAddress } from '~/utils/formatters'
+import { formatBytes } from '~/utils/formatters'
 import { formatNanoTokens, formatGasCost } from '~/utils/payment'
 import { useSettingsStore } from '~/stores/settings'
 import { useToastStore } from '~/stores/toasts'
@@ -633,7 +614,14 @@ async function setupDragDrop() {
     } else if (event.payload.type === 'drop') {
       dragging.value = false
       const paths = event.payload.paths
-      if (paths.length > 0) {
+      if (paths.length === 0) return
+      // With the Download dialog open, a dropped file is a datamap to download
+      // from — feed its path into the dialog's smart input rather than kicking
+      // off an upload.
+      if (showDownloadDialog.value) {
+        downloadPrefillFilename.value = ''
+        downloadPrefillAddress.value = paths[0]
+      } else {
         showUploadConfirmForPaths(paths)
       }
     } else if (event.payload.type === 'leave') {
@@ -806,27 +794,10 @@ watchEffect(() => {
   kickScheduler()
 })
 
-// Auto-dismiss the confirm dialog when every selected entry was detected as
-// already stored on the network. Those entries bypass `awaiting_approval`
-// (no user decision left to make) and flow through the scheduler on their
-// own, so leaving the dialog open waiting for an Approve that can never
-// enable is just clutter.
-watch(
-  () => selectedFileIds.value.map(id => filesStore.findById(id)?.alreadyStored),
-  (flags) => {
-    if (!showUploadConfirm.value) return
-    if (flags.length === 0) return
-    if (flags.some(f => f === undefined)) return
-    if (!flags.every(f => f === true)) return
-    const n = flags.length
-    showUploadConfirm.value = false
-    selectedFileIds.value = []
-    toastStore.add(
-      n === 1 ? t('files.toast.already_stored_one') : t('files.toast.already_stored_many', { count: n }),
-      'info',
-    )
-  },
-)
+// Note: already-stored files are NOT auto-dismissed. Even when every data
+// chunk is on-network the user still chooses private (return the DataMap) vs
+// public (publish the DataMap), so the confirm dialog stays open and waits for
+// an explicit Approve — the approve gate now counts already-stored entries.
 
 function cancelPendingUploads() {
   for (const id of selectedFileIds.value) filesStore.cancelPendingUpload(id)
@@ -847,8 +818,8 @@ const showDownloadDialog = ref(false)
 const downloadPrefillAddress = ref('')
 const downloadPrefillFilename = ref('')
 
-/** Manual "Download by address" — always opens a blank dialog. */
-function openDownloadByAddress() {
+/** Manual "Download" — always opens a blank unified dialog. */
+function openDownload() {
   downloadPrefillAddress.value = ''
   downloadPrefillFilename.value = ''
   showDownloadDialog.value = true
@@ -895,37 +866,11 @@ function waitForConnection(): Promise<boolean> {
   })
 }
 
-const showDatamapDialog = ref(false)
-const showDatamapSaveAs = ref(false)
-
-/** Set between phase 1 (picker) and phase 2 (Save As) of the download-by-
- *  datamap flow. Cleared once a download starts or the user cancels. */
-const pendingDatamap = ref<{ path: string; defaultName: string } | null>(null)
-
-/** Previously uploaded files for which we still hold a local datamap — the
- *  set the user can re-download from without picking a file from disk. */
-const datamapCandidates = computed(() =>
-  filesStore.files
-    .filter(f => f.kind === 'upload' && f.status === 'complete' && f.data_map_file)
-    .map(f => ({
-      name: f.name,
-      data_map_file: f.data_map_file!,
-      date: f.date,
-      size_bytes: f.size_bytes,
-    })),
-)
-
-function openDownloadByDatamap() {
-  showDatamapDialog.value = true
-}
-
-function onDatamapPicked(path: string, suggestedName: string) {
-  pendingDatamap.value = { path, defaultName: suggestedName }
-  showDatamapSaveAs.value = true
-}
-
+// The dialog's "drop a datamap / browse" affordance emits `browse`. Open the
+// native picker and feed the chosen path back into the dialog's smart input
+// (as a prefill) — the dialog then classifies it as a datamap and derives the
+// filename, exactly as a dropped or pasted path would.
 async function browseForDatamap() {
-  showDatamapDialog.value = false
   let selected: string | string[] | null
   try {
     selected = await openFileDialog({
@@ -938,58 +883,43 @@ async function browseForDatamap() {
     return
   }
   if (!selected) return
-  const datamapPath = String(Array.isArray(selected) ? selected[0] : selected)
-  const basename = datamapPath.split(/[\\/]/).pop() ?? 'download'
-  const defaultName = basename.replace(/\.datamap$/i, '') || basename
-  pendingDatamap.value = { path: datamapPath, defaultName }
-  showDatamapSaveAs.value = true
-}
-
-function cancelDatamapSaveAs() {
-  showDatamapSaveAs.value = false
-  pendingDatamap.value = null
+  downloadPrefillFilename.value = ''
+  downloadPrefillAddress.value = String(Array.isArray(selected) ? selected[0] : selected)
+  showDownloadDialog.value = true
 }
 
-async function startDatamapDownload(filename: string) {
-  const pending = pendingDatamap.value
-  if (!pending) return
-  showDatamapSaveAs.value = false
-  pendingDatamap.value = null
-
-  const id = await filesStore.downloadFromDatamapFile(pending.path, filename)
-  if (id === null) return
-
-  if (!autonomiConnected.value) {
-    invoke('retry_autonomi_client').catch(() => {})
-    const connected = await waitForConnection()
-    if (!connected) {
-      filesStore.updateEntry(id, { status: 'failed', error: t('files.error.not_connected_to_network') })
-      toastStore.add(t('files.toast.download_requires_network'), 'warning')
-      return
-    }
+// Ensure the embedded client is connected before a download row can progress.
+// Marks the row failed if the connection ultimately fails. Shared by both
+// download kinds.
+async function ensureConnectedForDownload(id: number): Promise<boolean> {
+  if (autonomiConnected.value) return true
+  // Kick the connect loop (no-op if already connecting) and wait. The row
+  // already shows `downloading`; progress stays at 0 until the client is ready.
+  invoke('retry_autonomi_client').catch(() => {})
+  const connected = await waitForConnection()
+  if (!connected) {
+    filesStore.updateEntry(id, { status: 'failed', error: t('files.error.not_connected_to_network') })
+    toastStore.add(t('files.toast.download_requires_network'), 'warning')
+    return false
   }
-
-  filesStore.startRealDownload(id)
+  return true
 }
 
-async function handleDownload(address: string, filename: string) {
-  const downloadDir = filesStore.getDownloadDir()
-  const destPath = `${downloadDir}/${filename}`
-  const id = filesStore.startDownload(address, filename, destPath)
-
-  if (!autonomiConnected.value) {
-    // Kick the connect loop (no-op if already connecting) and wait. The row
-    // already shows `downloading` — progress just stays at 0 until the
-    // client is ready.
-    invoke('retry_autonomi_client').catch(() => {})
-    const connected = await waitForConnection()
-    if (!connected) {
-      filesStore.updateEntry(id, { status: 'failed', error: t('files.error.not_connected_to_network') })
-      toastStore.add(t('files.toast.download_requires_network'), 'warning')
-      return
-    }
+// Unified download handler. The dialog resolved the free-form input into either
+// an address (hex / autonomi:// link) or a local `.datamap` file path.
+async function handleDownload(target: { kind: 'address' | 'datamap' | 'url'; value: string; filename: string }) {
+  let id: number | null
+  if (target.kind === 'datamap') {
+    id = await filesStore.downloadFromDatamapFile(target.value, target.filename)
+  } else if (target.kind === 'url') {
+    id = await filesStore.downloadFromDatamapUrl(target.value, target.filename)
+  } else {
+    const destPath = `${filesStore.getDownloadDir()}/${target.filename}`
+    id = filesStore.startDownload(target.value, target.filename, destPath)
   }
+  if (id === null) return
 
+  if (!(await ensureConnectedForDownload(id))) return
   filesStore.startRealDownload(id)
 }
 
diff --git a/src-tauri/src/autonomi_ops.rs b/src-tauri/src/autonomi_ops.rs
index a0a0da4..8b696af 100644
--- a/src-tauri/src/autonomi_ops.rs
+++ b/src-tauri/src/autonomi_ops.rs
@@ -944,6 +944,7 @@ pub async fn wallet_upload(
     state: tauri::State<'_, AutonomiState>,
     upload_id: String,
     file_path: String,
+    visibility: Option<String>,
 ) -> Result<UploadResult, String> {
     let client_lock = state.client.read().await;
     let client = client_lock
@@ -970,10 +971,21 @@ pub async fn wallet_upload(
 
     let progress_tx = spawn_upload_progress_forwarder(app.clone(), upload_id.clone());
 
-    let result = client
-        .file_upload_with_progress(&canonical, PaymentMode::Auto, Some(progress_tx))
-        .await
-        .map_err(|e| format!("Upload failed: {e}"))?;
+    // Public uploads bundle the serialized DataMap into the payment batch so
+    // it's stored on-network; the resulting chunk address comes back via
+    // `FileUploadResult.data_map_address` and is surfaced as `public_address`.
+    // Private uploads keep the DataMap local only. Default to private.
+    let is_public = matches!(visibility.as_deref(), Some("public"));
+    let result = if is_public {
+        client
+            .file_upload_public_with_progress(&canonical, PaymentMode::Auto, Some(progress_tx))
+            .await
+    } else {
+        client
+            .file_upload_with_progress(&canonical, PaymentMode::Auto, Some(progress_tx))
+            .await
+    }
+    .map_err(|e| format!("Upload failed: {e}"))?;
 
     let data_map_json = serde_json::to_string(&result.data_map)
         .map_err(|e| format!("Failed to serialize DataMap: {e}"))?;
@@ -1133,6 +1145,78 @@ pub fn read_datamap_file(path: String) -> Result<String, String> {
     serde_json::to_string(&data_map).map_err(|e| format!("Failed to encode datamap at {path}: {e}"))
 }
 
+/// Fetch a persisted DataMap from an `http(s)://` URL and return its JSON.
+///
+/// The URL-based sibling of [`read_datamap_file`]: used by the Download dialog
+/// when the user pastes a URL ending in `.datamap`. The fetched bytes are only
+/// a DataMap (a list of chunk addresses); the file's data is still pulled from
+/// the Autonomi network by `download_file`, so a hostile URL cannot substitute
+/// file content — at worst it points the download at other on-network chunks,
+/// no different from any datamap the user might paste.
+///
+/// Guardrails: a 15s total timeout and a 5 MiB streamed cap. A datamap is a few
+/// KB, so anything larger is treated as a wrong/hostile URL, not a datamap. The
+/// cap is enforced while streaming so a server with no (or a lying)
+/// `Content-Length` can't balloon memory.
+#[tauri::command]
+pub async fn read_datamap_url(url: String) -> Result<String, String> {
+    const MAX_BYTES: usize = 5 * 1024 * 1024;
+
+    let url = url.trim();
+    if !(url.starts_with("http://") || url.starts_with("https://")) {
+        return Err("Datamap URL must start with http:// or https://".into());
+    }
+
+    let client = reqwest::Client::builder()
+        .timeout(std::time::Duration::from_secs(15))
+        .build()
+        .map_err(|e| format!("HTTP client error: {e}"))?;
+
+    let mut resp = client
+        .get(url)
+        .send()
+        .await
+        .map_err(|e| format!("Failed to fetch datamap: {e}"))?;
+
+    if !resp.status().is_success() {
+        return Err(format!(
+            "Datamap URL returned HTTP {}",
+            resp.status().as_u16()
+        ));
+    }
+    // Fast-fail when the server declares an oversized body up front.
+    if let Some(len) = resp.content_length() {
+        if len as usize > MAX_BYTES {
+            return Err(format!("Datamap response too large ({len} bytes)"));
+        }
+    }
+
+    // Stream the body, enforcing the cap as we go — never trust Content-Length.
+    let mut bytes: Vec<u8> = Vec::new();
+    while let Some(chunk) = resp
+        .chunk()
+        .await
+        .map_err(|e| format!("Failed to read datamap response: {e}"))?
+    {
+        if bytes.len() + chunk.len() > MAX_BYTES {
+            return Err(format!("Datamap response too large (> {MAX_BYTES} bytes)"));
+        }
+        bytes.extend_from_slice(&chunk);
+    }
+
+    // Reuse ant-core's format-sniffing reader (msgpack canonical / legacy JSON,
+    // plus any future envelope) by round-tripping through a temp file keyed on
+    // the content hash so concurrent fetches don't collide.
+    let digest = Sha256::digest(&bytes);
+    let tmp = std::env::temp_dir().join(format!("ant-gui-datamap-{digest:x}.datamap"));
+    std::fs::write(&tmp, &bytes).map_err(|e| format!("Failed to buffer datamap: {e}"))?;
+    let parsed = ant_core::data::read_datamap(&tmp);
+    let _ = std::fs::remove_file(&tmp);
+    let data_map = parsed.map_err(|e| format!("Not a valid datamap: {e}"))?;
+
+    serde_json::to_string(&data_map).map_err(|e| format!("Failed to encode datamap: {e}"))
+}
+
 /// Check if the data client is currently connected.
 #[tauri::command]
 pub async fn is_autonomi_connected(state: tauri::State<'_, AutonomiState>) -> Result<bool, String> {
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index c068009..aacfe4d 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -1154,6 +1154,7 @@ pub fn run() {
             autonomi_ops::download_file,
             autonomi_ops::download_public,
             autonomi_ops::read_datamap_file,
+            autonomi_ops::read_datamap_url,
             autonomi_ops::is_autonomi_connected,
             autonomi_ops::retry_autonomi_client,
             autonomi_ops::get_connection_status,
diff --git a/stores/files.ts b/stores/files.ts
index dda4c01..1663e1d 100644
--- a/stores/files.ts
+++ b/stores/files.ts
@@ -449,17 +449,19 @@ export const useFilesStore = defineStore('files', {
           && estimate.storage_cost_atto === '0'
           && estimate.estimated_gas_cost_wei === '0'
 
-        // Already-stored entries skip awaiting_approval entirely — there's
-        // no user decision to make (no payment, no real upload). Route them
-        // straight into the upload queue so the scheduler drives them through
-        // to `complete` without a ceremonial Approve click.
+        // Even when every data chunk is already on the network the user still
+        // has a real decision to make: a private upload returns/writes the
+        // DataMap for later retrieval, a public upload publishes the DataMap
+        // on-network so it can be shared. Neither is a no-op, so always route
+        // through awaiting_approval and require an explicit Approve rather than
+        // silently queuing already-stored files with a default visibility.
         this.updateEntry(id, {
           estimate,
           paymentMode: estimate.payment_mode === 'merkle' ? 'merkle' : 'regular',
           cost: formatNanoTokens(estimate.storage_cost_atto),
           gas_cost: formatGasCost(estimate.estimated_gas_cost_wei),
           alreadyStored,
-          status: alreadyStored ? 'queued_for_upload' : 'awaiting_approval',
+          status: 'awaiting_approval',
         })
       } else {
         this.updateEntry(id, { status: 'awaiting_approval' })
@@ -615,7 +617,8 @@ export const useFilesStore = defineStore('files', {
             address: string
             chunks_stored: number
             data_map_file: string
-          }>('wallet_upload', { uploadId: String(id), filePath: entry.path })
+            public_address: string | null
+          }>('wallet_upload', { uploadId: String(id), filePath: entry.path, visibility: options.visibility })
 
           const duration = entry.transferStartedAt
             ? Math.round((Date.now() - entry.transferStartedAt) / 1000)
@@ -624,6 +627,7 @@ export const useFilesStore = defineStore('files', {
             status: 'complete',
             progress: 100,
             address: result.address,
+            public_address: result.public_address ?? undefined,
             data_map_json: result.data_map_json,
             data_map_file: result.data_map_file,
             duration,
@@ -978,6 +982,48 @@ export const useFilesStore = defineStore('files', {
       })
       return id
     },
+
+    /** Fetch a datamap from an `http(s)` URL and stage a download row, exactly
+     *  like {@link downloadFromDatamapFile} but sourcing the DataMap over the
+     *  network. The file's data is still pulled from Autonomi via the resolved
+     *  DataMap. Returns the new row id, or null if the fetch/parse failed. */
+    async downloadFromDatamapUrl(
+      url: string,
+      filename?: string,
+    ): Promise<number | null> {
+      const toasts = useToastStore()
+
+      let json: string
+      try {
+        json = await invoke<string>('read_datamap_url', { url })
+      } catch (e: any) {
+        toasts.add(t('files.toast.datamap_read_failed', { error: e.message ?? e }), 'error')
+        return null
+      }
+
+      const cleanUrl = url.split(/[?#]/)[0]
+      const basename = cleanUrl.split(/[\\/]/).pop() ?? 'download'
+      const fallback = basename.replace(/\.datamap$/i, '') || basename
+      const finalName = filename?.trim() || fallback
+      const address = await sha256Hex(json)
+      const destPath = `${this.getDownloadDir()}/${finalName}`
+
+      const id = this.nextId++
+      this.files.unshift({
+        id,
+        kind: 'download',
+        name: finalName,
+        size_bytes: 0,
+        address,
+        data_map_json: json,
+        status: 'downloading',
+        dest_path: destPath,
+        progress: 0,
+        date: new Date().toISOString(),
+        transferStartedAt: Date.now(),
+      })
+      return id
+    },
   },
 })
 
diff --git a/utils/validators.ts b/utils/validators.ts
index 12c6cbd..9693deb 100644
--- a/utils/validators.ts
+++ b/utils/validators.ts
@@ -12,15 +12,35 @@ export function isValidPublicAddress(addr: string): boolean {
 
 export interface AutonomiLink {
   address: string
-  /** Optional suggested filename from `?name=` — unvalidated; the download
-   *  dialog runs it through `filenameError` and blocks an unsafe name. */
+  /** Optional suggested filename. Derived from the query string: an explicit
+   *  `?name=` wins; otherwise `?filename=` and `?filetype=` are joined with a
+   *  dot (`filename.filetype`). Unvalidated — the download dialog runs it
+   *  through `filenameError` and blocks an unsafe name. */
   name?: string
 }
 
+/** Derive a suggested "save as" filename from an autonomi link's query string.
+ *  Precedence: explicit `name`, then `filename` + `filetype` joined by a dot,
+ *  then a bare `filename`. Returns undefined when the link carries no usable
+ *  name hint. A leading dot on `filetype` is tolerated (`.epub` → `epub`). */
+function deriveLinkName(url: string): string | undefined {
+  const q = url.indexOf('?')
+  if (q === -1) return undefined
+  const params = new URLSearchParams(url.slice(q + 1))
+  const explicit = params.get('name')?.trim()
+  if (explicit) return explicit
+  const base = params.get('filename')?.trim()
+  const ext = params.get('filetype')?.trim().replace(/^\.+/, '')
+  if (base && ext) return `${base}.${ext}`
+  if (base) return base
+  return undefined
+}
+
 /** Parse an `autonomi://<address>` deep link into its public address (and an
- *  optional `?name=` filename), or null if it isn't a well-formed autonomi URL
+ *  optional suggested filename), or null if it isn't a well-formed autonomi URL
  *  with a valid address. Tolerates an optional `//`, a trailing slash, and any
- *  query/fragment. Example: `autonomi://<64-hex>?name=book.epub`. */
+ *  query/fragment. Examples: `autonomi://<64-hex>?name=book.epub`,
+ *  `autonomi://<64-hex>?filename=book&filetype=epub`. */
 export function parseAutonomiDeepLink(url: string): AutonomiLink | null {
   const trimmed = url.trim()
   const m = trimmed.match(/^autonomi:(?:\/\/)?([^/?#]+)/i)
@@ -28,13 +48,98 @@ export function parseAutonomiDeepLink(url: string): AutonomiLink | null {
   const address = m[1]
   if (!isValidPublicAddress(address)) return null
 
-  let name: string | undefined
-  const q = trimmed.indexOf('?')
-  if (q !== -1) {
-    const raw = new URLSearchParams(trimmed.slice(q + 1)).get('name')?.trim()
-    if (raw) name = raw
+  const name = deriveLinkName(trimmed)
+  return name ? { address, name } : { address }
+}
+
+/** A concrete thing the Download dialog can act on, derived from its free-form
+ *  input box (or a dropped file): an on-network/known address, a local
+ *  `.datamap` file path, or an `http(s)` URL that serves a `.datamap`.
+ *  `invalid` means the input matched nothing. */
+export type DownloadTarget =
+  | { kind: 'address'; address: string; name?: string }
+  | { kind: 'datamap'; path: string; name?: string }
+  | { kind: 'url'; url: string; name?: string }
+  | { kind: 'invalid' }
+
+/** Suggested filename from a datamap path or URL: the last path segment (minus
+ *  any query/fragment) with a trailing `.datamap` stripped. */
+function datamapNameFromPath(p: string): string | undefined {
+  const clean = p.split(/[?#]/)[0]
+  const base = clean.split(/[\\/]/).pop() ?? clean
+  return base.replace(/\.datamap$/i, '') || undefined
+}
+
+/** If `input` is an `http(s)` URL (or a bare `host.tld/…` that we can safely
+ *  promote to `https://`) pointing at a `.datamap` resource, return the
+ *  normalized URL; otherwise null. Query/fragment are allowed after the
+ *  `.datamap` path segment. */
+function toHttpDatamapUrl(input: string): string | null {
+  const s = input.trim()
+  let url: string | null = null
+  if (/^https?:\/\//i.test(s)) {
+    url = s
+  } else if (/^[a-z0-9-]+(\.[a-z0-9-]+)+(:\d+)?\//i.test(s)) {
+    // Bare `host.tld/path…` with a dotted hostname before the first slash —
+    // treat as https. (A leading-slash absolute path or `C:\…` won't match.)
+    url = `https://${s}`
+  }
+  if (!url) return null
+  const pathPart = url.split(/[?#]/)[0]
+  return /\.datamap$/i.test(pathPart) ? url : null
+}
+
+/** Normalize a `file://` URI to a filesystem path (URL-decoded). Returns the
+ *  input trimmed-but-unchanged if it isn't a file URI. Handles the Windows
+ *  `file:///C:/x` → `C:/x` shape. */
+export function fileUriToPath(input: string): string {
+  const s = input.trim()
+  if (!/^file:\/\//i.test(s)) return s
+  // Strip the scheme and any authority/host component (`file://host/path`).
+  let p = s.replace(/^file:\/\/[^/]*/i, '')
+  try {
+    p = decodeURIComponent(p)
+  } catch {
+    /* leave the raw (possibly malformed) percent-encoding in place */
   }
-  return { address, name }
+  if (/^\/[a-zA-Z]:/.test(p)) p = p.slice(1)
+  return p
+}
+
+/** Classify a Download dialog input into a concrete {@link DownloadTarget}.
+ *
+ *  - `autonomi://<addr>[?name|filename+filetype]` → address (public), with a
+ *    suggested filename from the link.
+ *  - an `http(s)` URL (or bare `host.tld/…`) ending in `.datamap` → a remote
+ *    datamap to fetch, with a suggested filename from its last path segment.
+ *  - a `file://` URI or any path-looking string ending in `.datamap` → a local
+ *    datamap file, with a suggested filename from its basename.
+ *  - a bare 64-hex value (optional `0x`) → address.
+ *  - anything else → `invalid`.
+ *
+ *  Order matters: the `autonomi:` / URL / datamap-path checks run before the
+ *  bare hex check, and a bare 64-hex address contains no slashes / `.datamap`
+ *  so it never trips those branches. */
+export function classifyDownloadInput(input: string): DownloadTarget {
+  const s = input.trim()
+  if (!s) return { kind: 'invalid' }
+
+  if (/^autonomi:/i.test(s)) {
+    const link = parseAutonomiDeepLink(s)
+    return link ? { kind: 'address', address: link.address, name: link.name } : { kind: 'invalid' }
+  }
+
+  const url = toHttpDatamapUrl(s)
+  if (url) return { kind: 'url', url, name: datamapNameFromPath(url) }
+
+  if (/^file:\/\//i.test(s) || /[\\/]/.test(s) || /\.datamap$/i.test(s)) {
+    const path = fileUriToPath(s)
+    if (!/\.datamap$/i.test(path)) return { kind: 'invalid' }
+    return { kind: 'datamap', path, name: datamapNameFromPath(path) }
+  }
+
+  if (isValidPublicAddress(s)) return { kind: 'address', address: s }
+  return { kind: 'invalid' }
 }
 
 // Windows-reserved set is the strict superset across platforms — rejecting it