chore: icons rebase

Author: pete-watters

src/app/features/container/container.tsx

@@ -24,8 +24,8 @@ import { ContainerLayout } from '@app/ui/components/containers/container.layout'
 import { NetworkModeBadge } from '@app/ui/components/containers/headers/components/network-mode-badge';
 import { Header } from '@app/ui/components/containers/headers/header';
 import { Flag } from '@app/ui/components/flag/flag';
-import { HamburgerIcon } from '@app/ui/components/icons/hamburger-icon';
 import { Logo } from '@app/ui/components/logo';
+import { HamburgerIcon } from '@app/ui/icons/';
 
 import { useRestoreFormState } from '../popup-send-form-restoration/use-restore-form-state';
 import { Settings } from '../settings/settings';

src/app/features/dialogs/high-fee-dialog/high-fee-dialog.tsx

@@ -12,10 +12,10 @@ import {
 import { openInNewTab } from '@app/common/utils/open-in-new-tab';
 import { Button } from '@app/ui/components/button/button';
 import { Dialog } from '@app/ui/components/containers/dialog/dialog';
-import { ErrorIcon } from '@app/ui/components/icons/error-icon';
 import { Link } from '@app/ui/components/link/link';
 import { Caption } from '@app/ui/components/typography/caption';
 import { Title } from '@app/ui/components/typography/title';
+import { ErrorIcon } from '@app/ui/icons';
 
 interface HighFeeDialogProps {
   learnMoreUrl: string;
@@ -42,7 +42,7 @@ export function HighFeeDialog({ learnMoreUrl, isShowing = false }: HighFeeDialog
       {isShowingHighFeeConfirmation && (
         <Stack px="space.05" gap="space.05" pb="space.06">
           <HStack>
-            <ErrorIcon color="error.label" size="md" />
+            <ErrorIcon color="error.label" width="md" />
             <Title>
               Are you sure you want to pay {values.fee} {values.feeCurrency} in fees for this
               transaction?

src/app/features/retrieve-taproot-to-native-segwit/components/retrieve-taproot-to-native-segwit.layout.tsx

@@ -1,9 +1,9 @@
 import { Flex, styled } from 'leather-styles/jsx';
 
 import { WarningLabel } from '@app/components/warning-label';
+import { BtcIcon } from '@app/ui/components/avatar-icon/btc-icon';
 import { Button } from '@app/ui/components/button/button';
 import { Dialog } from '@app/ui/components/containers/dialog/dialog';
-import { BtcIcon } from '@app/ui/components/icons/btc-icon';
 
 interface RetrieveTaprootToNativeSegwitLayoutProps {
   isBroadcasting: boolean;

src/app/features/settings/network/components/network-list-item.layout.tsx

@@ -6,9 +6,7 @@ import { NetworkConfiguration } from '@shared/constants';
 import { getUrlHostname } from '@app/common/utils';
 import { Button } from '@app/ui/components/button/button';
 import { DropdownMenu } from '@app/ui/components/dropdown-menu/dropdown-menu';
-import { CheckmarkIcon } from '@app/ui/components/icons/checkmark-icon';
-import { CloudOffIcon } from '@app/ui/components/icons/cloud-off-icon';
-import { TrashIcon } from '@app/ui/components/icons/trash-icon';
+import { CheckmarkIcon, CloudOffIcon, TrashIcon } from '@app/ui/icons';
 
 interface NetworkListItemLayoutProps {
   networkId: string;

src/app/features/settings/settings.tsx

@@ -17,11 +17,8 @@ import { useHasLedgerKeys, useLedgerDeviceTargetId } from '@app/store/ledger/led
 import { useCurrentNetworkId } from '@app/store/networks/networks.selectors';
 import { DropdownMenu } from '@app/ui/components/dropdown-menu/dropdown-menu';
 import { Flag } from '@app/ui/components/flag/flag';
-import { ChevronsRightIcon } from '@app/ui/components/icons/chevrons-right-icon';
-import { ExternalLinkIcon } from '@app/ui/components/icons/external-link-icon';
-import { PlaceholderIcon } from '@app/ui/components/icons/placeholder-icon';
-import { SwapIcon } from '@app/ui/components/icons/swap-icon';
 import { Caption } from '@app/ui/components/typography/caption';
+import { ChevronsRightIcon, ExternalLinkIcon, PlaceholderIcon, SwapIcon } from '@app/ui/icons/';
 
 import { openFeedbackDialog } from '../feedback-button/feedback-button';
 import { extractDeviceNameFromKnownTargetIds } from '../ledger/utils/generic-ledger-utils';

src/app/features/settings/theme/theme-list-item.tsx

@@ -3,8 +3,7 @@ import { useCallback } from 'react';
 import { UserSelectedTheme, getThemeLabel } from '@app/common/theme-provider';
 import { DropdownMenu } from '@app/ui/components/dropdown-menu/dropdown-menu';
 import { Flag } from '@app/ui/components/flag/flag';
-import { CheckmarkIcon } from '@app/ui/components/icons/checkmark-icon';
-import { PlaceholderIcon } from '@app/ui/components/icons/placeholder-icon';
+import { CheckmarkIcon, PlaceholderIcon } from '@app/ui/icons';
 
 interface ThemeListItemProps {
   theme: UserSelectedTheme;

src/app/pages/home/components/send-button.tsx

@@ -13,7 +13,7 @@ import {
   useTransferableStacksFungibleTokenAssetBalances,
 } from '@app/query/stacks/balance/stacks-ft-balances.hooks';
 import { useCurrentStacksAccount } from '@app/store/accounts/blockchain/stacks/stacks-account.hooks';
-import { ActionButton } from '@app/ui/components/layout/card/account/action-button';
+import { ActionButton } from '@app/ui/components/account/action-button';
 import { SendIcon } from '@app/ui/icons';
 
 function SendButtonSuspense() {

src/app/pages/onboarding/allow-diagnostics/allow-diagnostics-layout.tsx

@@ -4,8 +4,7 @@ import { Box, Flex, Stack, styled } from 'leather-styles/jsx';
 import { Button } from '@app/ui/components/button/button';
 import { Dialog } from '@app/ui/components/containers/dialog/dialog';
 import { Footer } from '@app/ui/components/containers/footers/footer';
-import { LeatherIcon } from '@app/ui/components/icons/leather-icon';
-import { CheckmarkIcon } from '@app/ui/icons/checkmark-icon';
+import { CheckmarkIcon, LogomarkIcon } from '@app/ui/icons/';
 
 interface ReasonToAllowDiagnosticsProps {
   text: string;
@@ -57,7 +56,7 @@ export function AllowDiagnosticsLayout({
     >
       <Stack py="space.04" gap="space.04">
         <Box height="32px">
-          <LeatherIcon />
+          <LogomarkIcon />
         </Box>
         <styled.h1 textStyle="heading.03">Help us improve</styled.h1>
         <styled.p textStyle="heading.05">

src/app/pages/onboarding/back-up-secret-key/back-up-secret-key.tsx

@@ -7,9 +7,7 @@ import { RouteUrls } from '@shared/route-urls';
 
 import { SecretKey } from '@app/features/secret-key-displayer/secret-key-displayer';
 import { useDefaultWalletSecretKey } from '@app/store/in-memory-key/in-memory-key.selectors';
-import { EyeSlashIcon } from '@app/ui/components/icons/eye-slash-icon';
-import { LockIcon } from '@app/ui/components/icons/lock-icon';
-import { RotateLeftIcon } from '@app/ui/components/icons/rotate-left-icon';
+import { EyeSlashIcon, KeyIcon, LockIcon } from '@app/ui/icons/';
 import { TwoColumnLayout } from '@app/ui/pages/two-column.layout';
 
 export const BackUpSecretKeyPage = memo(() => {
@@ -34,7 +32,7 @@ export const BackUpSecretKeyPage = memo(() => {
       action={
         <Stack gap="space.05" marginTop="space.04">
           <HStack alignItems="center">
-            <RotateLeftIcon />
+            <KeyIcon />
             <styled.span textStyle="caption.01">
               Your Secret Key gives <br /> access to your wallet
             </styled.span>

src/app/pages/receive/components/receive-collectibles.tsx

@@ -3,8 +3,8 @@ import { css } from 'leather-styles/css';
 import { Stack } from 'leather-styles/jsx';
 
 import { StxAvatar } from '@app/components/crypto-assets/stacks/components/stx-avatar';
-import { OrdinalIcon } from '@app/ui/components/icons/ordinal-icon';
-import { StampsIcon } from '@app/ui/components/icons/stamps-icon';
+import { StampsIcon } from '@app/ui/components/avatar-icon//stamps-icon';
+import { OrdinalIcon } from '@app/ui/components/avatar-icon/ordinal-icon';
 
 import { receiveTabStyle } from '../receive-dialog';
 import { ReceiveItem } from './receive-item';

src/app/pages/receive/components/receive-tokens.tsx

@@ -3,7 +3,7 @@ import { css } from 'leather-styles/css';
 import { Stack } from 'leather-styles/jsx';
 
 import { StxAvatar } from '@app/components/crypto-assets/stacks/components/stx-avatar';
-import { BtcIcon } from '@app/ui/components/icons/btc-icon';
+import { BtcIcon } from '@app/ui/components/avatar-icon/btc-icon';
 
 import { receiveTabStyle } from '../receive-dialog';
 import { ReceiveItem } from './receive-item';

src/app/pages/send/send-crypto-asset-form/form/btc/btc-send-form.tsx

@@ -12,10 +12,10 @@ import { HighFeeDialog } from '@app/features/dialogs/high-fee-dialog/high-fee-di
 import { useNativeSegwitBalance } from '@app/query/bitcoin/balance/btc-native-segwit-balance.hooks';
 import { useCryptoCurrencyMarketData } from '@app/query/common/market-data/market-data.hooks';
 import { useCurrentAccountNativeSegwitIndexZeroSigner } from '@app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks';
+import { BtcIcon } from '@app/ui/components/avatar-icon/btc-icon';
 import { Button } from '@app/ui/components/button/button';
 import { AvailableBalance } from '@app/ui/components/containers/footers/available-balance';
 import { Footer } from '@app/ui/components/containers/footers/footer';
-import { BtcIcon } from '@app/ui/components/icons/btc-icon';
 
 import { AmountField } from '../../components/amount-field';
 import { SelectedAssetField } from '../../components/selected-asset-field';

src/app/ui/components/account/account.card.stories.tsx

@@ -2,10 +2,7 @@ import type { Meta } from '@storybook/react';
 import { Flex } from 'leather-styles/jsx';
 
 import { ActionButton } from '@app/ui/components/account/action-button';
-import { ArrowDownIcon } from '@app/ui/components/icons/arrow-down-icon';
-import { ArrowUpIcon } from '@app/ui/components/icons/arrow-up-icon';
-import { PlusIcon } from '@app/ui/components/icons/plus-icon';
-import { SwapIcon } from '@app/ui/components/icons/swap-icon';
+import { ArrowDownIcon, ArrowUpIcon, PlusIcon, SwapIcon } from '@app/ui/icons';
 
 import { AccountCard as Component } from './account.card';
 

src/app/ui/components/account/account.card.tsx

@@ -4,8 +4,8 @@ import { SettingsSelectors } from '@tests/selectors/settings.selectors';
 import { Box, Divider, Flex, styled } from 'leather-styles/jsx';
 
 import { SwitchAccountDialog } from '@app/features/dialogs/switch-account-dialog/switch-account-dialog';
-import { ChevronDownIcon } from '@app/ui/components/icons/chevron-down-icon';
 import { Link } from '@app/ui/components/link/link';
+import { ChevronDownIcon } from '@app/ui/icons';
 
 interface AccountCardProps {
   name: string;

src/app/ui/components/account/action-button.tsx

@@ -1,7 +1,7 @@
 import { Flex, styled } from 'leather-styles/jsx';
 
+import AccessibleIcon from '@app/ui/components/avatar-icon/accessible-icon';
 import { Button } from '@app/ui/components/button/button';
-import AccessibleIcon from '@app/ui/components/icons/accessible-icon';
 
 interface ActionButtonProps extends React.ComponentProps<typeof Button> {
   icon: React.ReactNode;

src/app/ui/components/containers/headers/header.tsx

@@ -4,8 +4,7 @@ import { Flex, HStack, styled } from 'leather-styles/jsx';
 
 import { isString } from '@shared/utils';
 
-import { ArrowLeftIcon } from '@app/ui/components/icons/arrow-left-icon';
-import { CloseIcon } from '@app/ui/components/icons/close-icon';
+import { ArrowLeftIcon, CloseIcon } from '@app/ui/icons';
 
 import { HeaderActionButton } from './header-action-button';
 

src/app/ui/components/logo.tsx

@@ -1,6 +1,6 @@
 import { styled } from 'leather-styles/jsx';
 
-import { LeatherIcon } from '@app/ui/components/icons/leather-icon';
+import { LogomarkIcon } from '@app/ui/icons/logomark-icon';
 
 interface LogoProps {
   onClick?(): void;
@@ -13,7 +13,7 @@ export function Logo({ onClick }: LogoProps) {
       cursor={onClick ? 'pointer' : 'unset'}
       onClick={onClick ? onClick : undefined}
     >
-      <LeatherIcon width="logoWidth" height="logoHeight" />
+      <LogomarkIcon width="logoWidth" height="logoHeight" />
     </styled.button>
   );
 }

src/app/ui/pages/home.layout.stories.tsx

@@ -4,11 +4,8 @@ import { Box, Flex, Stack } from 'leather-styles/jsx';
 import { RouteUrls } from '@shared/route-urls';
 
 import { ActionButton } from '@app/ui/components/account/action-button';
-import { ArrowDownIcon } from '@app/ui/components/icons/arrow-down-icon';
-import { ArrowUpIcon } from '@app/ui/components/icons/arrow-up-icon';
-import { PlusIcon } from '@app/ui/components/icons/plus-icon';
-import { SwapIcon } from '@app/ui/components/icons/swap-icon';
 import { Tabs } from '@app/ui/components/tabs/tabs';
+import { ArrowDownIcon, ArrowUpIcon, PlusIcon, SwapIcon } from '@app/ui/icons';
 
 import { HomeLayout as Component } from './home.layout';