diff --git a/src/components/AssetManagementPanel/AssetManagementApplication/AssetManagementApplication.test.tsx b/src/components/AssetManagementPanel/AssetManagementApplication/AssetManagementApplication.test.tsx
index f69d2b5..9974126 100644
--- a/src/components/AssetManagementPanel/AssetManagementApplication/AssetManagementApplication.test.tsx
+++ b/src/components/AssetManagementPanel/AssetManagementApplication/AssetManagementApplication.test.tsx
@@ -68,10 +68,10 @@ vi.mock('../AssetManagementForm', () => ({
),
}))
-// Mock TagBordered
+// Mock Tag
vi.mock('../../common/Tag', () => ({
- TagBordered: ({ children, ...props }: any) => (
-
+ Tag: ({ children, ...props }: any) => (
+
{children}
),
@@ -166,14 +166,14 @@ describe('AssetManagementApplication', () => {
/>
)
- expect(screen.getByTestId('expiredDoc')).toBeInTheDocument()
+ expect(screen.getByTestId('tag')).toBeInTheDocument()
expect(screen.getByText('Expired')).toBeInTheDocument()
})
it('does not render expired tag when document is not expired', () => {
render(
)
- expect(screen.queryByTestId('expiredDoc')).not.toBeInTheDocument()
+ expect(screen.queryByTestId('tag')).not.toBeInTheDocument()
})
})
@@ -413,7 +413,7 @@ describe('AssetManagementApplication', () => {
expect(
screen.queryByTestId('asset-management-form')
).not.toBeInTheDocument()
- expect(screen.queryByTestId('expiredDoc')).not.toBeInTheDocument()
+ expect(screen.queryByTestId('tag')).not.toBeInTheDocument()
})
})
diff --git a/src/components/AssetManagementPanel/AssetManagementApplication/index.tsx b/src/components/AssetManagementPanel/AssetManagementApplication/index.tsx
index 5515a75..f5a6e33 100644
--- a/src/components/AssetManagementPanel/AssetManagementApplication/index.tsx
+++ b/src/components/AssetManagementPanel/AssetManagementApplication/index.tsx
@@ -11,7 +11,7 @@ import { useTokenRegistryContract } from '../../../hooks/useTokenRegistryContrac
import { useTokenRegistryRole } from '../../../hooks/useTokenRegistryRole'
import { AssetManagementActions } from '../AssetManagementActions'
import { AssetManagementForm } from '../AssetManagementForm'
-import { TagBordered } from '../../common/Tag'
+import { Tag } from '../../common/Tag'
import { useTokenRegistryVersion } from '../../../hooks/useTokenRegistryVersion'
import { TokenRegistryVersions } from '../../../constants'
@@ -23,7 +23,7 @@ interface AssetManagementIsTransferableDocumentProps {
setShowEndorsementChain: (payload: boolean) => void
refreshEndorsementChain?: () => void
isTransferableDocument: true
- isExpired: boolean
+ isExpired?: boolean
}
interface AssetManagementIsNotTransferableDocumentProps {
@@ -200,16 +200,13 @@ export const AssetManagementApplication: FunctionComponent<
/>
) : (
isExpired && (
-
-
+
-
- Expired
-
-
+
Expired
+
)
)}
diff --git a/src/components/AssetManagementPanel/AssetManagementForm/AssetManagementForm.tsx b/src/components/AssetManagementPanel/AssetManagementForm/AssetManagementForm.tsx
index df11d81..1479c59 100644
--- a/src/components/AssetManagementPanel/AssetManagementForm/AssetManagementForm.tsx
+++ b/src/components/AssetManagementPanel/AssetManagementForm/AssetManagementForm.tsx
@@ -241,7 +241,6 @@ export const AssetManagementForm: FunctionComponent<
isTokenBurnt={isTokenBurnt}
setShowEndorsementChain={setShowEndorsementChain}
isTitleEscrow={isTitleEscrow}
- isExpired={isExpired}
/>
)}
{(formAction === AssetManagementActions.TransferHolder ||
diff --git a/src/components/AssetManagementPanel/AssetManagementForm/FormVariants/ActionSelectionForm/ActionSelectionForm.tsx b/src/components/AssetManagementPanel/AssetManagementForm/FormVariants/ActionSelectionForm/ActionSelectionForm.tsx
index baa4e58..b3fa1f8 100644
--- a/src/components/AssetManagementPanel/AssetManagementForm/FormVariants/ActionSelectionForm/ActionSelectionForm.tsx
+++ b/src/components/AssetManagementPanel/AssetManagementForm/FormVariants/ActionSelectionForm/ActionSelectionForm.tsx
@@ -24,7 +24,6 @@ interface ActionSelectionFormProps {
isTitleEscrow: boolean
isRejectPendingConfirmation?: boolean
isTokenBurnt: boolean
- isExpired?: boolean
canReturnToIssuer: boolean
canHandleShred?: boolean
@@ -50,7 +49,6 @@ export const ActionSelectionForm: FunctionComponent<
isTokenBurnt,
isTitleEscrow,
isRejectPendingConfirmation,
- isExpired,
canTransferHolder,
canTransferBeneficiary,
canTransferOwners,
@@ -187,14 +185,6 @@ export const ActionSelectionForm: FunctionComponent<
)}
- {isExpired && (
-
- ETR Expired
-
- )}
{!isTokenBurnt && (
diff --git a/src/components/home/VerifySection/ObfuscatedMessage.tsx b/src/components/home/VerifySection/ObfuscatedMessage.tsx
new file mode 100644
index 0000000..01ecc8c
--- /dev/null
+++ b/src/components/home/VerifySection/ObfuscatedMessage.tsx
@@ -0,0 +1,49 @@
+import React, { FunctionComponent, useEffect, useState } from 'react'
+import { isObfuscated } from '@trustvc/trustvc'
+
+interface ObfuscatedMessageProps {
+ document: unknown
+}
+
+export const ObfuscatedMessage: FunctionComponent