diff --git a/src/components/common/NetworkSelector/index.tsx b/src/components/common/NetworkSelector/index.tsx index fd578ca6b7..be1c268b38 100644 --- a/src/components/common/NetworkSelector/index.tsx +++ b/src/components/common/NetworkSelector/index.tsx @@ -45,10 +45,10 @@ import { skipToken } from '@reduxjs/toolkit/query' import { hasMultiChainAddNetworkFeature } from '@/features/multichain/utils/utils' const ChainIndicatorWithFiatBalance = ({ - isSelected, - chain, - safeAddress, - }: { + isSelected, + chain, + safeAddress, +}: { isSelected: boolean chain: ChainInfo safeAddress: string @@ -74,8 +74,8 @@ export const getNetworkLink = (router: NextRouter, safeAddress: string, networkS const query = ( isSafeOpened ? { - safe: `${networkShortName}:${safeAddress}`, - } + safe: `${networkShortName}:${safeAddress}`, + } : { chain: networkShortName } ) as { safe?: string @@ -96,10 +96,10 @@ export const getNetworkLink = (router: NextRouter, safeAddress: string, networkS } const UndeployedNetworkMenuItem = ({ - chain, - isSelected = false, - onSelect, - }: { + chain, + isSelected = false, + onSelect, +}: { chain: ChainInfo & { available: boolean } isSelected?: boolean onSelect: (chain: ChainInfo) => void @@ -163,11 +163,11 @@ const TestnetDivider = () => { } const UndeployedNetworks = ({ - deployedChains, - chains, - safeAddress, - closeNetworkSelect, - }: { + deployedChains, + chains, + safeAddress, + closeNetworkSelect, +}: { deployedChains: string[] chains: ChainInfo[] safeAddress: string @@ -331,9 +331,9 @@ const UndeployedNetworks = ({ } const NetworkSelector = ({ - onChainSelect, - offerSafeCreation = false, - }: { + onChainSelect, + offerSafeCreation = false, +}: { onChainSelect?: () => void offerSafeCreation?: boolean }): ReactElement => { @@ -433,10 +433,10 @@ const NetworkSelector = ({ }, ...(isDarkMode ? { - '& .Mui-selected, & .Mui-selected:hover': { - backgroundColor: `${theme.palette.secondary.background} !important`, - }, - } + '& .Mui-selected, & .Mui-selected:hover': { + backgroundColor: `${theme.palette.secondary.background} !important`, + }, + } : {}), }, }} diff --git a/src/components/new-safe/create/steps/ReviewStep/index.tsx b/src/components/new-safe/create/steps/ReviewStep/index.tsx index a88970b1e2..57f1e906a3 100644 --- a/src/components/new-safe/create/steps/ReviewStep/index.tsx +++ b/src/components/new-safe/create/steps/ReviewStep/index.tsx @@ -54,11 +54,11 @@ import { updateAddressBook } from '../../logic/address-book' import chains from '@/config/chains' export const NetworkFee = ({ - totalFee, - chain, - isWaived, - inline = false, - }: { + totalFee, + chain, + isWaived, + inline = false, +}: { totalFee: string chain: ChainInfo | undefined isWaived: boolean @@ -76,11 +76,11 @@ export const NetworkFee = ({ } export const SafeSetupOverview = ({ - name, - owners, - threshold, - networks, - }: { + name, + owners, + threshold, + networks, +}: { name?: string owners: NamedAddress[] threshold: number @@ -180,13 +180,13 @@ const ReviewStep = ({ data, onSubmit, onBack, setStep }: StepRenderProps chain ? createNewUndeployedSafeWithoutSalt( - data.safeVersion, - { - owners: data.owners.map((owner) => owner.address), - threshold: data.threshold, - }, - chain, - ) + data.safeVersion, + { + owners: data.owners.map((owner) => owner.address), + threshold: data.threshold, + }, + chain, + ) : undefined, [chain, data.owners, data.safeVersion, data.threshold], ) @@ -194,9 +194,9 @@ const ReviewStep = ({ data, onSubmit, onBack, setStep }: StepRenderProps { return newSafeProps ? { - ...newSafeProps, - saltNonce: Date.now().toString(), - } + ...newSafeProps, + saltNonce: Date.now().toString(), + } : undefined }, [newSafeProps]) @@ -308,10 +308,10 @@ const ReviewStep = ({ data, onSubmit, onBack, setStep }: StepRenderProps { diff --git a/src/components/settings/owner/OwnerList/index.tsx b/src/components/settings/owner/OwnerList/index.tsx index 013064eccc..513cae19dc 100644 --- a/src/components/settings/owner/OwnerList/index.tsx +++ b/src/components/settings/owner/OwnerList/index.tsx @@ -106,14 +106,16 @@ export const OwnerList = () => { }} > Members - - + Signers @@ -121,12 +123,13 @@ export const OwnerList = () => { reject them. - - + {(isOk) => ( diff --git a/src/components/transactions/TxSummary/index.tsx b/src/components/transactions/TxSummary/index.tsx index 0a3c7f6fb6..a29e92db02 100644 --- a/src/components/transactions/TxSummary/index.tsx +++ b/src/components/transactions/TxSummary/index.tsx @@ -96,9 +96,11 @@ const TxSummary = ({ item, isConflictGroup, isBulkGroup }: TxSummaryProps): Reac {isQueue && executionInfo && ( - + {executionInfo.confirmationsSubmitted > 0 || isPending ? ( )} - )} {isQueue && expiredSwap ? ( diff --git a/src/components/tx/DecodedTx/index.tsx b/src/components/tx/DecodedTx/index.tsx index 7e0767536d..9841f48a62 100644 --- a/src/components/tx/DecodedTx/index.tsx +++ b/src/components/tx/DecodedTx/index.tsx @@ -39,13 +39,13 @@ export const Divider = () => ( ) const DecodedTx = ({ - tx, - txDetails, - decodedData, - showMultisend = true, - showMethodCall = false, - showAdvancedDetails = true, - }: DecodedTxProps): ReactElement => { + tx, + txDetails, + decodedData, + showMultisend = true, + showMethodCall = false, + showAdvancedDetails = true, +}: DecodedTxProps): ReactElement => { const isMultisend = decodedData?.parameters && !!decodedData?.parameters[0]?.valueDecoded const isMethodCallInAdvanced = showAdvancedDetails && (!showMethodCall || (isMultisend && showMultisend)) diff --git a/src/components/tx/SignOrExecuteForm/SignOrExecuteForm.tsx b/src/components/tx/SignOrExecuteForm/SignOrExecuteForm.tsx index 6cceedf7f7..1627da354c 100644 --- a/src/components/tx/SignOrExecuteForm/SignOrExecuteForm.tsx +++ b/src/components/tx/SignOrExecuteForm/SignOrExecuteForm.tsx @@ -65,8 +65,8 @@ const trackTxEvents = ( const creationEvent = isRoleExecution ? TX_EVENTS.CREATE_VIA_ROLE : isProposerCreation - ? TX_EVENTS.CREATE_VIA_PROPOSER - : TX_EVENTS.CREATE + ? TX_EVENTS.CREATE_VIA_PROPOSER + : TX_EVENTS.CREATE const executionEvent = isRoleExecution ? TX_EVENTS.EXECUTE_VIA_ROLE : TX_EVENTS.EXECUTE const event = isCreation ? creationEvent : isExecuted ? executionEvent : TX_EVENTS.CONFIRM const txType = getTransactionTrackingType(details) @@ -177,8 +177,8 @@ export const SignOrExecuteForm = ({ isProposing ? ConfirmationTitleTypes.propose : willExecute - ? ConfirmationTitleTypes.execute - : ConfirmationTitleTypes.sign + ? ConfirmationTitleTypes.execute + : ConfirmationTitleTypes.sign } isCreation={isCreation} /> diff --git a/src/components/tx/security/tenderly/index.tsx b/src/components/tx/security/tenderly/index.tsx index 3684c642b4..32190ca14a 100644 --- a/src/components/tx/security/tenderly/index.tsx +++ b/src/components/tx/security/tenderly/index.tsx @@ -51,7 +51,7 @@ const TxSimulationBlock = ({ transactions, disabled, gasLimit, executionOwner }: simulateTransaction({ safe, // fall back to the first owner of the safe in case the transaction is created by a proposer - executionOwner: executionOwner ?? isSafeOwner ? wallet.address : safe.owners[0].value, + executionOwner: (executionOwner ?? isSafeOwner) ? wallet.address : safe.owners[0].value, transactions, gasLimit, } as SimulationTxParams) diff --git a/src/components/welcome/MyAccounts/MultiAccountItem.tsx b/src/components/welcome/MyAccounts/MultiAccountItem.tsx index 9786a14adc..7e00f2e083 100644 --- a/src/components/welcome/MyAccounts/MultiAccountItem.tsx +++ b/src/components/welcome/MyAccounts/MultiAccountItem.tsx @@ -52,7 +52,10 @@ const MultichainIndicator = ({ safes }: { safes: SafeItem[] }) => { Multichain account on: + }} + > + Multichain account on: + {safes.map((safeItem) => ( - - - + + @@ -194,12 +202,15 @@ const MultiAccountItem = ({ onLinkClick, multiSafeAccountItem }: MultiAccountIte - + {totalFiatValue !== undefined ? ( ) : ( diff --git a/src/features/counterfactual/CounterfactualSuccessScreen.tsx b/src/features/counterfactual/CounterfactualSuccessScreen.tsx index 7dad021838..8b482621c6 100644 --- a/src/features/counterfactual/CounterfactualSuccessScreen.tsx +++ b/src/features/counterfactual/CounterfactualSuccessScreen.tsx @@ -79,16 +79,20 @@ const CounterfactualSuccessScreen = () => { - - - - + + {isCFCreation ? 'Your account is almost set!' : 'Your account is all set!'} @@ -99,20 +103,22 @@ const CounterfactualSuccessScreen = () => { {isCFCreation && isMultiChain ? `You can use the address below to receive funds on the selected ${ - isMultiChain ? 'networks' : 'network' - }.` + isMultiChain ? 'networks' : 'network' + }.` : `Use your address to receive funds ${chainName ? `on ${chainName}` : ''}`} {safeAddress && ( - - + 0 ? networks : chain ? [chain] : []} /> { + safeAddress, + chain, + currentName, + open, + onClose, + safeCreationResult, + replayableChains, + isUnsupportedSafeCreationVersion, +}: ReplaySafeDialogProps) => { const formMethods = useForm({ mode: 'all', defaultValues: { @@ -171,11 +171,14 @@ const ReplaySafeDialog = ({ Add this Safe to another network with the same address. {chain && ( - + )} @@ -250,10 +253,10 @@ const ReplaySafeDialog = ({ } export const CreateSafeOnNewChain = ({ - safeAddress, - deployedChainIds, - ...props - }: Omit< + safeAddress, + deployedChainIds, + ...props +}: Omit< ReplaySafeDialogProps, 'safeCreationResult' | 'replayableChains' | 'chain' | 'isUnsupportedSafeCreationVersion' > & { diff --git a/src/features/proposers/components/EditProposerDialog.tsx b/src/features/proposers/components/EditProposerDialog.tsx index 9450125237..d42eb4f51c 100644 --- a/src/features/proposers/components/EditProposerDialog.tsx +++ b/src/features/proposers/components/EditProposerDialog.tsx @@ -24,8 +24,8 @@ const EditProposerDialog = ({ proposer }: { proposer: Delegate }) => { isOk && canEdit ? 'Edit proposer' : isOk && !canEdit - ? 'Only the owner of this proposer can edit them' - : undefined + ? 'Only the owner of this proposer can edit them' + : undefined } > diff --git a/src/features/targetedOutreach/components/OutreachPopup/index.tsx b/src/features/targetedOutreach/components/OutreachPopup/index.tsx index 9e9a079812..d60183c8e9 100644 --- a/src/features/targetedOutreach/components/OutreachPopup/index.tsx +++ b/src/features/targetedOutreach/components/OutreachPopup/index.tsx @@ -29,11 +29,11 @@ const OutreachPopup = (): ReactElement | null => { !wallet || !safeAddress ? skipToken : { - outreachId: ACTIVE_OUTREACH.id, - chainId: currentChainId, - safeAddress, - signerAddress: wallet?.address, - }, + outreachId: ACTIVE_OUTREACH.id, + chainId: currentChainId, + safeAddress, + signerAddress: wallet?.address, + }, ) const [askAgainLaterTimestamp, setAskAgainLaterTimestamp] = useSessionStorage(OUTREACH_SS_KEY) @@ -80,7 +80,6 @@ const OutreachPopup = (): ReactElement | null => { - { }} > Clem - - + Product Lead diff --git a/src/pages/privacy.tsx b/src/pages/privacy.tsx index 5a3bd6d395..8bf31ed9e1 100644 --- a/src/pages/privacy.tsx +++ b/src/pages/privacy.tsx @@ -6,7 +6,6 @@ import { IS_OFFICIAL_HOST } from '@/config/constants' import SafePrivacyPolicy from '@/markdown/privacy/privacy.md' const overrideComponents: MDXComponents = { - // @ts-expect-error a: CustomLink, }