diff --git a/package-lock.json b/package-lock.json index f4355be..f8378b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,6 @@ "react": ">= 17.0.2", "react-copy-to-clipboard": "5.0.4", "react-dom": ">= 17.0.2", - "react-feather": "2.0.9", "react-identicons": "1.2.5", "react-router": "6.2.1", "react-router-dom": "6.2.1", @@ -16815,17 +16814,6 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, - "node_modules/react-feather": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/react-feather/-/react-feather-2.0.9.tgz", - "integrity": "sha512-yMfCGRkZdXwIs23Zw/zIWCJO3m3tlaUvtHiXlW+3FH7cIT6fiK1iJ7RJWugXq7Fso8ZaQyUm92/GOOHXvkiVUw==", - "dependencies": { - "prop-types": "^15.7.2" - }, - "peerDependencies": { - "react": "^16.8.6 || ^17" - } - }, "node_modules/react-identicons": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/react-identicons/-/react-identicons-1.2.5.tgz", @@ -32626,14 +32614,6 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, - "react-feather": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/react-feather/-/react-feather-2.0.9.tgz", - "integrity": "sha512-yMfCGRkZdXwIs23Zw/zIWCJO3m3tlaUvtHiXlW+3FH7cIT6fiK1iJ7RJWugXq7Fso8ZaQyUm92/GOOHXvkiVUw==", - "requires": { - "prop-types": "^15.7.2" - } - }, "react-identicons": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/react-identicons/-/react-identicons-1.2.5.tgz", diff --git a/package.json b/package.json index 8388131..9a07390 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "react": ">= 17.0.2", "react-copy-to-clipboard": "5.0.4", "react-dom": ">= 17.0.2", - "react-feather": "2.0.9", "react-identicons": "1.2.5", "react-router": "6.2.1", "react-router-dom": "6.2.1", diff --git a/src/components/Card.tsx b/src/components/Card.tsx index 30cf141..e18bf7e 100644 --- a/src/components/Card.tsx +++ b/src/components/Card.tsx @@ -1,6 +1,7 @@ import { createStyles, makeStyles, Theme, Typography } from '@material-ui/core' import { ReactElement } from 'react' -import { AlertCircle, Check } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' +import AlertCircle from 'remixicon-react/ErrorWarningFillIcon' import { SwarmButton, SwarmButtonProps } from './SwarmButton' interface Props { @@ -60,11 +61,7 @@ export default function Card({ buttonProps, icon, title, subtitle, status }: Pro
{icon} - {status === 'ok' ? ( - - ) : ( - - )} + {status === 'ok' ? : }
{title} diff --git a/src/components/CashoutModal.tsx b/src/components/CashoutModal.tsx index 4e66c55..f6ddc91 100644 --- a/src/components/CashoutModal.tsx +++ b/src/components/CashoutModal.tsx @@ -7,7 +7,7 @@ import DialogContentText from '@material-ui/core/DialogContentText' import DialogTitle from '@material-ui/core/DialogTitle' import { useSnackbar } from 'notistack' import { ReactElement, useContext, useState } from 'react' -import { Zap } from 'react-feather' +import Zap from 'remixicon-react/FlashlightLineIcon' import { Context as SettingsContext } from '../providers/Settings' import EthereumAddress from './EthereumAddress' diff --git a/src/components/ClipboardCopy.tsx b/src/components/ClipboardCopy.tsx index 7ad40a2..b4f9a6c 100644 --- a/src/components/ClipboardCopy.tsx +++ b/src/components/ClipboardCopy.tsx @@ -1,7 +1,7 @@ import type { ReactElement } from 'react' import IconButton from '@material-ui/core/IconButton' import { CopyToClipboard } from 'react-copy-to-clipboard' -import { Clipboard } from 'react-feather' +import Clipboard from 'remixicon-react/ClipboardLineIcon' import { useSnackbar } from 'notistack' interface Props { diff --git a/src/components/ExpandableListItem.tsx b/src/components/ExpandableListItem.tsx index 0161f07..b9db46f 100644 --- a/src/components/ExpandableListItem.tsx +++ b/src/components/ExpandableListItem.tsx @@ -1,7 +1,7 @@ import { ReactElement, ReactNode } from 'react' import { makeStyles, Theme, createStyles } from '@material-ui/core/styles' import { Typography, Grid, IconButton, Tooltip } from '@material-ui/core' -import { Info } from 'react-feather' +import Info from 'remixicon-react/InformationLineIcon' import ListItem from '@material-ui/core/ListItem' const useStyles = makeStyles((theme: Theme) => diff --git a/src/components/ExpandableListItemInput.tsx b/src/components/ExpandableListItemInput.tsx index 08b8bed..7924098 100644 --- a/src/components/ExpandableListItemInput.tsx +++ b/src/components/ExpandableListItemInput.tsx @@ -2,10 +2,14 @@ import { Grid, IconButton, InputBase, ListItem, Typography } from '@material-ui/ import Collapse from '@material-ui/core/Collapse' import { createStyles, makeStyles, Theme } from '@material-ui/core/styles' import { ChangeEvent, ReactElement, useState } from 'react' -import { Edit, Minus, Search, X } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' +import Edit from 'remixicon-react/PencilLineIcon' +import Minus from 'remixicon-react/SubtractLineIcon' +import X from 'remixicon-react/CloseLineIcon' import ExpandableListItemActions from './ExpandableListItemActions' import ExpandableListItemNote from './ExpandableListItemNote' import { SwarmButton } from './SwarmButton' +import type { RemixiconReactIconProps } from 'remixicon-react' const useStyles = makeStyles((theme: Theme) => createStyles({ @@ -53,6 +57,7 @@ interface Props { expandedOnly?: boolean confirmLabel?: string confirmLabelDisabled?: boolean + confirmIcon?: React.ComponentType loading?: boolean onChange?: (value: string) => void onConfirm?: (value: string) => void @@ -67,6 +72,7 @@ export default function ExpandableListItemKey({ onChange, confirmLabel, confirmLabelDisabled, + confirmIcon, expandedOnly, helperText, placeholder, @@ -137,7 +143,7 @@ export default function ExpandableListItemKey({ (inputValue === '' && value === undefined) // Disable if no initial value was not provided and the field is empty. The undefined check is improtant so that it is possible to submit with empty input in other cases } loading={loading} - iconType={Search} + iconType={confirmIcon ?? Check} onClick={() => { if (onConfirm) onConfirm(inputValue) }} diff --git a/src/components/ExpandableListItemKey.tsx b/src/components/ExpandableListItemKey.tsx index 2d4587f..da7326f 100644 --- a/src/components/ExpandableListItemKey.tsx +++ b/src/components/ExpandableListItemKey.tsx @@ -3,7 +3,8 @@ import Collapse from '@material-ui/core/Collapse' import { createStyles, makeStyles, Theme } from '@material-ui/core/styles' import { ReactElement, useState } from 'react' import { CopyToClipboard } from 'react-copy-to-clipboard' -import { Eye, Minus } from 'react-feather' +import Eye from 'remixicon-react/EyeLineIcon' +import Minus from 'remixicon-react/SubtractLineIcon' const useStyles = makeStyles((theme: Theme) => createStyles({ diff --git a/src/components/Feedback.tsx b/src/components/Feedback.tsx index 558152a..9e4c5c4 100644 --- a/src/components/Feedback.tsx +++ b/src/components/Feedback.tsx @@ -2,7 +2,7 @@ import { ReactElement, useEffect, useState } from 'react' import * as Sentry from '@sentry/react' import { Link } from '@material-ui/core' import { createStyles, makeStyles, Theme } from '@material-ui/core/styles' -import { MessageSquare } from 'react-feather' +import MessageSquare from 'remixicon-react/Chat4LineIcon' import config from '../config' import SideBarItem from './SideBarItem' diff --git a/src/components/SideBarStatus.tsx b/src/components/SideBarStatus.tsx index d230230..bd8e98e 100644 --- a/src/components/SideBarStatus.tsx +++ b/src/components/SideBarStatus.tsx @@ -1,6 +1,6 @@ import { ReactElement, useContext } from 'react' import { useLocation, matchPath } from 'react-router-dom' -import { ArrowRight } from 'react-feather' +import ArrowRight from 'remixicon-react/ArrowRightLineIcon' import { createStyles, Theme, makeStyles } from '@material-ui/core/styles' import { ListItemText, ListItemIcon, ListItem, Typography } from '@material-ui/core' diff --git a/src/components/SwarmButton.tsx b/src/components/SwarmButton.tsx index 46976b3..a1593e0 100644 --- a/src/components/SwarmButton.tsx +++ b/src/components/SwarmButton.tsx @@ -1,9 +1,9 @@ import { Button, ButtonProps, CircularProgress, createStyles, makeStyles } from '@material-ui/core' import React, { ReactElement } from 'react' -import { IconProps } from 'react-feather' +import type { RemixiconReactIconProps } from 'remixicon-react' export interface SwarmButtonProps extends ButtonProps { - iconType: React.ComponentType + iconType: React.ComponentType loading?: boolean cancel?: boolean variant?: 'text' | 'contained' | 'outlined' @@ -18,7 +18,7 @@ const useStyles = makeStyles(() => color: '#242424', '&:hover, &:focus': { '& svg': { - stroke: '#fff', + fill: '#fff', transition: '0.1s', }, }, diff --git a/src/components/TroubleshootConnectionCard.tsx b/src/components/TroubleshootConnectionCard.tsx index 0598cad..3904846 100644 --- a/src/components/TroubleshootConnectionCard.tsx +++ b/src/components/TroubleshootConnectionCard.tsx @@ -1,7 +1,7 @@ import { Button, Grid, Link as MuiLink, Typography } from '@material-ui/core/' import { createStyles, makeStyles, Theme } from '@material-ui/core/styles' import type { ReactElement } from 'react' -import { Activity } from 'react-feather' +import Activity from 'remixicon-react/PulseLineIcon' import { Link } from 'react-router-dom' import { config } from '../config' import { ROUTES } from '../routes' diff --git a/src/containers/DepositModal.tsx b/src/containers/DepositModal.tsx index e76bdd8..a328af2 100644 --- a/src/containers/DepositModal.tsx +++ b/src/containers/DepositModal.tsx @@ -1,5 +1,5 @@ import { ReactElement, useContext } from 'react' -import { Download } from 'react-feather' +import Download from 'remixicon-react/DownloadLineIcon' import { Context as SettingsContext } from '../providers/Settings' import WithdrawDepositModal from '../components/WithdrawDepositModal' diff --git a/src/containers/WithdrawModal.tsx b/src/containers/WithdrawModal.tsx index 9f2fc55..0cf8fc1 100644 --- a/src/containers/WithdrawModal.tsx +++ b/src/containers/WithdrawModal.tsx @@ -1,6 +1,6 @@ import { BigNumber } from 'bignumber.js' import { ReactElement, useContext } from 'react' -import { Upload } from 'react-feather' +import Upload from 'remixicon-react/UploadLineIcon' import WithdrawDepositModal from '../components/WithdrawDepositModal' import { Context as SettingsContext } from '../providers/Settings' diff --git a/src/pages/account/feeds/AccountFeeds.tsx b/src/pages/account/feeds/AccountFeeds.tsx index 93706cb..a53410c 100644 --- a/src/pages/account/feeds/AccountFeeds.tsx +++ b/src/pages/account/feeds/AccountFeeds.tsx @@ -1,6 +1,9 @@ import { Box } from '@material-ui/core' import { ReactElement, useContext, useState } from 'react' -import { Download, Info, PlusSquare, Trash } from 'react-feather' +import Download from 'remixicon-react/Download2LineIcon' +import Info from 'remixicon-react/InformationLineIcon' +import PlusSquare from 'remixicon-react/AddBoxLineIcon' +import Trash from 'remixicon-react/DeleteBin7LineIcon' import { useNavigate } from 'react-router' import ExpandableList from '../../../components/ExpandableList' import ExpandableListItem from '../../../components/ExpandableListItem' diff --git a/src/pages/account/stamps/AccountStamps.tsx b/src/pages/account/stamps/AccountStamps.tsx index 7596110..45bdf10 100644 --- a/src/pages/account/stamps/AccountStamps.tsx +++ b/src/pages/account/stamps/AccountStamps.tsx @@ -1,6 +1,6 @@ import { CircularProgress, Container, createStyles, makeStyles } from '@material-ui/core' import { ReactElement, useContext, useEffect } from 'react' -import { PlusSquare } from 'react-feather' +import PlusSquare from 'remixicon-react/AddBoxLineIcon' import { useNavigate } from 'react-router' import { SwarmButton } from '../../../components/SwarmButton' import TroubleshootConnectionCard from '../../../components/TroubleshootConnectionCard' diff --git a/src/pages/account/wallet/AccountWallet.tsx b/src/pages/account/wallet/AccountWallet.tsx index c19d46f..0372813 100644 --- a/src/pages/account/wallet/AccountWallet.tsx +++ b/src/pages/account/wallet/AccountWallet.tsx @@ -1,6 +1,8 @@ import { Box, Grid, Typography } from '@material-ui/core' import { ReactElement, useContext } from 'react' -import { Download, Gift, Link } from 'react-feather' +import Download from 'remixicon-react/DownloadLineIcon' +import Gift from 'remixicon-react/GiftLineIcon' +import Link from 'remixicon-react/LinkIcon' import { useNavigate } from 'react-router' import ExpandableListItem from '../../../components/ExpandableListItem' import ExpandableListItemActions from '../../../components/ExpandableListItemActions' diff --git a/src/pages/feeds/CreateNewFeed.tsx b/src/pages/feeds/CreateNewFeed.tsx index 2255dd5..fdd8f1a 100644 --- a/src/pages/feeds/CreateNewFeed.tsx +++ b/src/pages/feeds/CreateNewFeed.tsx @@ -2,7 +2,8 @@ import { Box, Grid, Typography } from '@material-ui/core' import { Form, Formik } from 'formik' import { useSnackbar } from 'notistack' import { ReactElement, useContext, useState } from 'react' -import { Check, X } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' +import X from 'remixicon-react/CloseLineIcon' import { useNavigate } from 'react-router' import { DocumentationText } from '../../components/DocumentationText' import ExpandableListItemActions from '../../components/ExpandableListItemActions' diff --git a/src/pages/feeds/DeleteFeedDialog.tsx b/src/pages/feeds/DeleteFeedDialog.tsx index cc3a78a..5b882f6 100644 --- a/src/pages/feeds/DeleteFeedDialog.tsx +++ b/src/pages/feeds/DeleteFeedDialog.tsx @@ -1,6 +1,7 @@ import { Box, Typography } from '@material-ui/core' import { ReactElement } from 'react' -import { Trash, X } from 'react-feather' +import X from 'remixicon-react/CloseLineIcon' +import Trash from 'remixicon-react/DeleteBin7LineIcon' import ExpandableListItemActions from '../../components/ExpandableListItemActions' import { SwarmButton } from '../../components/SwarmButton' import { SwarmDialog } from '../../components/SwarmDialog' diff --git a/src/pages/feeds/ExportFeedDialog.tsx b/src/pages/feeds/ExportFeedDialog.tsx index fcfe73b..e23bf27 100644 --- a/src/pages/feeds/ExportFeedDialog.tsx +++ b/src/pages/feeds/ExportFeedDialog.tsx @@ -2,7 +2,8 @@ import { Box, createStyles, makeStyles, Typography } from '@material-ui/core' import { saveAs } from 'file-saver' import { useSnackbar } from 'notistack' import { ReactElement } from 'react' -import { Clipboard, Download } from 'react-feather' +import Download from 'remixicon-react/DownloadLineIcon' +import Clipboard from 'remixicon-react/ClipboardLineIcon' import { Code } from '../../components/Code' import ExpandableListItemActions from '../../components/ExpandableListItemActions' import { SwarmButton } from '../../components/SwarmButton' diff --git a/src/pages/feeds/FeedPasswordDialog.tsx b/src/pages/feeds/FeedPasswordDialog.tsx index 199341a..454d3d4 100644 --- a/src/pages/feeds/FeedPasswordDialog.tsx +++ b/src/pages/feeds/FeedPasswordDialog.tsx @@ -1,6 +1,7 @@ import { Box, Typography } from '@material-ui/core' import { ReactElement, useState } from 'react' -import { Check, X } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' +import X from 'remixicon-react/CloseLineIcon' import ExpandableListItemActions from '../../components/ExpandableListItemActions' import { SwarmButton } from '../../components/SwarmButton' import { SwarmDialog } from '../../components/SwarmDialog' diff --git a/src/pages/feeds/FeedSubpage.tsx b/src/pages/feeds/FeedSubpage.tsx index 236d197..d5b29ae 100644 --- a/src/pages/feeds/FeedSubpage.tsx +++ b/src/pages/feeds/FeedSubpage.tsx @@ -1,7 +1,7 @@ import * as swarmCid from '@ethersphere/swarm-cid' import { Box } from '@material-ui/core' import { ReactElement, useContext, useEffect, useState } from 'react' -import { X } from 'react-feather' +import X from 'remixicon-react/CloseLineIcon' import { useNavigate, useParams } from 'react-router-dom' import { DocumentationText } from '../../components/DocumentationText' import ExpandableListItemActions from '../../components/ExpandableListItemActions' diff --git a/src/pages/feeds/ImportFeedDialog.tsx b/src/pages/feeds/ImportFeedDialog.tsx index 83ed828..62ffc10 100644 --- a/src/pages/feeds/ImportFeedDialog.tsx +++ b/src/pages/feeds/ImportFeedDialog.tsx @@ -1,7 +1,8 @@ import { Box, createStyles, makeStyles, TextareaAutosize, Theme } from '@material-ui/core' import { useSnackbar } from 'notistack' import React, { ReactElement, useContext, useRef, useState } from 'react' -import { Check, Upload } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' +import Upload from 'remixicon-react/UploadLineIcon' import ExpandableListItemActions from '../../components/ExpandableListItemActions' import { SwarmButton } from '../../components/SwarmButton' import { SwarmDialog } from '../../components/SwarmDialog' diff --git a/src/pages/feeds/UpdateFeed.tsx b/src/pages/feeds/UpdateFeed.tsx index 60546a8..851939f 100644 --- a/src/pages/feeds/UpdateFeed.tsx +++ b/src/pages/feeds/UpdateFeed.tsx @@ -1,7 +1,8 @@ import { Box, Grid, Typography } from '@material-ui/core' import { useSnackbar } from 'notistack' import { ReactElement, useContext, useEffect, useState } from 'react' -import { Bookmark, X } from 'react-feather' +import X from 'remixicon-react/CloseLineIcon' +import Bookmark from 'remixicon-react/BookmarkLineIcon' import { useNavigate, useParams } from 'react-router' import ExpandableListItemActions from '../../components/ExpandableListItemActions' import { HistoryHeader } from '../../components/HistoryHeader' diff --git a/src/pages/feeds/index.tsx b/src/pages/feeds/index.tsx index a13bbba..a8dada4 100644 --- a/src/pages/feeds/index.tsx +++ b/src/pages/feeds/index.tsx @@ -1,6 +1,9 @@ import { Box, Typography } from '@material-ui/core' import { ReactElement, useContext, useState } from 'react' -import { Download, Info, PlusSquare, Trash } from 'react-feather' +import Download from 'remixicon-react/DownloadLineIcon' +import PlusSquare from 'remixicon-react/AddBoxLineIcon' +import Info from 'remixicon-react/InformationLineIcon' +import Trash from 'remixicon-react/DeleteBin7LineIcon' import { useNavigate } from 'react-router' import ExpandableList from '../../components/ExpandableList' import ExpandableListItem from '../../components/ExpandableListItem' diff --git a/src/pages/files/AssetPreview.tsx b/src/pages/files/AssetPreview.tsx index c83879f..7acea0b 100644 --- a/src/pages/files/AssetPreview.tsx +++ b/src/pages/files/AssetPreview.tsx @@ -1,7 +1,8 @@ import { Box, Grid, Typography } from '@material-ui/core' import { Web } from '@material-ui/icons' import { ReactElement } from 'react' -import { File, Folder } from 'react-feather' +import File from 'remixicon-react/FileLineIcon' +import Folder from 'remixicon-react/FolderLineIcon' import { FitImage } from '../../components/FitImage' import { shortenText } from '../../utils' import { getHumanReadableFileSize } from '../../utils/file' diff --git a/src/pages/files/Download.tsx b/src/pages/files/Download.tsx index 73f3b84..2f4cd63 100644 --- a/src/pages/files/Download.tsx +++ b/src/pages/files/Download.tsx @@ -3,6 +3,7 @@ import { ManifestJs } from '@ethersphere/manifest-js' import { useSnackbar } from 'notistack' import { ReactElement, useContext, useState } from 'react' import { useNavigate } from 'react-router-dom' +import Search from 'remixicon-react/SearchLineIcon' import ExpandableListItemInput from '../../components/ExpandableListItemInput' import { History } from '../../components/History' import { Context, defaultUploadOrigin } from '../../providers/File' @@ -88,6 +89,7 @@ export function Download(): ReactElement { helperText={referenceError} confirmLabel={'Find'} confirmLabelDisabled={Boolean(referenceError) || loading} + confirmIcon={Search} placeholder="e.g. 31fb0362b1a42536134c86bc58b97ac0244e5c6630beec3e27c2d1cecb38c605" expandedOnly mapperFn={value => recognizeEnsOrSwarmHash(value)} diff --git a/src/pages/files/DownloadActionBar.tsx b/src/pages/files/DownloadActionBar.tsx index 6efb982..a6cef80 100644 --- a/src/pages/files/DownloadActionBar.tsx +++ b/src/pages/files/DownloadActionBar.tsx @@ -1,6 +1,9 @@ import { Box, Grid } from '@material-ui/core' import { ReactElement } from 'react' -import { Bookmark, Download, Link, X } from 'react-feather' +import X from 'remixicon-react/CloseLineIcon' +import Bookmark from 'remixicon-react/BookmarkLineIcon' +import Download from 'remixicon-react/DownloadLineIcon' +import Link from 'remixicon-react/LinkIcon' import ExpandableListItemActions from '../../components/ExpandableListItemActions' import { SwarmButton } from '../../components/SwarmButton' diff --git a/src/pages/files/UploadActionBar.tsx b/src/pages/files/UploadActionBar.tsx index 8856c01..b0f54c2 100644 --- a/src/pages/files/UploadActionBar.tsx +++ b/src/pages/files/UploadActionBar.tsx @@ -1,6 +1,10 @@ import { Box, Grid } from '@material-ui/core' import { ReactElement } from 'react' -import { ArrowLeft, Check, Layers, PlusSquare, X } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' +import X from 'remixicon-react/CloseLineIcon' +import ArrowLeft from 'remixicon-react/ArrowLeftLineIcon' +import PlusSquare from 'remixicon-react/AddBoxLineIcon' +import Layers from 'remixicon-react/StackLineIcon' import { DocumentationText } from '../../components/DocumentationText' import ExpandableListItemActions from '../../components/ExpandableListItemActions' import { SwarmButton } from '../../components/SwarmButton' diff --git a/src/pages/files/UploadArea.tsx b/src/pages/files/UploadArea.tsx index ead585a..9eba267 100644 --- a/src/pages/files/UploadArea.tsx +++ b/src/pages/files/UploadArea.tsx @@ -2,7 +2,9 @@ import { createStyles, makeStyles, Theme } from '@material-ui/core' import { DropzoneArea } from 'material-ui-dropzone' import { useSnackbar } from 'notistack' import { ReactElement, useContext, useState } from 'react' -import { FilePlus, FolderPlus, PlusCircle } from 'react-feather' +import PlusCircle from 'remixicon-react/AddCircleLineIcon' +import FilePlus from 'remixicon-react/FileAddLineIcon' +import FolderPlus from 'remixicon-react/FolderAddLineIcon' import { useNavigate } from 'react-router-dom' import { DocumentationText } from '../../components/DocumentationText' import { SwarmButton } from '../../components/SwarmButton' diff --git a/src/pages/gift-code/index.tsx b/src/pages/gift-code/index.tsx index 220e59f..0d0d142 100644 --- a/src/pages/gift-code/index.tsx +++ b/src/pages/gift-code/index.tsx @@ -1,7 +1,8 @@ import { Box, Typography } from '@material-ui/core' import { useSnackbar } from 'notistack' import { ReactElement, useContext, useEffect, useState } from 'react' -import { Check, X } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' +import X from 'remixicon-react/CloseLineIcon' import { useNavigate } from 'react-router' import { Wallet } from 'ethers' import ExpandableListItem from '../../components/ExpandableListItem' diff --git a/src/pages/info/index.tsx b/src/pages/info/index.tsx index c07f620..a3be50f 100644 --- a/src/pages/info/index.tsx +++ b/src/pages/info/index.tsx @@ -1,6 +1,11 @@ import { ReactElement, useContext } from 'react' import { Button } from '@material-ui/core' -import { Globe, Briefcase, Search, Settings, ArrowUp, RefreshCcw } from 'react-feather' +import Wallet from 'remixicon-react/Wallet3LineIcon' +import ExchangeFunds from 'remixicon-react/ExchangeFundsLineIcon' +import Search from 'remixicon-react/SearchLineIcon' +import Globe from 'remixicon-react/GlobalLineIcon' +import Settings from 'remixicon-react/Settings2LineIcon' +import Upload from 'remixicon-react/UploadLineIcon' import { Context as BeeContext } from '../../providers/Bee' import Card from '../../components/Card' @@ -46,11 +51,11 @@ export default function Status(): ReactElement { {nodeInfo?.beeMode && ['light', 'full', 'dev'].includes(nodeInfo.beeMode) ? ( navigate(ROUTES.ACCOUNT_WALLET), }} - icon={} + icon={} title={`${balance?.bzz.toSignificantDigits(4)} xBZZ | ${balance?.dai.toSignificantDigits(4)} xDAI`} subtitle="Current wallet balance." status="ok" @@ -58,11 +63,11 @@ export default function Status(): ReactElement { ) : ( navigate(ROUTES.WALLET), }} - icon={} + icon={} title="Your wallet is not setup." subtitle="To share content on Swarm, please setup your wallet." status="error" @@ -75,11 +80,11 @@ export default function Status(): ReactElement { chequebookBalance?.availableBalance.toBigNumber.isGreaterThan(0) ? ( navigate(ROUTES.ACCOUNT_CHEQUEBOOK), }} - icon={} + icon={} title={`${chequebookBalance?.availableBalance.toSignificantDigits(4)} xBZZ`} subtitle="Current chequebook balance." status="ok" @@ -87,11 +92,11 @@ export default function Status(): ReactElement { ) : ( navigate(ROUTES.ACCOUNT_CHEQUEBOOK), }} - icon={} + icon={} title={ chequebookBalance?.availableBalance ? `${chequebookBalance.availableBalance.toFixedDecimal(4)} xBZZ` diff --git a/src/pages/rpc/Confirmation.tsx b/src/pages/rpc/Confirmation.tsx index 33ddd06..19ba1bc 100644 --- a/src/pages/rpc/Confirmation.tsx +++ b/src/pages/rpc/Confirmation.tsx @@ -1,6 +1,9 @@ import { Box, createStyles, Grid, makeStyles, Typography } from '@material-ui/core' import { ReactElement } from 'react' -import { Battery, BatteryCharging, Check, Gift } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' +import BankCard from 'remixicon-react/BankCard2LineIcon' +import MoneyDollarCircle from 'remixicon-react/MoneyDollarCircleLineIcon' +import Gift from 'remixicon-react/GiftLineIcon' import { useNavigate } from 'react-router' import ExpandableListItemActions from '../../components/ExpandableListItemActions' import { HistoryHeader } from '../../components/HistoryHeader' @@ -45,10 +48,10 @@ export default function Confirmation(): ReactElement { - navigate(ROUTES.TOP_UP_BANK_CARD)}> + navigate(ROUTES.TOP_UP_BANK_CARD)}> Get started with bank card - navigate(ROUTES.TOP_UP_CRYPTO)}> + navigate(ROUTES.TOP_UP_CRYPTO)}> Use DAI navigate(ROUTES.TOP_UP_GIFT_CODE)}> diff --git a/src/pages/rpc/index.tsx b/src/pages/rpc/index.tsx index e16e0ea..41387fc 100644 --- a/src/pages/rpc/index.tsx +++ b/src/pages/rpc/index.tsx @@ -1,7 +1,7 @@ import { Box, Typography } from '@material-ui/core' import { useSnackbar } from 'notistack' import { ReactElement, useContext, useState } from 'react' -import { Check } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' import { useNavigate } from 'react-router' import { providers } from 'ethers' import { HistoryHeader } from '../../components/HistoryHeader' diff --git a/src/pages/stamps/PostageStampCreation.tsx b/src/pages/stamps/PostageStampCreation.tsx index c25595b..ca927c3 100644 --- a/src/pages/stamps/PostageStampCreation.tsx +++ b/src/pages/stamps/PostageStampCreation.tsx @@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js' import { Form, Formik, FormikHelpers } from 'formik' import { useSnackbar } from 'notistack' import { ReactElement, useContext } from 'react' -import { Check } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' import { SwarmButton } from '../../components/SwarmButton' import { SwarmTextInput } from '../../components/SwarmTextInput' import { Context as BeeContext } from '../../providers/Bee' diff --git a/src/pages/stamps/index.tsx b/src/pages/stamps/index.tsx index ef3f91a..2a1bae6 100644 --- a/src/pages/stamps/index.tsx +++ b/src/pages/stamps/index.tsx @@ -1,7 +1,7 @@ import { CircularProgress, Container } from '@material-ui/core' import { createStyles, makeStyles } from '@material-ui/core/styles' import { ReactElement, useContext, useEffect } from 'react' -import { PlusSquare } from 'react-feather' +import PlusSquare from 'remixicon-react/AddBoxLineIcon' import { useNavigate } from 'react-router' import { SwarmButton } from '../../components/SwarmButton' import TroubleshootConnectionCard from '../../components/TroubleshootConnectionCard' diff --git a/src/pages/top-up/GiftCardFund.tsx b/src/pages/top-up/GiftCardFund.tsx index e12d00d..2c96ca9 100644 --- a/src/pages/top-up/GiftCardFund.tsx +++ b/src/pages/top-up/GiftCardFund.tsx @@ -1,7 +1,8 @@ import { Box, Typography } from '@material-ui/core' import { useSnackbar } from 'notistack' import { ReactElement, useContext, useEffect, useState } from 'react' -import { ArrowDown, Check } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' +import ArrowDown from 'remixicon-react/ArrowDownLineIcon' import { useNavigate, useParams } from 'react-router' import ExpandableListItem from '../../components/ExpandableListItem' import ExpandableListItemKey from '../../components/ExpandableListItemKey' diff --git a/src/pages/top-up/GiftCardTopUpIndex.tsx b/src/pages/top-up/GiftCardTopUpIndex.tsx index 290fbe2..e698748 100644 --- a/src/pages/top-up/GiftCardTopUpIndex.tsx +++ b/src/pages/top-up/GiftCardTopUpIndex.tsx @@ -2,7 +2,7 @@ import { Box, Typography } from '@material-ui/core' import { Wallet } from 'ethers' import { useSnackbar } from 'notistack' import { ReactElement, useContext, useState } from 'react' -import { ArrowRight } from 'react-feather' +import ArrowRight from 'remixicon-react/ArrowRightLineIcon' import { useNavigate } from 'react-router' import { Context as TopUpContext } from '../../providers/TopUp' import { HistoryHeader } from '../../components/HistoryHeader' diff --git a/src/pages/top-up/Swap.tsx b/src/pages/top-up/Swap.tsx index 9eca7ed..14dc81a 100644 --- a/src/pages/top-up/Swap.tsx +++ b/src/pages/top-up/Swap.tsx @@ -1,7 +1,8 @@ import { Box, Typography } from '@material-ui/core' import { useSnackbar } from 'notistack' import { ReactElement, useContext, useState } from 'react' -import { ArrowDown, Check } from 'react-feather' +import ArrowDown from 'remixicon-react/ArrowDownCircleLineIcon' +import Check from 'remixicon-react/CheckLineIcon' import { useNavigate } from 'react-router' import ExpandableListItem from '../../components/ExpandableListItem' import ExpandableListItemActions from '../../components/ExpandableListItemActions' diff --git a/src/pages/top-up/index.tsx b/src/pages/top-up/index.tsx index 8735502..8e89de1 100644 --- a/src/pages/top-up/index.tsx +++ b/src/pages/top-up/index.tsx @@ -1,6 +1,6 @@ import { Box, Grid, Typography } from '@material-ui/core' import { ReactElement, useContext } from 'react' -import { Check } from 'react-feather' +import Check from 'remixicon-react/CheckLineIcon' import { useNavigate } from 'react-router' import ExpandableListItem from '../../components/ExpandableListItem' import ExpandableListItemKey from '../../components/ExpandableListItemKey'