Fix: add custom delegate validation (#2149)

novasamatech · Aug 20, 2024 · 18fcf83 · 18fcf83
1 parent 34d1f1c
commit 18fcf83
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 34 deletions.
diff --git a/src/renderer/widgets/DelegateDetails/ui/YourDelegation.tsx b/src/renderer/widgets/DelegateDetails/ui/YourDelegation.tsx
@@ -1,4 +1,3 @@
-import { BN } from '@polkadot/util';
 import { useUnit } from 'effector-react';
 import { Trans } from 'react-i18next';
 
@@ -61,13 +60,10 @@ export const YourDelegation = () => {
                   components={{
                     votes: (
                       <AssetBalance
-                        value={activeDelegations[activeAccounts[0]]?.balance
-                          .mul(
-                            new BN(
-                              votingService.getConvictionMultiplier(activeDelegations[activeAccounts[0]]?.conviction),
-                            ),
-                          )
-                          .toString()}
+                        value={votingService.calculateVotingPower(
+                          activeDelegations[activeAccounts[0]]?.balance,
+                          activeDelegations[activeAccounts[0]]?.conviction,
+                        )}
                         asset={chain?.assets[0]}
                         showSymbol={false}
                       />

diff --git a/src/renderer/widgets/DelegateDetails/ui/YourDelegations.tsx b/src/renderer/widgets/DelegateDetails/ui/YourDelegations.tsx
@@ -1,4 +1,3 @@
-import { BN } from '@polkadot/util';
 import { useUnit } from 'effector-react';
 import { Trans } from 'react-i18next';
 
@@ -51,8 +50,6 @@ export const YourDelegations = () => {
 
           if (!account || !activeDelegation) return null;
 
-          const convictionMultiplier = votingService.getConvictionMultiplier(activeDelegation.conviction);
-
           return (
             <div key={address} className="flex h-[52px] items-center">
               <div className="flex-1 px-3">
@@ -80,7 +77,10 @@ export const YourDelegations = () => {
                     components={{
                       votes: (
                         <AssetBalance
-                          value={activeDelegation.balance.mul(new BN(convictionMultiplier))}
+                          value={votingService.calculateVotingPower(
+                            activeDelegation.balance,
+                            activeDelegation.conviction,
+                          )}
                           asset={chain.assets[0]}
                           showSymbol={false}
                         />
@@ -92,7 +92,7 @@ export const YourDelegations = () => {
                   <Trans
                     t={t}
                     i18nKey="governance.addDelegation.balanceValue"
-                    values={{ conviction: convictionMultiplier }}
+                    values={{ conviction: votingService.getConvictionMultiplier(activeDelegation.conviction) }}
                     components={{
                       balance: <AssetBalance value={activeDelegation.balance} asset={chain.assets[0]} />,
                     }}

diff --git a/src/renderer/widgets/DelegateModal/lib/helpers.ts b/src/renderer/widgets/DelegateModal/lib/helpers.ts
@@ -4,6 +4,7 @@ import { type Asset } from '@/shared/core';
 import { nonNullable } from '@shared/lib/utils';
 
 import { treasurySpendsDescription } from './constants';
+import { type Track } from './types';
 
 export const getTreasuryTrackDescription = (asset: Asset | null, description: string, t: TFunction) => {
   if (nonNullable(asset) && treasurySpendsDescription[description]?.[asset.symbol]) {
@@ -12,3 +13,7 @@ export const getTreasuryTrackDescription = (asset: Asset | null, description: st
 
   return t(`${description}General`);
 };
+
+export const getTrackIds = (tracks: Track[], votedTracks: string[]): number[] => {
+  return tracks.filter((t) => !votedTracks.includes(t.id)).map((track) => Number(track.id));
+};
diff --git a/src/renderer/widgets/DelegateModal/lib/types.ts b/src/renderer/widgets/DelegateModal/lib/types.ts
@@ -20,3 +20,9 @@ export type FeeData = {
   totalFee: string;
   multisigDeposit: string;
 };
+
+export type Track = {
+  id: string;
+  value: string;
+  description: string;
+};
diff --git a/src/renderer/widgets/DelegateModal/model/select-tracks-model.ts b/src/renderer/widgets/DelegateModal/model/select-tracks-model.ts
@@ -111,6 +111,9 @@ export const selectTracksModel = {
   $availableTracks,
   $votedTracks,
   $tracksGroup,
+  $allTracks: $tracksGroup.map(({ adminTracks, governanceTracks, treasuryTracks, fellowshipTracks }) => {
+    return [...adminTracks, ...governanceTracks, ...treasuryTracks, ...fellowshipTracks];
+  }),
 
   $accounts,
   $availableAccounts,

diff --git a/src/renderer/widgets/DelegateModal/ui/SelectTracksForm.tsx b/src/renderer/widgets/DelegateModal/ui/SelectTracksForm.tsx
@@ -6,7 +6,7 @@ import { BaseModal, Button, Checkbox, FootnoteText, Icon, MultiSelect, SmallTitl
 import { OperationTitle } from '@/entities/chain';
 import { AccountAddress, accountUtils } from '@/entities/wallet';
 import { votingAssetModel } from '@/features/governance';
-import { getTreasuryTrackDescription } from '../lib/helpers';
+import { getTrackIds, getTreasuryTrackDescription } from '../lib/helpers';
 import { delegateModel } from '../model/delegate-model';
 import { selectTracksModel } from '../model/select-tracks-model';
 
@@ -21,9 +21,9 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
   const chain = useUnit(selectTracksModel.$chain);
   const tracks = useUnit(selectTracksModel.$tracks);
   const accounts = useUnit(selectTracksModel.$accounts);
-  const availableTracks = useUnit(selectTracksModel.$availableTracks);
   const votedTracks = useUnit(selectTracksModel.$votedTracks);
   const tracksGroup = useUnit(selectTracksModel.$tracksGroup);
+  const allTracks = useUnit(selectTracksModel.$allTracks);
   const asset = useUnit(votingAssetModel.$votingAsset);
 
   const { adminTracks, governanceTracks, treasuryTracks, fellowshipTracks } = tracksGroup;
@@ -47,37 +47,41 @@ export const SelectTrackForm = ({ isOpen, onClose }: Props) => {
       <div className="flex flex-1 flex-col gap-6 px-5">
         <div className="flex gap-3">
           <Button
-            pallet={availableTracks.every((trackId) => tracks.includes(Number(trackId))) ? 'primary' : 'secondary'}
+            pallet={getTrackIds(allTracks, votedTracks).every((t) => tracks.includes(t)) ? 'primary' : 'secondary'}
             variant="chip"
-            onClick={() => selectTracksModel.events.tracksSelected(availableTracks.map((trackId) => Number(trackId)))}
+            onClick={() => selectTracksModel.events.tracksSelected(getTrackIds(allTracks, votedTracks))}
           >
             {t('governance.addDelegation.group.selectAll')}
           </Button>
           <Button
-            pallet={adminTracks.every((track) => tracks.includes(Number(track.id))) ? 'primary' : 'secondary'}
+            pallet={getTrackIds(adminTracks, votedTracks).every((t) => tracks.includes(t)) ? 'primary' : 'secondary'}
             variant="chip"
-            onClick={() => selectTracksModel.events.tracksSelected(adminTracks.map((track) => Number(track.id)))}
+            onClick={() => selectTracksModel.events.tracksSelected(getTrackIds(adminTracks, votedTracks))}
           >
             {t('governance.addDelegation.group.admin')}
           </Button>
           <Button
-            pallet={governanceTracks.every((track) => tracks.includes(Number(track.id))) ? 'primary' : 'secondary'}
+            pallet={
+              getTrackIds(governanceTracks, votedTracks).every((t) => tracks.includes(t)) ? 'primary' : 'secondary'
+            }
             variant="chip"
-            onClick={() => selectTracksModel.events.tracksSelected(governanceTracks.map((track) => Number(track.id)))}
+            onClick={() => selectTracksModel.events.tracksSelected(getTrackIds(governanceTracks, votedTracks))}
           >
             {t('governance.addDelegation.group.governance')}
           </Button>
           <Button
-            pallet={treasuryTracks.every((track) => tracks.includes(Number(track.id))) ? 'primary' : 'secondary'}
+            pallet={getTrackIds(treasuryTracks, votedTracks).every((t) => tracks.includes(t)) ? 'primary' : 'secondary'}
             variant="chip"
-            onClick={() => selectTracksModel.events.tracksSelected(treasuryTracks.map((track) => Number(track.id)))}
+            onClick={() => selectTracksModel.events.tracksSelected(getTrackIds(treasuryTracks, votedTracks))}
           >
             {t('governance.addDelegation.group.treasury')}
           </Button>
           <Button
-            pallet={fellowshipTracks.every((track) => tracks.includes(Number(track.id))) ? 'primary' : 'secondary'}
+            pallet={
+              getTrackIds(fellowshipTracks, votedTracks).every((t) => tracks.includes(t)) ? 'primary' : 'secondary'
+            }
             variant="chip"
-            onClick={() => selectTracksModel.events.tracksSelected(fellowshipTracks.map((track) => Number(track.id)))}
+            onClick={() => selectTracksModel.events.tracksSelected(getTrackIds(fellowshipTracks, votedTracks))}
           >
             {t('governance.addDelegation.group.fellowship')}
           </Button>

diff --git a/src/renderer/widgets/DelegationModal/components/AddCustomDelegationModal.tsx b/src/renderer/widgets/DelegationModal/components/AddCustomDelegationModal.tsx
@@ -63,7 +63,7 @@ export const AddCustomDelegationModel = () => {
       </div>
 
       <div className="flex justify-end px-5 pt-3">
-        <Button disabled={!error} onClick={() => delegationModel.events.createCustomDelegate()}>
+        <Button disabled={!!error} onClick={() => delegationModel.events.createCustomDelegate()}>
           {t('signing.continueButton')}
         </Button>
       </div>

diff --git a/src/renderer/widgets/DelegationModal/model/delegation-model.ts b/src/renderer/widgets/DelegationModal/model/delegation-model.ts
@@ -5,7 +5,7 @@ import { readonly } from 'patronum';
 
 import { type DelegateAccount } from '@/shared/api/governance';
 import { type Address } from '@/shared/core';
-import { Step, includesMultiple, toAccountId, toAddress, validateAddress } from '@/shared/lib/utils';
+import { Step, includesMultiple, toAccountId, validateAddress } from '@/shared/lib/utils';
 import { votingService } from '@/entities/governance';
 import { walletModel } from '@/entities/wallet';
 import {
@@ -89,22 +89,18 @@ const $customError = combine(
     wallet: walletModel.$activeWallet,
     chain: delegationAggregate.$chain,
   },
-  ({ delegate, votes, wallet, chain }): DelegationErrors | undefined => {
+  ({ delegate, votes, wallet, chain }): DelegationErrors | null => {
     if (!wallet || !chain || !delegate || !validateAddress(delegate)) return DelegationErrors.INVALID_ADDRESS;
 
     const isSameAccount = wallet.accounts.some((a) => a.accountId === toAccountId(delegate));
 
     if (isSameAccount) return DelegationErrors.YOUR_ACCOUNT;
 
-    const isAlreadyDelegated = wallet.accounts.some((a) => {
-      const address = toAddress(a.accountId, { prefix: chain.addressPrefix });
-
-      return Object.keys(votes[address]).length > 0;
-    });
+    const isAlreadyDelegated = delegate && votes[delegate] && Object.keys(votes[delegate]).length > 0;
 
     if (isAlreadyDelegated) return DelegationErrors.ALREADY_DELEGATED;
 
-    return;
+    return null;
   },
 );