Merge pull request #5 from carrawao/feature/watchlist

SPF-18: fix watchlist screen not showing in other browsers
carrawao · Mar 31, 2022 · 4447a3f · 4447a3f
2 parents a8a0ada + 6341766
commit 4447a3f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Frontend/src/components/screens/WatchLists/AssetsList.jsx b/Frontend/src/components/screens/WatchLists/AssetsList.jsx
@@ -97,7 +97,7 @@ const AssetsList = (props) => {
     />
   );
 
-  return (
+  return props.watchListsArray.length > 0 && (
     <Container className='pe-2 pe-xl-5'>
       <Stack direction='row' alignItems='center' gap={1}>
         <Typography variant='h6' noWrap>

diff --git a/Frontend/src/components/screens/WatchLists/WatchListsScreen.jsx b/Frontend/src/components/screens/WatchLists/WatchListsScreen.jsx
@@ -23,7 +23,6 @@ const WatchListsScreen = (props) => {
     <Grid container spacing={2}>
       <Grid item className='col-sm-5 col-md-4'>
         <WatchLists
-          {...props}
           watchListsArray={props.watchListsArray}
           setWatchListsArray={props.setWatchListsArray}
           selectedListIndex={selectedListIndex}
@@ -32,7 +31,6 @@ const WatchListsScreen = (props) => {
       </Grid>
       <Grid item className='col-sm-12 col-md-8'>
         <AssetsList
-          {...props}
           watchListsArray={props.watchListsArray}
           selectedListIndex={selectedListIndex}
         />

diff --git a/Frontend/src/routes/index.jsx b/Frontend/src/routes/index.jsx
@@ -18,7 +18,8 @@ const SettingsScreen = lazy(() => import('../components/screens/Settings/Setting
  */
 const persistState = (keyName, defaultValue) => {
   const savedData = localStorage.getItem(keyName);
-  return savedData !== '' ? JSON.parse(savedData) : defaultValue;
+  console.log('savedData ==== ', savedData);
+  return !savedData ? JSON.parse(savedData) : defaultValue;
 };
 
 /**
@@ -29,7 +30,7 @@ const AppRoutes = () => {
   const [watchListsArray, setWatchListsArray] = useState(() => persistState('watchListsArray', []));
 
   useEffect(() => {
-    localStorage.setItem("watchListsArray", JSON.stringify(watchListsArray));
+    localStorage.setItem('watchListsArray', JSON.stringify(watchListsArray));
   }, [watchListsArray]);
 
   return (