(chore): merge mostly pathway changes

src/components/GiftedDialog.vue

@@ -90,7 +90,7 @@
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
 import { NotificationIface } from "../constants/app";
-import { createAndSubmitGive, didInfo } from "../libs/endorserServer";
+import { createAndSubmitGive, didInfo, serverMessageForUser } from "../libs/endorserServer";
 import * as libsUtil from "../libs/util";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
 import { Contact } from "../db/tables/contacts";
@@ -336,7 +336,7 @@ export default class GiftedDialog extends Vue {
       console.error("Error with give recordation caught:", error);
       const errorMessage =
         error.userMessage ||
-        error.response?.data?.error?.message ||
+        serverMessageForUser(error) ||
         "There was an error recording the give.";
       this.$notify(
         {