(chore): merge mostly pathway changes

src/views/HomeView.vue

@@ -366,6 +366,8 @@
       </div>
     </div>
   </section>
+
+  <ChoiceButtonDialog ref="choiceButtonDialog" />
 </template>
 
 <script lang="ts">
@@ -374,6 +376,7 @@ import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
 
 import App from "../App.vue";
+<<<<<<< HEAD
 import EntityIcon from "../components/EntityIcon.vue";
 import GiftedDialog from "../components/GiftedDialog.vue";
 import GiftedPrompts from "../components/GiftedPrompts.vue";
@@ -383,6 +386,18 @@ import OnboardingDialog from "../components/OnboardingDialog.vue";
 import QuickNav from "../components/QuickNav.vue";
 import TopMessage from "../components/TopMessage.vue";
 import UserNameDialog from "../components/UserNameDialog.vue";
+=======
+import EntityIcon from "@/components/EntityIcon.vue";
+import GiftedDialog from "@/components/GiftedDialog.vue";
+import GiftedPrompts from "@/components/GiftedPrompts.vue";
+import FeedFilters from "@/components/FeedFilters.vue";
+import InfiniteScroll from "@/components/InfiniteScroll.vue";
+import OnboardingDialog from "@/components/OnboardingDialog.vue";
+import QuickNav from "@/components/QuickNav.vue";
+import TopMessage from "@/components/TopMessage.vue";
+import UserNameDialog from "@/components/UserNameDialog.vue";
+import ChoiceButtonDialog from "@/components/ChoiceButtonDialog.vue";
+>>>>>>> master
 import {
   AppString,
   NotificationIface,
@@ -448,6 +463,7 @@ interface GiveRecordWithContactInfo extends GiveSummaryRecord {
     GiftedPrompts,
     InfiniteScroll,
     OnboardingDialog,
+    ChoiceButtonDialog,
     QuickNav,
     TopMessage,
     UserNameDialog,
@@ -949,24 +965,22 @@ export default class HomeView extends Vue {
   }
 
   promptForShareMethod() {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Are you nearby with cameras?",
-        text: "If so, we'll use those with QR codes to share.",
-        onCancel: async () => {},
-        onNo: async () => {
-          (this.$router as Router).push({ name: "share-my-contact-info" });
-        },
-        onYes: async () => {
-          (this.$router as Router).push({ name: "contact-qr" });
-        },
-        noText: "we will share another way",
-        yesText: "we are nearby with cameras",
+    (this.$refs.choiceButtonDialog as ChoiceButtonDialog).open({
+      title: "How can you share your info?",
+      text: "",
+      option1Text: "We are in a meeting together",
+      option2Text: "We are nearby with cameras",
+      option3Text: "We will share some other way",
+      onOption1: () => {
+        (this.$router as Router).push({ name: "onboard-meeting-list" });
       },
-      -1,
-    );
+      onOption2: () => {
+        (this.$router as Router).push({ name: "contact-qr" });
+      },
+      onOption3: () => {
+        (this.$router as Router).push({ name: "share-my-contact-info" });
+      },
+    });
   }
 }
 </script>