Skip to content

Commit

Permalink
fix: integrate avatar and address displayer
Browse files Browse the repository at this point in the history
  • Loading branch information
pete-watters committed Jun 19, 2024
1 parent 85f86cf commit 808efbd
Show file tree
Hide file tree
Showing 55 changed files with 120 additions and 601 deletions.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
"@noble/secp256k1": "2.1.0",
"@octokit/types": "12.4.0",
"@radix-ui/colors": "3.0.0",
"@radix-ui/react-avatar": "1.0.4",
"@radix-ui/react-dialog": "1.0.5",
"@radix-ui/react-dropdown-menu": "2.0.6",
"@radix-ui/react-tabs": "1.0.4",
Expand Down Expand Up @@ -255,7 +254,7 @@
"@leather-wallet/panda-preset": "0.2.0",
"@leather-wallet/prettier-config": "0.4.1",
"@leather-wallet/rpc": "1.0.3",
"@leather-wallet/ui": "1.4.4",
"@leather-wallet/ui": "1.4.5",
"@ls-lint/ls-lint": "2.2.3",
"@mdx-js/loader": "3.0.0",
"@pandacss/dev": "0.40.1",
Expand Down
70 changes: 34 additions & 36 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SharedComponentsSelectors } from '@tests/selectors/shared-component.selectors';
import { Box, BoxProps } from 'leather-styles/jsx';

import { AddressDisplayer } from '@app/ui/components/address-displayer/address-displayer';
import { AddressDisplayer } from '@leather-wallet/ui';

interface FormAddressDisplayerProps extends BoxProps {
address: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Circle } from 'leather-styles/jsx';

import type { Inscription } from '@leather-wallet/models';

import { OrdinalAvatarIcon } from '@app/ui/components/avatar/ordinal-avatar-icon';
import { OrdinalAvatarIcon } from '@leather-wallet/ui';

export function InscriptionIcon({ inscription, ...rest }: { inscription: Inscription }) {
switch (inscription.mimeType) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { HStack } from 'leather-styles/jsx';

import type { BitcoinTx } from '@leather-wallet/models';
import { useInscriptionByOutput } from '@leather-wallet/query';
import { BulletSeparator, Caption } from '@leather-wallet/ui';
import { BtcAvatarIcon, BulletSeparator, Caption } from '@leather-wallet/ui';

import { RouteUrls } from '@shared/route-urls';
import { analytics } from '@shared/utils/analytics';
Expand All @@ -21,7 +21,6 @@ import { openInNewTab } from '@app/common/utils/open-in-new-tab';
import { IncreaseFeeButton } from '@app/components/stacks-transaction-item/increase-fee-button';
import { TransactionTitle } from '@app/components/transaction/transaction-title';
import { useCurrentAccountNativeSegwitAddressIndexZero } from '@app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks';
import { BtcAvatarIcon } from '@app/ui/components/avatar/btc-avatar-icon';

import { TransactionItemLayout } from '../transaction-item/transaction-item.layout';
import { BitcoinTransactionIcon } from './bitcoin-transaction-icon';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { BoxProps, Flex } from 'leather-styles/jsx';

import type { Inscription } from '@leather-wallet/models';

import { OrdinalAvatarIcon } from '@app/ui/components/avatar/ordinal-avatar-icon';
import { OrdinalAvatarIcon } from '@leather-wallet/ui';

import { InscriptionImage } from './inscription-image';
import { InscriptionPreviewContainer } from './inscription-preview-container';
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/loaders/btc-balance-loader.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { BtcCryptoAssetBalance } from '@leather-wallet/models';
import { isFetchedWithSuccess, isInitializingData } from '@leather-wallet/query';
import { BtcAvatarIcon } from '@leather-wallet/ui';

import { useBtcCryptoAssetBalanceNativeSegwit } from '@app/query/bitcoin/balance/btc-balance-native-segwit.hooks';
import { BtcAvatarIcon } from '@app/ui/components/avatar/btc-avatar-icon';

import { CryptoAssetItemError } from '../crypto-asset-item/crypto-asset-item-error';
import { CryptoAssetItemPlaceholder } from '../crypto-asset-item/crypto-asset-item-placeholder';
Expand Down
3 changes: 1 addition & 2 deletions src/app/components/loaders/stx-balance-loader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import {
isInitializingData,
useStxCryptoAssetBalance,
} from '@leather-wallet/query';

import { StxAvatarIcon } from '@app/ui/components/avatar/stx-avatar-icon';
import { StxAvatarIcon } from '@leather-wallet/ui';

import { CryptoAssetItemError } from '../crypto-asset-item/crypto-asset-item-error';
import { CryptoAssetItemPlaceholder } from '../crypto-asset-item/crypto-asset-item-placeholder';
Expand Down
10 changes: 6 additions & 4 deletions src/app/components/stacks-asset-avatar.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { Box, BoxProps } from 'leather-styles/jsx';

import { DynamicColorCircle } from '@leather-wallet/ui';

import { Avatar, defaultFallbackDelay } from '@app/ui/components/avatar/avatar';
import { StxAvatarIcon } from '@app/ui/components/avatar/stx-avatar-icon';
import {
Avatar,
DynamicColorCircle,
StxAvatarIcon,
defaultFallbackDelay,
} from '@leather-wallet/ui';

interface StacksAssetAvatarProps extends BoxProps {
gradientString?: string;
Expand Down
Loading

0 comments on commit 808efbd

Please sign in to comment.