diff --git a/packages/web/src/javascripts/Components/ContentListView/ListItemVaultInfo.tsx b/packages/web/src/javascripts/Components/ContentListView/ListItemVaultInfo.tsx index c61fbb8d2..26687ef53 100644 --- a/packages/web/src/javascripts/Components/ContentListView/ListItemVaultInfo.tsx +++ b/packages/web/src/javascripts/Components/ContentListView/ListItemVaultInfo.tsx @@ -28,7 +28,7 @@ const ListItemVaultInfo: FunctionComponent = ({ item }) => { const sharedByContact = application.sharedVaults.getItemSharedBy(item) return ( -
+
{sharedByContact && ( diff --git a/packages/web/src/javascripts/Components/Menu/MenuItem.tsx b/packages/web/src/javascripts/Components/Menu/MenuItem.tsx index 18456eefb..d13cb4785 100644 --- a/packages/web/src/javascripts/Components/Menu/MenuItem.tsx +++ b/packages/web/src/javascripts/Components/Menu/MenuItem.tsx @@ -21,7 +21,16 @@ type MenuItemProps = { const MenuItem = forwardRef( ( - { children, className = '', icon, iconClassName, tabIndex, shortcut, disabled, ...props }: MenuItemProps, + { + children, + className = '', + icon, + iconClassName = 'w-6 h-6 md:w-5 md:h-5 text-neutral mr-2', + tabIndex, + shortcut, + disabled, + ...props + }: MenuItemProps, ref: Ref, ) => { return ( diff --git a/packages/web/src/javascripts/Components/NoteView/CollaborationInfoHUD.tsx b/packages/web/src/javascripts/Components/NoteView/CollaborationInfoHUD.tsx index 9fe32cf12..c59d0ec0b 100644 --- a/packages/web/src/javascripts/Components/NoteView/CollaborationInfoHUD.tsx +++ b/packages/web/src/javascripts/Components/NoteView/CollaborationInfoHUD.tsx @@ -3,6 +3,7 @@ import Icon from '../Icon/Icon' import { useApplication } from '../ApplicationProvider' import { DecryptedItemInterface } from '@standardnotes/snjs' import { featureTrunkVaultsEnabled } from '@/FeatureTrunk' +import VaultNameBadge from '../Vaults/VaultNameBadge' type Props = { item: DecryptedItemInterface @@ -28,13 +29,10 @@ const CollaborationInfoHUD: FunctionComponent = ({ item }) => { return (
-
- - {vault.name} -
+ {lastEditedBy && ( -
+
{lastEditedBy?.name}
diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults.tsx index eeb537d71..29a3903e9 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Vaults.tsx @@ -133,7 +133,7 @@ const Vaults = () => { Vaults -
+
{vaults.map((vault) => { return })} diff --git a/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultSelectionMenu.tsx b/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultSelectionMenu.tsx index ea6075d0b..462795055 100644 --- a/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultSelectionMenu.tsx +++ b/packages/web/src/javascripts/Components/VaultSelectionMenu/VaultSelectionMenu.tsx @@ -6,6 +6,8 @@ import RadioButtonGroup from '@/Components/RadioButtonGroup/RadioButtonGroup' import ManyVaultSelectionMenu from './ManyVaultSelectionMenu' import SingleVaultSelectionMenu from './SingleVaultSelectionMenu' import { useApplication } from '../ApplicationProvider' +import MenuItemSeparator from '../Menu/MenuItemSeparator' +import MenuItem from '../Menu/MenuItem' type MenuProps = { controller: VaultSelectionMenuController @@ -41,9 +43,17 @@ const VaultSelectionMenu: FunctionComponent = () => { onChange={(value) => changeSelectionMode(value as SettingsMode)} className="m-3 mt-1" /> - {mode === 'many' && } {mode === 'single' && } + + { + application.preferencesController.openPreferences('vaults') + }} + > + Open vault settings + ) } diff --git a/packages/web/src/javascripts/Components/Vaults/VaultNameBadge.tsx b/packages/web/src/javascripts/Components/Vaults/VaultNameBadge.tsx index 62144d56d..8b9b56279 100644 --- a/packages/web/src/javascripts/Components/Vaults/VaultNameBadge.tsx +++ b/packages/web/src/javascripts/Components/Vaults/VaultNameBadge.tsx @@ -8,11 +8,9 @@ type Props = { const VaultNameBadge: FunctionComponent = ({ vault }) => { return ( -
- - -
{vault.name}
-
+
+ + {vault.name}
) } diff --git a/packages/web/src/javascripts/Controllers/PreferencesController.ts b/packages/web/src/javascripts/Controllers/PreferencesController.ts index c589b8c36..4316a37b2 100644 --- a/packages/web/src/javascripts/Controllers/PreferencesController.ts +++ b/packages/web/src/javascripts/Controllers/PreferencesController.ts @@ -29,7 +29,10 @@ export class PreferencesController extends AbstractViewController { this.currentPane = prefId } - openPreferences = (): void => { + openPreferences = (prefId?: PreferenceId): void => { + if (prefId) { + this.currentPane = prefId + } this._open = true }