From 53d9b1b3aa8e94752eccfcada0152800eff26533 Mon Sep 17 00:00:00 2001
From: Nicola Lanzilotto <nicola@tiledesk.com>
Date: Fri, 15 Dec 2023 18:03:13 +0100
Subject: [PATCH] minor improvements

---
 CHANGELOG.md                               |  3 ++
 package-lock.json                          |  2 +-
 package.json                               |  2 +-
 src/app/app-store/app-store.component.html |  9 ++++--
 src/app/app-store/app-store.component.scss |  4 +++
 src/app/app-store/app-store.component.ts   | 34 +++++++++++-----------
 6 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c750ebafb46..48f1802ee814 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # tiledesk-dashboard
 
+### 2.4.85
+- Improvements and bug fixing
+
 ### 2.4.84
 - Improvements and bug fixing
 
diff --git a/package-lock.json b/package-lock.json
index e4af104b6cad..d44ed0149e55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.4.84",
+  "version": "2.4.85",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d87b084bb43b..9a3faf0bb0e9 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.4.84",
+  "version": "2.4.85",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --aot",
diff --git a/src/app/app-store/app-store.component.html b/src/app/app-store/app-store.component.html
index bb004ebe9793..c574fbefd154 100644
--- a/src/app/app-store/app-store.component.html
+++ b/src/app/app-store/app-store.component.html
@@ -274,7 +274,8 @@ <h4 class="card-create-app-text">
       <!-- -------------------------------------------------------------------- -->
       <!-- @ App cards -->
       <!-- -------------------------------------------------------------------- -->
-      <div *ngFor="let app of apps" class="col-lg-4 col-md-4 col-sm-6" style="cursor:pointer">
+      <div *ngFor="let app of apps" class="col-lg-4 col-md-4 col-sm-6" style="cursor:pointer"
+        [ngClass]="{'hide-paid-app': !this.isVisiblePAY && (app.title === 'WhatsApp Business' || app.title === 'Facebook Messenger' || app.title === 'Help Center') }">
         <div class="card card-app-store">
 
           <div class="card-content">
@@ -318,7 +319,11 @@ <h4 class="card-create-app-text">
               </div>
             </div>
             <!-- padding: 0px 20px; min-height: 52px; -->
-            <h5 class="card-title" style="margin-bottom: 5px;" [ngClass]="{'app-store-card-no-badge': (app?.title !== 'Zapier') && (app?.title !== 'WhatsApp Business') && (app?.title !== 'Facebook Messenger') && (app?.title !== 'Help Center')}">
+            <h5 class="card-title" style="margin-bottom: 5px;" [ngClass]="{
+              'app-store-card-no-badge': (app?.title !== 'Zapier') && 
+                                          (app?.title !== 'WhatsApp Business') && 
+                                          (app?.title !== 'Facebook Messenger') && 
+                                          (app?.title !== 'Help Center')}">
               {{ app.title}}
             </h5>
     
diff --git a/src/app/app-store/app-store.component.scss b/src/app/app-store/app-store.component.scss
index c5ddbe783fb3..54b709b69016 100644
--- a/src/app/app-store/app-store.component.scss
+++ b/src/app/app-store/app-store.component.scss
@@ -184,3 +184,7 @@
     color: #080f1a;
     font-family: "Poppins", "Roboto", "Arial", sans-serif;
 }
+
+.hide-paid-app {
+    display: none;
+}
diff --git a/src/app/app-store/app-store.component.ts b/src/app/app-store/app-store.component.ts
index 1e2d8a8e3043..b724bc030a35 100644
--- a/src/app/app-store/app-store.component.ts
+++ b/src/app/app-store/app-store.component.ts
@@ -240,31 +240,31 @@ export class AppStoreComponent implements OnInit {
         }
       ]
 
-      if (!this.isVisiblePAY) {
-        // this.apps =  _apps.apps.filter(a => !paidApps.some(p => p.title == a.title));
+      // if (!this.isVisiblePAY) {
+      //   // this.apps =  _apps.apps.filter(a => !paidApps.some(p => p.title == a.title));
 
-        this.logger.log('APP-STORE - Here yes')
-        // console.log('APP-STORE - getApps APPS after filter', this.apps)
+      //   this.logger.log('APP-STORE - Here yes')
+      //   // console.log('APP-STORE - getApps APPS after filter', this.apps)
 
-        const sendWAAppIndex = this.apps.findIndex(object => {
-          return object.title === "WhatsApp Business";
-        });
+      //   const sendWAAppIndex = this.apps.findIndex(object => {
+      //     return object.title === "WhatsApp Business";
+      //   });
 
-        this.apps.splice(sendWAAppIndex, 1);
+      //   this.apps.splice(sendWAAppIndex, 1);
 
-        const sendFMAppIndex = this.apps.findIndex(object => {
-          return object.title === "Facebook Messenger";
-        });
+      //   const sendFMAppIndex = this.apps.findIndex(object => {
+      //     return object.title === "Facebook Messenger";
+      //   });
         
-        this.apps.splice(sendFMAppIndex, 1);
+      //   this.apps.splice(sendFMAppIndex, 1);
 
-        const sendHCAppIndex = this.apps.findIndex(object => {
-          return object.title === "Help Center";
-        });
+      //   const sendHCAppIndex = this.apps.findIndex(object => {
+      //     return object.title === "Help Center";
+      //   });
         
-        this.apps.splice(sendHCAppIndex, 1);
+      //   this.apps.splice(sendHCAppIndex, 1);
 
-      }
+      // }
 
       const sendTranscriptAppIndex = this.apps.findIndex(object => {
         return object.title === "Send transcript by email";