diff --git a/jsAgent/hint.js b/jsAgent/hint.js
index a9d006dd..3a2dea5f 100644
--- a/jsAgent/hint.js
+++ b/jsAgent/hint.js
@@ -9,16 +9,20 @@ bw.hint = {
 
         for (let i = 0; i < hintData.length; i++) {
             const item = hintData[i];
-            console.log(item);
             
             const tooltip = bw.hint.generateTooltip(item);
             const header = bw.hint.generateHeader(item);
             
             const contentContainer = bw.hint.generateContentContainer(item);
             const content = bw.hint.generateContent(item);
-            const button = bw.hint.generateButton(item);
+            
             contentContainer.appendChild(content);
-            contentContainer.appendChild(button);
+            
+            if(item.action !== 'no action'){
+                const button = bw.hint.generateButton(item);
+                contentContainer.appendChild(button);
+            }
+            
             
             tooltip.appendChild(header);
             tooltip.appendChild(contentContainer);
@@ -184,8 +188,7 @@ bw.hint = {
 
         button.addEventListener('click', () => {
             if(btnEvent == 'no action'){
-                //bw.hint.hideModal();
-                console.log('no action');
+                
             }
             else if(btnEvent == 'open url'){
                 location.href = item.actionButtonUrl;
diff --git a/jsAgent/popup.js b/jsAgent/popup.js
index 0ee111d4..c571890c 100644
--- a/jsAgent/popup.js
+++ b/jsAgent/popup.js
@@ -55,7 +55,7 @@ bw.popup = {
                     ${bw.popup.addHeader(option.header, option.headerBackgroundColor, option.headerColor, option.padding)}
                     <div class="modal-body" style='padding: ${option.padding}px ${option.padding}px; display: flex; justify-content: space-between; flex-direction: column; box-sizing: border-box; font-family: "Inter", sans-serif; font-size: 13px; min-height: 227px; '>
                         ${option.content}
-                        ${bw.popup.addButton(option.actionButtonText, option.buttonBackgroundColor, option.buttonTextColor, option.padding, `bw-popup-btn`)}
+                        ${option.closeButtonAction !== 'no action' ?  bw.popup.addButton(option.actionButtonText, option.buttonBackgroundColor, option.buttonTextColor, option.padding, `bw-popup-btn`): ''}
                     </div>
                 </div>
             </div>`;