fix: minor fixes

bgd-labs · Sep 28, 2023 · 269163b · 269163b
1 parent e228594
commit 269163b
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 23 deletions.
diff --git a/src/proposals/components/proposal/ProposalPage.tsx b/src/proposals/components/proposal/ProposalPage.tsx
@@ -109,7 +109,7 @@ export function ProposalPage({
         );
       }
 
-      if (!isVotingActive) {
+      if (isVotingActive) {
         startVotersPolling(
           proposal.data.id,
           proposal.data.votingChainId,

diff --git a/src/proposals/components/proposal/ProposalPayloads.tsx b/src/proposals/components/proposal/ProposalPayloads.tsx
@@ -189,19 +189,27 @@ function PayloadItem({
           )}
 
           {isPayloadReadyForExecution && !isExecuted && (
-            <SmallButton
-              disabled={tx?.status === 1}
-              loading={tx?.pending}
-              onClick={() => {
-                setSelectedPayloadForExecute({
-                  chainId: payload.chainId,
-                  payloadsController: payload.payloadsController,
-                  id: payload.id,
-                });
-                store.setExecutePayloadModalOpen(true);
-              }}>
-              {texts.proposals.payloadsDetails.execute}
-            </SmallButton>
+            <>
+              {store.activeWallet?.isActive ? (
+                <SmallButton
+                  disabled={tx?.status === 1}
+                  loading={tx?.pending}
+                  onClick={() => {
+                    setSelectedPayloadForExecute({
+                      chainId: payload.chainId,
+                      payloadsController: payload.payloadsController,
+                      id: payload.id,
+                    });
+                    store.setExecutePayloadModalOpen(true);
+                  }}>
+                  {texts.proposals.payloadsDetails.execute}
+                </SmallButton>
+              ) : (
+                <PayloadItemStatusInfo>
+                  {texts.proposals.payloadsDetails.execution}
+                </PayloadItemStatusInfo>
+              )}
+            </>
           )}
 
           {isExecuted && (

diff --git a/src/transactions/components/ActionModalContent.tsx b/src/transactions/components/ActionModalContent.tsx
@@ -1,7 +1,7 @@
 import { Box, useTheme } from '@mui/system';
 import React, { ReactNode } from 'react';
 
-import LinkIcon from '/public/images/icons/link.svg';
+import LinkIcon from '/public/images/icons/linkIcon.svg';
 
 import { selectTxExplorerLink, WalletType } from '../../../lib/web3/src';
 import { useStore } from '../../store';
@@ -157,15 +157,14 @@ export function ActionModalContent({
                     </Box>
                     <IconBox
                       sx={{
-                        width: 10,
-                        height: 10,
+                        width: 12,
+                        height: 12,
                         '> svg': {
-                          width: 10,
-                          height: 10,
+                          width: 12,
+                          height: 12,
                         },
-                        ml: 3,
+                        ml: 4,
                         position: 'relative',
-                        bottom: 0.5,
                       }}>
                       <LinkIcon />
                     </IconBox>

diff --git a/src/transactions/components/TransactionInfoItem.tsx b/src/transactions/components/TransactionInfoItem.tsx
@@ -5,6 +5,7 @@ import React from 'react';
 import CheckIcon from '/public/images/icons/check.svg';
 import CopyIcon from '/public/images/icons/copy.svg';
 import CrossIcon from '/public/images/icons/cross.svg';
+import LinkIcon from '/public/images/icons/linkIcon.svg';
 
 import { selectTxExplorerLink } from '../../../lib/web3/src';
 import { DelegatedText } from '../../delegate/components/DelegatedText';
@@ -73,21 +74,62 @@ export function TransactionInfoItem({ tx }: TransactionInfoItemProps) {
             </Box>
           )}
           {tx.hash && (
-            <Box sx={{ display: 'inline-flex', alignItems: 'center' }}>
+            <Box
+              sx={{
+                display: 'inline-flex',
+                alignItems: 'center',
+                a: { lineHeight: 0 },
+              }}>
               <Link
                 href={selectTxExplorerLink(
                   state,
                   chainInfoHelper.getChainParameters,
                   tx.hash,
                 )}
                 css={{
+                  display: 'inline-flex',
                   color: '$textSecondary',
-                  hover: { color: theme.palette.$text },
+                  alignItems: 'center',
+                  transition: 'all 0.2s ease',
+                  hover: {
+                    color: theme.palette.$text,
+                    svg: {
+                      path: {
+                        '&:first-of-type': {
+                          stroke: theme.palette.$text,
+                        },
+                        '&:last-of-type': {
+                          fill: theme.palette.$text,
+                        },
+                      },
+                    },
+                  },
                 }}
                 inNewWindow>
                 <Box component="p" sx={{ typography: 'descriptor' }}>
                   {textCenterEllipsis(tx.hash, 5, 5)}
                 </Box>
+                <IconBox
+                  sx={{
+                    width: 10,
+                    height: 10,
+                    ml: 2,
+                    '> svg': {
+                      width: 10,
+                      height: 10,
+                      transition: 'all 0.2s ease',
+                      path: {
+                        '&:first-of-type': {
+                          stroke: theme.palette.$textSecondary,
+                        },
+                        '&:last-of-type': {
+                          fill: theme.palette.$textSecondary,
+                        },
+                      },
+                    },
+                  }}>
+                  <LinkIcon />
+                </IconBox>
               </Link>
 
               <CopyToClipboard copyText={tx.hash}>

diff --git a/src/ui/components/SmallButton.tsx b/src/ui/components/SmallButton.tsx
@@ -51,6 +51,7 @@ export function SmallButton({
         '&:disabled': {
           cursor: 'not-allowed',
           '.SmallButton__inner': {
+            cursor: 'not-allowed',
             borderTop: `1px solid transparent`,
             borderRight: `1px solid transparent`,
             backgroundColor: '$disabled',

diff --git a/src/ui/utils/texts.ts b/src/ui/utils/texts.ts
@@ -65,6 +65,7 @@ export const texts = {
       executedIn: 'Executed in',
       execute: 'Execute',
       executedAt: 'Executed at',
+      execution: 'Ready for execution',
       cancelledAt: 'Cancelled at',
       expired: 'Expired',
       expiredIn: 'Expired in',