Merge branch 'staging'

webapp/src/components/card/index.js

@@ -53,6 +53,7 @@ const CardData = ({
   average,
   rate,
   showOptions,
+  isNewRate,
   ...props
 }) => {
   const { t } = useTranslation('translations')
@@ -185,7 +186,7 @@ const CardData = ({
               variant='contained'
               size='small'
             >
-              {t('rate')}
+              {isNewRate ? t('updateRatingButton') : t('rate')}
             </Button>
           </>
         )}
@@ -218,7 +219,8 @@ CardData.propTypes = {
   pathLink: PropTypes.string,
   average: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   rate: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  showOptions: PropTypes.bool
+  showOptions: PropTypes.bool,
+  isNewRate: PropTypes.bool
 }
 
 CardData.defaultProps = {

webapp/src/language/en.json

@@ -16,6 +16,7 @@
     "loadMore": "Load more",
     "view": "MORE",
     "rate": "RATE",
+    "updateRatingButton": "UPDATE RATING",
     "remove": "Remove vote",
     "addToVote": "Add to vote",
     "selected": "Selected",
@@ -214,6 +215,7 @@
     "average": "Average",
     "websiteInfo": "From Their Website",
     "buttonRate": "Rate this BP",
+    "updateRatingButton": "Update Rating",
     "buttonVote": "Vote for this Proxy",
     "allBP": "All Block Producers",
     "allP": "All Proxies",

webapp/src/language/es.json

@@ -16,6 +16,7 @@
     "loadMore": "Cargar más",
     "view": "MÁS",
     "rate": "CALIFICAR",
+    "updateRatingButton": "ACTUALIZAR CALIFICACIÓN",
     "remove": "Remover",
     "addToVote": "Agregar para votar",
     "selected": "Seleccionado",
@@ -173,7 +174,7 @@
     "rateText": "Si cree que no tiene suficiente conocimiento sobre una categoría específica, puede deshabilitarla.",
     "helpText": "Publique su calificación iniciando sesión con tu billetera favorita.",
     "publishRatingButton": "Publicar Calificación",
-    "updateRatingButton": "Actualizar calificación",
+    "updateRatingButton": "Actualizar Calificación",
     "cancelRatingButton": "Cancelar",
     "transparency": "Transparencia",
     "transparencyTooltip": "Cumplimiento de la divulgación de la información.",
@@ -214,6 +215,7 @@
     "average": "Promedio",
     "websiteInfo": "De su sitio web",
     "buttonRate": "Evalúa este PB",
+    "updateRatingButton": "Actualizar Calificación",
     "buttonVote": "Vota por este Proxy",
     "allBP": "Lista de productores de bloques",
     "allP": "Lista de Proxies",

webapp/src/language/kr.json

@@ -0,0 +1 @@
+

webapp/src/routes/block-producers/block-producer-profile.js

@@ -56,17 +56,20 @@ const ProfileTitle = ({
   )
 }
 
-const BlockProducerProfile = ({ account, ...props }) => {
+const BlockProducerProfile = ({ account, ual, ...props }) => {
   const { t } = useTranslation('profile')
   const classes = useStyles()
   const dispatch = useDispatch()
   const isDesktop = useMediaQuery('(min-width:767px)')
   const isMobile = useMediaQuery('(max-width:768px)')
+  const accountName = _get(ual, 'activeUser.accountName', null)
   const [sizes, setSizes] = useState()
+  const [isNewRate, setIsNewRate] = useState(true)
   const {
     list: blockProducers,
     producer,
-    edenRate
+    edenRate,
+    userRate
   } = useSelector((state) => state.blockProducers)
   const { isContentLoading } = useSelector((state) => state.isLoading)
   const bpHasInformation = Boolean(
@@ -118,6 +121,10 @@ const BlockProducerProfile = ({ account, ...props }) => {
       dispatch.blockProducers.getBlockProducerEdenRating({
         bp: account
       })
+      dispatch.blockProducers.getBlockProducerRatingByOwner({
+        bp: account,
+        userAccount: accountName
+      })
     }
 
     getData()
@@ -127,6 +134,11 @@ const BlockProducerProfile = ({ account, ...props }) => {
     dispatch.blockProducers.setShowSortSelected(false)
   }, [])
 
+  useEffect(() => {
+    if (userRate) setIsNewRate(false)
+    else setIsNewRate(true)
+  }, [userRate])
+
   return (
     <Grid container justify='center' className={classes.container}>
       <TitlePage title={`${t('title')} ${BlockProducerTitle} - EOS Rate`} />
@@ -213,7 +225,7 @@ const BlockProducerProfile = ({ account, ...props }) => {
               ))}
               className={classes.btnBP}
             >
-              {t('buttonRate')}
+              {isNewRate ? t('buttonRate') : t('updateRatingButton')}
             </Button>
           </Grid>
         </Grid>
@@ -244,7 +256,8 @@ const BlockProducerProfile = ({ account, ...props }) => {
 }
 
 BlockProducerProfile.propTypes = {
-  account: PropTypes.string
+  account: PropTypes.string,
+  ual: PropTypes.object
 }
 
 ProfileTitle.propTypes = {

webapp/src/routes/block-producers/block-producer-rate.js

@@ -284,6 +284,8 @@ const BlockProducerRate = ({ account, ual }) => {
         processing: false,
         txSuccess: true
       })
+
+      setTimeout(handleSetLastTransactionId, 4000)
     } catch (err) {
       setRatingState({
         ...ratingState,
@@ -318,7 +320,7 @@ const BlockProducerRate = ({ account, ual }) => {
             {t('allBPs')}
           </Button>
           <Button
-            className={classes.backButtonStyle}
+            style={{ marginLeft: !isDesktop ? 16 : 0, padding: '6px 16px' }}
             component={forwardRef((props, ref) => (
               <Link
                 {...props}

webapp/src/routes/block-producers/index.js

@@ -93,6 +93,17 @@ const AllBps = ({ ual }) => {
     })
   }
 
+  const handleSetIsNewRate = (owner) => {
+    if (user) {
+      for (const userRate of user.userRates) {
+        if (userRate.owner === owner) {
+          return true
+        }
+      }
+      return false
+    }
+  }
+
   const sendVoteBps = async (BPs) => {
     if (!accountName) return
 
@@ -231,6 +242,7 @@ const AllBps = ({ ual }) => {
               pathLink='block-producers'
               average={getAverageValue(_get(blockProducer, 'average', 0))}
               rate={_get(blockProducer, 'ratings_cntr', 0)}
+              isNewRate={handleSetIsNewRate(blockProducer.owner)}
             />
           </Grid>
         ))}