Version upgrade

Merge pull request #2659 from dannycolin/bz#1823729
Fix bz#1823729 - Listen only for status on tab updated
2024-09-10 10:57:47 -04:00 · 2024-08-29 09:22:53 -04:00 · 2024-08-28 13:52:55 -04:00 · 2024-08-28 11:26:57 -05:00 · 2024-08-27 17:06:07 -04:00 · 2024-08-27 15:34:06 -04:00
45 changed files with 26415 additions and 746 deletions
@@ -19,6 +19,7 @@ module.exports = {
    "OS": true,
    "ADDON_UNINSTALL": true,
    "ADDON_DISABLE": true,
    "CONTAINER_ORDER_STORAGE_KEY": true,
    "proxifiedContainers": true,
    "MozillaVPN": true,
    "MozillaVPN_Background": true
@@ -1,27 +0,0 @@
 <!--
  Feel free to ignore this Issue template if you just want to ask or suggest something. If you experience an Issue then please provide all asked information.
  Also please make sure that:
  - "Firefox will: Never remember history" in the Firefox Preferences/Options under "Privacy & Security > History" is NOT selected
  - You are NOT using Firefox in a Private Window
  - You can see a grayed out but ticked Checkbox with the description "Enable Container Tabs" in the Firefox Preferences/Options under "Tabs"
 -->
 - Multi-Account Containers Version:
 - Operating System + Version:
 - Firefox Version:
 - Other installed Add-ons + Version + Enabled/Disabled-Status:
 <!-- To be able to copy & paste the full list of your Add-ons navigate to "about:support" and scroll down to "Extensions" -->
 ### Actual behavior
 ### Expected behavior
 ### Steps to reproduce
 1.
 2.
 3.
 ### Notes
@@ -0,0 +1,53 @@
 name: Bug Report
 description: Report a problem in Multi-Account Containers
 labels: [bug]
 body:
  - type: checkboxes
    id: before-bug-report
    attributes:
      label: Before submitting a bug report
      options:
        - label: "I updated to the latest version of Multi-Account Container and tested if I can reproduce the issue"
          required: true
        - label: "I searched for existing reports to see if it hasn't already been reported"
          required: true
  - type: textarea
    id: step_to_reproduce
    attributes:
      label: "Step to reproduce"
      description: "Provide a list of steps you did to trigger this bug"
      placeholder: |
        1. I opened ...
        2. I clicked on ...
        3. ...
    validations:
      required: true
  - type: textarea
    id: actual_behavior
    attributes:
      label: "Actual behavior"
      description: "Provide a description of what is currently happening"
    validations:
      required: true
  - type: textarea
    id: expected_behavior
    attributes:
      label: "Expected behavior"
      description: "Provide a description of what should happen"
    validations:
      required: true
  - type: textarea
    id: additional_informations
    attributes:
      label: "Additional informations"
      description: "Provide any other information revelant to this issue"
    validations:
      required: false
  - type: textarea
    id: about_support
    attributes:
      label: "Provide a copy of Troubleshooting Information page (optional)"
      description: "To get a copy of the Troubleshooting Information page, type *about:support* in the address bar and click on the *Copy text to clipboard* button."
      render: "plain text"
    validations:
      required: false
@@ -0,0 +1,17 @@
 blank_issues_enabled: false
 contact_links:
  - name: "Explore our help articles"
    url: "https://support.mozilla.org/kb/containers"
    about: "Dig into the knowledge base, tips and tricks, troubleshooting, and so much more."
  - name: "Ask a support question"
    url: "https://support.mozilla.org/questions/new/desktop/form"
    about: "Get support from our contributors or staff members."
  - name: "Submit new ideas"
    url: "https://connect.mozilla.org/t5/discussions/how-to-submit-a-great-idea-in-five-easy-steps/td-p/24"
    about: "Have an idea for a new product feature? Share it with our community and staff members!"
  - name: "Discussions" 
    url: "https://connect.mozilla.org/t5/discussions/bd-p/discussions"
    about: "Give feedback and participate in meaningful conversations with the community and Mozilla employees"
  - name: "Discover more awesome tools"
    url: "https://www.mozilla.org/firefox/products/"
    about: "Learn more about other products from Mozilla"
@@ -0,0 +1,24 @@
 **Before submitting your pull request**
 - [ ] I agree to license my code under the [MPL 2.0 license](https://www.mozilla.org/en-US/MPL/2.0/).
 - [ ] I rebased my work on top of the main branch.
 - [ ] I ran `npm test` and all tests passed.
 - [ ] I added test coverages if relevant.
 # Description
 *Please include a summary of the changes including relevant motivation and context.*
 ## Type of change
 *Select all that apply.*
 - [ ] Bug fix
 - [ ] New feature
 - [ ] Major change (fix or feature that would cause existing functionality to work differently than in the current version)
 Tag issues related to this pull request:
 *
 *
 *
@@ -9,16 +9,16 @@ on:
      - main
      - production
  schedule:
-    - cron: '0 2 * * *' # Daily at 2AM UTC      
+    - cron: '0 2 * * *' # Daily at 2AM UTC
 jobs:
  builds:
    name: Builds
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
      - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: Create the package
        shell: bash
@@ -26,7 +26,7 @@ jobs:
          ./bin/build-addon.sh nightly.xpi
      - name: Uploading
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
        with:
            name: ${{matrix.config.name}} Build
            path: src/web-ext-artifacts
@@ -0,0 +1,28 @@
 name: Test
 on:
  push:
    branches:
      - main
      - production
  pull_request:
    branches:
 jobs:
  test:
    name: Run tests
    runs-on: ubuntu-latest
    steps:
      - name: Clone repository
        uses: actions/checkout@v3
      - name: Set up node
        uses: actions/setup-node@v3
        with:
          node-version: lts/*
      - name: Install dependencies
        run: npm install --legacy-peer-deps
      - name: Run tests
        run: npm run test
@@ -1,5 +1,4 @@
 .DS_Store
 package-lock.json
 node_modules
 README.html
 *.xpi
@@ -9,6 +8,7 @@ README.html
 addon.env
 src/web-ext-artifacts/*
 web-ext-artifacts
 # JetBrains IDE files
 .idea
@@ -1,10 +0,0 @@
 language: node_js
 node_js:
    - "lts/*"
 notifications:
    irc:
        - "ircs://irc.mozilla.org:6697/#testpilot-containers-bots"
 install:
    - npm install --legacy-peer-deps
@@ -1,35 +1,38 @@
 # Contributing
-Everyone is welcome to contribute to containers. Reach out to team members if you have questions:
+## Requirements
- Matrix chat: [#containers:mozilla.org](https://matrix.to/#/#containers:mozilla.org)
+* Firefox 91.1.0+
- Email: containers@mozilla.com
+* Git 2.13+
 * Node 7+
-## Filing bugs
+## Getting Started
-If you find a bug with containers, please file a issue.
+1. Follow the instructions on [How to fork a repository][fork]
 2. Fetch the locales:
-Check first if the bug might already exist: https://github.com/mozilla/multi-account-containers/issues
+    ```
    cd multi-account-containers
    git submodule update --init
    ```
 3. Install the project dependencies
    ```
    npm install --legacy-peer-deps
    ```
 4. Run `npm run dev`.
-[Open an issue](https://github.com/mozilla/multi-account-containers/issues/new)
+## Translations
-1. Visit about:support
+The translations are located in `src/_locales`. This directory is a git
-2. Click "Copy raw data to clipboard" and paste into the bug. Alternatively copy the following sections into the issue:
+repository like any other. Before editing files in this folder, you need to:
  - Application Basics
  - Nightly Features (if you are in nightly)
  - Extensions
  - Experimental Features
 3. Include clear steps to reproduce the issue you have experienced.
 4. Include screenshots if possible.
-## Sending Pull Requests
+1. `cd src/_locales/`
 2. `git checkout -b message-updates-yyyymmdd`
 3. `git push -u origin message-updates-yyyymmdd`
-Patches should be submitted as pull requests. When submitting patches as PRs:
+You can then [open a pull request][pr] on [the l10n repository][l10n].
- You agree to license your code under the project's open source license (MPL 2.0).
+[fork]: https://docs.github.com/en/get-started/quickstart/fork-a-repo
- Base your branch off the current master (see below for an example workflow).
+[l10n]: https://github.com/mozilla-l10n/multi-account-containers-l10n/
- Add both your code and new tests if relevant.
+[pr]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
- Run npm test to make sure all tests still pass.
+[web-ext]: https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext
 - Please do not include merge commits in pull requests; include only commits with the new relevant code.
 See the main [README](./README.md) for information on prerequisites, installing, running and testing.
@@ -1,109 +1,32 @@
 # Multi-Account Containers
-The Firefox Multi-Account Containers extension lets you carve out a separate box for each of your online lives – no more opening a different browser just to check your work email! [Learn More Here](https://blog.mozilla.org/firefox/introducing-firefox-multi-account-containers/)
+[![Test](https://github.com/mozilla/multi-account-containers/actions/workflows/test.yaml/badge.svg)](https://github.com/mozilla/multi-account-containers/actions/workflows/test.yaml)
-[Available on addons.mozilla.org](https://addons.mozilla.org/firefox/addon/multi-account-containers/)
+The Firefox Multi-Account Containers extension lets you carve out a separate box for each of your online lives – no more opening a different browser just to check your work email!
-For more info, see: 
+Learn more about Multi-Account Containers in
 [our end-user documentation][enduser].
-* [Test Pilot Product Hypothesis Document](https://docs.google.com/document/d/1WQdHTVXROk7dYkSFluc6_hS44tqZjIrG9I-uPyzevE8/edit#)
+## Contributing
 * [Shield Product Hypothesis Document](https://docs.google.com/document/d/1vMD-fH_5hGDDqNvpRZk12_RhCN2WAe4_yaBamaNdtik/edit#)
 Everyone is welcome to contribute to Multi-Account Containers. To learn how
 to contribute a patch to Multi-Account Container, please
 [read our contributing guide][contributing].
-## Requirements
+You can also chat with us on [our Matrix room][matrix] or [our forum][forum].
-* node 7+ (for jpm)
+This repository is governed by Mozilla's code of conduct and etiquette
-* Firefox 91.1.0+
+guidelines. For more details, [please read the Mozilla Community Participation Guidelines][cpg].
 ### License
-## Development
+This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
 file, You can obtain one at https://mozilla.org/MPL/2.0/.
-### Running Locally
+<!-- Please keep the list in alphabetical order -->
-
+[contributing]: CONTRIBUTING.md
-#### Via WebExtensions API (web-ext)
+[cpg]: https://www.mozilla.org/about/governance/policies/participation/
-
+[enduser]: https://support.mozilla.org/en-US/kb/containers
-1. Fetch the locales updating the git-submodules: `git submodule init && git submodule update --remote --depth 1 src/_locales`
+[forum]: https://discourse.mozilla.org/c/containers/223
-2. Install the [web-ext](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext) tool.
+[matrix]: https://matrix.to/#/#containers:mozilla.org
 3. Run `web-ext run -s src/`. This launches Firefox and installs the extension automatically.
 This tool provides some additional development features, such as [automatic reloading](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext#Automatic_extension_reloading).
 #### Via about:debugging in Firefox
 1. Fetch the locales updating the git-submodules: `git submodule init && git submodule update --remote --depth 1 src/_locales`
 2. Open the `about:debugging` page in Firefox.
 3. Click on `This Firefox`.
 4. Click on [Load Temporary Add-on](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Temporary_Installation_in_Firefox).
 5. Select `src/manifest.json`.
 Here is a [video](https://www.youtube.com/watch?v=cer9EUKegG4) that demonstrates how to do this.
 ### Testing
 * Install dependencies:
  ```
  npm install
  ```
 * Run all tests:
  ```
  npm run test
  ```
 * Only run the linter:
  ```
  npm run lint
  ```
 There is a timeout test that sometimes fails on certain machines, so make sure to run the tests on your clone before you make any changes to see if you have this problem.
 #### Add/update messages for translation
 The `src/_locales` directory is a git repository like any other, so to make changes to the messages:
 1. Make whatever changes you need in `src/_locales/en` as you work.
 2. `cd src/_locales/en`
 3. `git branch message-updates-yyyymmdd`
 4. `git push -u origin message-updates-yyyymmdd`
 You can then open a pull request from the `message-updates-yyyymmdd` branch to
 [the l10n repo](https://github.com/mozilla-l10n/multi-account-containers-l10n/) `main` branch.
 ### Distributing
 #### Make the new version
 1. Bump the version number in `package.json` and `manifest.json`
 2. Commit the version number bump
 3. Create a git tag for the version: `git tag <version>`
 4. Push the tag up to GitHub: `git push --tags`
 #### Publish to AMO
 1. `./bin/build-addon.sh`
 2. [Upload the `.zip` to AMO](https://addons.mozilla.org/developers/addon/multi-account-containers/versions/submit/)
 #### Publish to GitHub
 Finally, we also publish the release to GitHub for those followers.
 1. Download the signed `.xpi` from [the addon versions page](https://addons.mozilla.org/developers/addon/multi-account-containers/versions)
 2. [Make the new release on
   GitHub](https://github.com/mozilla/multi-account-containers/releases/new)
   * Use the version number for "Tag version" and "Release title"
   * Release notes: copy the output of `git log --no-merges --pretty=format:"%h %s" <previous-version>..<new-version>`
   * Attach binaries: select the signed `.xpi` file
 ### Links
 Facebook & Twitter icons CC-Attrib https://fairheadcreative.com.
 - [License](./LICENSE.txt)
 - [Contributing](./CONTRIBUTING.md)
 - [Code Of Conduct](./CODE_OF_CONDUCT.md)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/env bash
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -32,4 +32,4 @@ rm -rf $TMPDIR/src/_locales/.github || die
 print G "done."
 print Y "Running the test..."
-$(npm bin)/addons-linter $TMPDIR/src || die
+npx addons-linter $TMPDIR/src || die
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/env bash
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -23,4 +23,4 @@ if [[ $# -gt 0 ]]; then
  EXTRA_PARAMS="--filename $1"
 fi
-$(npm bin)/web-ext build --overwrite-dest $EXTRA_PARAMS || die
+npx web-ext build --overwrite-dest $EXTRA_PARAMS || die
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/env bash
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1,31 +0,0 @@
 # Acceptance Criteria
 ## User Experience
 - [ ] It should place a containers button on the user’s browser toolbar
 - [ ] It should include all containers management UI inside a door hanger from this toolbar button
 - [ ] It should provide a set of default container choices for users to pick from (work, home, travel etc.)
  - [ ] Each container type should have a color, icon and name
 - [ ] It should allow users to create new containers
 - [ ] It should allow users to delete containers
 - [ ] It should allow users to open container tabs
  - [ ] each container tab should be clearly demarcated by color/icon etc.
 - [ ] It should provide a control to show/hide all open tabs of one container type
 - [ ] It should provide a control to sort tabs by container type
 - [ ] It should provide a control to allow users to open containers in new tab or new window by default
 ## User Experience Non-Requirements (out of scope)
 - [ ] It should not show any UI in browser settings
 - [ ] It should not effect the awesome bar
 - [ ] It should not effect the Firefox Library 
 - [ ] It should not make any changes to sync functionality
 ## Measurements
 - [ ] It should measure container tab creations per session
 - [ ] It should measure the type of container tab created
 - [ ] It should measure container tab creations
 - [ ] It should measure new container creations
 - [ ] It should measure container deletes
 - [ ] It should measure container sorts
 - [ ] It should measure container hides
 - [ ] It should report URIs accessed across multiple containers
 - [ ] It should measure the % of tab-based vs windows-based containers
@@ -0,0 +1,31 @@
 # Release a new version
 ## Make the new version
 1. Bump the version number in `package.json` and `manifest.json`
 2. Commit the version number bump
 3. Create a git tag for the version: `git tag <version>`
 4. Push the tag up to GitHub: `git push --tags`
 ## Publish to AMO
 1. Run `./bin/build-addon.sh`
 2. [Upload the zip file to AMO][amo-upload]
 ## Publish to GitHub
 Finally, we also publish the release to GitHub.
 1. Download the signed `.xpi` from [the addon versions page][addon-page]
 2. [Create a new release on GitHub][gh-release]
   * For *Tag version* and *Release title*, use the version number
   * For *Release notes*, copy the output of:
     ```
     git log --no-merges \
             --pretty=format:"%h %s" <previous-version>..<new-version>
     ```
   * For the *Attach binaries*, select the signed `.xpi` file
 [addon-page]: https://addons.mozilla.org/developers/addon/multi-account-containers/versions
 [amo-upload]: https://addons.mozilla.org/developers/addon/multi-account-containers/versions/submit/
 [gh-release]: https://github.com/mozilla/multi-account-containers/releases/new
@@ -2,14 +2,14 @@
  "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.0.7",
+  "version": "8.2.0",
  "author": "Andrea Marchesini, Luke Crouch, Lesley Norton, Kendall Werts, Maxx Crawford, Jonathan Kingston",
  "bugs": {
    "url": "https://github.com/mozilla/multi-account-containers/issues"
  },
  "dependencies": {},
  "devDependencies": {
-    "addons-linter": "^3.23.0",
+    "addons-linter": "^5.28.0",
    "ajv": "^6.6.3",
    "chai": "^4.2.0",
    "eslint": "^7.32.0",
@@ -17,7 +17,7 @@
    "eslint-plugin-promise": "^5.2.0",
    "htmllint-cli": "0.0.7",
    "json": ">=10.0.0",
-    "mocha": "^6.2.2",
+    "mocha": "^10.1.0",
    "npm-run-all": "^4.0.0",
    "nyc": "^15.0.0",
    "sinon": "^7.5.0",
@@ -25,7 +25,7 @@
    "stylelint": "^13.5.0",
    "stylelint-config-standard": "^20.0.0",
    "stylelint-order": "^4.0.0",
-    "web-ext": "^5.4.1",
+    "web-ext": "^7.5.0",
    "webextensions-jsdom": "^1.2.1"
  },
  "homepage": "https://github.com/mozilla/multi-account-containers#readme",
@@ -36,13 +36,16 @@
    "url": "git+https://github.com/mozilla/multi-account-containers.git"
  },
  "scripts": {
-    "webext": "web-ext run -s src/",
+    "build": "web-ext build -s src/",
    "dev": "npm run remove-locales-github && web-ext run -s src/",
    "lint": "npm-run-all lint:*",
    "lint:addon": "./bin/addons-linter.sh",
    "lint:css": "stylelint src/css/*.css",
    "lint:html": "htmllint *.html",
    "lint:js": "eslint .",
    "package": "rm -rf src/web-ext-artifacts && npm run build && mv src/web-ext-artifacts/firefox_multi-account_containers-*.zip addon.xpi",
    "restore-locales-github": "cd src/_locales && git restore .github/",
    "remove-locales-github": "rm -rf src/_locales/.github",
    "test": "npm run lint && npm run coverage",
    "test:once": "mocha test/**/*.test.js",
    "test:watch": "npm run test:once -- --watch",
@@ -3,6 +3,7 @@
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
  <title data-i18n-message-id="confirmNavigationTitle"></title>
  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="chrome://browser/skin/aboutNetError.css" type="text/css" media="all" />
  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="chrome://global/skin/aboutNetError.css" type="text/css" media="all" />
  <script type="text/javascript" src="./js/i18n.js"></script>
  <link rel="stylesheet" href="/css/confirm-page.css" />
 </head>
@@ -23,8 +24,21 @@
      </label>
      <br />
      <div class="button-container">
-        <button id="deny" class="button" data-message-id="openInContainer" data-message-arg="current-container-name"></button>
+        <button id="deny"
-        <button id="confirm" class="button primary" autofocus data-message-id="openInContainer" data-message-arg="container-name"></button>
+                class="button"
                data-message-id="openInContainer"
                data-message-arg="current-container-name">
        </button>
        <button id="deny-no-container"
                class="button"
                data-message-id="openInNoContainer">
        </button>
        <button id="confirm"
                class="button primary"
                autofocus
                data-message-id="openInContainer"
                data-message-arg="container-name">
        </button>
      </div>
    </form>
  </main>
@@ -1,9 +0,0 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. --><svg data-name="Flat (For Export)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
  <style>rect,path {fill: rgba(249, 249, 250, 0.8);}</style>
  <rect x="1" y="1" width="6" height="6" rx="1"/>
  <path d="M14.75 3H13V1.25A0.25 0.25 0 0 0 12.75 1h-1.5A0.25 0.25 0 0 0 11 1.25V3H9.25A0.25 0.25 0 0 0 9 3.25v1.5A0.25 0.25 0 0 0 9.25 5H11v1.75A0.25 0.25 0 0 0 11.25 7h1.5A0.25 0.25 0 0 0 13 6.75V5h1.75A0.25 0.25 0 0 0 15 4.75v-1.5A0.25 0.25 0 0 0 14.75 3z" fill-rule="evenodd"/>
  <rect x="1" y="9" width="6" height="6" rx="1"/>
  <rect x="9" y="9" width="6" height="6" rx="1"/>
 </svg>
@@ -1,7 +1,13 @@
-<svg data-name="Flat (For Export)" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <style>rect,path {fill: rgba(24, 25, 26, 01);}</style>
+  <style>
    :root { color-scheme: light dark; }
    rect, path { fill: rgb(24, 25, 26); }
    @media (prefers-color-scheme: dark) {
      rect, path { fill: rgba(249, 249, 250, 0.8); }
    }
  </style>
  <rect x="1" y="1" width="6" height="6" rx="1"/>
  <path d="M14.75 3H13V1.25A0.25 0.25 0 0 0 12.75 1h-1.5A0.25 0.25 0 0 0 11 1.25V3H9.25A0.25 0.25 0 0 0 9 3.25v1.5A0.25 0.25 0 0 0 9.25 5H11v1.75A0.25 0.25 0 0 0 11.25 7h1.5A0.25 0.25 0 0 0 13 6.75V5h1.75A0.25 0.25 0 0 0 15 4.75v-1.5A0.25 0.25 0 0 0 14.75 3z" fill-rule="evenodd"/>
  <rect x="1" y="9" width="6" height="6" rx="1"/>
  <rect x="9" y="9" width="6" height="6" rx="1"/>
-</svg>
+</svg>
@@ -4,6 +4,7 @@
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;">
  <style>
    :root { color-scheme: light dark; }
    path, circle, g {
      fill: menutext;
    }
@@ -102,6 +102,7 @@ window.assignManager = {
    async deleteContainer(userContextId) {
      const sitesByContainer = await this.getAssignedSites(userContextId);
      this.area.remove(Object.keys(sitesByContainer));
      identityState.storageArea.remove(backgroundLogic.cookieStoreId(userContextId));
    },
    async getAssignedSites(userContextId = null) {
@@ -164,11 +165,17 @@ window.assignManager = {
  _neverAsk(m) {
    const pageUrl = m.pageUrl;
    if (m.neverAsk === true) {
      if (m.defaultContainer === true) {
        this.storageArea.remove(pageUrl);
        return;
      }
      // If we have existing data and for some reason it hasn't been
      // deleted etc lets update it
      this.storageArea.get(pageUrl).then((siteSettings) => {
        if (siteSettings) {
          siteSettings.neverAsk = true;
          siteSettings.userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(m.cookieStoreId);
          this.storageArea.set(pageUrl, siteSettings);
        }
      }).catch((e) => {
@@ -197,12 +204,17 @@ window.assignManager = {
      return {};
    }
    // proxyDNS only works for SOCKS proxies
    if (["socks", "socks4"].includes(result.proxy.type)) {
      result.proxy.proxyDNS = true;
    }
    if (!result.proxy.mozProxyEnabled) {
-      return { ...result.proxy, proxyDNS: true };
+      return result.proxy;
    }
    // Let's add the isolation key.
-    return [{ ...result.proxy, connectionIsolationKey: "" + MozillaVPN_Background.isolationKey, proxyDNS: true }];
+    return [{ ...result.proxy, connectionIsolationKey: "" + MozillaVPN_Background.isolationKey }];
  },
  // Before a request is handled by the browser we decide if we should
@@ -565,6 +577,16 @@ window.assignManager = {
    return true;
  },
  async _resetCookiesForSite(hostname, cookieStoreId) {
    const hostNameTruncated = hostname.replace(/^www\./, ""); // Remove "www." from the hostname
    await browser.browsingData.removeCookies({
      cookieStoreId: cookieStoreId,
      hostnames: [hostNameTruncated] // This does not remove cookies from associated domains. To remove all cookies, we have a container storage removal option.
    });
    return true;
  },
  async _setOrRemoveAssignment(tabId, pageUrl, userContextId, remove) {
    let actionName;
    // https://github.com/mozilla/testpilot-containers/issues/626
@@ -672,7 +694,7 @@ window.assignManager = {
    }
    browser.contextMenus.create({
      id: menuId,
-      title: "Always Open in This Container",
+      title: browser.i18n.getMessage("alwaysOpenSiteInContainer"),
      checked,
      type: "checkbox",
      contexts: ["all"],
@@ -686,13 +708,13 @@ window.assignManager = {
    browser.contextMenus.create({
      id: this.MENU_HIDE_ID,
-      title: "Hide This Container",
+      title: browser.i18n.getMessage("hideThisContainer"),
      contexts: ["all"],
    });
    browser.contextMenus.create({
      id: this.MENU_MOVE_ID,
-      title: "Move Tabs to a New Window",
+      title: browser.i18n.getMessage("moveTabsToANewWindow"),
      contexts: ["all"],
    });
  },
@@ -758,7 +780,7 @@ window.assignManager = {
  async initBookmarksMenu() {
    browser.contextMenus.create({
      id: this.OPEN_IN_CONTAINER,
-      title: "Open Bookmark in Container Tab",
+      title: browser.i18n.getMessage("openBookmarkInContainerTab"),
      contexts: ["bookmark"],
    });
@@ -1,4 +1,9 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */
 const DEFAULT_TAB = "about:newtab";
 const backgroundLogic = {
  NEW_TAB_PAGES: new Set([
    "about:startpage",
@@ -9,7 +14,13 @@ const backgroundLogic = {
  NUMBER_OF_KEYBOARD_SHORTCUTS: 10,
  unhideQueue: [],
  init() {
    browser.commands.onCommand.addListener(function (command) {
      if (command === "sort_tabs") {
        backgroundLogic.sortTabs();
        return;
      }
      for (let i=0; i < backgroundLogic.NUMBER_OF_KEYBOARD_SHORTCUTS; i++) {
        const key = "open_container_" + i;
        const cookieStoreId = identityState.keyboardShortcut[key];
@@ -22,6 +33,20 @@ const backgroundLogic = {
    browser.permissions.onAdded.addListener(permissions => this.resetPermissions(permissions));
    browser.permissions.onRemoved.addListener(permissions => this.resetPermissions(permissions));
    // Update Translation in Manifest
    browser.runtime.onInstalled.addListener(this.updateTranslationInManifest);
    browser.runtime.onStartup.addListener(this.updateTranslationInManifest);
  },
  updateTranslationInManifest() {
    for (let index = 0; index < 10; index++) {
      const ajustedIndex = index + 1; // We want to start from 1 instead of 0 in the UI.
      browser.commands.update({
        name: `open_container_${index}`,
        description: browser.i18n.getMessage("containerShortcut", `${ajustedIndex}`)
      });
    }
  },
  resetPermissions(permissions) {
@@ -50,6 +75,19 @@ const backgroundLogic = {
    return extensionInfo;
  },
  // Remove container data (cookies, localStorage and cache)
  async deleteContainerDataOnly(userContextId) {
    await browser.browsingData.removeCookies({
      cookieStoreId: this.cookieStoreId(userContextId)
    });
    await browser.browsingData.removeLocalStorage({
      cookieStoreId: this.cookieStoreId(userContextId)
    });
    return {done: true, userContextId};
  },
  getUserContextIdFromCookieStoreId(cookieStoreId) {
    if (!cookieStoreId) {
      return false;
@@ -118,7 +156,8 @@ const backgroundLogic = {
    // We can't open these we just have to throw them away
    if (protocol === "about:"
        || protocol === "chrome:"
-        || protocol === "moz-extension:") {
+        || protocol === "moz-extension:"
        || protocol === "file:") {
      return false;
    }
    return true;
@@ -168,7 +207,7 @@ const backgroundLogic = {
      if ("isIsolated" in containerState || remove) {
        delete containerState.isIsolated;
      } else {
-        containerState.isIsolated = "locked";        
+        containerState.isIsolated = "locked";
      }
      return await identityState.storageArea.set(cookieStoreId, containerState);
    } catch (error) {
@@ -317,19 +356,29 @@ const backgroundLogic = {
        continue;
      }
-      const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(tab.cookieStoreId);
+      if (!map.has(tab.cookieStoreId)) {
-      if (!map.has(userContextId)) {
+        const userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(tab.cookieStoreId);
-        map.set(userContextId, []);
+        map.set(tab.cookieStoreId, { order: userContextId, tabs: [] });
      }
-      map.get(userContextId).push(tab);
+      map.get(tab.cookieStoreId).tabs.push(tab);
    }
    const containerOrderStorage = await browser.storage.local.get([CONTAINER_ORDER_STORAGE_KEY]);
    const containerOrder =
      containerOrderStorage && containerOrderStorage[CONTAINER_ORDER_STORAGE_KEY];
    if (containerOrder) {
      map.forEach((obj, key) => {
        obj.order = (key in containerOrder) ? containerOrder[key] : -1;
      });
    }
    // Let's sort the map.
-    const sortMap = new Map([...map.entries()].sort((a, b) => a[0] > b[0]));
+    const sortMap = new Map([...map.entries()].sort((a, b) => a[1].order > b[1].order));
    // Let's move tabs.
-    sortMap.forEach(tabs => {
+    sortMap.forEach(obj => {
-      for (const tab of tabs) {
+      for (const tab of obj.tabs) {
        ++pos;
        browser.tabs.move(tab.id, {
          windowId: windowObj.id,
@@ -23,6 +23,9 @@ const messageHandler = {
      case "deleteContainer":
        response = backgroundLogic.deleteContainer(m.message.userContextId);
        break;
      case "deleteContainerDataOnly":
        response = backgroundLogic.deleteContainerDataOnly(m.message.userContextId);
        break;
      case "createOrUpdateContainer":
        response = backgroundLogic.createOrUpdateContainer(m.message);
        break;
@@ -45,6 +48,9 @@ const messageHandler = {
        // m.url is the assignment to be removed/added
        response = assignManager._setOrRemoveAssignment(m.tabId, m.url, m.userContextId, m.value);
        break;
      case "resetCookiesForSite":
        response = assignManager._resetCookiesForSite(m.pageUrl, m.cookieStoreId);
        break;
      case "sortTabs":
        backgroundLogic.sortTabs();
        break;
@@ -90,10 +96,10 @@ const messageHandler = {
        break;
      case "assignAndReloadInContainer":
        tab = await assignManager.reloadPageInContainer(
-          m.url, 
+          m.url,
          m.currentUserContextId,
-          m.newUserContextId, 
+          m.newUserContextId,
-          m.tabIndex, 
+          m.tabIndex,
          m.active,
          true
        );
@@ -220,7 +226,9 @@ const messageHandler = {
          // if it's a container tab wait for it to complete and
          // unhide other tabs from this container
          if (tab.cookieStoreId.startsWith("firefox-container")) {
-            browser.tabs.onUpdated.addListener(this.tabUpdateHandler);
+            browser.tabs.onUpdated.addListener(this.tabUpdateHandler, {
              properties: ["status"]
            });
          }
        }
      }
@@ -7,27 +7,47 @@ async function load() {
  redirectUrlElement.textContent = redirectUrl;
  appendFavicon(redirectUrl, redirectUrlElement);
  // Option for staying on the previous container
  document.getElementById("deny").addEventListener("click", (e) => {
    e.preventDefault();
-    denySubmit(redirectUrl);
+    denySubmit(redirectUrl, currentCookieStoreId);
  });
  // Option for going to the default container (no container)
  document.getElementById("deny-no-container").addEventListener("click", (e) => {
    e.preventDefault();
    denySubmit(redirectUrl, currentCookieStoreId);
  });
  const container = await browser.contextualIdentities.get(cookieStoreId);
  const currentContainer = currentCookieStoreId ? await browser.contextualIdentities.get(currentCookieStoreId) : null;
-  const currentContainerName = currentContainer ? currentContainer.name : "";
+  const currentContainerName = currentContainer ? setDenyButton(currentContainer.name) : setDenyButton("");
  document.querySelectorAll("[data-message-id]").forEach(el => {
    const elementData = el.dataset;
    const containerName = elementData.messageArg === "container-name" ? container.name : currentContainerName;
    el.textContent = browser.i18n.getMessage(elementData.messageId, containerName);
  });
-  
+
  // Option for going to newly selected container
  document.getElementById("confirm").addEventListener("click", (e) => {
    e.preventDefault();
    confirmSubmit(redirectUrl, cookieStoreId);
  });
 }
 function setDenyButton(currentContainerName) {
  const buttonDeny = document.getElementById("deny");
  const buttonDenyNoContainer = document.getElementById("deny-no-container");
  if (currentContainerName) {
    buttonDenyNoContainer.style.display = "none";
    return currentContainerName;
  }
  buttonDeny.style.display = "none";
  return;
 }
 function appendFavicon(pageUrl, redirectUrlElement) {
  const origin = new URL(pageUrl).origin;
  const favIconElement = Utils.createFavIconElement(`${origin}/favicon.ico`);
@@ -42,6 +62,7 @@ function confirmSubmit(redirectUrl, cookieStoreId) {
    browser.runtime.sendMessage({
      method: "neverAsk",
      neverAsk: true,
      cookieStoreId: cookieStoreId,
      pageUrl: redirectUrl
    });
  }
@@ -55,8 +76,21 @@ function getCurrentTab() {
  });
 }
-async function denySubmit(redirectUrl) {
+async function denySubmit(redirectUrl, currentCookieStoreId) {
  const tab = await getCurrentTab();
  const currentContainer = currentCookieStoreId ? await browser.contextualIdentities.get(currentCookieStoreId) : null;
  const neverAsk = document.getElementById("never-ask").checked;
  if (neverAsk) {
    await browser.runtime.sendMessage({
      method: "neverAsk",
      neverAsk: true,
      cookieStoreId: currentCookieStoreId,
      pageUrl: redirectUrl,
      defaultContainer: !currentContainer
    });
  }
  await browser.runtime.sendMessage({
    method: "exemptContainerAssignment",
    tabId: tab[0].id,
@@ -24,11 +24,12 @@ async function addMessage(message) {
  divElement.innerText = message.text;
  const imageElement = document.createElement("img");
-  const imagePath = browser.runtime.getURL("/img/container-site-d-24.png");
+  const imagePath = browser.runtime.getURL("/img/multiaccountcontainer-16.svg");
  const response = await fetch(imagePath);
  const blob = await response.blob();
  const objectUrl = URL.createObjectURL(blob);
  imageElement.src = objectUrl;
  imageElement.width = imageElement.height = 24;
  divElement.prepend(imageElement);
  document.body.appendChild(divElement);
@@ -34,11 +34,8 @@ const MozillaVPN = {
        }
        if (!mozillaVpnConnected && proxy.mozProxyEnabled) {
          flag.classList.add("proxy-unavailable");
          const tooltip = el.querySelector(".tooltip.proxy-unavailable");
          if (tooltip) {
            tooltip.textContent = tooltipProxyWarning;
          }
          const menuItemName = el.querySelector(".menu-item-name");
          menuItemName.setAttribute("title", tooltipProxyWarning);
          if (menuItemName) {
            el.querySelector(".menu-item-name").dataset.mozProxyWarning = "proxy-unavailable";
          }
@@ -68,14 +65,11 @@ const MozillaVPN = {
    const mozillaVpnConnected = await browser.runtime.sendMessage({ method: "MozillaVPN_getConnectionStatus" });
    const connectionStatusStringId = mozillaVpnConnected ? "moz-vpn-connected" : "moz-vpn-disconnected";
    const connectionStatusLocalizedString = browser.i18n.getMessage(connectionStatusStringId);
    const connectionStatusTooltip = document.querySelector(".vpn-status-container-list");
    connectionStatusTooltip.setAttribute("title", connectionStatusLocalizedString);
    statusIconEls.forEach(el => {
      el.style.backgroundImage = mozillaVpnConnected ? connectedIndicatorSrc : disconnectedIndicatorSrc;
      if (el.querySelector(".tooltip")) {
        el.querySelector(".tooltip").textContent = connectionStatusLocalizedString;
      } else {
        el.textContent = connectionStatusLocalizedString;
      }
    });
  },
@@ -53,11 +53,20 @@ async function enableDisableReplaceTab() {
  await browser.storage.local.set({replaceTabEnabled: !!checkbox.checked});
 }
 async function changeTheme(event) {
  const theme = event.currentTarget;
  await browser.storage.local.set({currentTheme: theme.value});
  await browser.storage.local.set({currentThemeId: theme.selectedIndex});
 }
 async function setupOptions() {
  const { syncEnabled } = await browser.storage.local.get("syncEnabled");
  const { replaceTabEnabled } = await browser.storage.local.get("replaceTabEnabled");
  const { currentThemeId } = await browser.storage.local.get("currentThemeId");
  document.querySelector("#syncCheck").checked = !!syncEnabled;
  document.querySelector("#replaceTabCheck").checked = !!replaceTabEnabled;
  document.querySelector("#changeTheme").selectedIndex = currentThemeId;
  setupContainerShortcutSelects();
 }
@@ -114,6 +123,8 @@ browser.permissions.onRemoved.addListener(resetPermissionsUi);
 document.addEventListener("DOMContentLoaded", setupOptions);
 document.querySelector("#syncCheck").addEventListener( "change", enableDisableSync);
 document.querySelector("#replaceTabCheck").addEventListener( "change", enableDisableReplaceTab);
 document.querySelector("#changeTheme").addEventListener( "change", changeTheme);
 maybeShowPermissionsWarningIcon();
 for (let i=0; i < NUMBER_OF_KEYBOARD_SHORTCUTS; i++) {
  document.querySelector("#open_container_"+i)
@@ -32,6 +32,9 @@ async function init() {
  list.appendChild(fragment);
  MozillaVPN.handleContainerList(identities);
  // Set the theme
  Utils.applyTheme();
 }
 init();
@@ -10,7 +10,6 @@ const DEFAULT_ICON = "circle";
 const NEW_CONTAINER_ID = "new";
 const ONBOARDING_STORAGE_KEY = "onboarding-stage";
 const CONTAINER_ORDER_STORAGE_KEY = "container-order";
 const CONTAINER_DRAG_DATA_TYPE = "firefox-container";
 // List of panels
@@ -33,6 +32,7 @@ const P_CONTAINER_EDIT = "containerEdit";
 const P_CONTAINER_DELETE = "containerDelete";
 const P_CONTAINERS_ACHIEVEMENT = "containersAchievement";
 const P_CONTAINER_ASSIGNMENTS = "containerAssignments";
 const P_CLEAR_CONTAINER_STORAGE = "clearContainerStorage";
 const P_MOZILLA_VPN_SERVER_LIST = "moz-vpn-server-list";
 const P_ADVANCED_PROXY_SETTINGS = "advanced-proxy-settings-panel";
@@ -66,6 +66,9 @@ const Logic = {
      method: "MozillaVPN_attemptPort"
    }),
    // Set the theme
    Utils.applyTheme();
    // Remove browserAction "upgraded" badge when opening panel
    this.clearBrowserActionBadge();
@@ -120,6 +123,19 @@ const Logic = {
  },
  notify(i18nOpts) {
    const notificationCards = document.querySelectorAll(".popup-notification-card");
    const text = browser.i18n.getMessage(i18nOpts.messageId, i18nOpts.placeholders);
    notificationCards.forEach(notificationCard => {
      notificationCard.textContent = text;
      notificationCard.classList.add("is-shown");
      setTimeout(() => {
        notificationCard.classList.remove("is-shown");
      }, 2000);
    });
  },
  async showAchievementOrContainersListPanel() {
    // Do we need to show an achievement panel?
    let showAchievements = false;
@@ -209,6 +225,11 @@ const Logic = {
  async saveContainerOrder(rows) {
    const containerOrder = {};
    rows.forEach((node, index) => {
      if (typeof browser.contextualIdentities.move === "function") {
        browser.contextualIdentities.move(
          node.dataset.containerId, index);
      }
      return containerOrder[node.dataset.containerId] = index;
    });
    await browser.storage.local.set({
@@ -394,7 +415,11 @@ const Logic = {
  },
  shortcutListener(e){
-    function openNewContainerTab(identity) {
+    function openTopContainers() {
      const identities = Logic.identities();
      const key = e.code.substring(5);
      const identity = e.code === "Digit0" ? identities[9] : identities[key - 1];
      try {
        browser.tabs.create({
          cookieStoreId: identity.cookieStoreId
@@ -404,12 +429,34 @@ const Logic = {
        window.close();
      }
    }
-    const identities = Logic.identities();
+
-    if ((e.keyCode >= 49 && e.keyCode <= 57) &&
+    // We monitor if the search input is focused so we can disable opening
-            Logic._currentPanel === "containersList") {
+    // containers by typing a digit between 0-9 while the popup is open.
-      const identity = identities[e.keyCode - 49];
+    const searchInput = document.getElementById("search-terms");
-      if (identity) {
+    let isSearchInputFocused = false;
-        openNewContainerTab(identity);
+
    if (document.activeElement === searchInput) {
      isSearchInputFocused = true;
    }
    if (Logic._currentPanel === "containersList" && !isSearchInputFocused) {
      switch(e.code) {
      case "Digit0":
      case "Digit1":
      case "Digit2":
      case "Digit3":
      case "Digit4":
      case "Digit5":
      case "Digit6":
      case "Digit7":
      case "Digit8":
      case "Digit9":
        openTopContainers();
        break;
      case "Slash":
        document.getElementById("search-terms").focus();
        e.preventDefault();
        break;
      }
    }
  },
@@ -462,6 +509,23 @@ const Logic = {
    default:
      break;
    }
  },
  filterContainerList() {
    const pattern = /^\s+|\s+$/g;
    const list = Array.from(document.querySelectorAll("#identities-list tr"));
    const search = document.querySelector("#search-terms").value.replace(pattern, "").toLowerCase();
    for (const i in list) {
      const text = list[i].querySelector("td div span");
      if (text.innerText.replace(pattern, "").toLowerCase().includes(search) ||
          !search) {
        list[i].style.display = "block";
      } else {
        list[i].style.display = "none";
      }
    }
  }
 };
@@ -621,7 +685,7 @@ Logic.registerPanel(P_ONBOARDING_7, {
    // Let's move to the containers list panel.
    Utils.addEnterHandler(document.querySelector("#sign-in"), async () => {
      browser.tabs.create({
-        url: "https://accounts.firefox.com/?service=sync&action=email&context=fx_desktop_v3&entrypoint=multi-account-containers&utm_source=addon&utm_medium=panel&utm_campaign=container-sync",
+        url: "https://accounts.firefox.com/?service=sync&action=email&context=fx_desktop_v3&entrypoint=multi-account-containers&utm_source=addon&utm_medium=panel&utm_campaign=container-sync&brand=mozilla",
      });
      await Logic.setOnboardingStage(7);
      Logic.showPanel(P_ONBOARDING_8);
@@ -786,7 +850,6 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
            </div>
          </div>
          <span class="menu-text">${identity.name}</span>
          <span class="tooltip proxy-unavailable"></span>
        </div>
        <span class="menu-right-float">
          <img alt="" class="always-open-in-flag flag-img" src="/img/flags/.png"/>
@@ -845,6 +908,7 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
    document.addEventListener("keydown", Logic.keyboardNavListener);
    document.addEventListener("keydown", Logic.shortcutListener);
    document.addEventListener("input", Logic.filterContainerList);
    MozillaVPN.handleContainerList(identities);
@@ -921,6 +985,7 @@ Logic.registerPanel(P_CONTAINER_INFO, {
      Utils.alwaysOpenInContainer(identity);
      window.close();
    });
    // Show or not the has-tabs section.
    for (let trHasTabs of document.getElementsByClassName("container-info-has-tabs")) { // eslint-disable-line prefer-const
      trHasTabs.style.display = !identity.hasHiddenTabs && !identity.hasOpenTabs ? "none" : "";
@@ -944,6 +1009,13 @@ Logic.registerPanel(P_CONTAINER_INFO, {
    Utils.addEnterHandler(manageContainer, async () => {
      Logic.showPanel(P_CONTAINER_EDIT, identity);
    });
    const clearContainerStorageButton = document.getElementById("clear-container-storage-info");
    Utils.addEnterHandler(clearContainerStorageButton, async () => {
      const granted = await browser.permissions.request({ permissions: ["browsingData"] });
      if (granted) {
        Logic.showPanel(P_CLEAR_CONTAINER_STORAGE, identity);
      }
    });
    return this.buildOpenTabTable(tabs);
  },
@@ -1244,6 +1316,7 @@ Logic.registerPanel(REOPEN_IN_CONTAINER_PICKER, {
    if (currentTab.cookieStoreId !== "firefox-default") {
      const tr = document.createElement("tr");
      tr.classList.add("menu-item", "hover-highlight", "keyboard-nav");
      tr.setAttribute("tabindex", "0");
      const td = document.createElement("td");
      td.innerHTML = Utils.escaped`
@@ -1404,11 +1477,14 @@ Logic.registerPanel(P_CONTAINER_ASSIGNMENTS, {
        /* As we don't have the full or correct path the best we can assume is the path is HTTPS and then replace with a broken icon later if it doesn't load.
           This is pending a better solution for favicons from web extensions */
        const assumedUrl = `https://${site.hostname}/favicon.ico`;
        const resetSiteCookiesInfo = browser.i18n.getMessage("clearSiteCookiesTooltipInfo");
        const deleteSiteInfo = browser.i18n.getMessage("deleteSiteTooltipInfo");
        trElement.innerHTML = Utils.escaped`
        <td>
          <div class="favicon"></div>
-          <span title="${site.hostname}" class="menu-text">${site.hostname}</span>
+          <span title="${site.hostname}" class="menu-text truncate-text">${site.hostname}</span>
-          <img class="trash-button delete-assignment" src="/img/container-delete.svg" />
+          <img title="${resetSiteCookiesInfo}" class="reset-button reset-assignment" src="/img/refresh-16.svg" />
          <img title="${deleteSiteInfo}" class="trash-button delete-assignment"  src="/img/container-delete.svg" />
        </td>`;
        trElement.getElementsByClassName("favicon")[0].appendChild(Utils.createFavIconElement(assumedUrl));
        const deleteButton = trElement.querySelector(".trash-button");
@@ -1420,6 +1496,20 @@ Logic.registerPanel(P_CONTAINER_ASSIGNMENTS, {
          delete assignments[siteKey];
          this.showAssignedContainers(assignments);
        });
        const resetButton = trElement.querySelector(".reset-button");
        Utils.addEnterHandler(resetButton, async () => {
          const cookieStoreId = Logic.currentCookieStoreId();
          const granted = await browser.permissions.request({ permissions: ["browsingData"] });
          if (!granted) {
            return;
          }
          const result = await Utils.resetCookiesForSite(site.hostname, cookieStoreId);
          if (result === true) {
            Logic.notify({messageId: "cookiesClearedSuccess", placeholders: [site.hostname]});
          } else {
            Logic.notify({messageId: "cookiesCouldNotBeCleared", placeholders: [site.hostname]});
          }
        });
        trElement.classList.add("menu-item", "hover-highlight", "keyboard-nav");
        tableElement.appendChild(trElement);
      });
@@ -1492,7 +1582,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
            } else {
              MozillaVPN.handleMozillaCtaClick("mac-edit-container-panel-btn");
            }
-           
+
          });
          this.switch.addEventListener("click", async() => {
@@ -1547,6 +1637,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
              this.updateProxyDependentUi(proxy);
            } else {
              this.switch.checked = false;
              this.updateProxyDependentUi({});
              return;
            }
          });
@@ -1677,7 +1768,6 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
          this.currentCityName.textContent = proxyInfo.cityName;
          this.countryCode = proxyInfo.countryCode;
        }
        return;
      }
      expandUi() {
@@ -1892,6 +1982,7 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
    if (proxyPermissionEnabled) {
      const proxyData = await proxifiedContainers.retrieve(identity.cookieStoreId);
      if (proxyData && proxyData.proxy.mozProxyEnabled && !mozillaVpnConnected) {
        mozillaVpnUi.updateProxyDependentUi({});
        return;
      }
      const proxy = proxyData ? proxyData.proxy : {};
@@ -2194,6 +2285,47 @@ Logic.registerPanel(P_MOZILLA_VPN_SERVER_LIST, {
  }
 });
 // P_CLEAR_CONTAINER_STORAGE: Page for confirming container storage removal.
 // ----------------------------------------------------------------------------
 Logic.registerPanel(P_CLEAR_CONTAINER_STORAGE, {
  panelSelector: "#clear-container-storage-panel",
  // This method is called when the object is registered.
  initialize() {
    Utils.addEnterHandler(document.querySelector("#clear-container-storage-cancel-link"), () => {
      const identity = Logic.currentIdentity();
      Logic.showPanel(P_CONTAINER_INFO, identity, false, false);
    });
    Utils.addEnterHandler(document.querySelector("#close-clear-container-storage-panel"), () => {
      const identity = Logic.currentIdentity();
      Logic.showPanel(P_CONTAINER_INFO, identity, false, false);
    });
    Utils.addEnterHandler(document.querySelector("#clear-container-storage-ok-link"), async () => {
      const identity = Logic.currentIdentity();
      const userContextId = Utils.userContextId(identity.cookieStoreId);
      const result = await browser.runtime.sendMessage({
        method: "deleteContainerDataOnly",
        message: { userContextId }
      });
      if (result.done === true) {
        Logic.notify({messageId: "storageWasClearedConfirmation", placeholders: [identity.name]});
      }
      Logic.showPanel(P_CONTAINER_INFO, identity, false, false);
    });
  },
  // This method is called when the panel is shown.
  prepare() {
    const identity = Logic.currentIdentity();
    // Populating the panel: name, icon, and warning message
    document.getElementById("container-clear-storage-title").textContent = identity.name;
    return Promise.resolve(null);
  },
 });
 // P_CONTAINER_DELETE: Delete a container.
 // ----------------------------------------------------------------------------
@@ -44,7 +44,7 @@ proxifiedContainers = {
  // Parses a proxy description string of the format type://host[:port] or type://username:password@host[:port] (port is optional)
  parseProxy(proxy_str, mozillaVpnData = null) {
-    const proxyRegexp = /(?<type>(https?)|(socks4?)):\/\/(\b(?<username>\w+):(?<password>\w+)@)?(?<host>((?:\d{1,3}\.){3}\d{1,3}\b)|(\b([\w.-]+)+))(:(?<port>\d+))?/;
+    const proxyRegexp = /(?<type>(https?)|(socks4?)):\/\/(\b(?<username>[\w-]+):(?<password>[\w-]+)@)?(?<host>((?:\d{1,3}\.){3}\d{1,3}\b)|(\b([\w.-]+)+))(:(?<port>\d+))?/;
    const matches = proxyRegexp.exec(proxy_str);
    if (!matches) {
      return false;
@@ -2,6 +2,9 @@
 const DEFAULT_FAVICON = "/img/blank-favicon.svg";
 // eslint-disable-next-line
 const CONTAINER_ORDER_STORAGE_KEY = "container-order";
 // TODO use export here instead of globals
 const Utils = {
@@ -135,6 +138,14 @@ const Utils = {
    });
  },
  resetCookiesForSite(pageUrl, cookieStoreId) {
    return browser.runtime.sendMessage({ 
      method: "resetCookiesForSite", 
      pageUrl,
      cookieStoreId,
    });
  },
  async reloadInContainer(url, currentUserContextId, newUserContextId, tabIndex, active) {
    return await browser.runtime.sendMessage({
      method: "reloadInContainer",
@@ -166,6 +177,26 @@ const Utils = {
      false
    );
  },
  /* Theme helper
   *
   * First, we look if there's a theme already set in the local storage. If
   * there isn't one, we set the theme based on `prefers-color-scheme`.
   * */
  getTheme(currentTheme, window) {
    if (typeof currentTheme !== "undefined" && currentTheme !== "auto") {
      return currentTheme;
    }
    if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
      return "dark";
    }
    return "light";
  },
  async applyTheme() {
    const { currentTheme } = await browser.storage.local.get("currentTheme");
    const popup = document.getElementsByTagName("html")[0];
    const theme = Utils.getTheme(currentTheme, window);
    popup.setAttribute("data-theme", theme);
  }
 };
 window.Utils = Utils;
@@ -1,12 +1,12 @@
 {
  "manifest_version": 2,
  "name": "Firefox Multi-Account Containers",
-  "version": "8.0.7",
+  "version": "8.2.0",
  "incognito": "not_allowed",
  "description": "__MSG_extensionDescription__",
  "icons": {
-    "48": "img/container-site-d-48.png",
+    "48": "img/multiaccountcontainer-16.svg",
-    "96": "img/container-site-d-96.png"
+    "96": "img/multiaccountcontainer-16.svg"
  },
  "homepage_url": "https://github.com/mozilla/multi-account-containers#readme",
  "permissions": [
@@ -26,6 +26,7 @@
  ],
  "optional_permissions": [
    "bookmarks",
    "browsingData",
    "nativeMessaging",
    "proxy"
  ],
@@ -41,77 +42,85 @@
        "default": "Ctrl+Period",
        "mac": "MacCtrl+Period"
      },
-      "description": "Open containers panel"
+      "description": "__MSG_openContainerPanel__"
    },
    "sort_tabs": {
      "suggested_key": {
        "default": "Ctrl+Comma",
        "mac": "MacCtrl+Comma"
      },
      "description": "__MSG_sortTabsByContainer__"
    },
    "open_container_0": {
      "suggested_key": {
        "default": "Ctrl+Shift+1"
      },
-      "description": "Container Shortcut 1"
+      "description": "__MSG_containerShortcut__"
    },
    "open_container_1": {
      "suggested_key": {
        "default": "Ctrl+Shift+2"
      },
-      "description": "Container Shortcut 2"
+      "description": "__MSG_containerShortcut__"
    },
    "open_container_2": {
      "suggested_key": {
        "default": "Ctrl+Shift+3"
      },
-      "description": "Container Shortcut 3"
+      "description": "__MSG_containerShortcut__"
    },
    "open_container_3": {
      "suggested_key": {
        "default": "Ctrl+Shift+4"
      },
-      "description": "Container Shortcut 4"
+      "description": "__MSG_containerShortcut__"
    },
    "open_container_4": {
      "suggested_key": {
        "default": "Ctrl+Shift+5"
      },
-      "description": "Container Shortcut 5"
+      "description": "__MSG_containerShortcut__"
    },
    "open_container_5": {
      "suggested_key": {
        "default": "Ctrl+Shift+6"
      },
-      "description": "Container Shortcut 6"
+      "description": "__MSG_containerShortcut__"
    },
    "open_container_6": {
      "suggested_key": {
        "default": "Ctrl+Shift+7"
      },
-      "description": "Container Shortcut 7"
+      "description": "__MSG_containerShortcut__"
    },
    "open_container_7": {
      "suggested_key": {
        "default": "Ctrl+Shift+8"
      },
-      "description": "Container Shortcut 8"
+      "description": "__MSG_containerShortcut__"
    },
    "open_container_8": {
      "suggested_key": {
        "default": "Ctrl+Shift+9"
      },
-      "description": "Container Shortcut 9"
+      "description": "__MSG_containerShortcut__"
    },
    "open_container_9": {
      "suggested_key": {
        "default": "Ctrl+Shift+0"
      },
-      "description": "Container Shortcut 10"
+      "description": "__MSG_containerShortcut__"
    }
  },
  "browser_action": {
    "browser_style": true,
    "default_icon": "img/multiaccountcontainer-16.svg",
-    "default_title": "Multi-Account Containers",
+    "default_title": "Firefox Multi-Account Containers",
    "default_popup": "popup.html",
    "default_area": "navbar",
    "theme_icons": [
      {
-        "light": "img/multiaccountcontainer-16-dark.svg",
+        "light": "img/multiaccountcontainer-16.svg",
        "dark": "img/multiaccountcontainer-16.svg",
        "size": 32
      }
@@ -120,7 +129,7 @@
  "page_action": {
    "browser_style": true,
    "default_icon": "img/container-openin-16.svg",
-    "default_title": "Always open this in a Container",
+    "default_title": "__MSG_alwaysOpenSiteInContainer__",
    "default_popup": "pageActionPopup.html",
    "pinned": false,
    "show_matches": ["*://*/*"]
@@ -144,7 +153,7 @@
  ],
  "default_locale": "en",
  "web_accessible_resources": [
-    "/img/container-site-d-24.png"
+    "/img/multiaccountcontainer-16.svg"
  ],
  "options_ui": {
    "page": "options.html",
@@ -40,7 +40,7 @@
          </div>
        </div>
      </div>
-      <h3 data-i18n-message-id="firefoxAccountsSync"></h3>
+      <h3 data-i18n-message-id="sync"></h3>
      <div class="settings-group">
        <label>
          <input type="checkbox" id="syncCheck">
@@ -59,6 +59,24 @@
        <p><em data-i18n-message-id="replaceTabDescription"></em></p>
      </div>
      <!--
        TODO
        - Add data-i18n
      -->
      <h3 data-i18n-message-id="theme"></h3>
      <p><label class="keyboard-shortcut">
          <span data-i18n-message-id="chooseTheme"></span>
          <select id="changeTheme" name="changeTheme">
            <option value="auto" selected data-i18n-message-id="themeAuto">
            </option>
            <option value="light" data-i18n-message-id="themeLight">
            </option>
            <option value="dark" data-i18n-message-id="themeDark">
            </option>
          </select>
      </label></p>
      <h3 data-i18n-message-id="keyboardShortCuts"></h3>
      <p><em data-i18n-message-id="editWhichContainer"></em></p>
@@ -1,7 +1,7 @@
 <html>
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Multi-Account Containers</title>
+  <title>Firefox Multi-Account Containers</title>
  <script type="text/javascript" src="./js/i18n.js"></script>
  <link rel="stylesheet" type="text/css" href="css/popup.css">
@@ -1,7 +1,7 @@
-<html>
+<html data-theme="auto">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Multi-Account Containers</title>
+  <title>Firefox Multi-Account Containers</title>
  <script type="text/javascript" src="./js/i18n.js"></script>
  <link rel="stylesheet" href="./css/popup.css">
 </head>
@@ -44,7 +44,7 @@
  <div class="panel onboarding onboarding-panel-6 hide" id="onboarding-panel-6">
    <img class="onboarding-img" alt="" src="/img/Sync.svg" />
    <h3 class="onboarding-title" data-i18n-message-id="onboarding-6-header"></h3>
-    <p data-i18n-message-id="onboarding-6-description"></p>
+    <p data-i18n-message-id="onboarding-6-description-2"></p>
    <div class="half-button-wrapper">
      <a href="#" id="no-sync" class="half-onboarding-button grey-button keyboard-nav" tabindex="0" data-i18n-message-id="notNow"></a>
      <a href="#" id="start-sync-button" class="half-onboarding-button keyboard-nav" tabindex="0" data-i18n-message-id="startSyncing"></a>
@@ -53,8 +53,8 @@
  <div class="panel onboarding onboarding-panel-7 hide" id="onboarding-panel-7">
    <img class="onboarding-img" alt="" src="/img/Account.svg" />
-    <h3 class="onboarding-title" data-i18n-message-id="onboarding-7-header"></h3>
+    <h3 class="onboarding-title" data-i18n-message-id="onboarding-7-header-2"></h3>
-    <p data-i18n-message-id="onboarding-7-description"></p>
+    <p data-i18n-message-id="onboarding-7-description-2"></p>
    <div class="half-button-wrapper">
      <a href="#" id="no-sign-in" class="half-onboarding-button grey-button keyboard-nav" tabindex="0" data-i18n-message-id="notNow"></a>
      <a href="#" id="sign-in" class="half-onboarding-button keyboard-nav" tabindex="0" data-i18n-message-id="signIn"></a>
@@ -107,7 +107,8 @@
  </div>
  <div class="panel menu-panel container-panel hide" id="container-panel">
-    <h3 class="title">Multi-Account Containers</h3>
+    <span class="popup-notification-card"></span>
    <h3 class="title">Firefox Multi-Account Containers</h3>
    <a href="#" class="info-icon" id="info-icon" tabindex="10">
      <img data-i18n-attribute-message-id="info" data-i18n-attribute="alt" alt="" src="/img/info.svg" / >
    </a>
@@ -154,11 +155,22 @@
      <div class="sub-header" data-i18n-message-id="containers"></div>
      <h4 class="moz-vpn-logotype vpn-status-container-list display-none">Mozilla VPN
        <span class="moz-vpn-connection-status-indicator container-list-status-icon">
          <span class="tooltip"></span>
        </span>
      </h4>
    </div>
    <div class="scrollable identities-list">
      <div class="searchbar">
        <label for="search-terms"
               class="hide-label"
               data-i18n-message-id="filterInputLabel">
        </label>
        <input type="text"
               id="search-terms"
               name="search-terms"
               placeholder="Search container name"
               data-i18n-attribute="placeholder"
               data-i18n-attribute-message-id="filterInputPlaceholder">
      </div>
      <table class="menu" id="identities-list">
        <tr class="menu-item hover-highlight">
          <td>
@@ -198,6 +210,7 @@
  <div class="hide panel menu-panel container-info-panel" id="container-info-panel" tabindex="-1">
    <span class="popup-notification-card"></span>
    <h3 class="title" id="container-info-title" data-i18n-attribute-message-id="personal"></h3>
    <button class="btn-return arrow-left controller keyboard-nav-back" id="close-container-info-panel" tabindex="0"></button>
    <hr>
@@ -234,6 +247,14 @@
            </span>
        </td>
      </tr>
      <tr class="menu-item hover-highlight keyboard-nav" id="clear-container-storage" tabindex="0">
        <td>
          <img class="menu-icon clear-storage-icon" alt="" src="img/container-delete.svg" />
          <span class="menu-text" id="clear-container-storage-info" data-i18n-message-id="clearContainerStorage"></span>
            <span class="menu-arrow">
            </span>
        </td>
      </tr>
    </table>
    <hr>
    <div class="sub-header-wrapper">
@@ -251,13 +272,14 @@
      </table>
    </div>
    <v-padding-hack-footer></v-padding-hack-footer>
-    <div class="bottom-btn keyboard-nav hover-highlight" id="manage-container-link" tabindex="0" data-i18n-message-id="manageThisContainer"></div>
+    <div class="bottom-btn keyboard-nav hover-highlight controller" id="manage-container-link" tabindex="0" data-i18n-message-id="manageThisContainer"></div>
  </div>
  <div class="panel menu-panel container-picker-panel hide" id="container-picker-panel">
    <span class="popup-notification-card"></span>
    <h3 class="title" id="picker-title">
-      Multi-Account Containers
+      Firefox Multi-Account Containers
    </h3>
    <button class="btn-return arrow-left controller keyboard-nav-back" id="close-container-picker-panel" tabindex="0"></button>
    <hr>
@@ -280,6 +302,7 @@
  </div>
  <div class="panel menu-panel edit-container-panel hide" id="edit-container-panel">
    <span class="popup-notification-card"></span>
    <h3 class="title" id="container-edit-title" data-i18n-message-id="default"></h3>
    <button class="btn-return arrow-left controller" id="close-container-edit-panel"></button>
    <hr>
@@ -342,10 +365,11 @@
        </button>
      </div>
    </moz-vpn-container-ui>
-    <button id="advanced-proxy-settings-btn" class="proxy-section advanced-proxy-settings-btn controller">
+    <button id="advanced-proxy-settings-btn" class="proxy-section advanced-proxy-settings-btn">
      <span class="advanced-proxy-settings-btn-label" data-i18n-message-id="advancedProxySettings"></span>
      <span id="advanced-proxy-address"></span>
    </button>
    <hr>
    <button class="delete-container delete-btn alert-text" id="delete-container-button" data-i18n-message-id="deleteThisContainer"></button>
    <!-- TODO get UX / CONTENT on how to message about unavailable proxies -->
@@ -369,6 +393,7 @@
  </div>
  <div class="panel menu-panel edit-container-assignments hide" id="edit-container-assignments">
    <span class="popup-notification-card"></span>
    <h3 class="title" id="edit-assignments-title" data-i18n-message-id="default"></h3>
    <button class="btn-return arrow-left controller" id="close-container-assignment-panel"></button>
    <hr>
@@ -398,7 +423,23 @@
    </div>
    <div class="panel-footer">
      <a href="#" class="button expanded secondary footer-button cancel-button" data-i18n-message-id="cancel" id="delete-container-cancel-link"></a>
-      <a href="#" class="button expanded primary footer-button" data-i18n-message-id="ok" id="delete-container-ok-link"></a>
+      <a href="#" class="button expanded confirmation-destructive-ok-btn footer-button alert-text" data-i18n-message-id="ok" id="delete-container-ok-link"></a>
    </div>
  </div>
  <div class="hide panel clear-container-storage-panel" id="clear-container-storage-panel">
    <h3 class="title" id="container-clear-storage-title" data-i18n-message-id="default">
    </h3>
    <button class="btn-return arrow-left controller" id="close-clear-container-storage-panel"></button>
    <hr>
    <div class="panel-content clear-container-storage-confirm">
      <h4 class="clear-container-storage-confirm-title" data-i18n-message-id="clearContainerStoragePanelTitle"></h4>
      <p class="clear-container-storage-warning" data-i18n-message-id="clearContainerStorageConfirmation"></p>
    </div>
    <div class="panel-footer">
      <a href="#" class="button expanded secondary footer-button cancel-button" data-i18n-message-id="cancel" id="clear-container-storage-cancel-link"></a>
      <a href="#" class="button expanded confirmation-destructive-ok-btn footer-button alert-text" data-i18n-message-id="ok" id="clear-container-storage-ok-link"></a>
    </div>
  </div>
@@ -0,0 +1,27 @@
 const { sinon, nextTick, buildBackgroundDom } = require("../common");
 describe("#1140", () => {
  beforeEach(async () => {
    this.background = await buildBackgroundDom();
  });
  describe("removing containers", () => {
    beforeEach(async () => {
      this.background.browser.contextualIdentities.onRemoved.addListener = sinon.stub();
      const [promise] = this.background.browser.runtime.onMessage.addListener.yield({
        method: "deleteContainer",
        message: {
          userContextId: "1"
        }
      });
      await promise;
      await nextTick();
    });
    it("should remove the identitystate from storage as well", async () => {
      this.background.browser.storage.local.remove.should.have.been.calledWith([
        "identitiesState@@_firefox-container-1"
      ]);
    });
  });
 });