diff --git a/src/assets/icons/zapIcons/blueChest.png b/src/assets/icons/blue-chest.png similarity index 100% rename from src/assets/icons/zapIcons/blueChest.png rename to src/assets/icons/blue-chest.png diff --git a/src/assets/icons/zapIcons/coinStack.png b/src/assets/icons/coin-stack.png similarity index 100% rename from src/assets/icons/zapIcons/coinStack.png rename to src/assets/icons/coin-stack.png diff --git a/src/assets/icons/zapIcons/coin.png b/src/assets/icons/coin.png similarity index 100% rename from src/assets/icons/zapIcons/coin.png rename to src/assets/icons/coin.png diff --git a/src/assets/icons/zapIcons/moneyBag.png b/src/assets/icons/money-bag.png similarity index 100% rename from src/assets/icons/zapIcons/moneyBag.png rename to src/assets/icons/money-bag.png diff --git a/src/assets/icons/zapIcons/pileCoins.png b/src/assets/icons/pile-coin.png similarity index 100% rename from src/assets/icons/zapIcons/pileCoins.png rename to src/assets/icons/pile-coin.png diff --git a/src/components/ui/button/button.tsx b/src/components/ui/button/button.tsx index c7bf840df..412717d3c 100644 --- a/src/components/ui/button/button.tsx +++ b/src/components/ui/button/button.tsx @@ -23,8 +23,6 @@ interface IButton { onClick?: (event: React.MouseEvent) => void; /** A predefined button size. */ size?: ButtonSizes; - /** A predefined icon size. */ - iconSize?: number; /** Text inside the button. Takes precedence over `children`. */ text?: React.ReactNode; /** Makes the button into a navlink, if provided. */ @@ -42,7 +40,6 @@ const Button = React.forwardRef((props, ref): JSX.El children, disabled = false, icon, - iconSize = 4, onClick, size = 'md', text, @@ -66,7 +63,7 @@ const Button = React.forwardRef((props, ref): JSX.El return null; } - return ; + return ; }; const handleClick: React.MouseEventHandler = React.useCallback((event) => { diff --git a/src/features/zap/components/zap-pay-request-form.tsx b/src/features/zap/components/zap-pay-request-form.tsx index f1ec92224..e56b435f3 100644 --- a/src/features/zap/components/zap-pay-request-form.tsx +++ b/src/features/zap/components/zap-pay-request-form.tsx @@ -7,10 +7,16 @@ import Account from 'soapbox/components/account'; import { Stack, Button, Input } from 'soapbox/components/ui'; import { useAppDispatch } from 'soapbox/hooks'; -import icons from '../../../components/ui/icon'; - import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities'; +const chestIcon = require('soapbox/assets/icons/blue-chest.png'); +const coinStack = require('soapbox/assets/icons/coin-stack.png'); +const coinIcon = require('soapbox/assets/icons/coin.png'); +const moneyBag = require('soapbox/assets/icons/money-bag.png'); +const pileCoin = require('soapbox/assets/icons/pile-coin.png'); + + + interface IZapPayRequestForm { status?: StatusEntity; account: AccountEntity; @@ -68,11 +74,11 @@ const ZapPayRequestForm = ({ account, status }: IZapPayRequestForm) => {
-