Merge pull request #5545 from LiskHQ/5544-commission-change-history-view

Fix commission history view for all validators
LiskHQ · Dec 11, 2023 · 4aee9c3 · 4aee9c3
2 parents 392b153 + b59ab83
commit 4aee9c3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/modules/pos/validator/components/CommissionHistory/index.js b/src/modules/pos/validator/components/CommissionHistory/index.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { useHistory } from 'react-router-dom';
 import grid from 'flexboxgrid/dist/flexboxgrid.css';
 import { useCurrentAccount } from '@account/hooks';
 import { useTransactionEvents } from '@transaction/hooks/queries';
@@ -8,13 +9,18 @@ import Box from '@theme/box';
 import BoxHeader from '@theme/box/header';
 import BoxContent from '@theme/box/content';
 import { QueryTable } from '@theme/QueryTable';
+import { selectSearchParamValue } from 'src/utils/searchParams';
 import header from './header';
 import CommissionHistoryRow from './CommissionHistoryRow';
 import styles from './styles.css';
 
 const CommissionHistory = () => {
   const { t } = useTranslation();
-  const [currentAccount] = useCurrentAccount();
+  const history = useHistory();
+  /* istanbul ignore next */
+  const [{ metadata: { address: currentAddress } = {} }] = useCurrentAccount();
+  const address =
+    selectSearchParamValue(history.location.search, 'validatorAddress') || currentAddress;
   return (
     <Dialog hasClose>
       <Box className={`${grid.col} ${styles.historyContainer} history-container`}>
@@ -29,7 +35,7 @@ const CommissionHistory = () => {
             queryConfig={{
               config: {
                 params: {
-                  senderAddress: currentAccount.metadata.address,
+                  senderAddress: address,
                   name: 'commissionChange',
                 },
               },

diff --git a/src/modules/pos/validator/components/ValidatorProfile/DetailsView.js b/src/modules/pos/validator/components/ValidatorProfile/DetailsView.js
@@ -17,6 +17,7 @@ import { useTransactionsFromPool } from '@transaction/hooks/queries';
 import styles from './ValidatorProfile.css';
 import { convertCommissionToPercentage } from '../../utils';
 import usePosToken from '../../hooks/usePosToken';
+import { MAX_VALIDATOR_COMMISSION } from '../../consts';
 
 const DetailsView = ({ data, isMyProfile }) => {
   const { name, rank, validatorWeight, commission, lastGeneratedHeight } = data;
@@ -59,9 +60,10 @@ const DetailsView = ({ data, isMyProfile }) => {
       onEdit: !isMyProfile
         ? undefined
         : () => addSearchParamsToUrl(history, { modal: 'changeCommission' }),
-      onView: !isMyProfile
-        ? undefined
-        : () => addSearchParamsToUrl(history, { modal: 'commissionHistory' }),
+      onView:
+        commission < MAX_VALIDATOR_COMMISSION
+          ? () => addSearchParamsToUrl(history, { modal: 'commissionHistory' })
+          : undefined,
     },
     {
       icon: 'calendar',

diff --git a/src/routes/routes.js b/src/routes/routes.js
@@ -277,7 +277,7 @@ export const modals = {
     forbiddenTokens: [],
   },
   commissionHistory: {
-    isPrivate: true,
+    isPrivate: false,
     forbiddenTokens: [],
   },
   noTokenBalance: {