Merge branch 'master' into ios-contact-copy

src/views/ContactsView.vue

@@ -107,7 +107,11 @@
       @copy-selected="copySelectedContacts"
     />
 
-    <GiftedDialog ref="customGivenDialog" />
+    <GiftedDialog
+      ref="customGivenDialog"
+      :giver-entity-type="'person'"
+      :recipient-entity-type="'person'"
+    />
     <OfferDialog ref="customOfferDialog" />
     <ContactNameDialog ref="contactNameDialog" />
 
@@ -1049,7 +1053,6 @@ export default class ContactsView extends Vue {
     }
 
     let callback: (amount: number) => void;
-    let customTitle = "";
     // choose whether to open dialog to user or from user
     if (giverDid == this.activeDid) {
       callback = (amount: number) => {
@@ -1057,7 +1060,6 @@ export default class ContactsView extends Vue {
         newList[recipientDid] = (newList[recipientDid] || 0) + amount;
         this.givenByMeUnconfirmed = newList;
       };
-      customTitle = "Given to " + (receiver?.name || "Someone Unnamed");
     } else {
       // must be (recipientDid == this.activeDid)
       callback = (amount: number) => {
@@ -1065,13 +1067,14 @@ export default class ContactsView extends Vue {
         newList[giverDid] = (newList[giverDid] || 0) + amount;
         this.givenToMeUnconfirmed = newList;
       };
-      customTitle = "Received from " + (giver?.name || "Someone Unnamed");
     }
     (this.$refs.customGivenDialog as GiftedDialog).open(
       giver,
       receiver,
       undefined as unknown as string,
-      customTitle,
+      undefined as unknown as string,
+      undefined as unknown as string,
+      undefined as unknown as string,
       undefined as unknown as string,
       callback,
     );