Uniswap
diff --git a/‎package.json
Lines changed: 4 additions & 0 deletions b/‎package.json
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/hooks/useV3Positions.ts
Lines changed: 3 additions & 3 deletions b/‎src/hooks/useV3Positions.ts
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/pages/Vote/Landing.tsx
Lines changed: 8 additions & 2 deletions b/‎src/pages/Vote/Landing.tsx
Lines changed: 8 additions & 2 deletions
diff --git a/‎src/pages/Vote/styled.tsx
Lines changed: 2 additions & 0 deletions b/‎src/pages/Vote/styled.tsx
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/state/index.ts
Lines changed: 2 additions & 2 deletions b/‎src/state/index.ts
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/state/multicall/actions.test.ts
Lines changed: 0 additions & 35 deletions b/‎src/state/multicall/actions.test.ts
Lines changed: 0 additions & 35 deletions
diff --git a/‎src/state/multicall/actions.ts
Lines changed: 0 additions & 30 deletions b/‎src/state/multicall/actions.ts
Lines changed: 0 additions & 30 deletions
@@ -18,7 +18,10 @@
     "@graphql-codegen/typescript-operations": "^1.18.2",
     "@graphql-codegen/typescript-rtk-query": "^1.1.1",
     "@lingui/cli": "^3.9.0",
+    "@lingui/macro": "^3.9.0",
+    "@lingui/react": "^3.9.0",
     "@metamask/jazzicon": "^2.0.0",
+    "@popperjs/core": "^2.4.4",
     "@reach/dialog": "^0.10.3",
     "@reach/portal": "^0.10.3",
     "@react-hook/window-scroll": "^1.3.0",
@@ -57,6 +60,7 @@
     "@uniswap/governance": "^1.0.2",
     "@uniswap/liquidity-staker": "^1.0.2",
     "@uniswap/merkle-distributor": "1.0.1",
+    "@uniswap/redux-multicall": "^1.0.0",
     "@uniswap/sdk-core": "^3.0.1",
     "@uniswap/token-lists": "^1.0.0-beta.27",
     "@uniswap/v2-core": "1.0.0",
 
@@ -1,6 +1,6 @@
 import { BigNumber } from '@ethersproject/bignumber'
 import { useMemo } from 'react'
-import { Result, useSingleCallResult, useSingleContractMultipleData } from 'state/multicall/hooks'
+import { CallStateResult, useSingleCallResult, useSingleContractMultipleData } from 'state/multicall/hooks'
 import { PositionDetails } from 'types/position'
 
 import { useV3NFTPositionManagerContract } from './useContract'
@@ -22,7 +22,7 @@ function useV3PositionsFromTokenIds(tokenIds: BigNumber[] | undefined): UseV3Pos
     if (!loading && !error && tokenIds) {
       return results.map((call, i) => {
         const tokenId = tokenIds[i]
-        const result = call.result as Result
+        const result = call.result as CallStateResult
         return {
           tokenId,
           fee: result.fee,
@@ -90,7 +90,7 @@ export function useV3Positions(account: string | null | undefined): UseV3Positio
     if (account) {
       return tokenIdResults
         .map(({ result }) => result)
-        .filter((result): result is Result => !!result)
+        .filter((result): result is CallStateResult => !!result)
         .map((result) => BigNumber.from(result[0]))
     }
     return []
 
@@ -40,8 +40,8 @@ const Proposal = styled(Button)`
   width: 100%;
   margin-top: 1rem;
   border-radius: 12px;
-  display: grid;
-  grid-template-columns: 48px 1fr 120px;
+  display: flex;
+  justify-content: space-between;
   align-items: center;
   text-align: left;
   outline: none;
@@ -59,10 +59,16 @@ const Proposal = styled(Button)`
 
 const ProposalNumber = styled.span`
   opacity: 0.6;
+  flex: 0 0 40px;
 `
 
 const ProposalTitle = styled.span`
   font-weight: 600;
+  flex: 1;
+  max-width: 420px;
+  white-space: initial;
+  word-wrap: break-word;
+  padding-right: 10px;
 `
 
 const VoteCard = styled(DataCard)`
 
@@ -54,6 +54,8 @@ const StyledProposalContainer = styled.span<{ status: ProposalState }>`
   width: fit-content;
   justify-self: flex-end;
   text-transform: uppercase;
+  flex: 0 0 100px;
+  text-align: center;
 `
 
 export function ProposalStatus({ status }: { status: ProposalState }) {
 
@@ -11,7 +11,7 @@ import lists from './lists/reducer'
 import logs from './logs/slice'
 import mint from './mint/reducer'
 import mintV3 from './mint/v3/reducer'
-import multicall from './multicall/reducer'
+import { multicall } from './multicall/instance'
 import { routingApi } from './routing/slice'
 import swap from './swap/reducer'
 import transactions from './transactions/reducer'
@@ -29,7 +29,7 @@ const store = configureStore({
     mintV3,
     burn,
     burnV3,
-    multicall,
+    multicall: multicall.reducer,
     lists,
     logs,
     [dataApi.reducerPath]: dataApi.reducer,
Original file line number	Diff line number	Diff line change
@@ -54,6 +54,8 @@ const StyledProposalContainer = styled.span<{ status: ProposalState }>`
`54`	`54`	`width: fit-content;`
`55`	`55`	`justify-self: flex-end;`
`56`	`56`	`text-transform: uppercase;`
	`57`	`+ flex: 0 0 100px;`
	`58`	`+ text-align: center;`
`57`	`59`	`
`58`	`60`
`59`	`61`	`export function ProposalStatus({ status }: { status: ProposalState }) {`