From 6383825c950f27fc9d4e9a660c78bff7c593aed2 Mon Sep 17 00:00:00 2001
From: maxxcrawford <maxx.crawford@gmail.com>
Date: Tue, 24 Oct 2023 13:08:44 -0500
Subject: [PATCH 1/5] FXA Rebrand 60466258b8d91046ee91bc21df2811506e8afeac

---
 src/js/popup.js  | 2 +-
 src/options.html | 2 +-
 src/popup.html   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index b8f80ff4b..1f2eaa9b7 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -640,7 +640,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);
diff --git a/src/options.html b/src/options.html
index c8b8ff9a7..08544bff9 100644
--- a/src/options.html
+++ b/src/options.html
@@ -40,7 +40,7 @@ <h3 class="moz-vpn-proxy-permissions-title">
           </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">
diff --git a/src/popup.html b/src/popup.html
index ef22e945a..d15f3e44e 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -44,7 +44,7 @@ <h3 class="onboarding-title" data-i18n-message-id="onboarding-5-header"></h3>
   <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 @@ <h3 class="onboarding-title" data-i18n-message-id="onboarding-6-header"></h3>
 
   <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>
-    <p data-i18n-message-id="onboarding-7-description"></p>
+    <h3 class="onboarding-title" data-i18n-message-id="onboarding-7-header-2"></h3>
+    <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>

From 944b849b2f38d8b78e1b85d9a97127ec7fe5d57c Mon Sep 17 00:00:00 2001
From: maxxcrawford <maxx.crawford@gmail.com>
Date: Tue, 24 Oct 2023 13:10:33 -0500
Subject: [PATCH 2/5] Bump version number to 8.1.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 src/manifest.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c03dfc64a..9416e5b14 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "testpilot-containers",
-  "version": "8.1.2",
+  "version": "8.1.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 3f9e2b2a2..28b5f55a6 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.1.2",
+  "version": "8.1.3",
   "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/manifest.json b/src/manifest.json
index 544e0b004..00811b4f8 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Firefox Multi-Account Containers",
-  "version": "8.1.2",
+  "version": "8.1.3",
   "incognito": "not_allowed",
   "description": "__MSG_extensionDescription__",
   "icons": {

From 05f63e07590ac9a8de2b9b8785c22576113fb4f9 Mon Sep 17 00:00:00 2001
From: maxxcrawford <maxx.crawford@gmail.com>
Date: Tue, 24 Oct 2023 13:28:05 -0500
Subject: [PATCH 3/5] Fix failing test 2dfd1ee4bb1bfb1dc5a843da8743a10779437394

---
 bin/build-addon.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/build-addon.sh b/bin/build-addon.sh
index 62d771c70..0a367d5d0 100755
--- a/bin/build-addon.sh
+++ b/bin/build-addon.sh
@@ -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

From a18a22e2f65a5858cc3ce6eccf58faf61ed1856e Mon Sep 17 00:00:00 2001
From: maxxcrawford <maxx.crawford@gmail.com>
Date: Tue, 24 Oct 2023 13:30:38 -0500
Subject: [PATCH 4/5] Fix addons-linter.sh

---
 bin/addons-linter.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons-linter.sh b/bin/addons-linter.sh
index 0038efeb6..f66c02625 100755
--- a/bin/addons-linter.sh
+++ b/bin/addons-linter.sh
@@ -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

From dc53cc40d63d01074ff06f11dffc4f292fab3e12 Mon Sep 17 00:00:00 2001
From: maxxcrawford <maxx.crawford@gmail.com>
Date: Tue, 24 Oct 2023 15:22:23 -0500
Subject: [PATCH 5/5] Add latest strings

---
 src/_locales | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_locales b/src/_locales
index 417e6294e..d3301069f 160000
--- a/src/_locales
+++ b/src/_locales
@@ -1 +1 @@
-Subproject commit 417e6294ed767914b617a5e56ccbe67482df181c
+Subproject commit d3301069f51262e8cf493a86aa2785cf3261141e