Merge pull request deriv-com#4 from sandeep-deriv/sandeep/73382/dbot-…

…add-charts Fixed icons and resequenced tabs
sandeep-deriv · Sep 1, 2022 · 0c6ec36 · 0c6ec36
2 parents 38fc22c + 38ca7fd
commit 0c6ec36
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 25 deletions.
diff --git a/packages/bot-web-ui/src/components/dashboard/bot-builder/bot-builder.tsx b/packages/bot-web-ui/src/components/dashboard/bot-builder/bot-builder.tsx
@@ -30,8 +30,6 @@ const BotBuilder = ({ app }: BotBuilderProps) => {
     );
 };
 
-export default connect((store: RootStore) => {
-    return {
-        app: store.app,
-    };
-})(BotBuilder);
+export default connect((store: RootStore) => ({
+    app: store.app,
+}))(BotBuilder);
diff --git a/packages/bot-web-ui/src/components/dashboard/dashboard.tsx b/packages/bot-web-ui/src/components/dashboard/dashboard.tsx
@@ -31,38 +31,26 @@ const Dashboard = (props: SideBarProps) => {
                 <ReactJoyride steps={DashBorardSteps} run={tourRun} continuous={true} showProgress={true} />
                 <Tabs active_index={active_index} onTabItemClick={setActiveTabIndex} top>
                     {/* [Todo] needs to update tabs comIcDashBoardComponentsTabponent children instead of using label property */}
-                    <div icon='IcGoogleDriveDbot' label={localize('Dashboard')}>
+                    <div icon='IcDashboardComponentTab' label={localize('Dashboard')}>
                         <DashboardComponents />
                     </div>
+                    <div icon='IcBotbuilderTabIcon' label='Bot Builder' id='id-bot-builder'>
+                        <BotBuilder />
+                    </div>
                     <div
-                        icon='IcGoogleDriveDbot'
+                        icon='IcQuickStrategyIcon'
                         label='Quick Strategy'
                         id='id-quick-strategy'
                         onTabItemClick={handleClick}
                     />
-                    <div icon='IcGoogleDriveDbot' label='Bot Builder' id='id-bot-builder'>
-                        <div>Contennt 3</div>
-                        <BotBuilder />
-                    </div>
-                    <div icon='IcGoogleDriveDbot' label='Charts' id='id-charts'>
+                    <div icon='IcChartsTabDbot' label='Charts' id='id-charts'>
                         <div className='dashboard__chart-wrapper'>
                             <Chart />
                         </div>
                     </div>
-                    <div icon='IcGoogleDriveDbot' label='Tutorial' id='id-tutorials'>
-                        <div>Contennt 4</div>
+                    <div icon='IcTutorialsTabs' label='Tutorial' id='id-tutorials'>
+                        <div>Under Development</div>
                     </div>
-                    {/* need to pull values dynamically TODO */}
-                    {/* {Translations.DashBoardIcons.map((data, index) => {
-                        const { label, component, icon, onClick, className } = data;
-                        return (
-                            <>
-                                <div key={index} label={localize(icon + label)} onTabItemClick={onClick}>
-                                        <div className={className}>{component}</div>
-                                </div> 
-                            </>
-                        );
-                    })} */}
                 </Tabs>
             </div>
             <SideBar checkIfSidebarOpen={showSideBar} setSideBarState={setshowSideBar} />