From e35d2c68b95b3224f6f7055e08c8923afe1a04ee Mon Sep 17 00:00:00 2001
From: Pete Watters <2938440+pete-watters@users.noreply.github.com>
Date: Mon, 4 Mar 2024 06:27:28 +0000
Subject: [PATCH] chore: rebase hell

---
 .../receive/components/receive-collectibles.tsx      | 12 ++++++------
 src/app/pages/receive/components/receive-tokens.tsx  |  8 ++++----
 .../components/recipient-fields/recipient-field.tsx  |  2 +-
 .../form/brc-20/brc20-send-form.tsx                  |  2 +-
 .../ui/components/dropdown-menu/dropdown-menu.tsx    |  4 ----
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/app/pages/receive/components/receive-collectibles.tsx b/src/app/pages/receive/components/receive-collectibles.tsx
index fd0999e859f..415704e0e97 100644
--- a/src/app/pages/receive/components/receive-collectibles.tsx
+++ b/src/app/pages/receive/components/receive-collectibles.tsx
@@ -3,9 +3,9 @@ import { css } from 'leather-styles/css';
 import { Stack } from 'leather-styles/jsx';
 
 import { copyToClipboard } from '@app/common/utils/copy-to-clipboard';
-import { StxAvatar } from '@app/components/crypto-assets/stacks/components/stx-avatar';
-import { StampsIcon } from '@app/ui/components/avatar-icon//stamps-icon';
-import { OrdinalIcon } from '@app/ui/components/avatar-icon/ordinal-icon';
+import { OrdinalAvatarIcon } from '@app/ui/components/avatar/ordinal-avatar-icon';
+import { StampsAvatarIcon } from '@app/ui/components/avatar/stamps-avatar-icon';
+import { StxAvatarIcon } from '@app/ui/components/avatar/stx-avatar-icon';
 
 import { receiveTabStyle } from '../receive-dialog';
 import { ReceiveItem } from './receive-item';
@@ -30,7 +30,7 @@ export function ReceiveCollectibles({
     <Stack className={css(receiveTabStyle)}>
       <ReceiveItem
         address={btcAddressTaproot}
-        icon={<OrdinalIcon />}
+        icon={<OrdinalAvatarIcon />}
         dataTestId={HomePageSelectors.ReceiveBtcTaprootQrCodeBtn}
         onCopyAddress={() => copyToClipboard(btcAddressTaproot)}
         onClickQrCode={onClickQrOrdinal}
@@ -38,14 +38,14 @@ export function ReceiveCollectibles({
       />
       <ReceiveItem
         address={btcAddressNativeSegwit}
-        icon={<StampsIcon />}
+        icon={<StampsAvatarIcon />}
         onClickQrCode={onClickQrStamp}
         onCopyAddress={() => copyToClipboard(btcAddressNativeSegwit)}
         title="Bitcoin Stamp"
       />
       <ReceiveItem
         address={stxAddress}
-        icon={<StxAvatar />}
+        icon={<StxAvatarIcon />}
         onCopyAddress={() => copyToClipboard(stxAddress)}
         onClickQrCode={onClickQrStacksNft}
         title="Stacks NFT"
diff --git a/src/app/pages/receive/components/receive-tokens.tsx b/src/app/pages/receive/components/receive-tokens.tsx
index d64acf158c5..aa00ef5a148 100644
--- a/src/app/pages/receive/components/receive-tokens.tsx
+++ b/src/app/pages/receive/components/receive-tokens.tsx
@@ -3,8 +3,8 @@ import { css } from 'leather-styles/css';
 import { Stack } from 'leather-styles/jsx';
 
 import { copyToClipboard } from '@app/common/utils/copy-to-clipboard';
-import { StxAvatar } from '@app/components/crypto-assets/stacks/components/stx-avatar';
-import { BtcIcon } from '@app/ui/components/avatar-icon/btc-icon';
+import { BtcAvatarIcon } from '@app/ui/components/avatar/btc-avatar-icon';
+import { StxAvatarIcon } from '@app/ui/components/avatar/stx-avatar-icon';
 
 import { receiveTabStyle } from '../receive-dialog';
 import { ReceiveItem } from './receive-item';
@@ -25,7 +25,7 @@ export function ReceiveTokens({
     <Stack className={css(receiveTabStyle)}>
       <ReceiveItem
         address={btcAddressNativeSegwit}
-        icon={<BtcIcon />}
+        icon={<BtcAvatarIcon />}
         dataTestId={HomePageSelectors.ReceiveBtcNativeSegwitQrCodeBtn}
         onCopyAddress={() => copyToClipboard(btcAddressNativeSegwit)}
         onClickQrCode={onClickQrBtc}
@@ -33,7 +33,7 @@ export function ReceiveTokens({
       />
       <ReceiveItem
         address={stxAddress}
-        icon={<StxAvatar />}
+        icon={<StxAvatarIcon />}
         dataTestId={HomePageSelectors.ReceiveStxQrCodeBtn}
         onCopyAddress={() => copyToClipboard(stxAddress)}
         onClickQrCode={onClickQrStx}
diff --git a/src/app/pages/send/send-crypto-asset-form/components/recipient-fields/recipient-field.tsx b/src/app/pages/send/send-crypto-asset-form/components/recipient-fields/recipient-field.tsx
index 0c9dc2a79ce..613201c1013 100644
--- a/src/app/pages/send/send-crypto-asset-form/components/recipient-fields/recipient-field.tsx
+++ b/src/app/pages/send/send-crypto-asset-form/components/recipient-fields/recipient-field.tsx
@@ -1,6 +1,6 @@
 import { TextInputFieldError } from '@app/components/field-error';
 
-import { SelectAccountButton } from '../recipient-accounts-drawer/select-account-button';
+import { SelectAccountButton } from '../recipient-accounts-dialog/select-account-button';
 import { RecipientAddressTypeField } from '../recipient-address-type-field';
 import { RecipientIdentifierTypeDropdown } from '../recipient-type-dropdown/recipient-type-dropdown';
 import { useRecipientSelectFields } from './hooks/use-recipient-select-fields';
diff --git a/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx b/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx
index cf26274f5de..682ea65d251 100644
--- a/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx
+++ b/src/app/pages/send/send-crypto-asset-form/form/brc-20/brc20-send-form.tsx
@@ -84,7 +84,7 @@ export function Brc20SendForm() {
                     }
                     autoComplete="off"
                   />
-                  <SelectedAssetField icon={<Brc20AvatarIcon />} name={tick} symbol={tick} />
+                  <SelectedAssetField icon={<Brc20AvatarIcon />} name={ticker} symbol={ticker} />
                   <Callout variant="info" title="Sending BRC-20 tokens requires two steps">
                     <styled.ol mb="space.02">
                       <li>1. Create transfer inscription with amount to send</li>
diff --git a/src/app/ui/components/dropdown-menu/dropdown-menu.tsx b/src/app/ui/components/dropdown-menu/dropdown-menu.tsx
index aea112c3c79..b36f4470769 100644
--- a/src/app/ui/components/dropdown-menu/dropdown-menu.tsx
+++ b/src/app/ui/components/dropdown-menu/dropdown-menu.tsx
@@ -115,14 +115,10 @@ const Group: typeof RadixDropdownMenu.Group = forwardRef((props, ref) => (
 
 export const DropdownMenu = {
   Root: RadixDropdownMenu.Root,
-  Group: RadixDropdownMenu.Group,
   Portal: RadixDropdownMenu.Portal,
   Trigger,
   Button,
-  Portal: RadixDropdownMenu.Portal,
   Group,
-  Trigger,
-  Button,
   IconButton,
   Content,
   Label,