Merge branch 'master' into registration-prompt-parity

Reviewed-on: #195

src/views/ContactQRScanShowView.vue

@@ -748,24 +748,17 @@ export default class ContactQRScanShow extends Vue {
         !contact.registered
       ) {
         setTimeout(() => {
-          this.notify.confirm(
+          this.$notify(
-            "Do you want to register them?",
             {
+              group: "modal",
+              type: "confirm",
+              title: "Register",
+              text: "Do you want to register them?",
               onCancel: async (stopAsking?: boolean) => {
-                if (stopAsking) {
+                await this.handleRegistrationPromptResponse(stopAsking);
-                  await this.$updateSettings({
-                    hideRegisterPromptOnNewContact: stopAsking,
-                  });
-                  this.hideRegisterPromptOnNewContact = stopAsking;
-                }
               },
               onNo: async (stopAsking?: boolean) => {
-                if (stopAsking) {
+                await this.handleRegistrationPromptResponse(stopAsking);
-                  await this.$updateSettings({
-                    hideRegisterPromptOnNewContact: stopAsking,
-                  });
-                  this.hideRegisterPromptOnNewContact = stopAsking;
-                }
               },
               onYes: async () => {
                 await this.register(contact);
@@ -895,6 +888,17 @@ export default class ContactQRScanShow extends Vue {
       videoElement.style.transform = shouldMirror ? "scaleX(-1)" : "none";
     }
   }
+
+  private async handleRegistrationPromptResponse(
+    stopAsking?: boolean,
+  ): Promise<void> {
+    if (stopAsking) {
+      await this.$saveSettings({
+        hideRegisterPromptOnNewContact: stopAsking,
+      });
+      this.hideRegisterPromptOnNewContact = stopAsking;
+    }
+  }
 }
 </script>