Further fixes for DAO v3 UI

src/components/App.jsx

@@ -13,8 +13,6 @@ import ProposalsProvider from './context/Proposals'
 import EventsProvider from './context/Events'
 import Avatar from './base/Avatar'
 import Overview from './pages/Overview'
-import Lending from './pages/Lending'
-import Nodes from './pages/Nodes'
 import Staking from './pages/Staking'
 import Disclaimer from './complex/Disclaimer'
 import SettingsDrawer from './complex/Settings'
@@ -25,14 +23,6 @@ const router = createHashRouter([
     path: '/',
     element: <Overview />
   },
-  {
-    path: '/lending',
-    element: <Lending />
-  },
-  {
-    path: '/nodes',
-    element: <Nodes />
-  },
   {
     path: '/staking',
     element: <Staking />

src/components/complex/Header/index.jsx

@@ -272,12 +272,6 @@ const Header = (_props) => {
           <StyledLink withmargin="true" to={'/staking'} active={(pathname === '/staking').toString()}>
             Staking
           </StyledLink>
-          <StyledLink withmargin="true" to={'/lending'} active={(pathname === '/lending').toString()}>
-            Lending
-          </StyledLink>
-          <StyledLink withmargin="true" to={'/nodes'} active={(pathname === '/nodes').toString()}>
-            Nodes
-          </StyledLink>
         </StyledNav>
         <ButtonsContainer>
           <CustomConnectButton />
@@ -294,12 +288,6 @@ const Header = (_props) => {
           <StyledLinkMobile to={'/staking'} active={(pathname === '/staking').toString()}>
             Staking
           </StyledLinkMobile>
-          <StyledLinkMobile to={'/lending'} active={(pathname === '/lending').toString()}>
-            Lending
-          </StyledLinkMobile>
-          <StyledLinkMobile to={'/nodes'} active={(pathname === '/nodes').toString()}>
-            Nodes
-          </StyledLinkMobile>
         </ContainerLinkMobile>
       </HeaderContainer>
       {/*<ContainerBottomMobile>

src/components/complex/Proposal/index.jsx

@@ -107,10 +107,6 @@ const QuorumText = styled(Text)`
   color: ${({ theme, quorumreached }) => (quorumreached ? theme.yellow : theme.red)};
 `
 
-const QuorumContainer = styled.div`
-  margin-left: 7px;
-`
-
 const StyledIcon = styled(Icon)`
   margin-right: 5px;
 `
@@ -143,7 +139,7 @@ const SpinnerView = styled.div`
   display: flex;
   flex: 1;
   justify-content: center;
-  align-items. center;
+  align-items: center;
   margin-top: 50px;
   margin-bottom: 50px;
 `
@@ -205,35 +201,23 @@ const Proposal = ({
     [open, daoPntBalance, vote]
   )
 
-  const { data: yesData, /*isLoading: isLoadingYes,*/ writeContract: callYes, error: yesError } = useWriteContract()
-  const yes = () => callYes({ activeChainId, address, id: effectiveId, vote: true, enabled: canVote })
-
-  const { data: noData, /*isLoading: isLoadingNo,*/ writeContract: callNo, error: noError } = useWriteContract()
-  const no = () => callNo({ activeChainId, address, id: effectiveId, vote: false, enabled: canVote })
-
-  useEffect(() => {
-    if (yesError && isValidError(yesError)) {
-      toast.error(yesError.message)
-    }
-  }, [yesError])
-
-  useEffect(() => {
-    if (noError && isValidError(noError)) {
-      toast.error(noError.message)
-    }
-  }, [noError])
+  const { data: voteData, /*isLoading: isLoadingYes,*/ writeContract: callVote, error: voteError } = useWriteContract()
+  const yes = () =>
+    callVote(prepareContractWriteVote({ activeChainId, address, id: effectiveId, vote: true, enabled: true }))
+  const no = () =>
+    callVote(prepareContractWriteVote({ activeChainId, address, id: effectiveId, vote: false, enabled: true }))
 
   useEffect(() => {
-    if (yesData) {
-      toastifyTransaction(yesData, { chainId: activeChainId })
+    if (voteError && isValidError(voteError)) {
+      toast.error(voteError.message)
     }
-  }, [yesData, activeChainId])
+  }, [voteError])
 
   useEffect(() => {
-    if (noData) {
-      toastifyTransaction(noData, { chainId: activeChainId })
+    if (voteData) {
+      toastifyTransaction(voteData, { chainId: activeChainId })
     }
-  }, [noData, activeChainId])
+  }, [voteData, activeChainId])
 
   const renderTooltip = (props) => (
     <Tooltip id="button-tooltip" {...props}>

src/hooks/use-lending-manager.js

@@ -83,12 +83,12 @@ const useLend = () => {
     )
 
   const { isLoading: isApproving } = useWaitForTransactionReceipt({
-    hash: approveData?.hash,
+    hash: approveData,
     confirmations: 1
   })
 
   const { isLoading: isLending } = useWaitForTransactionReceipt({
-    hash: lendData?.hash,
+    hash: lendData,
     confirmations: 1
   })
 

src/hooks/use-proposals.js

@@ -152,7 +152,7 @@ const useProposals = () => {
     return [...effectiveDaoV1Proposals, ...effectiveDaoV2ProposalVotes, ...daoV3ProposalsWithVote].sort(
       (_a, _b) => _b.timestamp - _a.timestamp
     )
-  }, [daoV1ProposalsWithVote, daoV2ProposalsWithVote])
+  }, [daoV1ProposalsWithVote, daoV2ProposalsWithVote, daoV3ProposalsWithVote])
 }
 
 const useCreateProposal = () => {

src/hooks/use-registration-manager.js

@@ -115,12 +115,12 @@ const useRegisterSentinel = ({ type = 'stake' }) => {
     )
 
   const { isLoading: isApproving } = useWaitForTransactionReceipt({
-    hash: approveData?.hash,
+    hash: approveData,
     confirmations: 1
   })
 
   const { isLoading: isUpdatingSentinelRegistrationByStaking } = useWaitForTransactionReceipt({
-    hash: updateSentinelRegistrationByStakingData?.hash,
+    hash: updateSentinelRegistrationByStakingData,
     confirmations: 1
   })
 
@@ -145,7 +145,7 @@ const useRegisterSentinel = ({ type = 'stake' }) => {
     )
 
   const { isLoading: isUpdatingSentinelRegistrationByBorrowing } = useWaitForTransactionReceipt({
-    hash: updateSentinelRegistrationByBorrowingData?.hash,
+    hash: updateSentinelRegistrationByBorrowingData,
     confirmations: 1
   })
 

src/hooks/use-safe-check.js

@@ -30,9 +30,7 @@ const useIsSafe = () => {
   useEffect(() => {
     const getCode = async () => {
       try {
-        console.log('address', address)
         const code = await client.getBytecode({ address: address, blockTag: 'latest' })
-        console.log('code', code)
         if (code === GNOSIS_PROXY_CONTRACT_BYTECODE) {
           const contract = getContract({
             address: address,

src/hooks/use-staking-manager.js

@@ -162,7 +162,7 @@ const useUnstake = (_opts = {}) => {
     )
 
   const { isLoading: isUnstaking } = useWaitForTransactionReceipt({
-    hash: unstakeData?.hash,
+    hash: unstakeData,
     confirmations: 1
   })
 

src/utils/amount.js

@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js'
 import { format } from 'currency-formatter'
-import { parseUnits } from 'viem'
+import { parseEther } from 'viem'
 import numeral from 'numeral'
 
 export const formatAssetAmount = (_amount, _symbol, _opts = {}) => {
@@ -35,6 +35,6 @@ export const formatCurrency = (_amount, _currency) =>
 export const removeUselessDecimals = (_amount, _decimals = 5) =>
   BigNumber(BigNumber(_amount).toFixed(_decimals)).toFixed()
 
-export const getEthersOnChainAmount = (_amount) => (_amount.toString().length > 0 ? parseUnits(_amount, 18) : 0n)
+export const getEthersOnChainAmount = (_amount) => (_amount.toString().length > 0 ? parseEther(_amount.toString()) : 0n)
 
 export const removeCommas = (_num) => _num?.replace(/,/g, '')