diff --git a/package.json b/package.json
index 57fdb871..f39b2a97 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     },
     "scripts": {
         "start": "vite",
-        "start:dev": "vite-live-preview --reload --port=8444",
+        "start:dev": "vite-live-preview --reload --port=8443",
         "build": "vite build",
         "preview": "vite preview",
         "test:lint": "prettier --log-level silent --write . && eslint \"./src/**/*.?(js|jsx|ts|tsx)\"",
@@ -119,4 +119,4 @@
         "vite-tsconfig-paths": "^4.3.2",
         "vitest": "^1.6.0"
     }
-}
+}
\ No newline at end of file
diff --git a/src/components/shared_ui/dialog/dialog.tsx b/src/components/shared_ui/dialog/dialog.tsx
index 200a1cb6..0c0a4ef8 100644
--- a/src/components/shared_ui/dialog/dialog.tsx
+++ b/src/components/shared_ui/dialog/dialog.tsx
@@ -1,12 +1,9 @@
+/* eslint-disable simple-import-sort/imports */
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { CSSTransition } from 'react-transition-group';
 import classNames from 'classnames';
-
-// import Icon from '../icon/icon';
-// import Button from '../button/button';
 import Text from '../text';
-// import { useOnClickOutside } from '../../hooks';
 
 type TDialog = {
     cancel_button_text?: string;
@@ -149,6 +146,7 @@ const Dialog = ({
                             {has_close_icon && (
                                 <div onClick={handleClose} className='dc-dialog__header--close'>
                                     <img src='icons/ic-cross.svg' />
+                                    {/* TODO: need to fix this component by importing the Icon in shared UI */}
                                     {/* <Icon icon='IcCross' /> */}
                                 </div>
                             )}
@@ -163,6 +161,7 @@ const Dialog = ({
                     )}
                     <div className='dc-dialog__footer'>
                         {!!onCancel && (
+                            //TODO: need to fix this component by importing the button in shared UI
                             // <Button
                             //     className='dc-dialog__button'
                             //     has_effect
@@ -176,6 +175,7 @@ const Dialog = ({
                             </button>
                         )}
                         {!!confirm_button_text && (
+                            //TODO: need to fix this component by importing the button in shared UI
                             // <Button
                             //     className='dc-dialog__button'
                             //     has_effect
diff --git a/src/external/bot-skeleton/utils/date-time-helper.js b/src/external/bot-skeleton/utils/date-time-helper.js
index d6dadfcc..4aad2fb7 100644
--- a/src/external/bot-skeleton/utils/date-time-helper.js
+++ b/src/external/bot-skeleton/utils/date-time-helper.js
@@ -3,10 +3,9 @@
 export const timeSince = timestamp => {
     const now = new Date();
     const secondPast = (now.getTime() - timestamp) / 1000;
-
+    // TODO: kept commented so we can apply localize function after translations fixed
     //console.log(secondPast)
     if (secondPast < 60) {
-
         return `${parseInt(secondPast)}s ago`;
         //return localize('{{secondPast}}s ago', { secondPast: parseInt(secondPast) });
     }
diff --git a/src/pages/dashboard/common/delete-dialog/delete-dialog.tsx b/src/pages/dashboard/common/delete-dialog/delete-dialog.tsx
index e6943b54..d138f2ca 100644
--- a/src/pages/dashboard/common/delete-dialog/delete-dialog.tsx
+++ b/src/pages/dashboard/common/delete-dialog/delete-dialog.tsx
@@ -1,11 +1,9 @@
+/* eslint-disable simple-import-sort/imports */
 import localForage from 'localforage';
 import LZString from 'lz-string';
 import { observer } from 'mobx-react-lite';
-
 import { Text } from '@deriv-com/ui';
-
 import { TStrategy } from 'Types';
-
 import { NOTIFICATION_TYPE } from '@/components/bot-notification/bot-notification-utils';
 import { getSavedWorkspaces } from '@/external/bot-skeleton';
 import { useStore } from '@/hooks/useStore';
@@ -66,15 +64,15 @@ const DeleteDialog = observer(() => {
     return (
         <div>
             <Dialog
-                title="Delete bot"
+                title='Delete bot'
                 is_visible={is_delete_modal_open}
-                confirm_button_text="Yes, delete"
+                confirm_button_text='Yes, delete'
                 onConfirm={() => {
                     removeBotStrategy(selected_strategy_id);
                     onToggleDeleteDialog(false);
                     setOpenSettings(NOTIFICATION_TYPE.BOT_DELETE);
                 }}
-                cancel_button_text="No"
+                cancel_button_text='No'
                 onCancel={() => {
                     onToggleDeleteDialog(false);
                 }}
diff --git a/src/pages/dashboard/common/info-panel.tsx b/src/pages/dashboard/common/info-panel.tsx
index a7f57298..10756b82 100644
--- a/src/pages/dashboard/common/info-panel.tsx
+++ b/src/pages/dashboard/common/info-panel.tsx
@@ -36,7 +36,7 @@ const InfoPanel = observer(() => {
 
     const handleClose = () => {
         setInfoPanelVisibility(false);
-        localStorage.removeItem('dbot_should_show_info');
+        localStorage.setItem('dbot_should_show_info', JSON.stringify(Date.now()));
     };
 
     const renderInfo = () => (
diff --git a/src/pages/main/main.tsx b/src/pages/main/main.tsx
index ae9a1380..f76a5ed1 100644
--- a/src/pages/main/main.tsx
+++ b/src/pages/main/main.tsx
@@ -1,9 +1,8 @@
+/* eslint-disable simple-import-sort/imports */
 import React, { useEffect } from 'react';
 import classNames from 'classnames';
 import { observer } from 'mobx-react-lite';
-
 import { Dialog } from '@deriv-com/ui';
-
 import DesktopWrapper from '@/components/shared_ui/desktop-wrapper';
 import MobileWrapper from '@/components/shared_ui/mobile-wrapper';
 import Tabs from '@/components/shared_ui/tabs/tabs';
@@ -15,7 +14,6 @@ import { api_base } from '@/external/bot-skeleton/services/api/api-base';
 import { isDbotRTL } from '@/external/bot-skeleton/utils/workspace';
 import { useStore } from '@/hooks/useStore';
 import { Localize, localize } from '@/utils/tmp/dummy';
-
 import RunPanel from '../../components/run-panel';
 import Chart from '../chart';
 import ChartModal from '../chart/chart-modal';
@@ -41,8 +39,9 @@ const AppWrapper = observer(() => {
     const { cancel_button_text, ok_button_text, title, message } = dialog_options as { [key: string]: string };
     const { clear } = summary_card;
     const { DASHBOARD, BOT_BUILDER } = DBOT_TABS;
+    // TODO: need to check this
     // const { ui } = useStore();
-   // const { url_hashed_values, is_mobile } = ui;
+    // const { url_hashed_values, is_mobile } = ui;
     //const hash = ['dashboard', 'bot_builder', 'chart', 'tutorial'];
 
     //let tab_value: number | string = active_tab;
@@ -73,6 +72,7 @@ const AppWrapper = observer(() => {
             setTourDialogVisibility(false);
         }
 
+        // TODO: need to check this
         // if (init_render.current) {
         //     //setActiveTab(Number(active_hash_tab));
         //     if (is_mobile) handleTabChange(Number(active_hash_tab));