diff --git a/packages/models/src/Domain/Runtime/AsymmetricMessage/MessageTypes/AsymmetricMessageSharedVaultInvite.ts b/packages/models/src/Domain/Runtime/AsymmetricMessage/MessageTypes/AsymmetricMessageSharedVaultInvite.ts index cd87231ab..9091dcdfb 100644 --- a/packages/models/src/Domain/Runtime/AsymmetricMessage/MessageTypes/AsymmetricMessageSharedVaultInvite.ts +++ b/packages/models/src/Domain/Runtime/AsymmetricMessage/MessageTypes/AsymmetricMessageSharedVaultInvite.ts @@ -1,5 +1,6 @@ import { KeySystemRootKeyContentSpecialized } from '../../../Syncable/KeySystemRootKey/KeySystemRootKeyContent' import { ContactPublicKeySetJsonInterface } from '../../../Syncable/TrustedContact/PublicKeySet/ContactPublicKeySetJsonInterface' +import { EmojiString, IconType } from '../../../Utilities/Icon/IconType' import { AsymmetricMessageDataCommon } from '../AsymmetricMessageDataCommon' import { AsymmetricMessagePayloadType } from '../AsymmetricMessagePayloadType' @@ -17,6 +18,7 @@ export type AsymmetricMessageSharedVaultInvite = { metadata: { name: string description?: string + iconString: IconType | EmojiString } } } diff --git a/packages/services/src/Domain/AsymmetricMessage/UseCase/ProcessAcceptedVaultInvite.ts b/packages/services/src/Domain/AsymmetricMessage/UseCase/ProcessAcceptedVaultInvite.ts index b3359f20c..b3fa74e4e 100644 --- a/packages/services/src/Domain/AsymmetricMessage/UseCase/ProcessAcceptedVaultInvite.ts +++ b/packages/services/src/Domain/AsymmetricMessage/UseCase/ProcessAcceptedVaultInvite.ts @@ -32,6 +32,7 @@ export class ProcessAcceptedVaultInvite { keyStorageMode: KeySystemRootKeyStorageMode.Synced, name: metadata.name, description: metadata.description, + iconString: metadata.iconString, sharing: { sharedVaultUuid: sharedVaultUuid, ownerUserUuid: ownerUuid, diff --git a/packages/services/src/Domain/SharedVaults/UseCase/CreateSharedVault.ts b/packages/services/src/Domain/SharedVaults/UseCase/CreateSharedVault.ts index 23ed45ccb..97decf859 100644 --- a/packages/services/src/Domain/SharedVaults/UseCase/CreateSharedVault.ts +++ b/packages/services/src/Domain/SharedVaults/UseCase/CreateSharedVault.ts @@ -1,5 +1,7 @@ import { GetVaultItems } from './../../Vault/UseCase/GetVaultItems' import { + EmojiString, + IconType, KeySystemRootKeyStorageMode, SharedVaultListingInterface, VaultListingInterface, @@ -23,12 +25,14 @@ export class CreateSharedVault { async execute(dto: { vaultName: string vaultDescription?: string + vaultIcon: IconType | EmojiString userInputtedPassword: string | undefined storagePreference: KeySystemRootKeyStorageMode }): Promise { const privateVault = await this._createVault.execute({ vaultName: dto.vaultName, vaultDescription: dto.vaultDescription, + vaultIcon: dto.vaultIcon, userInputtedPassword: dto.userInputtedPassword, storagePreference: dto.storagePreference, }) diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Contacts/EditContactModal.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Contacts/EditContactModal.tsx index a29efbc0a..7ecc621f4 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Contacts/EditContactModal.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Vaults/Contacts/EditContactModal.tsx @@ -84,7 +84,6 @@ const EditContactModal: FunctionComponent = ({ onCloseDialog, fromInvite,
= ({ onCloseDialog, fromInvite, }} /> - { - setCollaborationID(value) - }} - /> + {!editingContact?.isMe && ( + { + setCollaborationID(value) + }} + /> + )} {!editContactUuid && (