- {(isReturnedToIssuer || isTokenBurnt) && (
-
-
-
- {isReturnedToIssuer
- ? 'ETR Returned to Issuer'
- : 'ETR Taken Out of Circulation'}
-
-
-
+ {(isReturnedToIssuer || isTokenBurnt || isExpired) && (
+
+ {(isReturnedToIssuer || isTokenBurnt) && (
+
+
+ {isReturnedToIssuer
+ ? 'ETR Returned to Issuer'
+ : 'ETR Taken Out of Circulation'}
+
+
+ )}
+ {isExpired && (
+
+ ETR Expired
+
+ )}
+
)}
{!isTokenBurnt && (
diff --git a/src/components/AssetManagementPanel/AssetManagementForm/FormVariants/EditableAssetTitle/EditableAssetTitle.tsx b/src/components/AssetManagementPanel/AssetManagementForm/FormVariants/EditableAssetTitle/EditableAssetTitle.tsx
index 7290fa8..4d87aa7 100644
--- a/src/components/AssetManagementPanel/AssetManagementForm/FormVariants/EditableAssetTitle/EditableAssetTitle.tsx
+++ b/src/components/AssetManagementPanel/AssetManagementForm/FormVariants/EditableAssetTitle/EditableAssetTitle.tsx
@@ -16,7 +16,6 @@ interface EditableAssetTitleProps {
isEditable: boolean
newValue?: string
onSetNewValue?: (newValue: string) => void
- isError?: boolean
isRemark?: boolean
isSubmitted?: boolean
}
@@ -27,7 +26,6 @@ export const EditableAssetTitle: FunctionComponent
= ({
newValue,
isEditable,
onSetNewValue,
- isError: error,
isRemark,
isSubmitted,
}) => {
@@ -43,6 +41,8 @@ export const EditableAssetTitle: FunctionComponent = ({
// )
}
const [inputError, setInputError] = useState(false)
+ // const [unidentifiedAddressError, setUnidentifiedAddressError] =
+ // useState(false)
const verifySetNewValue = (newAddressValue: string) => {
// Update the value first
onSetNewValue?.(newAddressValue)
@@ -134,7 +134,7 @@ export const EditableAssetTitle: FunctionComponent = ({
value={newValue}
placeholder={`Input ${role}'s address`}
onChange={event => verifySetNewValue(event.target.value)}
- hasError={error || inputError}
+ hasError={inputError} //add in unidentifiedAddressError once implemented
/>
@@ -158,7 +158,7 @@ export const EditableAssetTitle: FunctionComponent
= ({
Input must be a valid address.
)}
- {error && (
+ {/* {unidentifiedAddressError && (
= ({
Unidentified address. Please check and input again.
- )}
+ )} */}
>
)
}
diff --git a/src/components/common/Overlay/OverlayContent/DocumentTransferMessage.tsx b/src/components/common/Overlay/OverlayContent/DocumentTransferMessage.tsx
index 6081994..32c2c69 100644
--- a/src/components/common/Overlay/OverlayContent/DocumentTransferMessage.tsx
+++ b/src/components/common/Overlay/OverlayContent/DocumentTransferMessage.tsx
@@ -12,14 +12,32 @@ export enum MessageTitle {
NO_MANAGE_ACCESS = 'No manage assets access',
NO_USER_AUTHORIZATION = 'User denied account authorization', // this error message must match error message from metamask extension itself
TRANSACTION_ERROR = 'Error - Failed transaction',
- RETURN_TO_ISSUER_DOCUMENT = 'Return of ETR Successful',
- ACCEPT_RETURN_TO_ISSUER_DOCUMENT = 'Return of ETR Accepted',
- REJECT_RETURN_TO_ISSUER_DOCUMENT = 'Return of ETR Rejected',
- CHANGE_BENEFICIARY_SUCCESS = 'Change Owner Success',
- NOMINATE_BENEFICIARY_HOLDER_SUCCESS = 'Nomination Success',
+ // Success
+ RETURN_TO_ISSUER_DOCUMENT_SUCCESS = 'Return of ETR Successful',
+ ACCEPT_RETURN_TO_ISSUER_DOCUMENT_SUCCESS = 'Return of ETR Accepted',
+ REJECT_RETURN_TO_ISSUER_DOCUMENT_SUCCESS = 'Return of ETR Rejected',
+
+ ENDORSE_BENEFICIARY_SUCCESS = 'Endorse Beneficiary Success',
+ NOMINATE_BENEFICIARY_SUCCESS = 'Nomination Success',
TRANSFER_HOLDER_SUCCESS = 'Transfer Holder Success',
TRANSFER_OWNER_HOLDER_SUCCESS = 'Transfer Ownership/Holdership Success',
TRANSFER_OWNER_SUCCESS = 'Transfer Owner Success',
+ REJECT_TRANSFER_OWNER_HOLDER_SUCCESS = 'Holdership/Ownership Rejection Success',
+ REJECT_TRANSFER_OWNER_SUCCESS = 'Ownership Rejection Success',
+ REJECT_TRANSFER_HOLDER_SUCCESS = 'Holder Rejection Success',
+ // Failed
+ TRANSFER_HOLDER_FAILED = 'Transfer Holder Failed',
+ TRANSFER_OWNER_FAILED = 'Transfer Owner Failed',
+ NOMINATE_BENEFICIARY_FAILED = 'Nomination Failed',
+ ENDORSE_BENEFICIARY_FAILED = 'Endorsement Failed',
+ TRANSFER_OWNER_HOLDER_FAILED = 'Transfer Ownership/Holdership Failed',
+ REJECT_TRANSFER_OWNER_HOLDER_FAILED = 'Holdership/Ownership Rejection Failed',
+ REJECT_TRANSFER_OWNER_FAILED = 'Ownership Rejection Failed',
+ REJECT_TRANSFER_HOLDER_FAILED = 'Holder Rejection Failed',
+
+ RETURN_TO_ISSUER_DOCUMENT_FAILED = 'Return of ETR Failed',
+ ACCEPT_RETURN_TO_ISSUER_DOCUMENT_FAILED = 'Return of ETR Acceptance Failed',
+ REJECT_RETURN_TO_ISSUER_DOCUMENT_FAILED = 'Return of ETR Rejection Failed',
}
interface ButtonCloseProps {
@@ -111,6 +129,7 @@ interface MessageProps {
beneficiaryAddress?: string
holderTitle?: string
holderAddress?: string
+ isSuccess?: boolean
}
export const MessageNoMetamask: FunctionComponent = () => {
@@ -156,76 +175,94 @@ export const MessageTransactionError: FunctionComponent