Merge branch 'staging'

eoscostarica · Oct 13, 2021 · c0f7e77 · c0f7e77
2 parents 5891b3d + f144b22
commit c0f7e77
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/webapp/src/components/BpChipAvatar/index.js b/webapp/src/components/BpChipAvatar/index.js
@@ -35,7 +35,7 @@ const ProducerChipAvatar = ({
               )}
             </Avatar>
           }
-          label={data.owner}
+          label={data?.owner}
         />
       )}
       {!isProxy && (
@@ -50,8 +50,8 @@ const ProducerChipAvatar = ({
               )}
             </Avatar>
           }
-          onDelete={() => onHandleRemove(data.owner)}
-          label={data.owner}
+          onDelete={() => onHandleRemove(data?.owner)}
+          label={data?.owner}
         />
       )}
     </>

diff --git a/webapp/src/components/CompareTool/CompareGraphView.js b/webapp/src/components/CompareTool/CompareGraphView.js
@@ -53,7 +53,7 @@ const CompareBodyList = ({ isProxy, selectedData, classes, removeBP }) => {
           onHandleRemove={removeBP}
           classNames={classes}
           imageURL={_get(data, 'bpjson.org.branding.logo_256', null)}
-          key={`data-list-name-${data.owner}`}
+          key={`data-list-name-${data?.owner}`}
           defaultName='BP'
         />
       ))}
@@ -134,7 +134,7 @@ const CompareGraphView = ({
       <Box className={classes.wrapperDesktop}>
         <Box className={classes.bodyModalView}>
           <Box className={classes.chartWrapper}>
-            <PolarChart data={selected.map(({ data }) => ({ ...data }))} />
+            <PolarChart data={selected.map(bp => ({ data: bp?.data?.data }))} />
           </Box>
           {isProxy && selected.length > 0 && (
             <Box className={classes.proxyVote}>

diff --git a/webapp/src/routes/BlockProducers/BlockProducerProfile.js b/webapp/src/routes/BlockProducers/BlockProducerProfile.js
@@ -96,7 +96,7 @@ const BlockProducerProfile = () => {
   const setProfileData = bp => {
     const userDataSet = getBPRadarData({
       name: t('edenRates'),
-      parameters: getRatingData(bp.edenRate)
+      parameters: getRatingData(bp?.edenRate)
     })
 
     setBpHasInformation(!!Object.values(bp.bpjson).length)

diff --git a/webapp/src/routes/BlockProducers/BlockProducerRate.js b/webapp/src/routes/BlockProducers/BlockProducerRate.js
@@ -269,7 +269,7 @@ const BlockProducerRate = () => {
     if (bp) {
       const edenDataSet = getBPRadarData({
         name: t('edenRates'),
-        parameters: getSavedRatingData(bp.edenRate)
+        parameters: getSavedRatingData(bp?.edenRate)
       })
 
       setBlockProducerTitle(

diff --git a/webapp/src/routes/BlockProducers/index.js b/webapp/src/routes/BlockProducers/index.js
@@ -55,7 +55,6 @@ const AllBps = () => {
   const handleToggleSelected = (item, isAddItem = false) => {
     if (isAddItem) {
       setSelectedProducers([...state.selectedProducers, item])
-      console.log({ selectedProducers: state?.selectedProducers })
     } else {
       const removeSelected = state.selectedProducers.filter(
         bpName => bpName !== item

diff --git a/webapp/src/routes/Proxies/index.js b/webapp/src/routes/Proxies/index.js
@@ -47,8 +47,6 @@ const AllProxies = ({ ual = {} }) => {
   }
 
   const handleOpenDesktopVotingTool = (isAdding, producerAccountName) => {
-    console.log({ isAdding, producerAccountName })
-
     setSelectedProxies([producerAccountName])
     setCompareProxyTool(true)
   }