fix: small ui fixes

* fix: voting proofs package

* fix: update packages

* fix: delegation ens

* fix: payload can be execute status

next.config.js

@@ -6,7 +6,7 @@ const nextConfig = {
     webpackBuildWorker: true,
   },
   webpack(config) {
-    config.resolve.fallback = { fs: false, path: false };
+    // config.resolve.fallback = { fs: false, path: false };
 
     // Grab the existing rule that handles SVG imports
     const fileLoaderRule = config.module.rules.find((rule) =>

package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@bgd-labs/aave-address-book": "^2.19.0",
-    "@bgd-labs/aave-governance-ui-helpers": "^2.2.0",
+    "@bgd-labs/aave-governance-ui-helpers": "^3.0.0",
     "@bgd-labs/frontend-web3-utils": "^1.1.1",
     "@emotion/cache": "^11.11.0",
     "@emotion/react": "^11.11.3",
@@ -75,7 +75,7 @@
     "react-loading-skeleton": "^3.4.0",
     "react-paginate": "^8.2.0",
     "sharp": "0.32.6",
-    "viem": "^2.7.1",
+    "viem": "^2.7.6",
     "wagmi": "^2.5.5",
     "zustand": "^4.5.0"
   },

src/delegate/components/DelegateTableItemAddress.tsx

@@ -186,7 +186,7 @@ export function DelegateTableItemAddress({
           forHelp={forHelp}
           address={formattedAddress}
           shownAddress={shownAddress}
-          isEnsName={isEnsName(address || '')}
+          isEnsName={isEnsName(shownAddress || '')}
         />
       )}
       {isEdit && !isViewChanges && (
@@ -238,7 +238,7 @@ export function DelegateTableItemAddress({
             shownAddress={shownAddress}
             isCrossed={isAddressToVisible}
             alwaysGray
-            isEnsName={isEnsName(address || '')}
+            isEnsName={isEnsName(shownAddress || '')}
           />
           {isAddressToVisible && (
             <Text
@@ -247,7 +247,7 @@ export function DelegateTableItemAddress({
                 isEnsName(addressTo || '') ? hoveredAddressTo : addressTo
               }
               shownAddress={shownAddressTo}
-              isEnsName={isEnsName(addressTo || '')}
+              isEnsName={isEnsName(shownAddressTo || '')}
               isError={isEnsToIncorrect}
             />
           )}

src/payloadsExplorer/components/PayloadExploreItem.tsx

@@ -5,7 +5,7 @@ import {
 } from '@bgd-labs/frontend-web3-utils';
 import { Box, useTheme } from '@mui/system';
 import React from 'react';
-import { toHex } from 'viem';
+import { Address, toHex } from 'viem';
 import { metis } from 'viem/chains';
 
 import { PayloadActions } from '../../proposals/components/proposal/PayloadActions';
@@ -94,7 +94,7 @@ export function PayloadExploreItem({
   const handleDetailsOpen = () => {
     setSelectedPayloadForDetailsModal({
       chainId: payload.chainId,
-      payloadsController: payload.payloadsController,
+      payloadsController: payload.payloadsController as Address,
       id: payload.id,
     });
     store.setIsPayloadExplorerItemDetailsModalOpen(true);
@@ -302,7 +302,8 @@ export function PayloadExploreItem({
                     if (!!setSelectedPayloadForExecute) {
                       setSelectedPayloadForExecute({
                         chainId: payload.chainId,
-                        payloadsController: payload.payloadsController,
+                        payloadsController:
+                          payload.payloadsController as Address,
                         id: payload.id,
                       });
                     }

src/payloadsExplorer/components/PayloadItemDetailsModal.tsx

@@ -5,7 +5,7 @@ import {
 } from '@bgd-labs/frontend-web3-utils';
 import { Box } from '@mui/system';
 import React, { useEffect } from 'react';
-import { toHex } from 'viem';
+import { Address, toHex } from 'viem';
 import { metis } from 'viem/chains';
 
 import { PayloadActions } from '../../proposals/components/proposal/PayloadActions';
@@ -48,15 +48,15 @@ export function PayloadItemDetailsModal({
   useEffect(() => {
     getPayloadsExploreDataById(
       initialPayload.chainId,
-      initialPayload.payloadsController,
+      initialPayload.payloadsController as Address,
       initialPayload.id,
     );
   }, []);
 
   const payload = selectPayloadExploreById(
     store,
     initialPayload.chainId,
-    initialPayload.payloadsController,
+    initialPayload.payloadsController as Address,
     initialPayload.id,
   );
 
@@ -177,7 +177,8 @@ export function PayloadItemDetailsModal({
                     if (!!setSelectedPayloadForExecute) {
                       setSelectedPayloadForExecute({
                         chainId: payload?.chainId,
-                        payloadsController: payload?.payloadsController,
+                        payloadsController:
+                          payload?.payloadsController as Address,
                         id: payload?.id,
                       });
                     }

src/proposals/components/proposal/ProposalStatusDetails.tsx

@@ -12,7 +12,6 @@ import {
 import { Box, useTheme } from '@mui/system';
 import dayjs from 'dayjs';
 import React, { useEffect } from 'react';
-import { Address } from 'viem';
 
 import { useStore } from '../../../store';
 import {
@@ -172,7 +171,7 @@ export function ProposalStatusDetails({
       underlyingAsset: asset,
       withSlot: false,
       baseBalanceSlotRaw: getVoteBalanceSlot(
-        asset as Address,
+        asset,
         false,
         appConfig.additional.aAaveAddress,
         assetsBalanceSlots,

src/proposals/store/proposalsSlice.ts

@@ -3,11 +3,9 @@ import {
   BasicProposal,
   checkHash,
   ContractsConstants,
-  formatBalances,
   getProofOfRepresentative,
   getProposalMetadata,
   getProposalStepsAndAmounts,
-  getVotingAssetsWithSlot,
   getVotingMachineProposalState,
   getVotingProofs,
   InitialPayload,
@@ -44,7 +42,11 @@ import { PAGE_SIZE } from '../../web3/services/govDataService';
 import { ENSDataExists } from '../../web3/store/ensSelectors';
 import { ENSProperty, IEnsSlice } from '../../web3/store/ensSlice';
 import { IWeb3Slice } from '../../web3/store/web3Slice';
-import { assetsBalanceSlots } from '../../web3/utils/assetsBalanceSlots';
+import {
+  assetsBalanceSlots,
+  formatBalances,
+  getVotingAssetsWithSlot,
+} from '../../web3/utils/assetsBalanceSlots';
 import { IProposalsHistorySlice } from './proposalsHistorySlice';
 import { IProposalsListCacheSlice } from './proposalsListCacheSlice';
 import {
@@ -688,7 +690,7 @@ export const createProposalsSlice: StoreSlice<
                 if (isProposalNotInCache) {
                   await get().getDetailedPayloadsData(
                     chainId,
-                    controller,
+                    controller as Address,
                     payloadsIds,
                   );
                 }
@@ -1349,7 +1351,7 @@ export const createProposalsSlice: StoreSlice<
         return govDataService.executePayload(
           payload.chainId,
           payload.id,
-          payload.payloadsController,
+          payload.payloadsController as Address,
         );
       },
       params: {
@@ -1410,7 +1412,7 @@ export const createProposalsSlice: StoreSlice<
         if (!formattedPayload) {
           await get().getDetailedPayloadsData(
             payload.chainId,
-            payload.payloadsController,
+            payload.payloadsController as Address,
             [payload.id],
           );
           formattedPayload =
@@ -1423,7 +1425,7 @@ export const createProposalsSlice: StoreSlice<
           chain: formattedPayload.chainId,
           id: formattedPayload.id,
           accessLevel: formattedPayload.maximumAccessLevelRequired,
-          payloadsController: formattedPayload.payloadsController,
+          payloadsController: formattedPayload.payloadsController as Address,
         };
       }),
     );

src/proposals/utils/formatPayloadData.ts

@@ -133,7 +133,7 @@ export function formatPayloadData({
     !isFinalStatus &&
     isPayloadReadyForExecution
   ) {
-    statusText = 'Can be execute';
+    statusText = 'Can be executed';
   } else if (isExecuted) {
     statusText = 'Executed';
     txHash = getTxHashFromHistory({

src/web3/utils/assetsBalanceSlots.ts

@@ -1,8 +1,11 @@
 import {
   Asset,
   AssetsBalanceSlots,
+  Balance,
   baseSlots,
+  getVoteBalanceSlot,
 } from '@bgd-labs/aave-governance-ui-helpers';
+import { Address } from 'viem';
 
 import { appConfig } from '../../utils/appConfig';
 
@@ -20,3 +23,53 @@ export const assetsBalanceSlots: AssetsBalanceSlots = {
     ...baseSlots[Asset.GOVCORE],
   },
 };
+
+export function formatBalances(balances: Balance[], aAaveAddress: Address) {
+  let formattedBalances = balances;
+  const aAAVEBalance = balances.find(
+    (balance) => balance.underlyingAsset === aAaveAddress,
+  );
+
+  const isAAAVEBalanceWithDelegation =
+    aAAVEBalance?.isWithDelegatedPower || false;
+
+  if (aAAVEBalance) {
+    if (isAAAVEBalanceWithDelegation) {
+      const isUserAAAVEBalance = aAAVEBalance.userBalance !== '0';
+      if (isUserAAAVEBalance) {
+        formattedBalances = [
+          ...balances,
+          {
+            ...aAAVEBalance,
+            isWithDelegatedPower: false,
+          },
+        ];
+      }
+    }
+  }
+  return formattedBalances;
+}
+
+export function getVotingAssetsWithSlot({
+  balances,
+  aAaveAddress,
+  slots,
+}: {
+  balances: Balance[];
+  aAaveAddress: Address;
+  slots: AssetsBalanceSlots;
+}) {
+  return balances
+    .filter((balance) => balance.value !== '0')
+    .map((balance) => {
+      return {
+        underlyingAsset: balance.underlyingAsset,
+        slot: getVoteBalanceSlot(
+          balance.underlyingAsset,
+          balance.isWithDelegatedPower,
+          aAaveAddress,
+          slots,
+        ),
+      };
+    });
+}