@bobfrankston/rmfmail 1.1.214 → 1.1.215

package/client/app.bundle.js

@@ -1960,6 +1960,18 @@ async function showAddContactDialog(nameIn, emailIn) {
       dup = match;
   } catch {
   }
+  let dupInfo = "";
+  if (dup) {
+    const nm = `<strong>${escapeText(dup.name || "(no name)")}</strong>`;
+    if (dup.source === "discovered") {
+      dupInfo = `<div class="mailx-modal-info">Found in <em>local discovered contacts</em> (auto-collected from your mail) as ${nm} \u2014 <strong>not yet in Google Contacts</strong>. Saving adds it to Google Contacts.</div>`;
+    } else if (dup.source === "google") {
+      dupInfo = `<div class="mailx-modal-info">Already in <strong>Google Contacts</strong> as ${nm}. Saving updates the name.</div>`;
+    } else {
+      dupInfo = `<div class="mailx-modal-info">Already saved as ${nm} (${escapeText(dup.source)}). Saving updates the name and syncs to Google Contacts.</div>`;
+    }
+  }
+  const saveLabel = dup ? dup.source === "discovered" ? "Add to Google Contacts" : "Update" : "Save";
   const backdrop = document.createElement("div");
   backdrop.className = "mailx-modal-backdrop";
   const panel = document.createElement("div");
@@ -1969,7 +1981,7 @@ async function showAddContactDialog(nameIn, emailIn) {
             <span class="mailx-modal-title-text">${dup ? "Update contact" : "Add contact"}</span>
             <button type="button" class="mailx-modal-close" id="ac-close" aria-label="Close">&times;</button>
         </div>
-        ${dup ? `<div class="mailx-modal-info">Already in address book as <strong>${escapeText(dup.name || "(no name)")}</strong> (${escapeText(dup.source)}). Saving will update the name.</div>` : ""}
+        ${dupInfo}
         <label class="mailx-modal-label">Name
             <input class="mailx-modal-input" id="ac-name" type="text" value="${escapeText(dup?.name || nameIn || "")}" autofocus>
         </label>
@@ -1982,7 +1994,7 @@ async function showAddContactDialog(nameIn, emailIn) {
         <div class="mailx-modal-buttons">
             <span class="mailx-modal-spacer"></span>
             <button type="button" class="mailx-modal-btn" data-action="cancel">Cancel</button>
-            <button type="button" class="mailx-modal-btn mailx-modal-btn-primary" data-action="save">${dup ? "Update" : "Save"}</button>
+            <button type="button" class="mailx-modal-btn mailx-modal-btn-primary" data-action="save">${escapeText(saveLabel)}</button>
         </div>`;
   backdrop.appendChild(panel);
   document.body.appendChild(backdrop);
@@ -2003,7 +2015,7 @@ async function showAddContactDialog(nameIn, emailIn) {
         close();
       } catch (e) {
         btn.disabled = false;
-        btn.textContent = dup ? "Update" : "Save";
+        btn.textContent = saveLabel;
         alert(`Couldn't save: ${e?.message || e}`);
       }
     });