From ab2a800b7c0e166ccab720216ead9198090cd831 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Wed, 18 May 2022 12:26:21 +0200 Subject: [PATCH] merged vault (from main) and resolved conflicts --- .../BugFinder/SessionList/SessionListHeader.js | 10 ++++++---- .../components/BugFinder/SessionsMenu/SessionsMenu.js | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/app/components/BugFinder/SessionList/SessionListHeader.js b/frontend/app/components/BugFinder/SessionList/SessionListHeader.js index 57d1a21b4..eba5ad002 100644 --- a/frontend/app/components/BugFinder/SessionList/SessionListHeader.js +++ b/frontend/app/components/BugFinder/SessionList/SessionListHeader.js @@ -33,10 +33,12 @@ function SessionListHeader({ { activeTab.name } { count ? numberWithCommas(count) : 0 } -
- Sessions Captured in - -
+ { activeTab.type !== 'bookmark' && ( +
+ Sessions Captured in + +
+ )}
{/*
diff --git a/frontend/app/components/BugFinder/SessionsMenu/SessionsMenu.js b/frontend/app/components/BugFinder/SessionsMenu/SessionsMenu.js index eb5eaab86..c86c7e573 100644 --- a/frontend/app/components/BugFinder/SessionsMenu/SessionsMenu.js +++ b/frontend/app/components/BugFinder/SessionsMenu/SessionsMenu.js @@ -79,7 +79,8 @@ function SessionsMenu(props) { title={ isEnterprise ? "Vault" : "Bookmarks" } iconName={ isEnterprise ? "safe" : "star" } active={activeTab.type === 'bookmark'} - onClick={() => onMenuItemClick({ name: 'Bookmarks', type: 'bookmark' })} + onClick={() => onMenuItemClick({ name: isEnterprise ? 'Vault' : 'Bookmarks', type: 'bookmark', description: isEnterprise ? 'Sessions saved to vault never get\'s deleted from records.' : '' })} + // TODO show the description in header />