diff --git a/packages/web/src/javascripts/Components/ContentListView/ListItemVaultInfo.tsx b/packages/web/src/javascripts/Components/ContentListView/ListItemVaultInfo.tsx index 26687ef53..4c4828361 100644 --- a/packages/web/src/javascripts/Components/ContentListView/ListItemVaultInfo.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/ListItemVaultInfo.tsx @@ -28,11 +28,11 @@ const ListItemVaultInfo: FunctionComponent = ({ item }) => { const sharedByContact = application.sharedVaults.getItemSharedBy(item) return ( -
+
{sharedByContact && ( -
+
{sharedByContact?.name}
diff --git a/packages/web/src/javascripts/Components/Icon/Icon.tsx b/packages/web/src/javascripts/Components/Icon/Icon.tsx index df6d6be5a..31f6d154a 100644 --- a/packages/web/src/javascripts/Components/Icon/Icon.tsx +++ b/packages/web/src/javascripts/Components/Icon/Icon.tsx @@ -4,11 +4,14 @@ import { IconNameToSvgMapping } from './IconNameToSvgMapping' import { classNames } from '@standardnotes/utils' import { LexicalIconName, LexicalIconNameToSvgMapping } from './LexicalIcons' +type Size = 'small' | 'medium' | 'normal' | 'large' | 'custom' + type Props = { type: VectorIconNameOrEmoji | LexicalIconName className?: string ariaLabel?: string - size?: 'small' | 'medium' | 'normal' | 'large' | 'custom' + size?: Size + emojiSize?: Size } const ContainerDimensions = { @@ -54,7 +57,7 @@ export const isIconEmoji = (type: VectorIconNameOrEmoji): boolean => { return getIconComponent(type) == undefined } -const Icon: FunctionComponent = ({ type, className = '', ariaLabel, size = 'normal' }) => { +const Icon: FunctionComponent = ({ type, className = '', ariaLabel, size = 'normal', emojiSize }) => { const IconComponent = getIconComponent(type) if (!IconComponent) { return ( @@ -62,9 +65,9 @@ const Icon: FunctionComponent = ({ type, className = '', ariaLabel, size className={classNames( 'fill-current', 'text-center', - EmojiSize[size], - EmojiContainerDimensions[size], - EmojiOffset[size], + EmojiSize[emojiSize || size], + EmojiContainerDimensions[emojiSize || size], + EmojiOffset[emojiSize || size], className, )} > diff --git a/packages/web/src/javascripts/Components/Vaults/VaultNameBadge.tsx b/packages/web/src/javascripts/Components/Vaults/VaultNameBadge.tsx index 437aeb47e..4dfdd3428 100644 --- a/packages/web/src/javascripts/Components/Vaults/VaultNameBadge.tsx +++ b/packages/web/src/javascripts/Components/Vaults/VaultNameBadge.tsx @@ -8,8 +8,17 @@ type Props = { const VaultNameBadge: FunctionComponent = ({ vault }) => { return ( -
- +
+ {vault.name}
)