From b6d105c4f468cb5124f78c8d70a26b89b54505dc Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 13 Mar 2023 10:49:41 -0700
Subject: [PATCH] removes help text from general integrations

---
 composer.json                                 |  5 +++-
 .../livewire/slack-settings-form.blade.php    | 25 ++-----------------
 resources/views/settings/index.blade.php      |  2 +-
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/composer.json b/composer.json
index abcf675b1a..2f1007fa73 100644
--- a/composer.json
+++ b/composer.json
@@ -127,6 +127,9 @@
     "sort-packages": true,
     "optimize-autoloader": true,
     "discard-changes": true,
-    "process-timeout": 3000
+    "process-timeout": 3000,
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
   }
 }
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index e15cdf0954..5bf501e225 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -24,9 +24,11 @@
         </div>
         <div class="box-body">
             <div class="col-md-12">
+                @if($webhook_selected != 'General')
                 <p>
                     {!! trans('admin/settings/general.webhook_integration_help',array('webhook_link' => $webhook_link, 'app' => $webhook_name)) !!}
                 </p>
+                @endif
                 <br>
             </div>
 
@@ -164,26 +166,3 @@
                     </div> <!-- /box -->
                 </div> <!-- /.col-md-8-->
 
-
-            @push('scripts')
-                <script>
-                    // function formatText (icon) {
-                    //     return $('<span><i class="fab ' + $(icon.element).data('icon') + '"></i> ' + icon.text + '</span>');
-                    // };
-                    //
-                    // $('.hook_options').select2({
-                    //     width: "50%",
-                    //     templateSelection: formatText,
-                    //     templateResult: formatText
-                    // });
-                    // $(document).ready(function () {
-                    //     $('.webhook_options').select2();
-                    //     $('.webhook_options').on('change', function (e) {
-                    //         let data = $('#select2').select2("val");
-                    //         @this.set('webhook_option', data);
-                    //     });
-                    // });
-
-
-                </script>
-    @endpush
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 5b49e1c7e4..678233c933 100755
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -164,7 +164,7 @@
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.slack.index') }}" class="settings_button">
-                  <i class="fa-regular fa-hashtag fa-4x" aria-hidden="true"></i>
+                  <i class="fa-solid fa-hashtag fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.integrations') }}</span>
                 </a>