Merge fixes

src/views/GiftedDetailsView.vue

@@ -818,7 +818,7 @@ export default class GiftedDetails extends Vue {
             title: "Error",
             text: errorMessage || "There was an error creating the give.",
           },
-          -1,
+          5000,
         );
       } else {
         this.$notify(
@@ -828,7 +828,7 @@ export default class GiftedDetails extends Vue {
             title: "Success",
             text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
           },
-          5000,
+          3000,
         );
         localStorage.removeItem("imageUrl");
         if (this.destinationPathAfter) {
@@ -851,7 +851,7 @@ export default class GiftedDetails extends Vue {
           title: "Error",
           text: errorMessage,
         },
-        -1,
+        5000,
       );
     }
   }
@@ -912,7 +912,7 @@ export default class GiftedDetails extends Vue {
         title: "Data Sharing",
         text: libsUtil.PRIVACY_MESSAGE,
       },
-      -1,
+      7000,
     );
   }
 }