diff --git a/package.json b/package.json index c92a48f..33f40e4 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "testpilot-containers", "title": "Multi-Account Containers", "description": "Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.", - "version": "8.3.1", + "version": "8.3.0", "author": "Andrea Marchesini, Luke Crouch, Lesley Norton, Kendall Werts, Maxx Crawford, Jonathan Kingston", "bugs": { "url": "https://github.com/mozilla/multi-account-containers/issues" diff --git a/src/css/popup.css b/src/css/popup.css index b0532b7..0f3cc9c 100644 --- a/src/css/popup.css +++ b/src/css/popup.css @@ -26,18 +26,10 @@ src: url("/fonts/Inter-Medium.woff2") format("woff2"); } -@font-face { - font-family: "Inter-SemiBold"; - font-style: normal; - font-weight: 700; - src: url("/fonts/Inter-SemiBold.woff2") format("woff2"); -} - [data-theme="light"], :root { --fontInter: "Inter", sans-serif; --fontInterMedium: "Inter-Medium", sans-serif; - --fontInterSemiBold: "Inter-SemiBold", sans-serif; --fontMetropolis: "Metropolis", sans-serif; --fontMetropolisLight: "Metropolis-Light", sans-serif; --iconArrowLeft: url("/img/arrow-icon-left.svg"); @@ -1659,20 +1651,8 @@ input[type=text] { background-color: var(--button-bg-hover-color-primary); } -#survey-achievement-done-button { - color: var(--button-bg-color-primary); - transition: color 0.1s ease; - font-size: 14px; - padding-inline: 3px; - padding-block: 1px; - border-radius: 1px; - text-align: center; - margin-inline: auto; -} - .onboarding-button:focus, -.half-onboarding-button:focus, -#survey-achievement-done-button:focus { +.half-onboarding-button:focus { box-shadow: 0 0 0 2px var(--button-bg-color-secondary), 0 0 0 4px var(--button-bg-focus-color-primary); @@ -2429,52 +2409,3 @@ tr:hover > td > .reset-button { .searchbar input { inline-size: 100%; } - -/* Survey Popup */ - -.survey-blurb, -#survey-panel h3.onboarding-title { - text-align: center; - margin-inline: auto; -} - -#survey-panel h3.onboarding-title { - max-inline-size: 100%; - font-family: var(--fontInterSemiBold); - line-height: 24px; - margin-block-end: 12px; -} - -#survey-panel { - padding-block: 40px; - padding-inline: 0; -} - -.survey-blurb { - margin-block-end: 16px; - margin-inline: 24px; -} - -#survey-img { - block-size: 180px; - margin-block-end: 16px; -} - -#survey-button { - padding-block: 4px; - padding-inline: 16px; - margin-block: 0 8px; - min-block-size: 32px; -} - -.share-ctas.survey-back { - margin-inline: auto; -} - -#survey-achievement-done-button:hover { - color: var(--button-bg-hover-color-primary); -} - -#survey-achievement-done-button:active { - color: var(--button-bg-active-color-primary); -} diff --git a/src/fonts/Inter-SemiBold.woff2 b/src/fonts/Inter-SemiBold.woff2 deleted file mode 100644 index 4ef2081..0000000 Binary files a/src/fonts/Inter-SemiBold.woff2 and /dev/null differ diff --git a/src/img/survey.svg b/src/img/survey.svg deleted file mode 100644 index 47737a2..0000000 --- a/src/img/survey.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js index a9d7865..1335d4d 100644 --- a/src/js/background/messageHandler.js +++ b/src/js/background/messageHandler.js @@ -257,8 +257,6 @@ const messageHandler = { browser.browserAction.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"}); browser.browserAction.setBadgeText({text: "NEW"}); } - - this.maybePrepareSurveyAchievementOnUpdate(countOfContainerTabsOpened); }, async onFocusChangedCallback(windowId) { @@ -275,33 +273,7 @@ const messageHandler = { }).catch((e) => { throw e; }); - }, - - async maybePrepareSurveyAchievementOnUpdate(countOpened) { - if (countOpened < 10) { - return; - } - - // Show the survey only for English locales (en or en-*). - const uiLang = browser.i18n.getUILanguage(); - const lang = (uiLang || "").toLowerCase(); - if (lang !== "en" && !lang.startsWith("en-")) { - return; - } - - // Check if already shown in the past; if so, do not show again. - const { achievements } = await browser.storage.local.get({ achievements: [] }); - const existing = achievements.find(a => a.name === "survey"); - if (existing) { - return; - } - - // Ensure the achievement exists and is pending. - achievements.push({ name: "survey", done: false }); - browser.storage.local.set({ achievements }); - browser.browserAction.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"}); - browser.browserAction.setBadgeText({text: "NEW"}); - }, + } }; // Lets do this last as theme manager did a check before connecting before diff --git a/src/js/popup.js b/src/js/popup.js index bc6529a..dd2492a 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -31,7 +31,6 @@ const P_CONTAINER_INFO = "containerInfo"; const P_CONTAINER_EDIT = "containerEdit"; const P_CONTAINER_DELETE = "containerDelete"; const P_CONTAINERS_ACHIEVEMENT = "containersAchievement"; -const P_SURVEY_ACHIEVEMENT = "surveyAchievement"; const P_CONTAINER_ASSIGNMENTS = "containerAssignments"; const P_CLEAR_CONTAINER_STORAGE = "clearContainerStorage"; @@ -139,23 +138,18 @@ const Logic = { async showAchievementOrContainersListPanel() { // Do we need to show an achievement panel? + let showAchievements = false; const achievementsStorage = await browser.storage.local.get({ achievements: [] }); - const pending = achievementsStorage.achievements.filter(a => !a.done); - - if (pending.length) { - // Prefer showing the survey view first if present, otherwise fall back - // to the existing achievement panel. - const survey = pending.find(a => a.name === "survey"); - if (survey) { - this.showPanel(P_SURVEY_ACHIEVEMENT); - return; + for (const achievement of achievementsStorage.achievements) { + if (!achievement.done) { + showAchievements = true; } - - this.showPanel(P_CONTAINERS_ACHIEVEMENT); - return; } - - this.showPanel(P_CONTAINERS_LIST); + if (showAchievements) { + this.showPanel(P_CONTAINERS_ACHIEVEMENT); + } else { + this.showPanel(P_CONTAINERS_LIST); + } }, // In case the user wants to click multiple actions, @@ -2382,30 +2376,6 @@ Logic.registerPanel(P_CONTAINERS_ACHIEVEMENT, { }, }); -// P_SURVEY_ACHIEVEMENT: A simple survey view. -// ---------------------------------------------------------------------------- - -Logic.registerPanel(P_SURVEY_ACHIEVEMENT, { - panelSelector: ".survey-panel", - - // This method is called when the object is registered. - initialize() { - Utils.addEnterHandler(document.querySelector("#survey-achievement-done-button"), async () => { - await Logic.setAchievementDone("survey"); - Logic.showPanel(P_CONTAINERS_LIST); - }); - Utils.addEnterHandler(document.querySelector("#survey-button"), async () => { - await Logic.setAchievementDone("survey"); - window.close(); - }); - }, - - // This method is called when the panel is shown. - prepare() { - return Promise.resolve(null); - }, -}); - Logic.init(); window.addEventListener("resize", function () { diff --git a/src/manifest.json b/src/manifest.json index 809c02d..c87c44c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Firefox Multi-Account Containers", - "version": "8.3.1", + "version": "8.3.0", "incognito": "not_allowed", "description": "__MSG_extensionDescription__", "icons": { diff --git a/src/popup.html b/src/popup.html index ec03aaa..5a87ae9 100644 --- a/src/popup.html +++ b/src/popup.html @@ -106,17 +106,6 @@ -
- -

Participate in Paid Research with Firefox

-

We'd love to learn about your experiences with this add-on! Join a 1:1 Zoom interview and receive a $75 Amazon e-gift card or PayPal payment.

-

Thank you for helping us improve Firefox.

-

- Take Interest Survey -

- Back -
-