From 4640a7584753410bedf4dda4f268a992672104a6 Mon Sep 17 00:00:00 2001 From: Sepehr Sanaei <46657145+sepehr2github@users.noreply.github.com> Date: Wed, 31 Jan 2024 18:08:58 +0330 Subject: [PATCH] Replace old ODS icons with new ODS icons (#1207) --- .babelrc | 8 --- babel.config.js | 8 +++ jest.config.js | 3 +- package.json | 2 +- src/components/accordionMethod/index.tsx | 15 ++--- .../addCommittee/addCommitteeWallet.tsx | 4 +- src/components/addCommittee/index.tsx | 4 +- src/components/addLinks/index.tsx | 5 +- src/components/addLinks/row.tsx | 4 +- src/components/addWallets/index.tsx | 4 +- src/components/addWallets/row.tsx | 4 +- src/components/breadcrumbs/index.tsx | 4 +- src/components/daoCard/index.tsx | 15 ++--- src/components/daoSelector/index.tsx | 4 +- .../executionWidget/actions/mintTokenCard.tsx | 5 +- src/components/executionWidget/index.tsx | 15 ++--- .../fullScreenStepper/fullScreenStepper.tsx | 13 ++--- src/components/headerMember/index.tsx | 18 ++---- .../membersList/actionItemAddress.tsx | 4 +- .../membersList/actionItemMembership.tsx | 6 +- .../membershipDAOList/membershipDAOList.tsx | 5 +- src/components/modalHeader/index.tsx | 7 ++- src/components/modalHeader/searchHeader.tsx | 15 ++--- src/components/multisigWallets/index.tsx | 4 +- src/components/multisigWallets/row.tsx | 6 +- src/components/navLink/index.tsx | 8 ++- src/components/resourceList/index.tsx | 5 +- src/components/stepperProgress/StepLine.tsx | 23 ++++---- .../userProposalList/userProposalList.tsx | 10 +++- src/components/wrappers/sectionWrappers.tsx | 9 +-- .../addAddresses/accordionSummary.tsx | 5 +- .../actionBuilder/addAddresses/addressRow.tsx | 4 +- .../actionBuilder/addAddresses/index.tsx | 4 +- .../mintTokens/addressTokenRow.tsx | 4 +- .../actionBuilder/removeAddresses/index.tsx | 4 +- src/containers/addActionMenu/index.tsx | 5 +- src/containers/configureActions/index.tsx | 7 ++- src/containers/daoExplorer/daoExplorer.tsx | 45 ++++++++------- src/containers/daoFilterModal/index.tsx | 27 ++++----- .../delegateVotingMenu/delegateVotingForm.tsx | 9 +-- .../delegateVotingSuccess.tsx | 5 +- .../delegationGatingMenu.tsx | 13 +++-- .../editSettings/majorityVoting.tsx | 12 ++-- src/containers/editSettings/multisig.tsx | 12 ++-- src/containers/exploreFooter/index.tsx | 4 +- .../exportCsvModal/ExportCsvModal.tsx | 11 ++-- src/containers/footer/index.tsx | 5 +- src/containers/goLive/community.tsx | 6 +- src/containers/goLive/index.tsx | 10 +--- .../GovTokensWrappingModal.tsx | 11 ++-- src/containers/membershipSnapshot/index.tsx | 16 ++---- .../mintTokensToTreasuryMenu/index.tsx | 11 +--- src/containers/navbar/breadcrumbDropdown.tsx | 11 +++- src/containers/navbar/daoSelectMenu.tsx | 13 ++--- src/containers/navbar/desktop.tsx | 12 ++-- src/containers/navbar/exploreNav.tsx | 13 ++--- src/containers/navbar/mobile.tsx | 15 ++--- src/containers/navbar/mobileMenu.tsx | 5 +- src/containers/navbar/updateBanner.tsx | 8 ++- src/containers/networkErrorMenu/index.tsx | 20 +++---- .../poapClaiming/PoapClaimModal.tsx | 5 +- .../privacyPolicy/cookiePreferenceMenu.tsx | 5 +- .../privacyPolicy/cookieSettingsMenu.tsx | 12 ++-- src/containers/proposalSnapshot/index.tsx | 9 ++- .../settings/gaslessVoting/index.tsx | 4 +- .../settings/majorityVoting/index.tsx | 9 +-- src/containers/settings/multisig/index.tsx | 7 ++- src/containers/settings/updateCard/index.tsx | 10 ++-- .../settings/versionInfoCard/index.tsx | 13 +++-- .../components/actionListGroup.tsx | 5 +- .../components/contractAddressValidation.tsx | 22 ++++---- .../components/inputForm.tsx | 8 +-- .../components/listHeaderContract.tsx | 23 ++++---- .../components/listItemContract.tsx | 6 +- .../components/smartContractListGroup.tsx | 4 +- .../desktopModal/index.tsx | 14 ++--- .../mobileModal/index.tsx | 25 ++++----- src/containers/tokenMenu/index.tsx | 9 +-- src/containers/transactionDetail/index.tsx | 12 ++-- .../transactionModals/publishModal.tsx | 5 +- src/containers/transferMenu/index.tsx | 7 ++- src/containers/treasurySnapshot/index.tsx | 14 ++--- .../updateListItem/updateListItem.tsx | 29 ++++------ .../updateVerificationCard/status.tsx | 20 +++---- src/containers/utcMenu/index.tsx | 5 +- .../votingTerminal/accordionItem.tsx | 7 ++- src/containers/votingTerminal/index.tsx | 12 ++-- .../dAppValidationModal/index.tsx | 6 +- .../walletConnect/selectAppModal/index.tsx | 7 ++- src/containers/walletMenu/LoginRequired.tsx | 7 ++- src/containers/walletMenu/index.tsx | 21 +++---- src/context/stepperModal.tsx | 14 ++--- src/hooks/useMappedBreadcrumbs.tsx | 24 +++----- src/pages/community.tsx | 32 +++++------ src/pages/dashboard.tsx | 10 ++-- src/pages/finance.tsx | 6 +- src/pages/governance.tsx | 13 +++-- src/pages/proposal.tsx | 18 ++---- src/pages/settings.tsx | 27 ++++----- src/pages/tokens.tsx | 6 +- src/pages/transfers.tsx | 9 ++- src/utils/constants/misc.ts | 23 ++++---- yarn.lock | 55 +++++++++++++++++-- 103 files changed, 557 insertions(+), 586 deletions(-) delete mode 100644 .babelrc create mode 100644 babel.config.js diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 36dd79b13..000000000 --- a/.babelrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "presets": [ - ["@babel/preset-env", {"targets": {"node": "current"}}], - "@babel/preset-react", - "@babel/preset-typescript", - "babel-preset-vite" - ] -} diff --git a/babel.config.js b/babel.config.js new file mode 100644 index 000000000..feaae2659 --- /dev/null +++ b/babel.config.js @@ -0,0 +1,8 @@ +module.exports = { + presets: [ + ['@babel/preset-env', {targets: {node: 'current'}}], + '@babel/preset-react', + '@babel/preset-typescript', + 'babel-preset-vite', + ], +}; diff --git a/jest.config.js b/jest.config.js index 2e95b87a2..9ee87d18f 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,6 +1,6 @@ module.exports = { transform: { - '^.+\\.tsx?$': 'babel-jest', + '^.+\\.m?[tj]sx?$': 'babel-jest', '^.+\\.svg$': '/svgTransform.ts', }, testEnvironment: 'jsdom', @@ -13,4 +13,5 @@ module.exports = { // using this to include utils folder so jest is aware of where the test-utils file resides moduleDirectories: ['node_modules', 'utils', __dirname], setupFiles: ['dotenv/config'], + transformIgnorePatterns: ['node_modules/(?!(.*\\.mjs$|react-merge-refs))'], }; diff --git a/package.json b/package.json index 863504cf2..0811d0844 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@apollo/client": "^3.5.8", - "@aragon/ods": "^1.0.8", + "@aragon/ods": "^1.0.9", "@aragon/sdk-client": "^1.22.1", "@aragon/sdk-client-common": "^1.14.1", "@elastic/apm-rum-react": "^2.0.0", diff --git a/src/components/accordionMethod/index.tsx b/src/components/accordionMethod/index.tsx index 636228092..f01ed1226 100644 --- a/src/components/accordionMethod/index.tsx +++ b/src/components/accordionMethod/index.tsx @@ -3,13 +3,10 @@ import * as Accordion from '@radix-ui/react-accordion'; import { AlertInline, ButtonIcon, - IconChevronDown, - IconMenuVertical, - IconSuccess, - IconWarning, Dropdown, ListItemProps, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import styled from 'styled-components'; import {shortenAddress} from 'utils/library'; @@ -91,7 +88,11 @@ export const AccordionItem: React.FC = ({ {shortenAddress(smartContractAddress)}

)} - {verified ? : } + {verified ? ( + + ) : ( + + )}

= ({ } + icon={} /> } /> @@ -124,7 +125,7 @@ export const AccordionItem: React.FC = ({ } + icon={} /> diff --git a/src/components/addCommittee/addCommitteeWallet.tsx b/src/components/addCommittee/addCommitteeWallet.tsx index 356376710..65efbb298 100644 --- a/src/components/addCommittee/addCommitteeWallet.tsx +++ b/src/components/addCommittee/addCommitteeWallet.tsx @@ -1,11 +1,11 @@ import { ButtonIcon, Dropdown, - IconMenuVertical, Label, ListItemAction, InputValue as WalletInputValue, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import React, {useCallback} from 'react'; import {Controller, useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; @@ -121,7 +121,7 @@ const AddCommitteeWalletRow: React.FC = ({index, onDelete}) => { mode="ghost" size="large" bgWhite - icon={} + icon={} data-testid="trigger" /> } diff --git a/src/components/addCommittee/index.tsx b/src/components/addCommittee/index.tsx index 5fff725ae..80c86f58d 100644 --- a/src/components/addCommittee/index.tsx +++ b/src/components/addCommittee/index.tsx @@ -3,7 +3,6 @@ import { ButtonIcon, ButtonText, Dropdown, - IconMenuVertical, ListItemAction, } from '@aragon/ods-old'; import React, {useEffect, useRef} from 'react'; @@ -19,6 +18,7 @@ import Row from './addCommitteeWallet'; import {useNetwork} from '../../context/network'; import {Address, useEnsName} from 'wagmi'; import {CHAIN_METADATA} from '../../utils/constants'; +import {Icon, IconType} from '@aragon/ods'; const AddCommittee: React.FC = () => { const {t} = useTranslation(); @@ -98,7 +98,7 @@ const AddCommittee: React.FC = () => { mode="ghost" size="large" bgWhite - icon={} + icon={} data-testid="trigger" /> } diff --git a/src/components/addLinks/index.tsx b/src/components/addLinks/index.tsx index 07402a417..037ebf6b9 100644 --- a/src/components/addLinks/index.tsx +++ b/src/components/addLinks/index.tsx @@ -1,4 +1,4 @@ -import {ButtonText, IconAdd} from '@aragon/ods-old'; +import {ButtonText} from '@aragon/ods-old'; import {useAlertContext} from 'context/alert'; import React from 'react'; import {useFieldArray, useFormContext, useWatch} from 'react-hook-form'; @@ -7,6 +7,7 @@ import styled from 'styled-components'; import Header from './header'; import Row from './row'; +import {Icon, IconType} from '@aragon/ods'; export type AddLinks = { /** Name of the fieldArray that is the target of the link inputs. Defaults to @@ -66,7 +67,7 @@ const AddLinks: React.FC = ({ mode={bgWhite ? 'ghost' : 'secondary'} size="large" onClick={handleAddLink} - {...(buttonPlusIcon ? {iconLeft: } : {})} + {...(buttonPlusIcon ? {iconLeft: } : {})} /> ); diff --git a/src/components/addLinks/row.tsx b/src/components/addLinks/row.tsx index bbdab7714..fd5117187 100644 --- a/src/components/addLinks/row.tsx +++ b/src/components/addLinks/row.tsx @@ -2,7 +2,6 @@ import { AlertInline, ButtonIcon, Dropdown, - IconMenuVertical, Label, ListItemAction, TextInput, @@ -19,6 +18,7 @@ import { } from 'utils/constants'; import {isOnlyWhitespace} from 'utils/library'; import {BgWhite} from './header'; +import {Icon, IconType} from '@aragon/ods'; type LinkRowProps = { index: number; @@ -183,7 +183,7 @@ const LinkRow: React.FC = ({ mode="ghost" size="large" bgWhite - icon={} + icon={} data-testid="trigger" /> } diff --git a/src/components/addWallets/index.tsx b/src/components/addWallets/index.tsx index cd05831d5..7ae6d1c0f 100644 --- a/src/components/addWallets/index.tsx +++ b/src/components/addWallets/index.tsx @@ -2,9 +2,9 @@ import { ButtonIcon, ButtonText, Dropdown, - IconMenuVertical, ListItemAction, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import React, {useEffect, useRef} from 'react'; import {useFieldArray, useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; @@ -115,7 +115,7 @@ const AddWallets: React.FC = () => { mode="ghost" size="large" bgWhite - icon={} + icon={} data-testid="trigger" /> } diff --git a/src/components/addWallets/row.tsx b/src/components/addWallets/row.tsx index 174e70216..3f6fcc517 100644 --- a/src/components/addWallets/row.tsx +++ b/src/components/addWallets/row.tsx @@ -2,13 +2,13 @@ import { AlertInline, ButtonIcon, Dropdown, - IconMenuVertical, Label, ListItemAction, NumberInput, TextInput, InputValue as WalletInputValue, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import Big from 'big.js'; import {constants} from 'ethers'; import React, {useCallback, useState} from 'react'; @@ -236,7 +236,7 @@ const WalletRow: React.FC = ({index, onDelete}) => { mode="ghost" size="large" bgWhite - icon={} + icon={} data-testid="trigger" /> } diff --git a/src/components/breadcrumbs/index.tsx b/src/components/breadcrumbs/index.tsx index deb7f275b..7833009a4 100644 --- a/src/components/breadcrumbs/index.tsx +++ b/src/components/breadcrumbs/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import styled from 'styled-components'; import {Link} from 'react-router-dom'; import {BreadcrumbData} from 'use-react-router-breadcrumbs'; -import {IconChevronRight} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; type Props = { breadcrumbs: BreadcrumbData[]; @@ -24,7 +24,7 @@ const Breadcrumbs: React.FC = ({breadcrumbs}) => { > {breadcrumb} - {!isLast && } + {!isLast && } ); })} diff --git a/src/components/daoCard/index.tsx b/src/components/daoCard/index.tsx index 541208e7a..9097116c1 100644 --- a/src/components/daoCard/index.tsx +++ b/src/components/daoCard/index.tsx @@ -1,4 +1,5 @@ -import {AvatarDao, IconBlock, IconCommunity} from '@aragon/ods-old'; +import {AvatarDao} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import React from 'react'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -52,11 +53,11 @@ export const DaoCard = (props: IDaoCardProps) => { - + {CHAIN_METADATA[network].name} - + {daoType} @@ -118,11 +119,3 @@ const IconWrapper = styled.div.attrs({ const DaoDataWrapper = styled.div.attrs({ className: 'flex flex-col grow space-y-3 flex-1', })``; - -const StyledIconBlock = styled(IconBlock).attrs({ - className: 'text-neutral-600', -})``; - -const StyledIconCommunity = styled(IconCommunity).attrs({ - className: 'text-neutral-600', -})``; diff --git a/src/components/daoSelector/index.tsx b/src/components/daoSelector/index.tsx index 14faf79d8..e97bbe307 100644 --- a/src/components/daoSelector/index.tsx +++ b/src/components/daoSelector/index.tsx @@ -2,9 +2,9 @@ import { AvatarDao, AvatarDaoProps, ButtonIcon, - IconChevronDown, shortenAddress, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import React from 'react'; import styled from 'styled-components'; @@ -39,7 +39,7 @@ export const DaoSelector: React.FC = ({ } + icon={} mode="secondary" size="small" bgWhite={!isDesktop} diff --git a/src/components/executionWidget/actions/mintTokenCard.tsx b/src/components/executionWidget/actions/mintTokenCard.tsx index 15df52216..c6135d36d 100644 --- a/src/components/executionWidget/actions/mintTokenCard.tsx +++ b/src/components/executionWidget/actions/mintTokenCard.tsx @@ -1,7 +1,8 @@ -import {IconLinkExternal, Link, ListItemAddress} from '@aragon/ods-old'; import React, {useCallback, useEffect, useMemo, useState} from 'react'; +import {Link, ListItemAddress} from '@aragon/ods-old'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; +import {Icon, IconType} from '@aragon/ods'; import {AccordionMethod} from 'components/accordionMethod'; import {useNetwork} from 'context/network'; @@ -170,7 +171,7 @@ export const MintTokenCard: React.FC<{ } + iconRight={} /> diff --git a/src/components/executionWidget/index.tsx b/src/components/executionWidget/index.tsx index 28a05f214..552af6596 100644 --- a/src/components/executionWidget/index.tsx +++ b/src/components/executionWidget/index.tsx @@ -1,11 +1,6 @@ -import { - AlertCard, - AlertInline, - ButtonText, - IconAdd, - IconLinkExternal, -} from '@aragon/ods-old'; import React from 'react'; +import {AlertCard, AlertInline, ButtonText} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -51,7 +46,7 @@ export const ExecutionWidget: React.FC = ({ onAddAction && { label: t('governance.executionCard.addAction'), onClick: onAddAction, - iconLeft: , + iconLeft: , } } /> @@ -135,7 +130,7 @@ const WidgetFooter: React.FC = ({ } + iconRight={} size="large" bgWhite onClick={handleTxViewButtonClick} @@ -154,7 +149,7 @@ const WidgetFooter: React.FC = ({ } + iconRight={} size="large" bgWhite onClick={handleTxViewButtonClick} diff --git a/src/components/fullScreenStepper/fullScreenStepper.tsx b/src/components/fullScreenStepper/fullScreenStepper.tsx index 2c264e799..64baa211c 100644 --- a/src/components/fullScreenStepper/fullScreenStepper.tsx +++ b/src/components/fullScreenStepper/fullScreenStepper.tsx @@ -1,10 +1,3 @@ -import { - Breadcrumb, - ButtonText, - IconChevronLeft, - IconChevronRight, - Wizard, -} from '@aragon/ods-old'; import React, { createContext, useCallback, @@ -13,6 +6,8 @@ import React, { useMemo, useState, } from 'react'; +import {Breadcrumb, ButtonText, Wizard} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import {useNavigate} from 'react-router-dom'; import styled from 'styled-components'; @@ -171,7 +166,7 @@ export const FullScreenStepper: React.FC = ({ onBackButtonClicked ? onBackButtonClicked() : prev() } disabled={currentStep === 1} - iconLeft={} + iconLeft={} /> = ({ onNextButtonClicked ? onNextButtonClicked(next) : next() } disabled={isNextButtonDisabled} - iconRight={} + iconRight={} /> diff --git a/src/components/headerMember/index.tsx b/src/components/headerMember/index.tsx index 9cf3411f8..159099c0c 100644 --- a/src/components/headerMember/index.tsx +++ b/src/components/headerMember/index.tsx @@ -1,15 +1,13 @@ import React, {useMemo, ReactNode} from 'react'; import {styled} from 'styled-components'; import { - IconChevronDown, - IconCopy, Dropdown, ButtonText, AvatarWallet, shortenAddress, shortenDaoUrl, - IconLinkExternal, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; export interface HeaderMemberStat { value: ReactNode; @@ -48,7 +46,7 @@ export const HeaderMember: React.FC = ({ component: ( onCopy?.(address)}> {shortenAddress(address)} - + ), }, @@ -59,7 +57,7 @@ export const HeaderMember: React.FC = ({ onClick={() => onCopy?.(`https://${profileUrl}`)} > {shortenDaoUrl(profileUrl)} - + ), }, @@ -73,7 +71,7 @@ export const HeaderMember: React.FC = ({ onClick={() => window.open(explorerUrl, '_blank')} > {explorerName} - + ), }, @@ -84,7 +82,7 @@ export const HeaderMember: React.FC = ({ component: ( onCopy?.(ens)}> {ens} - + ), }); @@ -107,7 +105,7 @@ export const HeaderMember: React.FC = ({ trigger={ } + iconRight={} mode="secondary" className="border border-neutral-100" /> @@ -183,10 +181,6 @@ const Break = styled.hr.attrs({ className: 'border-neutral-100', })``; -const StyledCopyIcon = styled(IconCopy).attrs({ - className: 'text-neutral-400', -})``; - const StatsContainer = styled.div.attrs<{total: number}>({ className: `relative grid shadow-neutral border-[0.5px] border-neutral-100 rounded-xl overflow-hidden m-auto w-full md:left-10 md:m-0`, })` diff --git a/src/components/membersList/actionItemAddress.tsx b/src/components/membersList/actionItemAddress.tsx index eddb956ba..8b1eef386 100644 --- a/src/components/membersList/actionItemAddress.tsx +++ b/src/components/membersList/actionItemAddress.tsx @@ -7,8 +7,8 @@ import { Avatar, ButtonIcon, Tag, - IconChevronRight, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {DaoMember} from 'utils/paths'; import {generatePath, useNavigate, useParams} from 'react-router-dom'; import {useNetwork} from 'context/network'; @@ -145,7 +145,7 @@ export const ActionItemAddress: React.FC = props => { {!useCompactMode && ( } + icon={} size="medium" bgWhite className="group-hover:text-primary-600" diff --git a/src/components/membersList/actionItemMembership.tsx b/src/components/membersList/actionItemMembership.tsx index 40fbe8f7c..2e5b38eed 100644 --- a/src/components/membersList/actionItemMembership.tsx +++ b/src/components/membersList/actionItemMembership.tsx @@ -1,6 +1,7 @@ import React, {useEffect, useState} from 'react'; import styled from 'styled-components'; -import {shortenAddress, IconChevronRight, AvatarDao} from '@aragon/ods-old'; +import {shortenAddress, AvatarDao} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {resolveIpfsCid} from '@aragon/sdk-client-common'; import {useClient} from 'hooks/useClient'; import {Client, DaoListItem} from '@aragon/sdk-client'; @@ -11,7 +12,6 @@ import {useResolveDaoAvatar} from 'hooks/useResolveDaoAvatar'; import {useQueryClient} from '@tanstack/react-query'; import {aragonSdkQueryKeys} from 'services/aragon-sdk/query-keys'; import {SupportedNetworks} from 'utils/constants'; - /** * Type declarations for `ActionItemAddressProps`. */ @@ -104,7 +104,7 @@ export const ActionItemMembership: React.FC = props => { */} - + ); }; diff --git a/src/components/membershipDAOList/membershipDAOList.tsx b/src/components/membershipDAOList/membershipDAOList.tsx index 4da5259c4..190b2abc0 100644 --- a/src/components/membershipDAOList/membershipDAOList.tsx +++ b/src/components/membershipDAOList/membershipDAOList.tsx @@ -1,5 +1,6 @@ import React, {useState} from 'react'; -import {ButtonText, IconChevronDown} from '@aragon/ods-old'; +import {ButtonText} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import {EmptyMemberSection, MemberSection} from 'pages/daoMember'; import {MemberDAOsType} from 'utils/types'; @@ -61,7 +62,7 @@ export const MembershipDAOList: React.FC = ({ mode="secondary" label={t('members.profile.labelViewMore')} className="border-neutral-100" - iconRight={} + iconRight={} onClick={() => setPage(current => current + 1)} /> )} diff --git a/src/components/modalHeader/index.tsx b/src/components/modalHeader/index.tsx index b6f54069b..2bd34e01a 100644 --- a/src/components/modalHeader/index.tsx +++ b/src/components/modalHeader/index.tsx @@ -1,6 +1,7 @@ -import {ButtonIcon, IconChevronLeft, IconClose} from '@aragon/ods-old'; import React from 'react'; import styled from 'styled-components'; +import {Icon, IconType} from '@aragon/ods'; +import {ButtonIcon} from '@aragon/ods-old'; type Props = { title: string; @@ -33,7 +34,7 @@ const ModalHeader: React.FC = props => { } + icon={} onClick={onBackButtonClicked} bgWhite {...otherProps} @@ -49,7 +50,7 @@ const ModalHeader: React.FC = props => { } + icon={} onClick={onClose} bgWhite className="hidden xl:block" diff --git a/src/components/modalHeader/searchHeader.tsx b/src/components/modalHeader/searchHeader.tsx index c4b1873fc..605668afe 100644 --- a/src/components/modalHeader/searchHeader.tsx +++ b/src/components/modalHeader/searchHeader.tsx @@ -1,12 +1,7 @@ -import { - ButtonIcon, - IconChevronRight, - IconClose, - IconHome, - IconType, -} from '@aragon/ods-old'; import React from 'react'; import styled from 'styled-components'; +import {Icon, IconType} from '@aragon/ods'; +import {ButtonIcon, IconChevronRight} from '@aragon/ods-old'; type SearchHeader = { onClose?: () => void; @@ -22,7 +17,7 @@ const SearchHeader: React.FC = props => { } + icon={props.buttonIcon || } mode="secondary" bgWhite onClick={props.onHomeButtonClick} @@ -31,7 +26,7 @@ const SearchHeader: React.FC = props => { {props.selectedValue && ( <> {props.selectedValue} - + )} @@ -43,7 +38,7 @@ const SearchHeader: React.FC = props => { } + icon={} onClick={props.onClose} bgWhite /> diff --git a/src/components/multisigWallets/index.tsx b/src/components/multisigWallets/index.tsx index a2b3d9068..a3632b48b 100644 --- a/src/components/multisigWallets/index.tsx +++ b/src/components/multisigWallets/index.tsx @@ -3,10 +3,10 @@ import { ButtonIcon, ButtonText, Dropdown, - IconMenuVertical, Label, ListItemAction, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import React, {useEffect, useRef} from 'react'; import {useFieldArray, useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; @@ -162,7 +162,7 @@ export const MultisigWallets = () => { size="large" mode="secondary" bgWhite - icon={} + icon={} data-testid="trigger" /> } diff --git a/src/components/multisigWallets/row.tsx b/src/components/multisigWallets/row.tsx index 9e29efb7d..4571694a8 100644 --- a/src/components/multisigWallets/row.tsx +++ b/src/components/multisigWallets/row.tsx @@ -1,11 +1,11 @@ +import React from 'react'; import { ButtonIcon, Dropdown, - IconMenuVertical, InputValue, ListItemAction, } from '@aragon/ods-old'; -import React from 'react'; +import {Icon, IconType} from '@aragon/ods'; import {Controller, useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -101,7 +101,7 @@ export const Row = ({index, ...props}: MultisigWalletsRowProps) => { bgWhite size="large" mode="secondary" - icon={} + icon={} data-testid="trigger" /> } diff --git a/src/components/navLink/index.tsx b/src/components/navLink/index.tsx index afab0c08a..18e529b57 100644 --- a/src/components/navLink/index.tsx +++ b/src/components/navLink/index.tsx @@ -1,7 +1,8 @@ +import React from 'react'; import {ListItemAction} from '@aragon/ods-old'; +import {Icon} from '@aragon/ods'; import {useNetwork} from 'context/network'; import useScreen from 'hooks/useScreen'; -import React from 'react'; import { generatePath, matchRoutes, @@ -10,6 +11,7 @@ import { useNavigate, } from 'react-router-dom'; import styled from 'styled-components'; + import {NavLinkData} from 'utils/constants'; type NavLinkProps = { @@ -58,7 +60,7 @@ const NavLink = ({caller, data, onItemClick}: NavLinkProps) => { } + iconLeft={} onClick={handleOnClick} mode={matches ? 'selected' : 'default'} /> @@ -73,7 +75,7 @@ const NavLink = ({caller, data, onItemClick}: NavLinkProps) => { return ( } + iconLeft={} onClick={handleOnClick} mode={matches ? 'selected' : 'default'} /> diff --git a/src/components/resourceList/index.tsx b/src/components/resourceList/index.tsx index 07bdeb1b1..a674942c6 100644 --- a/src/components/resourceList/index.tsx +++ b/src/components/resourceList/index.tsx @@ -1,10 +1,11 @@ -import {IconAdd, ListItemLink} from '@aragon/ods-old'; +import {ListItemLink} from '@aragon/ods-old'; import React from 'react'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; import {StateEmpty} from 'components/stateEmpty'; import {ProposalResource} from 'utils/types'; +import {Icon, IconType} from '@aragon/ods'; type ResourceListProps = { links?: Array; @@ -42,7 +43,7 @@ const ResourceList: React.FC = ({ ? { label: t('labels.addResource'), onClick: emptyStateButtonClick, - iconLeft: , + iconLeft: , } : undefined } diff --git a/src/components/stepperProgress/StepLine.tsx b/src/components/stepperProgress/StepLine.tsx index 2a37f5aaf..db907ac4c 100644 --- a/src/components/stepperProgress/StepLine.tsx +++ b/src/components/stepperProgress/StepLine.tsx @@ -1,18 +1,21 @@ -import {StepData, StepStatus} from '../../hooks/useFunctionStepper'; import React from 'react'; -import { - IconRadioCancel, - IconRadioDefault, - IconSuccess, - Spinner, -} from '../../@aragon/ods-old'; import styled from 'styled-components'; +import {Spinner} from '../../@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; +import {StepData, StepStatus} from '../../hooks/useFunctionStepper'; + const icons = { - [StepStatus.WAITING]: , + [StepStatus.WAITING]: ( + + ), [StepStatus.LOADING]: , - [StepStatus.SUCCESS]: , - [StepStatus.ERROR]: , + [StepStatus.SUCCESS]: ( + + ), + [StepStatus.ERROR]: ( + + ), }; const textColor = { diff --git a/src/components/userProposalList/userProposalList.tsx b/src/components/userProposalList/userProposalList.tsx index 41255eea4..3fa7b3c6d 100644 --- a/src/components/userProposalList/userProposalList.tsx +++ b/src/components/userProposalList/userProposalList.tsx @@ -1,6 +1,7 @@ import React, {useState} from 'react'; import {ProposalBase} from '@aragon/sdk-client-common'; -import {ButtonText, IconChevronDown, IconChevronRight} from '@aragon/ods-old'; +import {ButtonText} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {Link, generatePath, useParams} from 'react-router-dom'; import {NewProposal, Proposal} from 'utils/paths'; import {useTranslation} from 'react-i18next'; @@ -94,7 +95,10 @@ export const UserProposalList: React.FC = props => { })}

- + ))} @@ -103,7 +107,7 @@ export const UserProposalList: React.FC = props => { mode="secondary" label={t('members.profile.labelViewMore')} className="border-neutral-100" - iconRight={} + iconRight={} onClick={() => setPage(current => current + 1)} /> )} diff --git a/src/components/wrappers/sectionWrappers.tsx b/src/components/wrappers/sectionWrappers.tsx index 5bb468ef6..4e53cbb80 100644 --- a/src/components/wrappers/sectionWrappers.tsx +++ b/src/components/wrappers/sectionWrappers.tsx @@ -2,7 +2,8 @@ import React from 'react'; import styled from 'styled-components'; import {generatePath, Link, useParams} from 'react-router-dom'; import {useTranslation} from 'react-i18next'; -import {ButtonText, IconChevronDown, IconChevronRight} from '@aragon/ods-old'; +import {ButtonText} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useNetwork} from 'context/network'; import {AllTokens, AllTransfers} from 'utils/paths'; @@ -43,7 +44,7 @@ export const TokenSectionWrapper = ({title, children}: SectionWrapperProps) => { } + iconRight={} /> @@ -71,7 +72,7 @@ export const DaoListSectionWrapper = ({ } + iconRight={} /> @@ -105,7 +106,7 @@ export const TransferSectionWrapper = ({ } + iconRight={} /> diff --git a/src/containers/actionBuilder/addAddresses/accordionSummary.tsx b/src/containers/actionBuilder/addAddresses/accordionSummary.tsx index a90358898..92724b60f 100644 --- a/src/containers/actionBuilder/addAddresses/accordionSummary.tsx +++ b/src/containers/actionBuilder/addAddresses/accordionSummary.tsx @@ -1,5 +1,6 @@ -import {IconLinkExternal, Link} from '@aragon/ods-old'; import React, {useMemo} from 'react'; +import {Link} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import {generatePath, useParams} from 'react-router-dom'; import styled from 'styled-components'; @@ -64,7 +65,7 @@ const AccordionSummary: React.FC = ({ } + iconRight={} /> )} diff --git a/src/containers/actionBuilder/addAddresses/addressRow.tsx b/src/containers/actionBuilder/addAddresses/addressRow.tsx index bf79d21b0..f81c61a80 100644 --- a/src/containers/actionBuilder/addAddresses/addressRow.tsx +++ b/src/containers/actionBuilder/addAddresses/addressRow.tsx @@ -1,9 +1,9 @@ import { ButtonIcon, Dropdown, - IconMenuVertical, InputValue as WalletInputValue, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import React, {useCallback} from 'react'; import {Controller, useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; @@ -134,7 +134,7 @@ export const AddressRow = ({ } + icon={} data-testid="trigger" bgWhite /> diff --git a/src/containers/actionBuilder/addAddresses/index.tsx b/src/containers/actionBuilder/addAddresses/index.tsx index 66aba7b88..672c16083 100644 --- a/src/containers/actionBuilder/addAddresses/index.tsx +++ b/src/containers/actionBuilder/addAddresses/index.tsx @@ -2,10 +2,10 @@ import { ButtonIcon, ButtonText, Dropdown, - IconMenuVertical, Label, ListItemAction, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import React, {useCallback, useEffect} from 'react'; import {useFieldArray, useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; @@ -234,7 +234,7 @@ const AddAddresses: React.FC = ({ } + icon={} data-testid="trigger" bgWhite /> diff --git a/src/containers/actionBuilder/mintTokens/addressTokenRow.tsx b/src/containers/actionBuilder/mintTokens/addressTokenRow.tsx index 01d824eb8..c6d501e1f 100644 --- a/src/containers/actionBuilder/mintTokens/addressTokenRow.tsx +++ b/src/containers/actionBuilder/mintTokens/addressTokenRow.tsx @@ -2,13 +2,13 @@ import { AlertInline, ButtonIcon, Dropdown, - IconMenuVertical, InputValue, Label, ListItemAction, NumberInput, TextInput, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import Big from 'big.js'; import React, {useCallback, useEffect} from 'react'; import {Controller, useFormContext, useWatch} from 'react-hook-form'; @@ -216,7 +216,7 @@ const DropdownMenu: React.FC = ({ } + icon={} bgWhite /> } diff --git a/src/containers/actionBuilder/removeAddresses/index.tsx b/src/containers/actionBuilder/removeAddresses/index.tsx index 1d4befd42..42ff9b540 100644 --- a/src/containers/actionBuilder/removeAddresses/index.tsx +++ b/src/containers/actionBuilder/removeAddresses/index.tsx @@ -2,10 +2,10 @@ import { ButtonIcon, ButtonText, Dropdown, - IconMenuVertical, Label, ListItemAction, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import React, {useEffect} from 'react'; import {useFieldArray, useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; @@ -209,7 +209,7 @@ const RemoveAddresses: React.FC = ({ } + icon={} data-testid="trigger" bgWhite /> diff --git a/src/containers/addActionMenu/index.tsx b/src/containers/addActionMenu/index.tsx index df9982376..e42faf28c 100644 --- a/src/containers/addActionMenu/index.tsx +++ b/src/containers/addActionMenu/index.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; import {useTranslation} from 'react-i18next'; -import {ListItemAction, IconChevronRight} from '@aragon/ods-old'; +import {ListItemAction} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useGlobalModalContext} from 'context/globalModals'; import {useActionsContext} from 'context/actions'; @@ -37,7 +38,7 @@ const AddActionMenu: React.FC = ({actions}) => { ? 'disabled' : 'default' } - iconRight={} + iconRight={} onClick={() => { trackEvent('newProposal_action_selected', { dao_address: daoAddressOrEns, diff --git a/src/containers/configureActions/index.tsx b/src/containers/configureActions/index.tsx index ec6d3296d..b6d804300 100644 --- a/src/containers/configureActions/index.tsx +++ b/src/containers/configureActions/index.tsx @@ -1,8 +1,9 @@ -import {AlertInline, ButtonText, IconAdd, Label} from '@aragon/ods-old'; import React, {useEffect, useMemo} from 'react'; import {useTranslation} from 'react-i18next'; import {useParams} from 'react-router-dom'; import styled from 'styled-components'; +import {AlertInline, ButtonText, Label} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {StateEmpty} from 'components/stateEmpty'; import ActionBuilder from 'containers/actionBuilder'; @@ -92,7 +93,7 @@ const ConfigureActions: React.FC = ({ size="large" bgWhite label={addExtraActionLabel} - iconLeft={} + iconLeft={} onClick={handleExtraActionClick} className="mt-4 w-full md:w-max" /> @@ -110,7 +111,7 @@ const ConfigureActions: React.FC = ({ secondaryButton={{ label: addNewActionLabel, onClick: handleAddNewActionClick, - iconLeft: , + iconLeft: , }} /> {!hideAlert && ( diff --git a/src/containers/daoExplorer/daoExplorer.tsx b/src/containers/daoExplorer/daoExplorer.tsx index e8ec5eda1..f43b60dfb 100644 --- a/src/containers/daoExplorer/daoExplorer.tsx +++ b/src/containers/daoExplorer/daoExplorer.tsx @@ -1,15 +1,6 @@ -import { - ButtonIcon, - ButtonText, - Dropdown, - IconCheckmark, - IconChevronDown, - IconFilter, - IconReload, - IconSort, - Spinner, -} from '@aragon/ods-old'; import React, {useMemo, useReducer, useState} from 'react'; +import {ButtonText, Spinner, Dropdown, ButtonIcon} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; import {Address} from 'viem'; @@ -176,7 +167,7 @@ export const DaoExplorer = () => { isActive={filtersCount !== ''} mode="secondary" size="large" - iconLeft={} + iconLeft={} onClick={() => { setShowAdvancedFilters(true); }} @@ -191,7 +182,7 @@ export const DaoExplorer = () => { isActive={activeDropdown} mode="secondary" size="large" - icon={} + icon={} /> } onOpenChange={e => { @@ -204,7 +195,9 @@ export const DaoExplorer = () => { isActive={filters.order === 'tvl'} > {t('explore.sortBy.largestTreasury')} - {filters.order === 'tvl' && } + {filters.order === 'tvl' && ( + + )} ), callback: () => toggleOrderby('tvl'), @@ -215,7 +208,9 @@ export const DaoExplorer = () => { isActive={filters.order === 'proposals'} > {t('explore.sortBy.mostProposals')} - {filters.order === 'proposals' && } + {filters.order === 'proposals' && ( + + )} ), callback: () => toggleOrderby('proposals'), @@ -226,7 +221,9 @@ export const DaoExplorer = () => { isActive={filters.order === 'members'} > {t('explore.sortBy.largestCommunity')} - {filters.order === 'members' && } + {filters.order === 'members' && ( + + )} ), callback: () => toggleOrderby('members'), @@ -237,7 +234,9 @@ export const DaoExplorer = () => { isActive={filters.order === 'createdAt'} > {t('explore.sortBy.recentlyCreated')} - {filters.order === 'createdAt' && } + {filters.order === 'createdAt' && ( + + )} ), callback: () => toggleOrderby('createdAt'), @@ -257,15 +256,15 @@ export const DaoExplorer = () => { contentWrapperClassName="lg:w-[560px]" secondaryButton={{ label: t('explore.emptyStateSearch.ctaLabel'), - iconLeft: , + iconLeft: , onClick: handleClearFilters, className: 'w-full', }} /> ) : ( - {filteredDaoList?.map(dao => ( - + {filteredDaoList?.map((dao, index) => ( + ))} {isLoading && } @@ -278,7 +277,11 @@ export const DaoExplorer = () => { label={t('explore.explorer.showMore')} className="self-start" iconRight={ - isFetchingNextPage ? : + isFetchingNextPage ? ( + + ) : ( + + ) } bgWhite={true} mode="ghost" diff --git a/src/containers/daoFilterModal/index.tsx b/src/containers/daoFilterModal/index.tsx index 895da7ad3..daa2cd82a 100644 --- a/src/containers/daoFilterModal/index.tsx +++ b/src/containers/daoFilterModal/index.tsx @@ -1,12 +1,7 @@ -import {Button, Icon, IconType, Switch, Toggle, ToggleGroup} from '@aragon/ods'; -import { - ButtonIcon, - ButtonText, - IconClose, - IconReload, - Modal, -} from '@aragon/ods-old'; import React from 'react'; +import {ButtonIcon, ButtonText, Modal} from '@aragon/ods-old'; +import {Button, Icon, IconType, Switch, Toggle, ToggleGroup} from '@aragon/ods'; + import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -84,7 +79,7 @@ const Header: React.FC = ({onClose}) => { {t('explore.modal.filterDAOs.title')}

} + icon={} className="lg:hidden" mode="secondary" size="small" @@ -92,7 +87,7 @@ const Header: React.FC = ({onClose}) => { onClick={onClose} /> } + icon={} className="hidden lg:block" mode="secondary" size="large" @@ -204,12 +199,12 @@ const ModalContent: React.FC = ({ {displayedChains.flatMap(f => ( ))} - + {/* Governance Filters */} @@ -291,7 +286,7 @@ const ModalFooter: React.FC = props => { label={t('explore.modal.filterDAOs.buttonLabel.clearFilters')} bgWhite onClick={handleClearFilters} - iconLeft={} + iconLeft={} className="w-full lg:w-auto" /> diff --git a/src/containers/delegateVotingMenu/delegateVotingForm.tsx b/src/containers/delegateVotingMenu/delegateVotingForm.tsx index 7a6901b9f..05870403d 100644 --- a/src/containers/delegateVotingMenu/delegateVotingForm.tsx +++ b/src/containers/delegateVotingMenu/delegateVotingForm.tsx @@ -1,7 +1,5 @@ import React, {useEffect, useState} from 'react'; import styled from 'styled-components'; -import {useWallet} from 'hooks/useWallet'; -import {useDaoDetailsQuery} from 'hooks/useDaoDetails'; import {useTranslation} from 'react-i18next'; import { AlertCard, @@ -10,9 +8,12 @@ import { ButtonText, Spinner, AlertInline, - IconReload, InputValue, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; + +import {useWallet} from 'hooks/useWallet'; +import {useDaoDetailsQuery} from 'hooks/useDaoDetails'; import {useDaoToken} from 'hooks/useDaoToken'; import {WrappedWalletInput} from 'components/wrappedWalletInput'; import {useDelegatee} from 'services/aragon-sdk/queries/use-delegatee'; @@ -113,7 +114,7 @@ export const DelegateVotingForm: React.FC = props => { const ctaIcon = isLoading ? ( ) : isError ? ( - + ) : undefined; const alertLabel = isReclaimMode diff --git a/src/containers/delegateVotingMenu/delegateVotingSuccess.tsx b/src/containers/delegateVotingMenu/delegateVotingSuccess.tsx index 098ed8e63..e8050e4d8 100644 --- a/src/containers/delegateVotingMenu/delegateVotingSuccess.tsx +++ b/src/containers/delegateVotingMenu/delegateVotingSuccess.tsx @@ -1,10 +1,11 @@ import { ButtonText, - IconLinkExternal, IllustrationHuman, InputValue, shortenAddress, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; + import {useNetwork} from 'context/network'; import {useDaoDetailsQuery} from 'hooks/useDaoDetails'; import {useDaoToken} from 'hooks/useDaoToken'; @@ -100,7 +101,7 @@ export const DelegateVotingSuccess: React.FC< label={t('modal.delegation.successBtnSecondaryLabel')} mode="secondary" size="large" - iconRight={} + iconRight={} onClick={handleTransactionClick} /> diff --git a/src/containers/delegationGatingMenu/delegationGatingMenu.tsx b/src/containers/delegationGatingMenu/delegationGatingMenu.tsx index 5fca2cc4e..5e97c0867 100644 --- a/src/containers/delegationGatingMenu/delegationGatingMenu.tsx +++ b/src/containers/delegationGatingMenu/delegationGatingMenu.tsx @@ -1,10 +1,11 @@ -import ModalBottomSheetSwitcher from 'components/modalBottomSheetSwitcher'; -import {useGlobalModalContext} from 'context/globalModals'; -import styled from 'styled-components'; import React from 'react'; +import styled from 'styled-components'; + import {formatUnits} from 'ethers/lib/utils'; import {useTranslation} from 'react-i18next'; -import {ButtonText, IlluObject, Link, IconLinkExternal} from '@aragon/ods-old'; +import {ButtonText, IlluObject, Link} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; + import {useDaoDetailsQuery} from 'hooks/useDaoDetails'; import {useDaoToken} from 'hooks/useDaoToken'; import {Address, useBalance} from 'wagmi'; @@ -14,6 +15,8 @@ import {abbreviateTokenAmount} from 'utils/tokens'; import {useWallet} from 'hooks/useWallet'; import {TokenVotingProposal} from '@aragon/sdk-client'; import {useMember} from 'services/aragon-sdk/queries/use-member'; +import ModalBottomSheetSwitcher from 'components/modalBottomSheetSwitcher'; +import {useGlobalModalContext} from 'context/globalModals'; export interface IDelegationGatingMenuState { proposal?: TokenVotingProposal; @@ -143,7 +146,7 @@ export const DelegationGatingMenu: React.FC = () => { href={t('modal.delegation.NoVotingPower.LinkURL')} target="_blank" className="my-3 self-center" - iconRight={} + iconRight={} /> diff --git a/src/containers/editSettings/majorityVoting.tsx b/src/containers/editSettings/majorityVoting.tsx index 38584f185..907bd892c 100644 --- a/src/containers/editSettings/majorityVoting.tsx +++ b/src/containers/editSettings/majorityVoting.tsx @@ -1,12 +1,8 @@ -import { - AlertInline, - ButtonText, - IconGovernance, - ListItemAction, -} from '@aragon/ods-old'; +import React, {useCallback, useEffect, useMemo} from 'react'; import {DaoDetails, VotingMode, VotingSettings} from '@aragon/sdk-client'; import {BigNumber} from 'ethers/lib/ethers'; -import React, {useCallback, useEffect, useMemo} from 'react'; +import {AlertInline, ButtonText, ListItemAction} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import { useFieldArray, useFormContext, @@ -550,7 +546,7 @@ export const EditMvSettings: React.FC = ({daoDetails}) => { } + iconLeft={} size="large" disabled={settingsUnchanged || !isValid} onClick={() => diff --git a/src/containers/editSettings/multisig.tsx b/src/containers/editSettings/multisig.tsx index 8b4c03fd2..a0454af00 100644 --- a/src/containers/editSettings/multisig.tsx +++ b/src/containers/editSettings/multisig.tsx @@ -1,11 +1,7 @@ -import { - AlertInline, - ButtonText, - IconGovernance, - ListItemAction, -} from '@aragon/ods-old'; -import {DaoDetails, MultisigVotingSettings} from '@aragon/sdk-client'; import React, {useCallback, useEffect, useMemo} from 'react'; +import {DaoDetails, MultisigVotingSettings} from '@aragon/sdk-client'; +import {AlertInline, ButtonText, ListItemAction} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import { useFieldArray, useFormContext, @@ -347,7 +343,7 @@ export const EditMsSettings: React.FC = ({daoDetails}) => { } + iconLeft={} size="large" disabled={settingsUnchanged || !isValid} onClick={() => diff --git a/src/containers/exploreFooter/index.tsx b/src/containers/exploreFooter/index.tsx index e85ded679..486180f11 100644 --- a/src/containers/exploreFooter/index.tsx +++ b/src/containers/exploreFooter/index.tsx @@ -1,6 +1,6 @@ -import {IconInfo} from '@aragon/ods-old'; import React from 'react'; import styled from 'styled-components'; +import {Icon, IconType} from '@aragon/ods'; import {GridLayout} from 'components/layout'; import {StyledLink} from 'components/styledLink'; @@ -61,7 +61,7 @@ const Footer: React.FC = () => {
- + Aragon App Public Beta
diff --git a/src/containers/exportCsvModal/ExportCsvModal.tsx b/src/containers/exportCsvModal/ExportCsvModal.tsx index 28e99327b..21b769b8c 100644 --- a/src/containers/exportCsvModal/ExportCsvModal.tsx +++ b/src/containers/exportCsvModal/ExportCsvModal.tsx @@ -1,25 +1,26 @@ import React, {useCallback, useMemo, useState} from 'react'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; -import {useGlobalModalContext} from 'context/globalModals'; import {useForm, useWatch, Controller} from 'react-hook-form'; import {saveAs} from 'file-saver'; -import ModalBottomSheetSwitcher from 'components/modalBottomSheetSwitcher'; import { AlertInline, ButtonText, DateInput, - IconReload, Label, Spinner, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; +import {DaoDetails} from '@aragon/sdk-client'; + import {getCanonicalDate} from 'utils/date'; import {StateEmpty} from 'components/stateEmpty'; import {Transfer, Deposit, Withdraw} from 'utils/types'; import {TransferTypes} from 'utils/constants'; -import {DaoDetails} from '@aragon/sdk-client'; import {toDisplayEns} from 'utils/library'; +import {useGlobalModalContext} from 'context/globalModals'; +import ModalBottomSheetSwitcher from 'components/modalBottomSheetSwitcher'; interface ExportCsvModalProps { transfers: Transfer[]; @@ -271,7 +272,7 @@ const ExportCsvModal: React.FC = ({ isCsvGenerationLoading ? ( ) : ( - + ) } size="large" diff --git a/src/containers/footer/index.tsx b/src/containers/footer/index.tsx index af5381c9b..622b2a46a 100644 --- a/src/containers/footer/index.tsx +++ b/src/containers/footer/index.tsx @@ -1,6 +1,7 @@ -import {IconInfo, Link} from '@aragon/ods-old'; import React from 'react'; import styled from 'styled-components'; +import {Link} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {GridLayout} from 'components/layout'; import useScreen from 'hooks/useScreen'; @@ -60,7 +61,7 @@ const Footer: React.FC = () => { isOnWrongNetwork ? 'mb-[88px] md:mb-[120px]' : 'mb-16 md:mb-24' }`} > - + Aragon App Public Beta diff --git a/src/containers/goLive/community.tsx b/src/containers/goLive/community.tsx index e64eb87b9..0a019b1f8 100644 --- a/src/containers/goLive/community.tsx +++ b/src/containers/goLive/community.tsx @@ -1,8 +1,10 @@ -import {IconLinkExternal, Link, Tag} from '@aragon/ods-old'; import React, {useMemo} from 'react'; import {Controller, useFormContext} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; +import {Link, Tag} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; + import {Dd, DescriptionListContainer, Dl, Dt} from 'components/descriptionList'; import {useFormStep} from 'components/fullScreenStepper'; import CommunityAddressesModal from 'containers/communityAddressesModal'; @@ -207,7 +209,7 @@ const Community: React.FC = () => { '/token/tokenholderchart/' + tokenAddress?.address || tokenAddress } - iconRight={} + iconRight={} external /> )} diff --git a/src/containers/goLive/index.tsx b/src/containers/goLive/index.tsx index a647c1f0a..bf5f7f83f 100644 --- a/src/containers/goLive/index.tsx +++ b/src/containers/goLive/index.tsx @@ -5,12 +5,8 @@ import {useFormContext} from 'react-hook-form'; // import {DAOFactory} from 'typechain'; // TODO reintroduce this by adding back the postInstall script in packages.json // that executes the generate-abis-and-types command. -import { - AlertCard, - Breadcrumb, - ButtonText, - IconChevronRight, -} from '@aragon/ods-old'; +import {AlertCard, Breadcrumb, ButtonText} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useNavigate} from 'react-router-dom'; import Blockchain from './blockchain'; @@ -116,7 +112,7 @@ export const GoLiveFooter: React.FC = () => {
} + iconRight={} label={t('createDAO.review.title')} onClick={publishDao} disabled={IsButtonDisabled()} diff --git a/src/containers/govTokensWrappingModal/GovTokensWrappingModal.tsx b/src/containers/govTokensWrappingModal/GovTokensWrappingModal.tsx index df99ebce6..4e806fd14 100644 --- a/src/containers/govTokensWrappingModal/GovTokensWrappingModal.tsx +++ b/src/containers/govTokensWrappingModal/GovTokensWrappingModal.tsx @@ -1,14 +1,15 @@ +import React, {useCallback, useMemo, FC} from 'react'; + import { AlertInline, ButtonText, CheckboxListItem, - IconReload, Label, LinearProgress, Spinner, ValueInput, } from '@aragon/ods-old'; -import React, {useCallback, useMemo, FC} from 'react'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -368,7 +369,7 @@ const GovTokensWrappingModal: FC = ({ isTokenApproveLoading ? ( ) : isTokenApproveError ? ( - + ) : undefined } size="large" @@ -388,7 +389,7 @@ const GovTokensWrappingModal: FC = ({ isTokenWrapLoading ? ( ) : isTokenWrapError ? ( - + ) : undefined } size="large" @@ -411,7 +412,7 @@ const GovTokensWrappingModal: FC = ({ isTokenUnwrapLoading ? ( ) : isTokenUnwrapError ? ( - + ) : undefined } size="large" diff --git a/src/containers/membershipSnapshot/index.tsx b/src/containers/membershipSnapshot/index.tsx index 0b7e59c5a..6b2929437 100644 --- a/src/containers/membershipSnapshot/index.tsx +++ b/src/containers/membershipSnapshot/index.tsx @@ -1,10 +1,6 @@ -import { - ButtonText, - IconChevronRight, - IconCommunity, - ListItemHeader, -} from '@aragon/ods-old'; import React from 'react'; +import {ButtonText, ListItemHeader} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate} from 'react-router-dom'; import styled from 'styled-components'; @@ -82,7 +78,7 @@ export const MembershipSnapshot: React.FC = ({
} + icon={} value={`${totalMemberCount} ${t('labels.members')}`} label={ walletBased @@ -109,7 +105,7 @@ export const MembershipSnapshot: React.FC = ({ } + iconRight={} label={t('labels.seeAll')} onClick={() => navigate(generatePath(Community, {network, dao: daoAddressOrEns})) @@ -123,7 +119,7 @@ export const MembershipSnapshot: React.FC = ({ return ( } + icon={} value={`${totalMemberCount} ${t('labels.members')}`} label={ walletBased @@ -150,7 +146,7 @@ export const MembershipSnapshot: React.FC = ({ } + iconRight={} label={t('labels.seeAll')} onClick={() => navigate(generatePath(Community, {network, dao: daoAddressOrEns})) diff --git a/src/containers/mintTokensToTreasuryMenu/index.tsx b/src/containers/mintTokensToTreasuryMenu/index.tsx index 451558a8a..c5f511055 100644 --- a/src/containers/mintTokensToTreasuryMenu/index.tsx +++ b/src/containers/mintTokensToTreasuryMenu/index.tsx @@ -1,11 +1,6 @@ -import { - AlertCard, - ButtonIcon, - ButtonText, - IconChevronLeft, - InputValue, -} from '@aragon/ods-old'; import React, {useCallback, useMemo, useState} from 'react'; +import {AlertCard, ButtonIcon, ButtonText, InputValue} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {Controller, useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -103,7 +98,7 @@ const MintTokensToTreasuryMenu: React.FC = ({ } + icon={} onClick={() => { setStep(0); resetField('mintTokensToTreasury'); diff --git a/src/containers/navbar/breadcrumbDropdown.tsx b/src/containers/navbar/breadcrumbDropdown.tsx index d2a249687..7d5028b81 100644 --- a/src/containers/navbar/breadcrumbDropdown.tsx +++ b/src/containers/navbar/breadcrumbDropdown.tsx @@ -1,6 +1,7 @@ -import {ButtonIcon, Dropdown, IconClose, IconMenu} from '@aragon/ods-old'; import React, {useState} from 'react'; import styled from 'styled-components'; +import {ButtonIcon, Dropdown} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import NavLink from 'components/navLink'; import {NAV_LINKS_DATA} from 'utils/constants'; @@ -17,7 +18,13 @@ export const NavlinksDropdown: React.FC = () => { : } + icon={ + showCrumbMenu ? ( + + ) : ( + + ) + } isActive={showCrumbMenu} /> } diff --git a/src/containers/navbar/daoSelectMenu.tsx b/src/containers/navbar/daoSelectMenu.tsx index 3b4266376..8f76b02e5 100644 --- a/src/containers/navbar/daoSelectMenu.tsx +++ b/src/containers/navbar/daoSelectMenu.tsx @@ -1,11 +1,6 @@ -import { - ButtonIcon, - ButtonText, - IconChevronLeft, - IconLinkExternal, - ListItemDao, -} from '@aragon/ods-old'; import React, {useCallback} from 'react'; +import {ButtonIcon, ButtonText, ListItemDao} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate} from 'react-router-dom'; import styled from 'styled-components'; @@ -59,7 +54,7 @@ const DaoSelectMenu: React.FC = () => { mode="secondary" size="small" bgWhite - icon={} + icon={} onClick={handleBackButtonClick} /> {t('daoSwitcher.title')} @@ -97,7 +92,7 @@ const DaoSelectMenu: React.FC = () => { mode="secondary" size="large" label={t('daoSwitcher.subtitle')} - iconLeft={} + iconLeft={} className="w-full" onClick={() => { navigate('/'); diff --git a/src/containers/navbar/desktop.tsx b/src/containers/navbar/desktop.tsx index ee9bcb056..d7b2cdf6c 100644 --- a/src/containers/navbar/desktop.tsx +++ b/src/containers/navbar/desktop.tsx @@ -1,12 +1,8 @@ -import {useReactiveVar} from '@apollo/client'; -import { - Breadcrumb, - ButtonText, - ButtonWallet, - IconFeedback, -} from '@aragon/ods-old'; import React, {useCallback, useState} from 'react'; +import {Breadcrumb, ButtonText, ButtonWallet} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; +import {useReactiveVar} from '@apollo/client'; import {generatePath, useNavigate, useParams} from 'react-router-dom'; import styled from 'styled-components'; @@ -125,7 +121,7 @@ const DesktopNav: React.FC = props => { size="large" label={t('navButtons.giveFeedback')} mode="secondary" - iconRight={} + iconRight={} onClick={props.onFeedbackClick} /> diff --git a/src/containers/navbar/exploreNav.tsx b/src/containers/navbar/exploreNav.tsx index 9fbc7b9b0..9ad6ec9e6 100644 --- a/src/containers/navbar/exploreNav.tsx +++ b/src/containers/navbar/exploreNav.tsx @@ -1,12 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { - ButtonIcon, - ButtonText, - ButtonWallet, - IconFeedback, - useScreen, -} from '@aragon/ods-old'; +import {ButtonIcon, ButtonText, ButtonWallet, useScreen} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import {useWallet} from 'hooks/useWallet'; @@ -57,14 +52,14 @@ const ExploreNav: React.FC = () => { size="large" label={t('navButtons.giveFeedback')} mode="secondary" - iconRight={} + iconRight={} onClick={handleFeedbackButtonClick} /> ) : ( } + icon={} onClick={handleFeedbackButtonClick} /> )} diff --git a/src/containers/navbar/mobile.tsx b/src/containers/navbar/mobile.tsx index fbc86c04c..fbaf29417 100644 --- a/src/containers/navbar/mobile.tsx +++ b/src/containers/navbar/mobile.tsx @@ -1,14 +1,9 @@ -import {useReactiveVar} from '@apollo/client'; -import { - AvatarDao, - ButtonIcon, - ButtonText, - ButtonWallet, - IconMenu, -} from '@aragon/ods-old'; import React from 'react'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; +import {useReactiveVar} from '@apollo/client'; +import {AvatarDao, ButtonIcon, ButtonText, ButtonWallet} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {selectedDaoVar} from 'context/apolloClient'; import {useGlobalModalContext} from 'context/globalModals'; @@ -38,7 +33,7 @@ const MobileNav: React.FC = props => { } + icon={} onClick={() => open('mobileMenu')} /> ) : ( @@ -46,7 +41,7 @@ const MobileNav: React.FC = props => { size="large" mode="secondary" label={t('menu')} - iconLeft={} + iconLeft={} onClick={() => open('mobileMenu')} /> )} diff --git a/src/containers/navbar/mobileMenu.tsx b/src/containers/navbar/mobileMenu.tsx index aad8bae03..6016907ed 100644 --- a/src/containers/navbar/mobileMenu.tsx +++ b/src/containers/navbar/mobileMenu.tsx @@ -2,6 +2,8 @@ import {useReactiveVar} from '@apollo/client'; import React from 'react'; import styled from 'styled-components'; import {useTranslation} from 'react-i18next'; +import {ButtonText} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import BottomSheet from 'components/bottomSheet'; import {DaoSelector} from 'components/daoSelector'; @@ -9,7 +11,6 @@ import NavLinks from 'components/navLinks'; import {selectedDaoVar} from 'context/apolloClient'; import {useGlobalModalContext} from 'context/globalModals'; import {usePrivacyContext} from 'context/privacyContext'; -import {ButtonText, IconFeedback} from '@aragon/ods-old'; import {toDisplayEns} from 'utils/library'; type MobileNavMenuProps = { @@ -47,7 +48,7 @@ const MobileNavMenu = (props: MobileNavMenuProps) => { size="large" label={t('navButtons.giveFeedback')} mode="secondary" - iconRight={} + iconRight={} onClick={props.onFeedbackClick} />
diff --git a/src/containers/navbar/updateBanner.tsx b/src/containers/navbar/updateBanner.tsx index e904d7dfd..4ace8fb35 100644 --- a/src/containers/navbar/updateBanner.tsx +++ b/src/containers/navbar/updateBanner.tsx @@ -1,4 +1,4 @@ -import {ButtonText, IconClose, IconUpdate} from '@aragon/ods-old'; +import {ButtonText} from '@aragon/ods-old'; import React, {useState} from 'react'; import {useTranslation} from 'react-i18next'; import { @@ -8,6 +8,7 @@ import { useParams, } from 'react-router-dom'; import styled from 'styled-components'; +import {Icon, IconType} from '@aragon/ods'; import {useNetwork} from 'context/network'; import {useDaoDetailsQuery} from 'hooks/useDaoDetails'; @@ -61,7 +62,7 @@ const UpdateBanner: React.FC = () => { - + {t('update.banner.title')} @@ -82,7 +83,8 @@ const UpdateBanner: React.FC = () => { } /> - { setBannerHidden(true); diff --git a/src/containers/networkErrorMenu/index.tsx b/src/containers/networkErrorMenu/index.tsx index fe778d045..beffcaa30 100644 --- a/src/containers/networkErrorMenu/index.tsx +++ b/src/containers/networkErrorMenu/index.tsx @@ -1,10 +1,9 @@ -import { - Avatar, - ButtonIcon, - ButtonText, - IconClose, - IconCopy, -} from '@aragon/ods-old'; +import React from 'react'; +import {Trans, useTranslation} from 'react-i18next'; +import styled from 'styled-components'; +import {Icon, IconType} from '@aragon/ods'; +import {Avatar, ButtonIcon, ButtonText} from '@aragon/ods-old'; + import ModalBottomSheetSwitcher from 'components/modalBottomSheetSwitcher'; import {useAlertContext} from 'context/alert'; import {useGlobalModalContext} from 'context/globalModals'; @@ -13,9 +12,6 @@ import useScreen from 'hooks/useScreen'; import {useSwitchNetwork} from 'hooks/useSwitchNetwork'; import {useWallet} from 'hooks/useWallet'; import WalletIcon from 'public/wallet.svg'; -import React from 'react'; -import {Trans, useTranslation} from 'react-i18next'; -import styled from 'styled-components'; import {CHAIN_METADATA} from 'utils/constants'; import {handleClipboardActions, shortenAddress} from 'utils/library'; @@ -59,7 +55,7 @@ export const NetworkErrorMenu = () => { } + icon={} size="small" onClick={() => address ? handleClipboardActions(address, () => null, alert) : null @@ -68,7 +64,7 @@ export const NetworkErrorMenu = () => { {isDesktop && ( } + icon={} size="small" onClick={handleCloseMenu} /> diff --git a/src/containers/poapClaiming/PoapClaimModal.tsx b/src/containers/poapClaiming/PoapClaimModal.tsx index 1265a7205..85672da77 100644 --- a/src/containers/poapClaiming/PoapClaimModal.tsx +++ b/src/containers/poapClaiming/PoapClaimModal.tsx @@ -1,6 +1,7 @@ -import {ButtonText, IconLinkExternal} from '@aragon/ods-old'; import React from 'react'; import {useTranslation} from 'react-i18next'; +import {ButtonText} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import styled from 'styled-components'; import {useGlobalModalContext} from 'context/globalModals'; @@ -30,7 +31,7 @@ const PoapClaimModal: React.FC = () => { size="large" label={t('modal.claimPoap.ctaLabel')} className="w-full" - iconRight={} + iconRight={} onClick={() => { window.open(t('modal.claimPoap.ctaURL'), '_blank'); close(); diff --git a/src/containers/privacyPolicy/cookiePreferenceMenu.tsx b/src/containers/privacyPolicy/cookiePreferenceMenu.tsx index d24481133..81f0c1de5 100644 --- a/src/containers/privacyPolicy/cookiePreferenceMenu.tsx +++ b/src/containers/privacyPolicy/cookiePreferenceMenu.tsx @@ -1,7 +1,8 @@ import React from 'react'; import styled from 'styled-components'; import {useTranslation} from 'react-i18next'; -import {ButtonIcon, ButtonText, IconClose} from '@aragon/ods-old'; +import {ButtonIcon, ButtonText} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import ModalBottomSheetSwitcher from 'components/modalBottomSheetSwitcher'; @@ -25,7 +26,7 @@ const CookiePreferenceMenu: React.FC = ({show, onClose, onAccept}) => { } + icon={} onClick={onClose} bgWhite /> diff --git a/src/containers/privacyPolicy/cookieSettingsMenu.tsx b/src/containers/privacyPolicy/cookieSettingsMenu.tsx index e3c193c8f..5e3c0b240 100644 --- a/src/containers/privacyPolicy/cookieSettingsMenu.tsx +++ b/src/containers/privacyPolicy/cookieSettingsMenu.tsx @@ -1,12 +1,8 @@ -import { - ButtonIcon, - ButtonText, - CheckboxListItem, - IconChevronLeft, -} from '@aragon/ods-old'; +import React, {useState} from 'react'; import styled from 'styled-components'; import {useTranslation} from 'react-i18next'; -import React, {useState} from 'react'; +import {ButtonIcon, ButtonText, CheckboxListItem} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; export type CookiesType = { analytics: boolean; @@ -32,7 +28,7 @@ const CookieSettingsMenu: React.FC = props => { } + icon={} onClick={props.onClose} bgWhite /> diff --git a/src/containers/proposalSnapshot/index.tsx b/src/containers/proposalSnapshot/index.tsx index 887710ea9..867577cff 100644 --- a/src/containers/proposalSnapshot/index.tsx +++ b/src/containers/proposalSnapshot/index.tsx @@ -1,13 +1,12 @@ +import React from 'react'; import { ButtonText, CardProposal, CardProposalProps, - IconChevronRight, - IconGovernance, ListItemHeader, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {DaoAction} from '@aragon/sdk-client-common'; -import React from 'react'; import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate} from 'react-router-dom'; import styled from 'styled-components'; @@ -143,7 +142,7 @@ const ProposalSnapshot: React.FC = ({ return ( } + icon={} value={displayedCount?.toString() ?? '0'} label={t('dashboard.proposalsTitle')} buttonText={t('newProposal.title')} @@ -166,7 +165,7 @@ const ProposalSnapshot: React.FC = ({ } + iconRight={} label={t('labels.seeAll')} onClick={() => navigate(generatePath(Governance, {network, dao: daoAddressOrEns})) diff --git a/src/containers/settings/gaslessVoting/index.tsx b/src/containers/settings/gaslessVoting/index.tsx index a564dd3b9..cc88a1034 100644 --- a/src/containers/settings/gaslessVoting/index.tsx +++ b/src/containers/settings/gaslessVoting/index.tsx @@ -111,7 +111,7 @@ const GaslessVotingSettings: React.FC = ({daoDetails}) => { {/*
*/} {/* }*/} + {/* iconRight={} */} {/* href={daoTokenBlockUrl}*/} {/* description={shortenAddress(daoToken.address)}*/} {/* className="shrink-0"*/} @@ -130,7 +130,7 @@ const GaslessVotingSettings: React.FC = ({daoDetails}) => { {/* value: daoMembers.memberCount,*/} {/* })}*/} {/* description={t('settings.community.distributionHelptext')}*/} - {/* iconRight={}*/} + {/* iconRight={icon={IconType.LINK_EXTERNAL} />}*/} {/* onClick={() =>*/} {/* navigate(*/} {/* generatePath(Community, {network, dao: daoDetails.address})*/} diff --git a/src/containers/settings/majorityVoting/index.tsx b/src/containers/settings/majorityVoting/index.tsx index 25fa359b7..4ab6fb171 100644 --- a/src/containers/settings/majorityVoting/index.tsx +++ b/src/containers/settings/majorityVoting/index.tsx @@ -1,8 +1,9 @@ -import {IconLinkExternal, Link, Tag} from '@aragon/ods-old'; -import {VotingMode, VotingSettings} from '@aragon/sdk-client'; import React from 'react'; +import {Link, Tag} from '@aragon/ods-old'; +import {VotingMode, VotingSettings} from '@aragon/sdk-client'; import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate} from 'react-router-dom'; +import {Icon, IconType} from '@aragon/ods'; import {Loading} from 'components/temporary'; import { @@ -108,7 +109,7 @@ const MajorityVotingSettings: React.FC = ({daoDetails}) => {
} + iconRight={} href={daoTokenBlockUrl} description={shortenAddress(daoToken.address)} className="shrink-0" @@ -128,7 +129,7 @@ const MajorityVotingSettings: React.FC = ({daoDetails}) => { value: daoMembers.memberCount, })} description={t('settings.community.distributionHelptext')} - iconRight={} + iconRight={} onClick={() => navigate( generatePath(Community, {network, dao: daoDetails.address}) diff --git a/src/containers/settings/multisig/index.tsx b/src/containers/settings/multisig/index.tsx index 749c2bbcf..d5a4d7dba 100644 --- a/src/containers/settings/multisig/index.tsx +++ b/src/containers/settings/multisig/index.tsx @@ -1,8 +1,9 @@ -import {IconLinkExternal, Link} from '@aragon/ods-old'; -import {MultisigVotingSettings} from '@aragon/sdk-client'; import React from 'react'; import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate} from 'react-router-dom'; +import {MultisigVotingSettings} from '@aragon/sdk-client'; +import {Link} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {Loading} from 'components/temporary'; import { @@ -67,7 +68,7 @@ const MultisigSettings: React.FC = ({daoDetails}) => { count: daoMembers.memberCount, })} description={t('settings.community.memberHelptext')} - iconRight={} + iconRight={} onClick={() => navigate( generatePath(Community, {network, dao: daoDetails.address}) diff --git a/src/containers/settings/updateCard/index.tsx b/src/containers/settings/updateCard/index.tsx index de0626bf6..e2cd0bc9e 100644 --- a/src/containers/settings/updateCard/index.tsx +++ b/src/containers/settings/updateCard/index.tsx @@ -1,8 +1,8 @@ -import {IconLinkExternal, IconUpdate} from '@aragon/ods-old'; import React from 'react'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; import {generatePath, useNavigate, useParams} from 'react-router-dom'; +import {Icon, IconType} from '@aragon/ods'; import {StyledLink} from 'components/styledLink'; import useScreen from 'hooks/useScreen'; @@ -23,7 +23,7 @@ export const SettingsUpdateCard: React.FC = () => {
- + {t('update.alert.title')} @@ -33,7 +33,7 @@ export const SettingsUpdateCard: React.FC = () => { } + iconRight={} onClick={() => navigate( generatePath(NewProposal, { @@ -53,7 +53,7 @@ export const SettingsUpdateCard: React.FC = () => { return ( - + {t('update.alert.title')} @@ -61,7 +61,7 @@ export const SettingsUpdateCard: React.FC = () => { } + iconRight={} onClick={() => navigate( generatePath(NewProposal, { diff --git a/src/containers/settings/versionInfoCard/index.tsx b/src/containers/settings/versionInfoCard/index.tsx index db99da422..366fca135 100644 --- a/src/containers/settings/versionInfoCard/index.tsx +++ b/src/containers/settings/versionInfoCard/index.tsx @@ -1,11 +1,12 @@ -import {IconLinkExternal, Link} from '@aragon/ods-old'; +import React from 'react'; +import {useTranslation} from 'react-i18next'; +import {Link} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import { LIVE_CONTRACTS, SupportedVersion, SupportedNetworksArray, } from '@aragon/sdk-client-common'; -import React from 'react'; -import {useTranslation} from 'react-i18next'; import {useNetwork} from 'context/network'; import {AppVersion, CHAIN_METADATA} from 'utils/constants'; @@ -73,7 +74,7 @@ export const VersionInfoCard: React.FC<{ } + iconRight={} href={'https://app.aragon.org'} /> @@ -88,7 +89,7 @@ export const VersionInfoCard: React.FC<{ description={OSxAddress ? shortenAddress(OSxAddress) : undefined} type="primary" href={explorerEndpoint + OSxAddress} - iconRight={} + iconRight={} /> @@ -101,7 +102,7 @@ export const VersionInfoCard: React.FC<{ description={shortenAddress(pluginAddress)} type="primary" href={explorerEndpoint + pluginAddress} - iconRight={} + iconRight={} /> diff --git a/src/containers/smartContractComposer/components/actionListGroup.tsx b/src/containers/smartContractComposer/components/actionListGroup.tsx index fac1ae2d8..594b800f3 100644 --- a/src/containers/smartContractComposer/components/actionListGroup.tsx +++ b/src/containers/smartContractComposer/components/actionListGroup.tsx @@ -1,5 +1,6 @@ -import {IconChevronRight, ListItemAction} from '@aragon/ods-old'; import React from 'react'; +import {ListItemAction} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -38,7 +39,7 @@ const ActionListGroup: React.FC = ({ key={a.name} title={a.name} subtitle={a.name} - iconRight={} + iconRight={} onClick={() => { setValue('selectedAction', a); onActionSelected?.(); diff --git a/src/containers/smartContractComposer/components/contractAddressValidation.tsx b/src/containers/smartContractComposer/components/contractAddressValidation.tsx index f4b906e81..d54c88cb2 100644 --- a/src/containers/smartContractComposer/components/contractAddressValidation.tsx +++ b/src/containers/smartContractComposer/components/contractAddressValidation.tsx @@ -1,20 +1,18 @@ +import React, {useCallback, useEffect, useMemo, useState} from 'react'; import { AlertInline, ButtonText, - IconChevronRight, - IconRadioCancel, IconRadioMulti, - IconSuccess, Link, Spinner, TextareaSimple, shortenAddress, WalletInputLegacy, - IconLinkExternal, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {ethers} from 'ethers'; import {isAddress} from 'ethers/lib/utils'; -import React, {useCallback, useEffect, useMemo, useState} from 'react'; + import { Controller, useController, @@ -68,7 +66,7 @@ type Props = { const icons = { [TransactionState.WAITING]: undefined, [TransactionState.LOADING]: undefined, - [TransactionState.SUCCESS]: , + [TransactionState.SUCCESS]: , [TransactionState.ERROR]: undefined, [TransactionState.INCORRECT_URI]: undefined, }; @@ -396,7 +394,7 @@ const ContractAddressValidation: React.FC = props => { if (sourcifyFullData) { return (
- + {t('scc.validation.sourcifyStatusSuccess')} @@ -414,7 +412,7 @@ const ContractAddressValidation: React.FC = props => { } else { return (
- + {t('scc.validation.sourcifyStatusCritical')} @@ -449,7 +447,7 @@ const ContractAddressValidation: React.FC = props => { ) { return (
- + {t('scc.validation.etherscanStatusSuccess', { blockExplorerName: CHAIN_METADATA[network].explorerName, @@ -460,7 +458,7 @@ const ContractAddressValidation: React.FC = props => { } else { return (
- + {t('scc.validation.etherscanStatusCritical', { blockExplorerName: CHAIN_METADATA[network].explorerName, @@ -565,7 +563,7 @@ const ContractAddressValidation: React.FC = props => { } + iconRight={} href={`https://sourcify.dev/#/lookup/${addressField}`} label={t('scc.validation.explorerLinkLabel')} className="ft-text-sm" @@ -578,7 +576,7 @@ const ContractAddressValidation: React.FC = props => { } + iconRight={} href={`${CHAIN_METADATA[network].explorer}address/${addressField}#code`} label={t('scc.validation.explorerLinkLabel')} className="ft-text-sm" diff --git a/src/containers/smartContractComposer/components/inputForm.tsx b/src/containers/smartContractComposer/components/inputForm.tsx index f28746a55..aa48d1a7c 100644 --- a/src/containers/smartContractComposer/components/inputForm.tsx +++ b/src/containers/smartContractComposer/components/inputForm.tsx @@ -1,13 +1,13 @@ +import React, {useCallback, useEffect, useMemo, useState} from 'react'; import { ButtonText, CheckboxListItem, - IconSuccess, NumberInput, TextInput, WalletInputLegacy, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {t} from 'i18next'; -import React, {useCallback, useEffect, useMemo, useState} from 'react'; import { Controller, FormProvider, @@ -168,7 +168,7 @@ const InputForm: React.FC = ({

{selectedSC.name}

- +
{selectedAction.notice} @@ -176,7 +176,7 @@ const InputForm: React.FC = ({

{selectedSC.name}

- +
{actionInputs.length > 0 ? (
diff --git a/src/containers/smartContractComposer/components/listHeaderContract.tsx b/src/containers/smartContractComposer/components/listHeaderContract.tsx index fe3e15bb3..0274e2a1f 100644 --- a/src/containers/smartContractComposer/components/listHeaderContract.tsx +++ b/src/containers/smartContractComposer/components/listHeaderContract.tsx @@ -1,24 +1,21 @@ +import React from 'react'; import { Dropdown, - IconClose, - IconCopy, - IconLinkExternal, - IconMenuVertical, - IconSwitch, Link, ListItemAction, ListItemActionProps, shortenAddress, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; +import {useFormContext} from 'react-hook-form'; +import {useTranslation} from 'react-i18next'; + import {useAlertContext} from 'context/alert'; import {useNetwork} from 'context/network'; -import React from 'react'; -import {useFormContext} from 'react-hook-form'; import {chainExplorerAddressLink} from 'utils/constants/chains'; import {handleClipboardActions} from 'utils/library'; import {SmartContract} from 'utils/types'; import {SccFormData} from '..'; -import {useTranslation} from 'react-i18next'; type Props = Partial & { sc: SmartContract; @@ -46,7 +43,7 @@ export const ListHeaderContract: React.FC = ({ external type="neutral" iconRight={ - + } href={chainExplorerAddressLink(network, sc.address) + '#code'} label={t('scc.detailContract.dropdownExplorerLinkLabel', { @@ -62,7 +59,7 @@ export const ListHeaderContract: React.FC = ({ } + iconRight={} label={t('scc.detailContract.dropdownCopyLabel')} className="my-2 w-full justify-between px-4" /> @@ -76,7 +73,7 @@ export const ListHeaderContract: React.FC = ({ } + iconRight={} label={t('scc.detailContract.dropdownRemoveLabel')} className="my-2 w-full justify-between px-4" /> @@ -102,7 +99,7 @@ export const ListHeaderContract: React.FC = ({ ? t('scc.writeProxy.dropdownWriteAsProxyLabel') : t('scc.writeProxy.dropdownDontWriteLabel') } - iconRight={} + iconRight={} className="my-2 w-full justify-between px-4" /> ), @@ -142,7 +139,7 @@ export const ListHeaderContract: React.FC = ({ align="start" trigger={ } sideOffset={8} diff --git a/src/containers/smartContractComposer/components/listItemContract.tsx b/src/containers/smartContractComposer/components/listItemContract.tsx index 921a1f46d..0e55634ae 100644 --- a/src/containers/smartContractComposer/components/listItemContract.tsx +++ b/src/containers/smartContractComposer/components/listItemContract.tsx @@ -1,11 +1,11 @@ +import React from 'react'; import { Dropdown, - IconMenuVertical, ListItemAction, ListItemActionProps, ListItemProps, } from '@aragon/ods-old'; -import React from 'react'; +import {Icon, IconType} from '@aragon/ods'; type Props = Omit & { logo?: string; @@ -24,7 +24,7 @@ export const ListItemContract: React.FC = ({ align="start" trigger={ } sideOffset={8} diff --git a/src/containers/smartContractComposer/components/smartContractListGroup.tsx b/src/containers/smartContractComposer/components/smartContractListGroup.tsx index d3d235baf..66161a1ea 100644 --- a/src/containers/smartContractComposer/components/smartContractListGroup.tsx +++ b/src/containers/smartContractComposer/components/smartContractListGroup.tsx @@ -1,8 +1,8 @@ -import {IconChevronRight} from '@aragon/ods-old'; import React from 'react'; import {useFormContext} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; +import {Icon, IconType} from '@aragon/ods'; import {ListItemContract} from './listItemContract'; import {SccFormData} from 'containers/smartContractComposer'; @@ -40,7 +40,7 @@ const SmartContractListGroup: React.FC = () => { })} logo={c.logo} bgWhite - iconRight={} + iconRight={} onClick={() => { setValue('selectedSC', c); setValue( diff --git a/src/containers/smartContractComposer/desktopModal/index.tsx b/src/containers/smartContractComposer/desktopModal/index.tsx index e7092d895..af57ce318 100644 --- a/src/containers/smartContractComposer/desktopModal/index.tsx +++ b/src/containers/smartContractComposer/desktopModal/index.tsx @@ -1,11 +1,7 @@ -import { - ButtonText, - IconLinkExternal, - IconSwitch, - Link, - Modal, -} from '@aragon/ods-old'; import React, {useEffect, useState} from 'react'; +import {ButtonText, Link, Modal} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; + import {useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -114,7 +110,7 @@ const DesktopModal: React.FC = props => { } + iconRight={} href={t('scc.listContracts.learnLinkURL')} label={t('scc.listContracts.learnLinkLabel')} className="mt-4 w-full justify-center" @@ -164,7 +160,7 @@ const EmptyActionsState: React.FC<{selectedSC: SmartContract}> = ({ {selectedSC.implementationData && ( } + iconLeft={} label={t('scc.writeContractEmptyState.ctaLabel')} onClick={() => { setValue( diff --git a/src/containers/smartContractComposer/mobileModal/index.tsx b/src/containers/smartContractComposer/mobileModal/index.tsx index 5c8d97edf..cb28b9328 100644 --- a/src/containers/smartContractComposer/mobileModal/index.tsx +++ b/src/containers/smartContractComposer/mobileModal/index.tsx @@ -1,13 +1,7 @@ -import { - ButtonIcon, - ButtonText, - IconChevronLeft, - IconClose, - IconHome, - IconLinkExternal, - Link, -} from '@aragon/ods-old'; import React, {useEffect, useState} from 'react'; +import {ButtonIcon, ButtonText, Link} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; + import {useFormContext, useWatch} from 'react-hook-form'; import {useTranslation} from 'react-i18next'; import {useParams} from 'react-router-dom'; @@ -118,7 +112,7 @@ const MobileModal: React.FC = props => { } + iconRight={} href={t('scc.listContracts.learnLinkURL')} label={t('scc.listContracts.learnLinkLabel')} className="mt-4 w-full justify-center" @@ -177,12 +171,17 @@ const CustomMobileHeader: React.FC = props => { } + icon={} bgWhite onClick={props.onBackButtonClicked} /> ) : ( - } bgWhite /> + } + bgWhite + /> )} = props => { } + icon={} onClick={props.onClose} bgWhite /> diff --git a/src/containers/tokenMenu/index.tsx b/src/containers/tokenMenu/index.tsx index 6aa0b8f3f..c5eb4199e 100644 --- a/src/containers/tokenMenu/index.tsx +++ b/src/containers/tokenMenu/index.tsx @@ -1,6 +1,7 @@ -import {AssetBalance} from '@aragon/sdk-client'; -import {ButtonText, IconAdd, IconStorage, SearchInput} from '@aragon/ods-old'; import React, {useCallback, useState} from 'react'; +import {AssetBalance} from '@aragon/sdk-client'; +import {ButtonText, IconStorage, SearchInput} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -87,7 +88,7 @@ const TokenMenu: React.FC = ({ <> - + {t('TokenModal.tokenNotAvailable')} @@ -158,7 +159,7 @@ const TokenMenu: React.FC = ({ mode="secondary" size="large" label="Add Custom Token" - iconLeft={} + iconLeft={} onClick={() => { onTokenSelect({...customToken, symbol: searchValue}); close(); diff --git a/src/containers/transactionDetail/index.tsx b/src/containers/transactionDetail/index.tsx index 19a00a129..af7bd987e 100644 --- a/src/containers/transactionDetail/index.tsx +++ b/src/containers/transactionDetail/index.tsx @@ -1,14 +1,12 @@ +import React, {useCallback} from 'react'; import { ButtonIcon, CardText, CardToken, CardTransfer, - IconChevronRight, - IconClose, - IconLinkExternal, ListItemAction, } from '@aragon/ods-old'; -import React, {useCallback} from 'react'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate} from 'react-router-dom'; import styled from 'styled-components'; @@ -71,7 +69,7 @@ const TransactionDetail: React.FC = () => { mode="secondary" size="small" bgWhite - icon={} + icon={} onClick={onClose} /> @@ -117,7 +115,7 @@ const TransactionDetail: React.FC = () => { } + iconRight={} onClick={handleNavigateToProposal} /> )} @@ -136,7 +134,7 @@ const TransactionDetail: React.FC = () => { > } + iconRight={} />
diff --git a/src/containers/transactionModals/publishModal.tsx b/src/containers/transactionModals/publishModal.tsx index d31924338..bf9db1cb5 100644 --- a/src/containers/transactionModals/publishModal.tsx +++ b/src/containers/transactionModals/publishModal.tsx @@ -1,5 +1,6 @@ import React, {useMemo} from 'react'; -import {AlertInline, ButtonText, IconReload, Spinner} from '@aragon/ods-old'; +import {AlertInline, ButtonText, Spinner} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import styled from 'styled-components'; import {useTranslation} from 'react-i18next'; @@ -33,7 +34,7 @@ const icons = { [TransactionState.LOADING]: , [TransactionState.SUCCESS]: undefined, [TransactionState.INCORRECT_URI]: undefined, - [TransactionState.ERROR]: , + [TransactionState.ERROR]: , }; const PublishModal: React.FC = ({ diff --git a/src/containers/transferMenu/index.tsx b/src/containers/transferMenu/index.tsx index 2a92213bd..f845f410d 100644 --- a/src/containers/transferMenu/index.tsx +++ b/src/containers/transferMenu/index.tsx @@ -1,5 +1,6 @@ -import {IconChevronRight, ListItemAction} from '@aragon/ods-old'; import React from 'react'; +import {ListItemAction} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate, useParams} from 'react-router-dom'; import styled from 'styled-components'; @@ -43,13 +44,13 @@ const TransferMenu: React.FC = () => { } + iconRight={} onClick={() => handleClick('deposit_assets')} /> } + iconRight={} onClick={() => handleClick('withdraw_assets')} /> diff --git a/src/containers/treasurySnapshot/index.tsx b/src/containers/treasurySnapshot/index.tsx index d4fc13b49..32bb35720 100644 --- a/src/containers/treasurySnapshot/index.tsx +++ b/src/containers/treasurySnapshot/index.tsx @@ -1,11 +1,7 @@ -import { - ButtonText, - IconChevronRight, - IconFinance, - ListItemHeader, - TransferListItem, -} from '@aragon/ods-old'; import React from 'react'; +import {ButtonText, ListItemHeader, TransferListItem} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; + import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate} from 'react-router-dom'; import styled from 'styled-components'; @@ -59,7 +55,7 @@ const TreasurySnapshot: React.FC = ({ return ( } + icon={} value={new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD', @@ -83,7 +79,7 @@ const TreasurySnapshot: React.FC = ({ } + iconRight={} label={t('labels.seeAll')} onClick={() => navigate(generatePath(AllTransfers, {network, dao: daoAddressOrEns})) diff --git a/src/containers/updateListItem/updateListItem.tsx b/src/containers/updateListItem/updateListItem.tsx index 3c5c18c76..57f55f386 100644 --- a/src/containers/updateListItem/updateListItem.tsx +++ b/src/containers/updateListItem/updateListItem.tsx @@ -1,30 +1,23 @@ -import { - ButtonText, - IconCheckboxDefault, - IconCheckboxSelected, - IconLinkExternal, - IconRadioDefault, - IconRadioSelected, - Link, - Tag, -} from '@aragon/ods-old'; +import React, {useEffect} from 'react'; +import {ButtonText, Link, Tag} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {EditorContent, useEditor} from '@tiptap/react'; import StarterKit from '@tiptap/starter-kit'; import {Markdown} from 'tiptap-markdown'; -import React, {useEffect} from 'react'; import styled from 'styled-components'; + import {IReleaseNote} from 'services/aragon-sdk/domain/release-note'; export const Icons = { multiSelect: { - active: , - default: , - error: , + active: , + default: , + error: , }, radio: { - active: , - default: , - error: , + active: , + default: , + error: , }, }; @@ -90,7 +83,7 @@ export const UpdateListItem: React.FC = ({ } + iconRight={} href={releaseNote?.html_url} /> diff --git a/src/containers/updateVerificationCard/status.tsx b/src/containers/updateVerificationCard/status.tsx index 2924cc004..83b39f0b7 100644 --- a/src/containers/updateVerificationCard/status.tsx +++ b/src/containers/updateVerificationCard/status.tsx @@ -1,13 +1,7 @@ import React, {ReactNode} from 'react'; import styled from 'styled-components'; -import { - Spinner, - IconRadioCancel, - IconSuccess, - ButtonText, - IconLinkExternal, - Tag, -} from '@aragon/ods-old'; +import {Spinner, ButtonText, Tag} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; export interface StatusProps { mode: 'loading' | 'success' | 'error'; @@ -30,14 +24,14 @@ const iconColors: Record = { error: 'text-critical-500', }; -const Icon: React.FC<{mode: StatusProps['mode']}> = ({mode}) => { +const StatusIcon: React.FC<{mode: StatusProps['mode']}> = ({mode}) => { switch (mode) { case 'loading': return ; case 'error': - return ; + return ; default: - return ; + return ; } }; @@ -52,7 +46,7 @@ export const Status: React.FC = ({ return ( - + @@ -72,7 +66,7 @@ export const Status: React.FC = ({
} + iconRight={} mode="secondary" size="small" bgWhite diff --git a/src/containers/utcMenu/index.tsx b/src/containers/utcMenu/index.tsx index a58329be1..6444bd5ff 100644 --- a/src/containers/utcMenu/index.tsx +++ b/src/containers/utcMenu/index.tsx @@ -1,7 +1,8 @@ import React, {useState} from 'react'; import styled from 'styled-components'; import {useTranslation} from 'react-i18next'; -import {IconChevronRight, ListItemAction, SearchInput} from '@aragon/ods-old'; +import {ListItemAction, SearchInput} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useGlobalModalContext} from 'context/globalModals'; import {timezones} from './utcData'; @@ -51,7 +52,7 @@ const UtcMenu: React.FC = ({onTimezoneSelect}) => { mode="default" key={tz} title={tz} - iconRight={} + iconRight={} onClick={() => handleUtcClick(tz)} /> ); diff --git a/src/containers/votingTerminal/accordionItem.tsx b/src/containers/votingTerminal/accordionItem.tsx index 38009e772..cc7eb9f6b 100644 --- a/src/containers/votingTerminal/accordionItem.tsx +++ b/src/containers/votingTerminal/accordionItem.tsx @@ -1,11 +1,14 @@ import React, {PropsWithChildren} from 'react'; import * as Accordion from '@radix-ui/react-accordion'; -import {AlertInline, ButtonIcon, IconChevronDown} from '../../@aragon/ods-old'; + import styled from 'styled-components'; +import {Icon, IconType} from '@aragon/ods'; + import { AccordionMethodType, AccordionType, } from '../../components/accordionMethod'; +import {AlertInline, ButtonIcon} from '../../@aragon/ods-old'; type AccordionCustomHeaderType = Pick< AccordionMethodType, @@ -26,7 +29,7 @@ export const VotingTerminalAccordionItem: React.FC< } + icon={} /> diff --git a/src/containers/votingTerminal/index.tsx b/src/containers/votingTerminal/index.tsx index 5160df6e9..4349716d3 100644 --- a/src/containers/votingTerminal/index.tsx +++ b/src/containers/votingTerminal/index.tsx @@ -1,24 +1,22 @@ +import React, {useEffect, useMemo, useState} from 'react'; import { AlertCard, AlertInline, ButtonGroup, ButtonText, CheckboxListItem, - IconClock, - IconInfo, - IconRadioCancel, Option, SearchInput, VoterType, VotersTable, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import { Erc20TokenDetails, Erc20WrapperTokenDetails, VoteValues, } from '@aragon/sdk-client'; import {ProposalStatus} from '@aragon/sdk-client-common'; -import React, {useEffect, useMemo, useState} from 'react'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -445,11 +443,11 @@ type StatusProp = { const StatusIcon: React.FC = ({status}) => { if (status === 'Pending' || status === 'Active') { - return ; + return ; } else if (status === 'Defeated') { - return ; + return ; } else { - return ; + return ; } }; diff --git a/src/containers/walletConnect/dAppValidationModal/index.tsx b/src/containers/walletConnect/dAppValidationModal/index.tsx index 89aa1a470..c8d88e7eb 100644 --- a/src/containers/walletConnect/dAppValidationModal/index.tsx +++ b/src/containers/walletConnect/dAppValidationModal/index.tsx @@ -1,12 +1,12 @@ +import React, {useCallback, useEffect, useMemo, useState} from 'react'; import { AlertInline, ButtonText, - IconReload, Label, Spinner, WalletInputLegacy, } from '@aragon/ods-old'; -import React, {useCallback, useEffect, useMemo, useState} from 'react'; +import {Icon, IconType} from '@aragon/ods'; import { Controller, useFormContext, @@ -254,7 +254,7 @@ const WCdAppValidation: React.FC = props => { })} {...((connectionStatus === ConnectionState.ERROR || connectionStatus === ConnectionState.INCORRECT_URI) && { - iconLeft: , + iconLeft: , })} onClick={ctaHandler} /> diff --git a/src/containers/walletConnect/selectAppModal/index.tsx b/src/containers/walletConnect/selectAppModal/index.tsx index 51756a5cd..0c9a2a00d 100644 --- a/src/containers/walletConnect/selectAppModal/index.tsx +++ b/src/containers/walletConnect/selectAppModal/index.tsx @@ -1,6 +1,7 @@ -import {AlertInline, IconChevronRight, ListItemAction} from '@aragon/ods-old'; -import {SessionTypes, SignClientTypes} from '@walletconnect/types'; import React, {useMemo} from 'react'; +import {AlertInline, ListItemAction} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; +import {SessionTypes, SignClientTypes} from '@walletconnect/types'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -104,7 +105,7 @@ const SelectWCApp: React.FC = props => {

{t('modal.dappConnect.dAppConnectedLabel')}

)} - +
} truncateText diff --git a/src/containers/walletMenu/LoginRequired.tsx b/src/containers/walletMenu/LoginRequired.tsx index d5ec8edf9..4dcc9f9f5 100644 --- a/src/containers/walletMenu/LoginRequired.tsx +++ b/src/containers/walletMenu/LoginRequired.tsx @@ -1,6 +1,7 @@ -import {ButtonIcon, ButtonText, IconClose} from '@aragon/ods-old'; -import {useWallet} from 'hooks/useWallet'; import React from 'react'; +import {ButtonIcon, ButtonText} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; +import {useWallet} from 'hooks/useWallet'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -47,7 +48,7 @@ export const LoginRequired: React.FC = props => { {isDesktop && ( } + icon={} size="small" onClick={() => onClose()} /> diff --git a/src/containers/walletMenu/index.tsx b/src/containers/walletMenu/index.tsx index e06c15b92..040a48d18 100644 --- a/src/containers/walletMenu/index.tsx +++ b/src/containers/walletMenu/index.tsx @@ -1,14 +1,7 @@ -import { - Avatar, - ButtonIcon, - ButtonText, - IconClose, - IconCopy, - IconSwitch, - IconTurnOff, -} from '@aragon/ods-old'; -import {useGlobalModalContext} from 'context/globalModals'; import React, {useEffect} from 'react'; +import {Avatar, ButtonIcon, ButtonText} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; +import {useGlobalModalContext} from 'context/globalModals'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -86,7 +79,7 @@ export const WalletMenu = () => { } + icon={} size="small" onClick={() => address ? handleClipboardActions(address, () => null, alert) : null @@ -95,7 +88,7 @@ export const WalletMenu = () => { {isDesktop && ( } + icon={} size="small" onClick={() => close()} /> @@ -105,14 +98,14 @@ export const WalletMenu = () => { } + iconLeft={} label={t('labels.viewTransactions')} onClick={handleViewTransactions} /> } + iconLeft={} label={t('labels.disconnectWallet')} onClick={handleDisconnect} /> diff --git a/src/context/stepperModal.tsx b/src/context/stepperModal.tsx index 970179ae7..399749fe6 100644 --- a/src/context/stepperModal.tsx +++ b/src/context/stepperModal.tsx @@ -1,17 +1,13 @@ import React, {useMemo} from 'react'; import styled from 'styled-components'; import {useTranslation} from 'react-i18next'; +import {Icon, IconType} from '@aragon/ods'; +import {AlertInline, ButtonText} from '@aragon/ods-old'; import {CHAIN_METADATA} from 'utils/constants'; import ModalBottomSheetSwitcher from 'components/modalBottomSheetSwitcher'; import {useNetwork} from 'context/network'; import {formatUnits} from 'utils/library'; -import { - AlertInline, - ButtonText, - IconChevronRight, - IconReload, -} from '@aragon/ods-old'; import {StepsMap, StepStatus} from '../hooks/useFunctionStepper'; import { StepperModalProgress, @@ -174,12 +170,14 @@ const StepperModal = ({ className="mt-3 w-full" label={buttonLabels[globalState]!} iconLeft={ - globalState === StepStatus.ERROR ? : undefined + globalState === StepStatus.ERROR ? ( + + ) : undefined } iconRight={ globalState === StepStatus.WAITING || globalState === StepStatus.SUCCESS ? ( - + ) : undefined } disabled={gasEstimationError !== undefined} diff --git a/src/hooks/useMappedBreadcrumbs.tsx b/src/hooks/useMappedBreadcrumbs.tsx index 13ab82b1e..7ac847993 100644 --- a/src/hooks/useMappedBreadcrumbs.tsx +++ b/src/hooks/useMappedBreadcrumbs.tsx @@ -1,15 +1,7 @@ -import { - IconCommunity, - IconDashboard, - IconFinance, - IconGovernance, - IconSettings, - Tag, - TagColorScheme, - TagProps, -} from '@aragon/ods-old'; -import {ProposalStatus} from '@aragon/sdk-client-common'; import React, {useMemo} from 'react'; +import {Tag, TagColorScheme, TagProps} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; +import {ProposalStatus} from '@aragon/sdk-client-common'; import {useMatch} from 'react-router-dom'; import useBreadcrumbs, {BreadcrumbData} from 'use-react-router-breadcrumbs'; @@ -46,11 +38,11 @@ const routes = Object.values(Paths).map(path => { }); function basePathIcons(path: string) { - if (path.includes('dashboard')) return ; - if (path.includes('community')) return ; - if (path.includes('finance')) return ; - if (path.includes('settings')) return ; - else return ; + if (path.includes('dashboard')) return ; + if (path.includes('community')) return ; + if (path.includes('finance')) return ; + if (path.includes('settings')) return ; + else return ; } export function useMappedBreadcrumbs(): MappedBreadcrumbs { diff --git a/src/pages/community.tsx b/src/pages/community.tsx index 3821bb6ab..ddbea1e58 100644 --- a/src/pages/community.tsx +++ b/src/pages/community.tsx @@ -1,17 +1,13 @@ +import React, {useCallback, useState} from 'react'; import { - IconAdd, - IconLinkExternal, Pagination, SearchInput, IllustrationHuman, Dropdown, ButtonText, ListItemAction, - IconCheckmark, - IconSort, - IconFailure, } from '@aragon/ods-old'; -import React, {useCallback, useState} from 'react'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; import {useNavigate} from 'react-router-dom'; import styled from 'styled-components'; @@ -191,7 +187,7 @@ export const Community: React.FC = () => { description: t('explore.explorer.tokenBased'), primaryBtnProps: { label: t('governance.actionSecondary'), - iconLeft: , + iconLeft: , onClick: () => open('delegateVoting'), }, secondaryBtnProps: { @@ -200,7 +196,7 @@ export const Community: React.FC = () => { }, tertiaryBtnProps: { label: t('labels.seeAllHolders'), - iconLeft: , + iconLeft: , onClick: handleSecondaryButtonClick, }, } @@ -209,17 +205,17 @@ export const Community: React.FC = () => { description: t('explore.explorer.tokenBased'), primaryBtnProps: { label: t('governance.actionSecondary'), - iconLeft: , + iconLeft: , onClick: handlePrimaryClick, }, secondaryBtnProps: { label: t('labels.mintTokens'), - iconLeft: , + iconLeft: , onClick: handleSecondaryButtonClick, }, tertiaryBtnProps: { label: t('labels.seeAllHolders'), - iconLeft: , + iconLeft: , onClick: navigateToTokenHoldersChart, }, } @@ -227,12 +223,12 @@ export const Community: React.FC = () => { description: t('explore.explorer.tokenBased'), primaryBtnProps: { label: t('governance.actionSecondary'), - iconLeft: , + iconLeft: , onClick: () => open('delegateVoting'), }, secondaryBtnProps: { label: t('labels.seeAllHolders'), - iconLeft: , + iconLeft: , onClick: handleSecondaryButtonClick, }, })} @@ -263,7 +259,9 @@ export const Community: React.FC = () => { bgWhite={true} mode={sort === 'votingPower' ? 'selected' : 'default'} iconRight={ - sort === 'votingPower' ? : undefined + sort === 'votingPower' ? ( + + ) : undefined } /> ), @@ -276,7 +274,9 @@ export const Community: React.FC = () => { bgWhite={true} mode={sort === 'delegations' ? 'selected' : 'default'} iconRight={ - sort === 'delegations' ? : undefined + sort === 'delegations' ? ( + + ) : undefined } /> ), @@ -286,7 +286,7 @@ export const Community: React.FC = () => { trigger={ } + iconLeft={} size="large" label={sortLabel} /> diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx index cb6b99b40..c42bc40bd 100644 --- a/src/pages/dashboard.tsx +++ b/src/pages/dashboard.tsx @@ -1,13 +1,13 @@ +import React, {useCallback, useEffect, useMemo, useState} from 'react'; import { ButtonText, HeaderDao, - IconCheckmark, - IconClose, IconSpinner, IlluObject, IllustrationHuman, } from '@aragon/ods-old'; -import React, {useCallback, useEffect, useMemo, useState} from 'react'; +import {Icon, IconType} from '@aragon/ods'; + import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate, useParams} from 'react-router-dom'; import styled from 'styled-components'; @@ -71,7 +71,7 @@ export const Dashboard: React.FC = () => { const removeFollowedDaoMutation = useRemoveFollowedDaoMutation({ onMutate: () => { - alert(t('alert.chip.unfavorite'), ); + alert(t('alert.chip.unfavorite'), ); }, }); @@ -227,7 +227,7 @@ export const Dashboard: React.FC = () => { [DaoCreationState.ASSEMBLING_DAO]: ( ), - [DaoCreationState.DAO_READY]: , + [DaoCreationState.DAO_READY]: , [DaoCreationState.OPEN_DAO]: undefined, }; diff --git a/src/pages/finance.tsx b/src/pages/finance.tsx index 8806adb00..01bfb6f19 100644 --- a/src/pages/finance.tsx +++ b/src/pages/finance.tsx @@ -1,7 +1,6 @@ import { Breadcrumb, ButtonText, - IconAdd, IlluObject, IllustrationHuman, Tag, @@ -10,6 +9,7 @@ import React from 'react'; import {useTranslation} from 'react-i18next'; import {useNavigate} from 'react-router-dom'; import styled from 'styled-components'; +import {Icon, IconType} from '@aragon/ods'; import {StateEmpty} from 'components/stateEmpty'; import {Loading} from 'components/temporary'; @@ -185,7 +185,7 @@ export const Finance: React.FC = () => { } + iconLeft={} className="w-full md:w-auto" onClick={() => { trackEvent('finance_newTransferBtn_clicked', { @@ -320,7 +320,7 @@ export const Finance: React.FC = () => { } + iconLeft={} className="w-full md:w-auto" onClick={() => { trackEvent('finance_newTransferBtn_clicked', { diff --git a/src/pages/governance.tsx b/src/pages/governance.tsx index 7ca749b93..f8856f743 100644 --- a/src/pages/governance.tsx +++ b/src/pages/governance.tsx @@ -1,14 +1,13 @@ +import React, {useState} from 'react'; import { ButtonGroup, ButtonText, - IconAdd, - IconChevronDown, IllustrationHuman, Option, Spinner, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {ProposalStatus} from '@aragon/sdk-client-common'; -import React, {useState} from 'react'; import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate} from 'react-router-dom'; import styled from 'styled-components'; @@ -138,7 +137,7 @@ export const Governance: React.FC = () => { title={'Proposals'} primaryBtnProps={{ label: t('governance.action'), - iconLeft: , + iconLeft: , onClick: handleNewProposalClick, }} secondaryBtnProps={ @@ -184,7 +183,11 @@ export const Governance: React.FC = () => { : + isFetchingNextPage ? ( + + ) : ( + + ) } bgWhite mode="ghost" diff --git a/src/pages/proposal.tsx b/src/pages/proposal.tsx index 9780fd2cc..b6cb74443 100644 --- a/src/pages/proposal.tsx +++ b/src/pages/proposal.tsx @@ -1,11 +1,6 @@ -import { - Breadcrumb, - ButtonText, - IconChevronDown, - IconChevronUp, - IconGovernance, - WidgetStatus, -} from '@aragon/ods-old'; +import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; +import {Breadcrumb, ButtonText, WidgetStatus} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import { MultisigClient, MultisigProposal, @@ -17,7 +12,6 @@ import {DaoAction, ProposalStatus} from '@aragon/sdk-client-common'; import TipTapLink from '@tiptap/extension-link'; import {useEditor} from '@tiptap/react'; import StarterKit from '@tiptap/starter-kit'; -import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate, useParams, Link} from 'react-router-dom'; import sanitizeHtml from 'sanitize-html'; @@ -781,7 +775,7 @@ export const Proposal: React.FC = () => { ) } crumbs={breadcrumbs} - icon={} + icon={} tag={tag} /> )} @@ -810,7 +804,7 @@ export const Proposal: React.FC = () => { size="large" label={t('governance.proposals.buttons.readFullProposal')} mode="secondary" - iconRight={} + iconRight={} onClick={() => setExpandedProposal(true)} /> )} @@ -825,7 +819,7 @@ export const Proposal: React.FC = () => { className="mt-6 w-full md:w-max" label={t('governance.proposals.buttons.closeFullProposal')} mode="secondary" - iconRight={} + iconRight={} onClick={() => setExpandedProposal(false)} /> diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx index e9cfcda2a..22991ed40 100644 --- a/src/pages/settings.tsx +++ b/src/pages/settings.tsx @@ -1,17 +1,14 @@ +import React, {ReactNode, useEffect, useRef, useState} from 'react'; import { AlertInline, AvatarDao, ButtonText, Dropdown, - IconChevronDown, - IconChevronUp, - IconGovernance, - IconLinkExternal, Link, Tag, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {DaoDetails} from '@aragon/sdk-client'; -import React, {ReactNode, useEffect, useRef, useState} from 'react'; import {useTranslation} from 'react-i18next'; import {generatePath, useNavigate, useParams} from 'react-router-dom'; import styled from 'styled-components'; @@ -117,7 +114,9 @@ export const Settings: React.FC = () => { label={t('settings.edit')} className="w-full md:w-max" size="large" - iconLeft={!isDesktop ? : undefined} + iconLeft={ + !isDesktop ? : undefined + } onClick={() => navigate('edit')} /> @@ -219,7 +218,7 @@ const SettingsCardDao: React.FC<{daoDetails: DaoDetails}> = ({daoDetails}) => { type="primary" className="shrink-0" href={explorerLink} - iconRight={} + iconRight={} />
@@ -237,11 +236,11 @@ const SettingsCardDao: React.FC<{daoDetails: DaoDetails}> = ({daoDetails}) => { {...(showAll ? { label: t('settings.dao.summaryToggleClose'), - iconRight: , + iconRight: , } : { label: t('settings.dao.summaryToggleMore'), - iconRight: , + iconRight: , })} className="ft-text-base" onClick={() => setShowAll(prevState => !prevState)} @@ -262,7 +261,7 @@ const SettingsCardDao: React.FC<{daoDetails: DaoDetails}> = ({daoDetails}) => { description={url} type="primary" href={url} - iconRight={} + iconRight={} /> ))} {daoDetails.metadata.links.length > 3 && ( @@ -271,7 +270,7 @@ const SettingsCardDao: React.FC<{daoDetails: DaoDetails}> = ({daoDetails}) => { } + iconRight={} /> } listItems={daoDetails.metadata.links.map(({name, url}) => ({ @@ -282,7 +281,7 @@ const SettingsCardDao: React.FC<{daoDetails: DaoDetails}> = ({daoDetails}) => { description={url} type="primary" href={url} - iconRight={} + iconRight={} />
), @@ -339,7 +338,9 @@ const SettingsWrapper: React.FC<{children: ReactNode}> = ({children}) => { title={t('labels.daoSettings')} primaryBtnProps={{ label: t('settings.edit'), - iconLeft: isMobile ? : undefined, + iconLeft: isMobile ? ( + + ) : undefined, onClick: () => navigate(generatePath(EditSettings, {network, dao})), }} customBody={<>{children}} diff --git a/src/pages/tokens.tsx b/src/pages/tokens.tsx index 915e4f144..091cb6b11 100644 --- a/src/pages/tokens.tsx +++ b/src/pages/tokens.tsx @@ -1,6 +1,8 @@ -import {IconAdd, SearchInput} from '@aragon/ods-old'; import React, {useState} from 'react'; +import {SearchInput} from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {useTranslation} from 'react-i18next'; + import TokenList from 'components/tokenList'; import {PageWrapper} from 'components/wrappers'; import {useGlobalModalContext} from 'context/globalModals'; @@ -32,7 +34,7 @@ export const Tokens: React.FC = () => { } primaryBtnProps={{ label: t('TransferModal.newTransfer'), - iconLeft: , + iconLeft: , onClick: () => open('transfer'), }} > diff --git a/src/pages/transfers.tsx b/src/pages/transfers.tsx index 21029dcbc..1dc47c6c5 100644 --- a/src/pages/transfers.tsx +++ b/src/pages/transfers.tsx @@ -1,15 +1,14 @@ +import React, {useCallback, useMemo, useState} from 'react'; import { ButtonGroup, ButtonIcon, Dropdown, - IconAdd, - IconMenuVertical, ListItemAction, Option, } from '@aragon/ods-old'; +import {Icon, IconType} from '@aragon/ods'; import {Locale, format} from 'date-fns'; import * as Locales from 'date-fns/locale'; -import React, {useCallback, useMemo, useState} from 'react'; import {useTranslation} from 'react-i18next'; import styled from 'styled-components'; @@ -110,7 +109,7 @@ export const Transfers: React.FC = () => { description={`${totalTransfers} Total Volume`} primaryBtnProps={{ label: t('TransferModal.newTransfer'), - iconLeft: , + iconLeft: , onClick: () => open('transfer'), }} > @@ -147,7 +146,7 @@ export const Transfers: React.FC = () => { } + icon={} /> } /> diff --git a/src/utils/constants/misc.ts b/src/utils/constants/misc.ts index 290a36192..239849edc 100644 --- a/src/utils/constants/misc.ts +++ b/src/utils/constants/misc.ts @@ -1,11 +1,4 @@ -import { - IconCommunity, - IconDashboard, - IconFinance, - IconGovernance, - IconType, - IconSettings, -} from '@aragon/ods-old'; +import {IconType} from '@aragon/ods'; import {i18n} from '../../../i18n.config'; import {Dashboard, Community, Finance, Governance, Settings} from '../paths'; @@ -45,23 +38,27 @@ export const NAV_LINKS_DATA: NavLinkData[] = [ { label: i18n.t('navLinks.dashboard'), path: Dashboard, - icon: IconDashboard, + icon: IconType.APP_DASHBOARD, }, { label: i18n.t('navLinks.governance'), path: Governance, - icon: IconGovernance, + icon: IconType.APP_GOVERNANCE, + }, + { + label: i18n.t('navLinks.finance'), + path: Finance, + icon: IconType.APP_FINANCE, }, - {label: i18n.t('navLinks.finance'), path: Finance, icon: IconFinance}, { label: i18n.t('navLinks.members'), path: Community, - icon: IconCommunity, + icon: IconType.APP_COMMUNITY, }, { label: i18n.t('navLinks.settings'), path: Settings, - icon: IconSettings, + icon: IconType.SETTINGS, }, ]; diff --git a/yarn.lock b/yarn.lock index 1c47a4f94..30264b481 100644 --- a/yarn.lock +++ b/yarn.lock @@ -48,17 +48,20 @@ tslib "^2.3.0" zen-observable-ts "^1.2.0" -"@aragon/ods@^1.0.8": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@aragon/ods/-/ods-1.0.8.tgz#825bd83449ed4ceab91771a0c1de6e09730d9eb6" - integrity sha512-ihvufK+vtN5EfNiHLrSkE/++M3QCUngS1rwojtrW931FmBrG2sp9HqsByNW46ey9VgweanHGnUt0Or8Nh76LEg== +"@aragon/ods@^1.0.9": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@aragon/ods/-/ods-1.0.9.tgz#8205ce254e6d389fd25ce9938d1a035015475169" + integrity sha512-FeCB6BKujJfZTlSsT9WThYqj8037upST60XGX7TWxbq7AVMJs4bf351Rly50fs12hnqQSRcbkoAo/uaIJNHqZg== dependencies: + "@radix-ui/react-avatar" "^1.0.0" "@radix-ui/react-progress" "^1.0.0" "@radix-ui/react-switch" "^1.0.0" "@radix-ui/react-toggle-group" "^1.0.0" classnames "^2.0.0" react "^18.0.0" react-dom "^18.0.0" + react-imask "^7.3.0" + react-merge-refs "^2.0.0" "@aragon/osx-ethers-v1.0.0@npm:@aragon/osx-ethers@1.2.1": version "1.2.1" @@ -1236,6 +1239,14 @@ core-js-pure "^3.19.0" regenerator-runtime "^0.13.4" +"@babel/runtime-corejs3@^7.23.6": + version "7.23.9" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.23.9.tgz#1b43062a13ecb60158aecdd81bc3fab4108b7cbc" + integrity sha512-oeOFTrYWdWXCvXGB5orvMTJ6gCZ9I6FBjR+M38iKNXCsPxr4xT0RTdg5uz1H7QP8pp74IzPtwritEr+JscqHXQ== + dependencies: + core-js-pure "^3.30.2" + regenerator-runtime "^0.14.0" + "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.13.9", "@babel/runtime@^7.14.6", "@babel/runtime@^7.17.2", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.23.1" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.1.tgz#72741dc4d413338a91dcb044a86f3c0bc402646d" @@ -2820,6 +2831,17 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-primitive" "1.0.3" +"@radix-ui/react-avatar@^1.0.0": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@radix-ui/react-avatar/-/react-avatar-1.0.4.tgz#de9a5349d9e3de7bbe990334c4d2011acbbb9623" + integrity sha512-kVK2K7ZD3wwj3qhle0ElXhOjbezIgyl2hVvgwfIdexL3rN6zJmy5AqqIf+D31lxVppdzV8CjAfZ6PklkmInZLw== + dependencies: + "@babel/runtime" "^7.13.10" + "@radix-ui/react-context" "1.0.1" + "@radix-ui/react-primitive" "1.0.3" + "@radix-ui/react-use-callback-ref" "1.0.1" + "@radix-ui/react-use-layout-effect" "1.0.1" + "@radix-ui/react-collapsible@1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@radix-ui/react-collapsible/-/react-collapsible-1.0.3.tgz#df0e22e7a025439f13f62d4e4a9e92c4a0df5b81" @@ -7830,6 +7852,11 @@ core-js-pure@^3.19.0: resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.1.tgz#edffc1fc7634000a55ba05e95b3f0fe9587a5aa4" integrity sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ== +core-js-pure@^3.30.2: + version "3.35.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.35.1.tgz#f33ad7fdf9dddae260339a30e5f8363f5c49a3bc" + integrity sha512-zcIdi/CL3MWbBJYo5YCeVAAx+Sy9yJE9I3/u9LkFABwbeaPhTMRWraM8mYFp9jW5Z50hOy7FVzCc8dCrpZqtIQ== + core-js@^2.4.0, core-js@^2.5.0: version "2.6.12" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" @@ -11492,6 +11519,13 @@ ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0, ignore@^5.2.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== +imask@^7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/imask/-/imask-7.3.0.tgz#2b851ae8dc517f92cdd0d6dea0447bec9f27731d" + integrity sha512-TG+/rfb62JaQDM2KVrzEHMb4lv2srbsby7vHndXhqgQFB1MgPIXl60VQUfly/Xv5iWfA9ytB+rfQ+skUgINw7A== + dependencies: + "@babel/runtime-corejs3" "^7.23.6" + immediate@^3.2.3: version "3.3.0" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266" @@ -15232,6 +15266,14 @@ react-i18next@^13.2.2: "@babel/runtime" "^7.22.5" html-parse-stringify "^3.0.1" +react-imask@^7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/react-imask/-/react-imask-7.3.0.tgz#c9c9dd67a1e3f49f6b7261ff20ef50b18c0381a7" + integrity sha512-AHoQUeXil6PfqDzJHN08hO2liWxNDRJosNUa2XSqliFY2tXGL/3Elm0msupDNAyNPItAnyF9G5FGFoCfiCn+AQ== + dependencies: + imask "^7.3.0" + prop-types "^15.8.1" + react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -15247,6 +15289,11 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== +react-merge-refs@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/react-merge-refs/-/react-merge-refs-2.1.1.tgz#e46763f8f1b881c0226ee54a1a2a10ffefba0233" + integrity sha512-jLQXJ/URln51zskhgppGJ2ub7b2WFKGq3cl3NYKtlHoTG+dN2q7EzWrn3hN3EgPsTMvpR9tpq5ijdp7YwFZkag== + react-refresh@^0.14.0: version "0.14.0" resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"