From 9a5a12da508961a7e3f44d922968f9456ebefd0d Mon Sep 17 00:00:00 2001 From: kyranjamie Date: Fri, 8 Mar 2024 14:40:12 +0100 Subject: [PATCH] fix: updated icons --- .../features/approver/approver.stories.tsx | 21 +++++++++++++++++-- .../approver/components/approver-header.tsx | 2 +- .../components/approver-subheader.tsx | 12 ++++++++++- src/app/ui/components/item/item.layout.tsx | 9 ++++---- theme/semantic-tokens.ts | 4 +--- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/app/features/approver/approver.stories.tsx b/src/app/features/approver/approver.stories.tsx index 441dc22a851..c0c581e1b55 100644 --- a/src/app/features/approver/approver.stories.tsx +++ b/src/app/features/approver/approver.stories.tsx @@ -6,6 +6,7 @@ import { Callout } from '@app/ui/components/callout/callout'; import { Flag } from '@app/ui/components/flag/flag'; import { ItemInteractive } from '@app/ui/components/item/item-interactive'; import { ItemLayout } from '@app/ui/components/item/item.layout'; +import { ZapIcon } from '@app/ui/icons'; import { Approver } from './approver'; @@ -32,8 +33,24 @@ export const ExampleOne: Story = { Hey watch out for this sketchy app - Example flag content - } align="top"> + + Subheader with icon + + + } + titleLeft={} + titleRight={} + captionLeft={} + captionRight={} + /> + + Subheader 2 + } + align="top" + mb="space.03" + > diff --git a/src/app/features/approver/components/approver-header.tsx b/src/app/features/approver/components/approver-header.tsx index 3b1135e0a11..dd9f8e13028 100644 --- a/src/app/features/approver/components/approver-header.tsx +++ b/src/app/features/approver/components/approver-header.tsx @@ -17,7 +17,7 @@ export function ApproverHeader({ title, requester }: ApproverHeaderProps) { {title} - + Requested by {requester} diff --git a/src/app/features/approver/components/approver-subheader.tsx b/src/app/features/approver/components/approver-subheader.tsx index 760cd7bf069..aa83095c376 100644 --- a/src/app/features/approver/components/approver-subheader.tsx +++ b/src/app/features/approver/components/approver-subheader.tsx @@ -6,5 +6,15 @@ type ApproverSubheaderProps = HTMLStyledProps<'h2'>; export function ApproverSubheader(props: ApproverSubheaderProps) { useRegisterApproverChild('subheader'); - return ; + return ( + + ); } diff --git a/src/app/ui/components/item/item.layout.tsx b/src/app/ui/components/item/item.layout.tsx index 236e96144c7..ccb8e3a5630 100644 --- a/src/app/ui/components/item/item.layout.tsx +++ b/src/app/ui/components/item/item.layout.tsx @@ -31,7 +31,6 @@ export function ItemLayout({ + {titleLeft} )} @@ -56,18 +55,18 @@ export function ItemLayout({ )} - + {isValidElement(titleRight) ? ( titleRight ) : ( - + {titleRight} )} {isValidElement(captionRight) ? ( captionRight ) : ( - + {captionRight} )} diff --git a/theme/semantic-tokens.ts b/theme/semantic-tokens.ts index cc2dd434cd9..de35a593b44 100644 --- a/theme/semantic-tokens.ts +++ b/theme/semantic-tokens.ts @@ -2,6 +2,4 @@ import { semanticTokens as leatherSemanticTokens } from '@leather-wallet/tokens' import { defineSemanticTokens } from '@pandacss/dev'; // ts-unused-exports:disable-next-line -export const semanticTokens = defineSemanticTokens({ - ...leatherSemanticTokens, -}); +export const semanticTokens = defineSemanticTokens({ ...leatherSemanticTokens });