don't delete a gift image on an edit unless they hit 'save'

src/constants/notifications.ts

@@ -1175,11 +1175,6 @@ export const NOTIFY_GIFTED_DETAILS_DELETE_IMAGE_CONFIRM = {
   message: "",
 };
 
-export const NOTIFY_GIFTED_DETAILS_DELETE_IMAGE_ERROR = {
-  title: "Error",
-  message: "There was a problem deleting the image.",
-};
-
 export const NOTIFY_GIFTED_DETAILS_NO_IDENTIFIER = {
   title: "Missing Identifier",
   message: "You must select an identifier before you can record a give.",

src/views/GiftedDetailsView.vue

@@ -263,7 +263,6 @@ import { showSeedPhraseReminder } from "@/utils/seedPhraseReminder";
 import {
   NOTIFY_GIFTED_DETAILS_RETRIEVAL_ERROR,
   NOTIFY_GIFTED_DETAILS_DELETE_IMAGE_CONFIRM,
-  NOTIFY_GIFTED_DETAILS_DELETE_IMAGE_ERROR,
   NOTIFY_GIFTED_DETAILS_NO_IDENTIFIER,
   NOTIFY_GIFT_ERROR_NEGATIVE_AMOUNT,
   NOTIFY_GIFTED_DETAILS_RECORDING_GIVE,
@@ -302,6 +301,7 @@ export default class GiftedDetails extends Vue {
   giverName = "";
   hideBackButton = false;
   imageUrl = "";
+  imageUrlToDelete = "";
   message = "";
   offerId = "";
   prevCredToEdit?: GenericCredWrapper<GiveActionClaim>;
@@ -517,9 +517,9 @@ export default class GiftedDetails extends Vue {
   }
 
   cancel() {
-    // Only delete if the image was freshly uploaded, not loaded from an existing claim
+    // Only delete freshly uploaded images, not ones from an existing claim
-    if (this.imageUrl !== this.prevCredToEdit?.claim?.image) {
+    if (this.imageUrl && this.imageUrl !== this.prevCredToEdit?.claim?.image) {
-      this.deleteImage(); // not awaiting, so they'll go back immediately
+      this.deleteImage(this.imageUrl); // not awaiting, so they'll go back immediately
     }
     if (this.destinationPathAfter) {
       (this.$router as Router).push({ path: this.destinationPathAfter });
@@ -529,9 +529,9 @@ export default class GiftedDetails extends Vue {
   }
 
   cancelBack() {
-    // Only delete if the image was freshly uploaded, not loaded from an existing claim
+    // Only delete freshly uploaded images, not ones from an existing claim
-    if (this.imageUrl !== this.prevCredToEdit?.claim?.image) {
+    if (this.imageUrl && this.imageUrl !== this.prevCredToEdit?.claim?.image) {
-      this.deleteImage(); // not awaiting, so they'll go back immediately
+      this.deleteImage(this.imageUrl); // not awaiting, so they'll go back immediately
     }
     (this.$router as Router).back();
   }
@@ -545,13 +545,18 @@ export default class GiftedDetails extends Vue {
   confirmDeleteImage() {
     this.notify.confirm(
       NOTIFY_GIFTED_DETAILS_DELETE_IMAGE_CONFIRM.message,
-      this.deleteImage,
+      () => {
+        // Stage the image for deletion on submit rather than deleting immediately,
+        // so that canceling the edit doesn't destroy the referenced image.
+        this.imageUrlToDelete = this.imageUrl;
+        this.imageUrl = "";
+      },
       TIMEOUTS.LONG,
     );
   }
 
-  async deleteImage() {
+  async deleteImage(imageUrl: string) {
-    if (!this.imageUrl) {
+    if (!imageUrl) {
       return;
     }
     try {
@@ -565,38 +570,21 @@ export default class GiftedDetails extends Vue {
         );
       }
       const response = await this.axios.delete(
-        DEFAULT_IMAGE_API_SERVER +
+        DEFAULT_IMAGE_API_SERVER + "/image/" + encodeURIComponent(imageUrl),
-          "/image/" +
-          encodeURIComponent(this.imageUrl),
         { headers },
       );
       if (response.status === 204) {
         // don't bother with a notification
-        // (either they'll simply continue or they're canceling and going back)
       } else {
         logger.error("Problem deleting image:", response);
-        this.notify.error(
-          NOTIFY_GIFTED_DETAILS_DELETE_IMAGE_ERROR.message,
-          TIMEOUTS.LONG,
-        );
-        return;
       }
-
-      this.imageUrl = "";
     } catch (error) {
       logger.error("Error deleting image:", error);
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       if ((error as any)?.response?.status === 404) {
-        logger.log("Weird: the image was already deleted.", error);
+        logger.log("Image was already deleted:", error);
-
-        this.imageUrl = "";
-
-        // it already doesn't exist so we won't say anything to the user
       } else {
-        this.notify.error(
+        logger.error("Failed to delete image from server:", error);
-          NOTIFY_GIFTED_DETAILS_DELETE_IMAGE_ERROR.message,
-          TIMEOUTS.LONG,
-        );
       }
     }
   }
@@ -739,6 +727,12 @@ export default class GiftedDetails extends Vue {
           TIMEOUTS.LONG,
         );
       } else {
+        // Delete the old image from storage now that the edit is saved
+        if (this.imageUrlToDelete) {
+          this.deleteImage(this.imageUrlToDelete); // not awaiting
+          this.imageUrlToDelete = "";
+        }
+
         this.notify.success(
           NOTIFY_GIFTED_DETAILS_GIFT_RECORDED.message,
           TIMEOUTS.SHORT,