From ae26f4a87cb9b8fb3c5bb6ab0b7d4cc62295d461 Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Wed, 8 Nov 2023 14:35:30 -0800 Subject: [PATCH 1/2] the digital credential is not equivalent to the permit --- .../dashboard/mine/permits/Permits.tsx | 2 +- .../dashboard/mine/permits/PermitsTable.tsx | 2 +- .../IssuePermitDigitalCredential.tsx | 17 ++++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/services/minespace-web/src/components/dashboard/mine/permits/Permits.tsx b/services/minespace-web/src/components/dashboard/mine/permits/Permits.tsx index dfc18b68c2..1f0d579698 100644 --- a/services/minespace-web/src/components/dashboard/mine/permits/Permits.tsx +++ b/services/minespace-web/src/components/dashboard/mine/permits/Permits.tsx @@ -122,7 +122,7 @@ export const Permits: FC = ({ mine, permits, ...props }) => { ) } > - Generate Digital Wallet Connection + Generate Connection Invitation )} diff --git a/services/minespace-web/src/components/dashboard/mine/permits/PermitsTable.tsx b/services/minespace-web/src/components/dashboard/mine/permits/PermitsTable.tsx index f054bfd5e3..601fedb6b7 100644 --- a/services/minespace-web/src/components/dashboard/mine/permits/PermitsTable.tsx +++ b/services/minespace-web/src/components/dashboard/mine/permits/PermitsTable.tsx @@ -77,7 +77,7 @@ export const PermitsTable: FC = (props) => { event.preventDefault(); props.openModal({ props: { - title: "Issue Permit as Digital Credential", + title: "Issue Digital Credential", issuanceState: permit.lastAmendedVC, connectionState: permit.current_permittee_digital_wallet_connection_state, permitAmendmentGuid: permit.lastAmendedGuid, diff --git a/services/minespace-web/src/components/modalContent/verifiableCredentials/IssuePermitDigitalCredential.tsx b/services/minespace-web/src/components/modalContent/verifiableCredentials/IssuePermitDigitalCredential.tsx index 8d36374a4c..6900388648 100644 --- a/services/minespace-web/src/components/modalContent/verifiableCredentials/IssuePermitDigitalCredential.tsx +++ b/services/minespace-web/src/components/modalContent/verifiableCredentials/IssuePermitDigitalCredential.tsx @@ -76,7 +76,7 @@ export const IssuePermitDigitalCredential: FC alertTitle: { noWallet: "Your digital wallet needs to be set up before you can add this permit to your digital wallet.", - issueReady: "Option to Issue Permit as a Digital Credential.", + issueReady: `Issue Digital Credential for ${current_permittee}.`, pending: "The digital credential for this permit has already been offered to your digital wallet.", active: "This digital credential has been accepted.", @@ -84,7 +84,7 @@ export const IssuePermitDigitalCredential: FC alertMessage: { noWallet: "Digital wallets must be connected in order to send and receive digital credentials. Please establish a digital wallet connection by clicking on the 'Generate Digital Wallet Connection' button below.", - issueReady: `Receive your permit as a digital credential by clicking the button below. A request will be sent to the Chief Permitting Officer of B.C. who will then issue your permit as a digital credential for you to review, accept, and store in the digital wallet of ${current_permittee}.`, + issueReady: `Receive your permit as a digital credential by clicking the button below. The digital credential will be offered from the Chief Permitting Officer of B.C. for you to review, accept, and store in the digital wallet of ${current_permittee}.`, pending: `Please review and verify this digital credential in the digital wallet of ${current_permittee}. If all data is accurate, accept the credential for it to be stored in your digital wallet.`, active: `Please review the details in the digital wallet of ${current_permittee}.`, }, @@ -93,10 +93,9 @@ export const IssuePermitDigitalCredential: FC issueReady: ( <> - By generating this request, you are requesting your permit to be sent as a digital - credential. Please monitor the digital wallet of {current_permittee} to review and - accept any incoming offers being sent from the Chief Permitting Officer of B.C.'s - digital wallet. + By generating this request, you are requesting your digital credential. Please monitor + the digital wallet of {current_permittee} to review and accept any incoming offers from + the Chief Permitting Officer of B.C.'s digital wallet. Click below to add permit {permit_no} to the digital wallet of {current_permittee} @@ -105,9 +104,9 @@ export const IssuePermitDigitalCredential: FC ), }, issueButton: { - issueReady: `Issue Digital Credential for permit ${permit_no}`, - pending: `Digital Credential for permit ${permit_no} has been issued`, - active: `Digital Credential for permit ${permit_no} accepted`, + issueReady: `Issue Digital Credential for Permit ${permit_no}`, + pending: `Digital Credential for Permit ${permit_no} has been issued`, + active: `Digital Credential for Permit ${permit_no} accepted`, }, credentialStatusText: { pending: ( From c7094c05ff7e10c58abba3ec4afe56e0944ba5c1 Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Wed, 8 Nov 2023 14:42:49 -0800 Subject: [PATCH 2/2] other language changes --- .../IssuePermitDigitalCredential.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/services/minespace-web/src/components/modalContent/verifiableCredentials/IssuePermitDigitalCredential.tsx b/services/minespace-web/src/components/modalContent/verifiableCredentials/IssuePermitDigitalCredential.tsx index 6900388648..ce04b79fce 100644 --- a/services/minespace-web/src/components/modalContent/verifiableCredentials/IssuePermitDigitalCredential.tsx +++ b/services/minespace-web/src/components/modalContent/verifiableCredentials/IssuePermitDigitalCredential.tsx @@ -75,17 +75,16 @@ export const IssuePermitDigitalCredential: FC const content = { alertTitle: { noWallet: - "Your digital wallet needs to be set up before you can add this permit to your digital wallet.", + "Your digital wallet needs to be set up before you can add this credential to your digital wallet.", issueReady: `Issue Digital Credential for ${current_permittee}.`, - pending: - "The digital credential for this permit has already been offered to your digital wallet.", + pending: "This digital credential has already been offered.", active: "This digital credential has been accepted.", }, alertMessage: { noWallet: "Digital wallets must be connected in order to send and receive digital credentials. Please establish a digital wallet connection by clicking on the 'Generate Digital Wallet Connection' button below.", - issueReady: `Receive your permit as a digital credential by clicking the button below. The digital credential will be offered from the Chief Permitting Officer of B.C. for you to review, accept, and store in the digital wallet of ${current_permittee}.`, - pending: `Please review and verify this digital credential in the digital wallet of ${current_permittee}. If all data is accurate, accept the credential for it to be stored in your digital wallet.`, + issueReady: `Receive your digital credential by clicking the button below. The digital credential will be offered from the Chief Permitting Officer of B.C. for you to review, accept, and store in the digital wallet of ${current_permittee}.`, + pending: `Please review this digital credential in the digital wallet of ${current_permittee}. If all data is accurate, accept the credential for it to be stored in your digital wallet.`, active: `Please review the details in the digital wallet of ${current_permittee}.`, }, modalBody: { @@ -105,7 +104,7 @@ export const IssuePermitDigitalCredential: FC }, issueButton: { issueReady: `Issue Digital Credential for Permit ${permit_no}`, - pending: `Digital Credential for Permit ${permit_no} has been issued`, + pending: `Digital Credential for Permit ${permit_no} has been offered`, active: `Digital Credential for Permit ${permit_no} accepted`, }, credentialStatusText: {