Merge pull request #165 from kaleido-io/alignment

[alignment] home dashboard recent events vertical scroll
hyperledger · Apr 20, 2022 · 3e6c358 · 3e6c358
2 parents be4de68 + 1e1013d
commit 3e6c358
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/components/Cards/FireFlyCard.tsx b/src/components/Cards/FireFlyCard.tsx
@@ -50,7 +50,6 @@ export const FireFlyCard: React.FC<Props> = ({ cardData, size }) => {
           alignItems={'flex-start'}
           justifyContent="flex-start"
           item
-          direction="column"
           sx={{ height: COMPONENT_HEIGHT, width: '100%', overflow: 'auto' }}
         >
           {cardData.component}

diff --git a/src/pages/Home/views/Dashboard.tsx b/src/pages/Home/views/Dashboard.tsx
@@ -337,7 +337,13 @@ export const HomeDashboard: () => JSX.Element = () => {
       headerText: t('myRecentTransactions'),
       clickPath: FF_NAV_PATHS.activityTimelinePath(selectedNamespace),
       component: (
-        <>
+        <Grid
+          container
+          direction="column"
+          item
+          alignItems="flex-start"
+          justifyContent="flex-start"
+        >
           {recentEventTxs?.length === 0 ? (
             <EmptyStateCard text={t('noRecentTransactions')} />
           ) : !recentEventTxs ? (
@@ -364,15 +370,21 @@ export const HomeDashboard: () => JSX.Element = () => {
               </React.Fragment>
             ))
           )}
-        </>
+        </Grid>
       ),
     },
     // Recent Network Events
     {
       headerText: t('recentNetworkEvents'),
       clickPath: FF_NAV_PATHS.activityTimelinePath(selectedNamespace),
       component: (
-        <>
+        <Grid
+          container
+          direction="column"
+          item
+          alignItems="flex-start"
+          justifyContent="flex-start"
+        >
           {recentEvents?.length === 0 ? (
             <EmptyStateCard text={t('noRecentNetworkEvents')} />
           ) : !recentEvents ? (
@@ -403,7 +415,7 @@ export const HomeDashboard: () => JSX.Element = () => {
               </React.Fragment>
             ))
           )}
-        </>
+        </Grid>
       ),
     },
   ];