Merge pull request #153 from kaleido-io/misc-tweaks

[misc-tweaks] removing unneeded width params
hyperledger · Apr 6, 2022 · d475b88 · d475b88
2 parents e264e31 + aad8d3a
commit d475b88
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/components/Cards/SmallCard.tsx b/src/components/Cards/SmallCard.tsx
@@ -87,7 +87,7 @@ export const SmallCard: React.FC<Props> = ({ card }) => {
               {data.data !== undefined ? (
                 <Typography
                   noWrap
-                  sx={{ fontSize: 24, width: 40, fontWeight: 'bold' }}
+                  sx={{ fontSize: 24, fontWeight: 'bold' }}
                   variant="subtitle1"
                 >
                   {data.data}

diff --git a/src/components/Lists/BalanceList.tsx b/src/components/Lists/BalanceList.tsx
@@ -1,10 +1,12 @@
 import { Grid } from '@mui/material';
-import { useEffect, useState } from 'react';
+import { useContext, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import Jazzicon, { jsNumberForAddress } from 'react-jazzicon';
+import { ApplicationContext } from '../../contexts/ApplicationContext';
 import { ITokenBalance, ITokenPool } from '../../interfaces';
 import { IDataListItem } from '../../interfaces/lists';
 import { FFCopyButton } from '../Buttons/CopyButton';
+import { PoolButton } from '../Buttons/PoolButton';
 import { FFCircleLoader } from '../Loaders/FFCircleLoader';
 import { FFListItem } from './FFListItem';
 import { FFListText } from './FFListText';
@@ -17,6 +19,7 @@ interface Props {
 }
 
 export const BalanceList: React.FC<Props> = ({ balance, pool }) => {
+  const { selectedNamespace } = useContext(ApplicationContext);
   const { t } = useTranslation();
   const [dataList, setDataList] = useState<IDataListItem[]>(FFSkeletonList);
 
@@ -40,6 +43,7 @@ export const BalanceList: React.FC<Props> = ({ balance, pool }) => {
               </Grid>
             </Grid>
           ),
+          button: <PoolButton ns={selectedNamespace} poolID={pool.id} />,
         },
         {
           label: t('balance'),

diff --git a/src/components/NetworkMap/NetworkMap.tsx b/src/components/NetworkMap/NetworkMap.tsx
@@ -89,14 +89,14 @@ export const NetworkMap: React.FC<Props> = ({ size }) => {
   const id = open ? 'simple-popover' : undefined;
 
   useEffect(() => {
-    fetchCatcher(`${FF_Paths.apiPrefix}/${FF_Paths.networkOrgs}`)
+    fetchCatcher(`${FF_Paths.apiPrefix}${FF_Paths.networkOrgs}`)
       .then((orgRes: IOrganization[]) => {
         setOrgs(orgRes);
       })
       .catch((err) => {
         reportFetchError(err);
       });
-    fetchCatcher(`${FF_Paths.apiPrefix}/${FF_Paths.networkNodes}`)
+    fetchCatcher(`${FF_Paths.apiPrefix}${FF_Paths.networkNodes}`)
       .then((nodeRes: INode[]) => {
         setNodes(nodeRes);
       })