From b3857f987d404077a8c33d16921cd5b092b6eee4 Mon Sep 17 00:00:00 2001
From: bencroker <ben@putyourlightson.com>
Date: Tue, 2 Aug 2022 17:50:03 +0200
Subject: [PATCH] Fix error on create contact page

---
 CHANGELOG.md                    | 4 ++++
 composer.json                   | 2 +-
 src/elements/ContactElement.php | 6 ++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56438df9..0533ddb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Campaign
 
+## 2.1.3 - 2022-08-02
+### Fixed
+- Fixed an error that occurred when creating contacts in the control panel.
+
 ## 2.1.2 - 2022-07-25
 ### Fixed
 - Fixed a bug when subscribing users via front-end forms.
diff --git a/composer.json b/composer.json
index ec4591cc..132e3576 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "putyourlightson/craft-campaign",
     "description": "Send and manage email campaigns, contacts and mailing lists.",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "type": "craft-plugin",
     "homepage": "https://putyourlightson.com/plugins/campaign",
     "license": "proprietary",
diff --git a/src/elements/ContactElement.php b/src/elements/ContactElement.php
index 8be4917c..31677721 100644
--- a/src/elements/ContactElement.php
+++ b/src/elements/ContactElement.php
@@ -392,7 +392,7 @@ protected static function defineDefaultTableAttributes(string $source): array
      */
     public function __toString(): string
     {
-        return $this->email;
+        return $this->email ?? '';
     }
 
     /**
@@ -747,7 +747,9 @@ public function getHasRoundedThumb(): bool
      */
     public function prepareEditScreen(Response $response, string $containerId): void
     {
-        Craft::$app->getView()->registerJs('new Campaign.ContactEdit();');
+        if (!$this->getIsFresh()) {
+            Craft::$app->getView()->registerJs('new Campaign.ContactEdit();');
+        }
 
         /** @var Response|CpScreenResponseBehavior $response */
         $response->selectedSubnavItem = 'contacts';