Release/0.3.3

.nvmrc

@@ -1 +1 @@
-20.16.0
+20.17.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "decent-interface",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "private": true,
   "dependencies": {
     "@amplitude/analytics-browser": "^2.11.1",
@@ -13,7 +13,7 @@
     "@ethersproject/abstract-signer": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
     "@fontsource/space-mono": "^5.0.19",
-    "@fractal-framework/fractal-contracts": "^0.8.1",
+    "@fractal-framework/fractal-contracts": "^0.8.2",
     "@graphprotocol/client-apollo": "^1.0.16",
     "@hatsprotocol/sdk-v1-core": "^0.9.0",
     "@hatsprotocol/sdk-v1-subgraph": "^1.0.0",
@@ -63,7 +63,7 @@
     "viem": "^2.13.1",
     "vite": "^5.1.0",
     "vite-plugin-checker": "^0.6.4",
-    "wagmi": "^2.9.7",
+    "wagmi": "^2.12.12",
     "yup": "^1",
     "zustand": "^4.5.2"
   },
@@ -83,8 +83,8 @@
     "postinstall": "npm run graphql:build"
   },
   "engines": {
-    "node": "20.16.0",
-    "npm": "10.8.1"
+    "node": "20.17.0",
+    "npm": "10.8.2"
   },
   "browserslist": {
     "production": [

src/assets/abi/DecentHats_0_1_0_Abi.ts

@@ -73,6 +73,82 @@ const DecentHats010Abi = [
                 name: 'wearer',
                 type: 'address',
               },
+              {
+                components: [
+                  {
+                    internalType: 'contract ISablierV2LockupLinear',
+                    name: 'sablier',
+                    type: 'address',
+                  },
+                  {
+                    internalType: 'address',
+                    name: 'sender',
+                    type: 'address',
+                  },
+                  {
+                    internalType: 'uint128',
+                    name: 'totalAmount',
+                    type: 'uint128',
+                  },
+                  {
+                    internalType: 'address',
+                    name: 'asset',
+                    type: 'address',
+                  },
+                  {
+                    internalType: 'bool',
+                    name: 'cancelable',
+                    type: 'bool',
+                  },
+                  {
+                    internalType: 'bool',
+                    name: 'transferable',
+                    type: 'bool',
+                  },
+                  {
+                    components: [
+                      {
+                        internalType: 'uint40',
+                        name: 'start',
+                        type: 'uint40',
+                      },
+                      {
+                        internalType: 'uint40',
+                        name: 'cliff',
+                        type: 'uint40',
+                      },
+                      {
+                        internalType: 'uint40',
+                        name: 'end',
+                        type: 'uint40',
+                      },
+                    ],
+                    internalType: 'struct LockupLinear.Timestamps',
+                    name: 'timestamps',
+                    type: 'tuple',
+                  },
+                  {
+                    components: [
+                      {
+                        internalType: 'address',
+                        name: 'account',
+                        type: 'address',
+                      },
+                      {
+                        internalType: 'uint256',
+                        name: 'fee',
+                        type: 'uint256',
+                      },
+                    ],
+                    internalType: 'struct LockupLinear.Broker',
+                    name: 'broker',
+                    type: 'tuple',
+                  },
+                ],
+                internalType: 'struct DecentHats_0_1_0.SablierStreamParams[]',
+                name: 'sablierParams',
+                type: 'tuple[]',
+              },
             ],
             internalType: 'struct DecentHats_0_1_0.Hat',
             name: 'adminHat',
@@ -105,6 +181,82 @@ const DecentHats010Abi = [
                 name: 'wearer',
                 type: 'address',
               },
+              {
+                components: [
+                  {
+                    internalType: 'contract ISablierV2LockupLinear',
+                    name: 'sablier',
+                    type: 'address',
+                  },
+                  {
+                    internalType: 'address',
+                    name: 'sender',
+                    type: 'address',
+                  },
+                  {
+                    internalType: 'uint128',
+                    name: 'totalAmount',
+                    type: 'uint128',
+                  },
+                  {
+                    internalType: 'address',
+                    name: 'asset',
+                    type: 'address',
+                  },
+                  {
+                    internalType: 'bool',
+                    name: 'cancelable',
+                    type: 'bool',
+                  },
+                  {
+                    internalType: 'bool',
+                    name: 'transferable',
+                    type: 'bool',
+                  },
+                  {
+                    components: [
+                      {
+                        internalType: 'uint40',
+                        name: 'start',
+                        type: 'uint40',
+                      },
+                      {
+                        internalType: 'uint40',
+                        name: 'cliff',
+                        type: 'uint40',
+                      },
+                      {
+                        internalType: 'uint40',
+                        name: 'end',
+                        type: 'uint40',
+                      },
+                    ],
+                    internalType: 'struct LockupLinear.Timestamps',
+                    name: 'timestamps',
+                    type: 'tuple',
+                  },
+                  {
+                    components: [
+                      {
+                        internalType: 'address',
+                        name: 'account',
+                        type: 'address',
+                      },
+                      {
+                        internalType: 'uint256',
+                        name: 'fee',
+                        type: 'uint256',
+                      },
+                    ],
+                    internalType: 'struct LockupLinear.Broker',
+                    name: 'broker',
+                    type: 'tuple',
+                  },
+                ],
+                internalType: 'struct DecentHats_0_1_0.SablierStreamParams[]',
+                name: 'sablierParams',
+                type: 'tuple[]',
+              },
             ],
             internalType: 'struct DecentHats_0_1_0.Hat[]',
             name: 'hats',

src/components/Proposals/SnapshotProposalDetails/SnapshotProposalVoteItem.tsx

@@ -1,4 +1,5 @@
-import { GridItem, Text, Flex } from '@chakra-ui/react';
+import { Flex, GridItem, Text } from '@chakra-ui/react';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import useDisplayName from '../../../hooks/utils/useDisplayName';
 import { useFractal } from '../../../providers/App/AppProvider';
@@ -22,6 +23,18 @@ export default function SnapshotProposalVoteItem({ proposal, vote }: ISnapshotPr
   } = useFractal();
 
   const isWeighted = proposal.type === 'weighted';
+  const voteSymbol = useMemo(() => {
+    return proposal.strategies
+      .filter(
+        (strategy, index) => !!strategy.params.symbol && vote.votingWeightByStrategy[index] > 0,
+      )
+      .map(strategy => strategy.params.symbol)
+      .join();
+  }, [proposal.strategies, vote.votingWeightByStrategy]);
+
+  const totalVoteWeightedWeight = useMemo(() => {
+    return vote.votingWeightByStrategy.reduce((prev, curr) => prev + curr, 0);
+  }, [vote.votingWeightByStrategy]);
 
   return (
     <>
@@ -68,12 +81,38 @@ export default function SnapshotProposalVoteItem({ proposal, vote }: ISnapshotPr
         )}
       </GridItem>
       <GridItem>
-        <Text
-          textStyle="body-base"
-          color="neutral-7"
-        >
-          {vote.votingWeight} {proposal.strategies[0].params.symbol}
-        </Text>
+        {isWeighted ? (
+          <Flex
+            gap={1}
+            flexWrap="wrap"
+          >
+            {proposal.strategies.map((strategy, strategyIdx) => {
+              const choiceWeight =
+                (vote.votingWeightByStrategy[strategyIdx] / totalVoteWeightedWeight) *
+                vote.votingWeight;
+              if (!choiceWeight) {
+                return null;
+              }
+              return (
+                <StatusBox key={strategyIdx}>
+                  <Text
+                    textStyle="body-base"
+                    color="neutral-7"
+                  >
+                    {choiceWeight} {strategy.params.symbol}
+                  </Text>
+                </StatusBox>
+              );
+            })}
+          </Flex>
+        ) : (
+          <Text
+            textStyle="body-base"
+            color="neutral-7"
+          >
+            {vote.votingWeight} {voteSymbol}
+          </Text>
+        )}
       </GridItem>
     </>
   );

src/components/Proposals/SnapshotProposalDetails/SnapshotProposalVotes.tsx

@@ -1,6 +1,7 @@
-import { Flex, Grid, GridItem, Text } from '@chakra-ui/react';
+import { Box, Flex, Grid, GridItem, Text } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import { ExtendedSnapshotProposal, FractalProposalState } from '../../../types';
+import StatusBox from '../../ui/badges/StatusBox';
 import ContentBox from '../../ui/containers/ContentBox';
 import { ProposalCountdown } from '../../ui/proposal/ProposalCountdown';
 import Divider from '../../ui/utils/Divider';
@@ -16,7 +17,6 @@ export default function SnapshotProposalVotes({ proposal }: ISnapshotProposalVot
   const { t } = useTranslation('proposal');
   const { totalVotesCasted } = useTotalVotes({ proposal });
   const { votes, votesBreakdown, choices, strategies, privacy, state, type } = proposal;
-  const strategySymbol = strategies[0].params.symbol;
 
   return (
     <>
@@ -41,7 +41,19 @@ export default function SnapshotProposalVotes({ proposal }: ISnapshotProposalVot
               ml={1}
               textStyle="display-lg"
             >
-              {totalVotesCasted} {strategySymbol}
+              {totalVotesCasted}
+              {strategies.map((strategy, index) =>
+                strategy.params.symbol ? (
+                  <Box
+                    mx={1}
+                    key={index}
+                    display="inline-block"
+                    as="span"
+                  >
+                    <StatusBox>{strategy.params.symbol}</StatusBox>
+                  </Box>
+                ) : null,
+              )}
             </Text>
           </Flex>
         </Flex>
@@ -58,7 +70,7 @@ export default function SnapshotProposalVotes({ proposal }: ISnapshotProposalVot
                   ? votesBreakdownChoice?.total
                   : 0;
               const choicePercentageFromTotal =
-                (votesBreakdownChoiceTotal * 100) / totalVotesCasted;
+                totalVotesCasted > 0 ? (votesBreakdownChoiceTotal * 100) / totalVotesCasted : 0;
 
               return (
                 <VotesPercentage