From a16d2c653d746ad3e9729aa9b842a5d726e3788d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Thu, 30 Jul 2020 23:58:42 +0530
Subject: [PATCH] Chore: Update mailer to remove hardcoded twitter link (#1103)

---
 app/controllers/widgets_controller.rb         |  2 +-
 app/javascript/shared/store/globalConfig.js   |  2 ++
 app/javascript/widget/components/Branding.vue | 12 ++++++-----
 app/mailers/application_mailer.rb             |  2 +-
 app/views/layouts/mailer.html.erb             | 20 +++++++++----------
 config/installation_config.yml                |  2 ++
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/controllers/widgets_controller.rb b/app/controllers/widgets_controller.rb
index c396de4ce..957203f16 100644
--- a/app/controllers/widgets_controller.rb
+++ b/app/controllers/widgets_controller.rb
@@ -11,7 +11,7 @@ class WidgetsController < ActionController::Base
   private
 
   def set_global_config
-    @global_config = GlobalConfig.get('LOGO_THUMBNAIL', 'INSTALLATION_NAME', 'WIDGET_BRAND_URL')
+    @global_config = GlobalConfig.get('LOGO_THUMBNAIL', 'BRAND_NAME', 'WIDGET_BRAND_URL')
   end
 
   def set_web_widget
diff --git a/app/javascript/shared/store/globalConfig.js b/app/javascript/shared/store/globalConfig.js
index 4b1e75162..c761781c6 100644
--- a/app/javascript/shared/store/globalConfig.js
+++ b/app/javascript/shared/store/globalConfig.js
@@ -1,6 +1,7 @@
 const {
   APP_VERSION: appVersion,
   CREATE_NEW_ACCOUNT_FROM_DASHBOARD: createNewAccountFromDashboard,
+  BRAND_NAME: brandName,
   INSTALLATION_NAME: installationName,
   LOGO_THUMBNAIL: logoThumbnail,
   LOGO: logo,
@@ -12,6 +13,7 @@ const {
 const state = {
   appVersion,
   createNewAccountFromDashboard,
+  brandName,
   installationName,
   logo,
   logoThumbnail,
diff --git a/app/javascript/widget/components/Branding.vue b/app/javascript/widget/components/Branding.vue
index 4c6c787bf..2c4e4fc35 100644
--- a/app/javascript/widget/components/Branding.vue
+++ b/app/javascript/widget/components/Branding.vue
@@ -1,18 +1,17 @@
 <template>
   <a
+    v-if="globalConfig.brandName"
     class="branding"
     :href="`${globalConfig.widgetBrandURL}?utm_source=widget_branding`"
     rel="noreferrer noopener nofollow"
     target="_blank"
   >
-    <img
-      :alt="globalConfig.installationName"
-      :src="globalConfig.logoThumbnail"
-    />
+    <img :alt="globalConfig.brandName" :src="globalConfig.logoThumbnail" />
     <span>
-      {{ useInstallationName($t('POWERED_BY'), globalConfig.installationName) }}
+      {{ useInstallationName($t('POWERED_BY'), globalConfig.brandName) }}
     </span>
   </a>
+  <div v-else class="brand--alternative" />
 </template>
 
 <script>
@@ -58,4 +57,7 @@ export default {
     max-height: $space-slab;
   }
 }
+.brand--alternative {
+  padding: $space-slab;
+}
 </style>
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index eee412690..50d50f125 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -7,7 +7,7 @@ class ApplicationMailer < ActionMailer::Base
   helper :frontend_urls
   helper do
     def global_config
-      @global_config ||= GlobalConfig.get('INSTALLATION_NAME', 'BRAND_URL')
+      @global_config ||= GlobalConfig.get('BRAND_NAME', 'BRAND_URL')
     end
   end
 
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index f94e076e6..babc451f7 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -82,13 +82,6 @@
                                 <meta itemprop="name" content="Confirm Email" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;" />
                                 <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
                                     <%= yield %>
-
-                                    <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                                        <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-                                            &mdash; Team <%= global_config['INSTALLATION_NAME'] %> <br/>
-                                            <a href="<%= global_config['BRAND_URL'] %>" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top"><%= global_config['BRAND_URL'] %></a>
-                                        </td>
-                                    </tr>
                                 </table>
                             </td>
                         </tr>
@@ -96,10 +89,15 @@
                     <div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
                         <table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
                             <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                                <% if global_config['INSTALLATION_NAME'] == 'Chatwoot' %>
-                                <td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">
-                                  Follow <a href="http://twitter.com/chatwootapp" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">@chatwootapp</a> on Twitter.
-                                </td>
+                                <% if global_config['BRAND_NAME'].present? %>
+                                    <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                                        <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                                            Powered by
+                                            <a href="<%= global_config['BRAND_URL'] %>" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">
+                                                <%= global_config['BRAND_NAME'] %>
+                                            </a>
+                                        </td>
+                                    </tr>
                                 <% end %>
                             </tr>
                         </table>
diff --git a/config/installation_config.yml b/config/installation_config.yml
index ae0d271f6..b48d3a9d3 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -20,3 +20,5 @@
   value:
 - name: CREATE_NEW_ACCOUNT_FROM_DASHBOARD
   value: false
+- name: BRAND_NAME
+  value: 'Chatwoot'