diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue index 7b9b520ff..b23400d3d 100644 --- a/src/components/GiftedDialog.vue +++ b/src/components/GiftedDialog.vue @@ -55,7 +55,7 @@ }" class="text-blue-500" > - Photo & Details ... + Photo & more options ... diff --git a/src/components/OfferDialog.vue b/src/components/OfferDialog.vue index af48780ee..0d7fab770 100644 --- a/src/components/OfferDialog.vue +++ b/src/components/OfferDialog.vue @@ -36,18 +36,27 @@ -
- - Expiration +
+ + + Conditions & more options... + -

Sign & Send to publish to the world @@ -71,7 +80,6 @@ diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue index c19632ca3..6d282d981 100644 --- a/src/views/ContactsView.vue +++ b/src/views/ContactsView.vue @@ -271,7 +271,7 @@ @@ -1131,8 +1131,11 @@ export default class ContactsView extends Vue { ); } - openOfferDialog(recipientDid: string) { - (this.$refs.customOfferDialog as OfferDialog).open(recipientDid); + openOfferDialog(recipientDid: string, recipientName: string) { + (this.$refs.customOfferDialog as OfferDialog).open( + recipientDid, + recipientName, + ); } private async onClickCancelName() { diff --git a/src/views/GiftedDetails.vue b/src/views/GiftedDetailsView.vue similarity index 98% rename from src/views/GiftedDetails.vue rename to src/views/GiftedDetailsView.vue index 3e1466c5a..dfdb18969 100644 --- a/src/views/GiftedDetails.vue +++ b/src/views/GiftedDetailsView.vue @@ -269,6 +269,7 @@ export default class GiftedDetails extends Vue { this.hideBackButton = (this.$route as Router).query["hideBackButton"] === "true"; this.message = ((this.$route as Router).query["message"] as string) || ""; + // find any offer ID const fulfills = this.prevCredToEdit?.claim?.fulfills; const fulfillsArray = Array.isArray(fulfills) @@ -351,6 +352,7 @@ export default class GiftedDetails extends Vue { ); } } + // these should be functions but something's wrong with the syntax in the <> conditional this.givenToProject = !!this.projectId; this.givenToRecipient = !this.givenToProject && !!this.recipientDid; @@ -549,7 +551,7 @@ export default class GiftedDetails extends Vue { group: "alert", type: "warning", title: "Error", - text: "To assign to a project, you must open this dialog through a project.", + text: "To assign to a project, you must open this page through a project.", }, 3000, ); @@ -574,7 +576,7 @@ export default class GiftedDetails extends Vue { group: "alert", type: "warning", title: "Error", - text: "To assign to a recipient, you must open this dialog from a contact.", + text: "To assign to a recipient, you must open this page from a contact.", }, 3000, ); @@ -694,7 +696,6 @@ export default class GiftedDetails extends Vue { constructGiveParam() { const recipientDid = this.givenToRecipient ? this.recipientDid : undefined; const projectId = this.givenToProject ? this.projectId : undefined; - // const giveClaim = constructGive( const giveClaim = hydrateGive( this.prevCredToEdit?.claim as GiveVerifiableCredential, this.giverDid, diff --git a/src/views/NewEditProjectView.vue b/src/views/NewEditProjectView.vue index 5c469f0a1..c48613573 100644 --- a/src/views/NewEditProjectView.vue +++ b/src/views/NewEditProjectView.vue @@ -97,8 +97,8 @@ /> diff --git a/src/views/OfferDetailsView.vue b/src/views/OfferDetailsView.vue new file mode 100644 index 000000000..fc26305bb --- /dev/null +++ b/src/views/OfferDetailsView.vue @@ -0,0 +1,633 @@ +