From e3eba8b39f120fcd59f1f0e6208313a4cf428d56 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Wed, 26 Feb 2020 18:38:36 -0500 Subject: [PATCH] Fixed install extension toast appearing even when extension is installed --- layouts/default.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/layouts/default.vue b/layouts/default.vue index 996759827..6b18381da 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -641,6 +641,7 @@ import intializePwa from "../assets/js/pwa" import * as version from "../.postwoman/version.json" import { hasExtensionInstalled } from "../functions/strategies/ExtensionStrategy" +import { hasChromeExtensionInstalled } from "../functions/strategies/ChromeStrategy" import firebase from "firebase/app" import { fb } from "../functions/fb" @@ -702,7 +703,6 @@ export default { showExtensions: false, showShortcuts: false, showSupport: false, - extensionInstalled: hasExtensionInstalled(), fb, navigatorShare: navigator.share, } @@ -762,8 +762,8 @@ export default { // Just return if showExtensionsToast is "no" if (!showExtensionsToast) return - if (!this.extensionInstalled) { - setTimeout(() => { + setTimeout(() => { + if (!(hasExtensionInstalled() || hasChromeExtensionInstalled())) { this.$toast.show(this.$t("extensions_info2"), { icon: "extension", duration: 5000, @@ -790,8 +790,8 @@ export default { }, ], }) - }, 15000) - } + } + }, 15000) this._keyListener = function(e) { if (e.key === "Escape") {