From ad3a140982ee890e206b6f7bc6b44fe0b42cc03f Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Thu, 5 May 2022 12:57:11 -0700
Subject: [PATCH] =?UTF-8?q?fix(wp):=20=F0=9F=90=9B=20Bubble=20not=20displa?=
 =?UTF-8?q?ying=20with=20proactive=20message?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/wordpress/package.json               |  6 ++--
 packages/wordpress/trunk/README.txt           |  5 +++-
 .../trunk/public/class-typebot-public.php     | 30 +++++++++----------
 packages/wordpress/trunk/typebot.php          |  4 +--
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/packages/wordpress/package.json b/packages/wordpress/package.json
index 6a5ded249..a67310670 100644
--- a/packages/wordpress/package.json
+++ b/packages/wordpress/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wordpress",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "main": "index.js",
   "repository": "https://github.com/typebot-io/wordpress.git",
   "author": "baptisteArno",
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "deploy": "yarn copy && yarn commit",
-    "copy": "svn copy ./trunk ./tags/2.1.7",
-    "commit": "svn ci -m 'Update typebot lib'"
+    "copy": "svn copy ./trunk ./tags/2.1.8",
+    "commit": "svn ci -m 'Fix proactive message bug'"
   }
 }
diff --git a/packages/wordpress/trunk/README.txt b/packages/wordpress/trunk/README.txt
index 1081ece26..8e6970c1b 100644
--- a/packages/wordpress/trunk/README.txt
+++ b/packages/wordpress/trunk/README.txt
@@ -5,7 +5,7 @@ Requires at least: 5.0
 Tested up to: 5.9.1
 License: GPL 2.0
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
-Stable Tag: 2.1.6
+Stable Tag: 2.1.8
 
 Build beautiful conversational forms
 
@@ -26,6 +26,9 @@ This plugin relies on Typebot which is a tool that allows you to create conversa
 3. Activate your Typebot with the "Typebot" admin button located in the sidebar
 
 == Changelog ==
+= 2.1.8 =
+* Fix bubble not displayed with proactive message
+
 = 2.1.6 =
 * Fix auto open bubble even if empty param
 
diff --git a/packages/wordpress/trunk/public/class-typebot-public.php b/packages/wordpress/trunk/public/class-typebot-public.php
index 12b12b7ed..d8ac438a8 100644
--- a/packages/wordpress/trunk/public/class-typebot-public.php
+++ b/packages/wordpress/trunk/public/class-typebot-public.php
@@ -154,32 +154,32 @@ class Typebot_Public
         $url .
         '",
 						autoOpenDelay: ' .
-        empty(get_option('chat_delay'))
+        (get_option('chat_delay') === '' || get_option('chat_delay') === null
           ? 'undefined'
-          : get_option('chat_delay') * 1000 .
-            ',
+          : get_option('chat_delay') * 1000) .
+        ',
 					proactiveMessage: {
 						avatarUrl: "' .
-            get_option('avatar') .
-            '",
+        get_option('avatar') .
+        '",
 						textContent: "' .
-            get_option('text_content') .
-            '",
+        get_option('text_content') .
+        '",
 						delay: ' .
-            get_option('bubble_delay') * 1000 .
-            ',
+        get_option('bubble_delay') * 1000 .
+        ',
         rememberClose: ' .
-            $remember .
-            '
+        $remember .
+        '
 					},
 					hiddenVariables: typebotWpUser,
 					button: {
             color: "' .
-            $button_color .
-            '",
+        $button_color .
+        '",
             iconUrl: "' .
-            $chat_icon .
-            '",
+        $chat_icon .
+        '",
           },
 				}';
     }
diff --git a/packages/wordpress/trunk/typebot.php b/packages/wordpress/trunk/typebot.php
index 557e9880b..04ff8e0fa 100644
--- a/packages/wordpress/trunk/typebot.php
+++ b/packages/wordpress/trunk/typebot.php
@@ -3,7 +3,7 @@
 /**
  * Plugin Name:       Typebot
  * Description:       Convert more with conversational forms
- * Version:           2.1.7
+ * Version:           2.1.8
  * Author:            Typebot
  * Author URI:        http://typebot.io/
  * License:           GPL-2.0+
@@ -16,7 +16,7 @@ if (!defined('WPINC')) {
   die();
 }
 
-define('TYPEBOT_VERSION', '2.1.7');
+define('TYPEBOT_VERSION', '2.1.8');
 
 function activate_typebot()
 {