fix: prevent intercept error when from is object (#393)

liamross · psugihara · web-flow · commit e155434d8962 · 2022-12-01T11:21:08.000-08:00
* fix: prevent error when `from` is object

this prevents the preview page breaking when `from` is an object instead of a string

* ammend intercepts/mock as manual test

* add changeset

Co-authored-by: Peter Sugihara &lt;peter@campsh.com&gt;
diff --git a/.changeset/sweet-berries-know.md b/.changeset/sweet-berries-know.md
@@ -0,0 +1,6 @@
+---
+"mailing": patch
+"mailing-core": patch
+---
+
+fix: prevent intercept error when from is object
diff --git a/packages/cli/src/components/Intercept.tsx b/packages/cli/src/components/Intercept.tsx
@@ -101,7 +101,14 @@ const Intercept: React.FC<InterceptProps> = ({ data }) => {
         <div>
           <div>Subject: {data.subject ? `"${data.subject}"` : "MISSING"}</div>
           {data.to && <div>To: {data.to}</div>}
-          <div>From: {data.from || "MISSING"}</div>
+          <div>
+            From:{' '}
+            {!data.from
+              ? 'MISSING'
+              : typeof data.from === 'string'
+              ? data.from
+              : `${data.from.name} <${data.from.address}>`}
+          </div>
           {data.cc && <div>CC: {data.cc}</div>}
           {data.bcc && <div>BCC: {data.bcc}</div>}
         </div>
diff --git a/packages/cli/src/custom.d.ts b/packages/cli/src/custom.d.ts
@@ -2,7 +2,7 @@ type Intercept = {
   id: string;
   html: string;
   to?: string | string[];
-  from?: string;
+  from?: string | { name: string; address: string };
   subject?: string;
   cc?: string | string[];
   bcc?: string | string[];
diff --git a/packages/cli/src/pages/intercepts/mock.tsx b/packages/cli/src/pages/intercepts/mock.tsx
@@ -5,7 +5,7 @@ const ShowIntercept = () => {
     id: "mock",
     html: "<html><body><h1>Title</h1>hope it's not too strict</body></html>",
     to: "peter s. <peter+test@campsh.com>",
-    from: "peter+sendgrid@campsh.com",
+    from: { name: "peter", address: "peter+sendgrid@campsh.com" },
     subject: "A test email",
   };
 

-Original file line number
+Diff line change
     id: "mock",
     html: "<html><body><h1>Title</h1>hope it's not too strict</body></html>",
     to: "peter s. <[email protected]>",
 -    from: "[email protected]",
 +    from: { name: "peter", address: "peter[email protected]" },
     subject: "A test email",
   };