diff --git a/helpers/DATA/firefox/patch_changes/Remove_Andoir_and_iOS_promotion.patch b/helpers/DATA/firefox/patch_changes/Remove_Andoir_and_iOS_promotion.patch
index 0bef617..c90956a 100644
--- a/helpers/DATA/firefox/patch_changes/Remove_Andoir_and_iOS_promotion.patch
+++ b/helpers/DATA/firefox/patch_changes/Remove_Andoir_and_iOS_promotion.patch
@@ -29,8 +29,8 @@ diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser
index 1b29e8d..6f7566c 100644
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
-@@ -714,16 +714,6 @@ sync-signedout-account-signin2 =
- .label = Sign in to { -sync-brand-short-name }…
+@@ -838,17 +838,7 @@ sync-signedout-account-signin3 =
+ .label = Sign in to sync…
.accesskey = i
-# This message contains two links and two icon images.
@@ -43,9 +43,11 @@ index 1b29e8d..6f7566c 100644
-# to your language, but should not be changed or translated.
-sync-mobile-promo = Download Firefox for ![]()
Android or ![]()
iOS to sync with your mobile device.
-
- ## Sync Account - Signed in
+-## Firefox account - Signed in
++## Sync Account - Signed in
sync-profile-picture =
+ .tooltiptext = Change profile picture
diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs
index 2417f1a641..698c48ccc3 100644
--- a/browser/components/protections/content/vpn-card.mjs
diff --git a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
index 3e47dbb..1d8fa52 100644
--- a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
+++ b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
@@ -3,9 +3,9 @@ Based on https://git.parabola.nu/abslibre.git/diff/libre/iceweasel/9004-FSDG-mis
- Remove 'More from Mozilla' section in Preferences
- Remove promos of Firefox Focus and Klar from Private Browsing
-diff -Nru source_orig/browser/app/profile/firefox.js source/browser/app/profile/firefox.js
---- source_orig/browser/app/profile/firefox.js 2022-05-22 09:35:55.500675021 +0000
-+++ source/browser/app/profile/firefox.js 2022-05-22 21:54:34.961904349 +0000
+diff -Nru a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
+--- a/browser/app/profile/firefox.js 2022-05-22 09:35:55.500675021 +0000
++++ b/browser/app/profile/firefox.js 2022-05-22 21:54:34.961904349 +0000
@@ -1007,11 +1007,11 @@
// Toggling Search bar on and off in about:preferences
pref("browser.preferences.search", true);
@@ -29,9 +29,9 @@ diff -Nru source_orig/browser/app/profile/firefox.js source/browser/app/profile/
// Comma separated string of mozilla vpn supported platforms.
pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux");
-diff -Nru source_orig/browser/base/content/test/static/browser_all_files_referenced.js source/browser/base/content/test/static/browser_all_files_referenced.js
---- source_orig/browser/base/content/test/static/browser_all_files_referenced.js 2022-05-22 09:35:55.336673325 +0000
-+++ source/browser/base/content/test/static/browser_all_files_referenced.js 2022-05-22 21:50:33.783348501 +0000
+diff -Nru a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
+--- a/browser/base/content/test/static/browser_all_files_referenced.js 2022-05-22 09:35:55.336673325 +0000
++++ b/browser/base/content/test/static/browser_all_files_referenced.js 2022-05-22 21:50:33.783348501 +0000
@@ -32,8 +32,6 @@
"chrome://activity-stream/content/data/content/assets/remote/",
"chrome://browser/content/assets/moz-vpn.svg",
@@ -41,31 +41,30 @@ diff -Nru source_orig/browser/base/content/test/static/browser_all_files_referen
// These app marketplace icons are referenced based on the user's locale
// in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx
-@@ -136,17 +133,6 @@
+@@ -145,15 +145,6 @@ var whitelist = [
// extensions/pref/autoconfig/src/nsReadConfig.cpp
{ file: "resource://gre/defaults/autoconfig/prefcalls.js" },
- // browser/components/preferences/moreFromMozilla.js
- // These files URLs are constructed programatically at run time.
- {
-- file:
-- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg",
+- file: "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg",
- },
- {
-- file:
-- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg",
+- file: "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg",
- },
-
{ file: "resource://gre/greprefs.js" },
// layout/mathml/nsMathMLChar.cpp
-diff -Nru source/browser/components/newtab/lib/OnboardingMessageProvider.jsm source/browser/components/newtab/lib/OnboardingMessageProvider.jsm_fix
---- source/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-10-16 05:35:50.783203285 -0500
-+++ source/browser/components/newtab/lib/OnboardingMessageProvider.jsm_fix 2022-10-16 06:20:07.235345215 -0500
-@@ -649,321 +649,6 @@
+diff -Nru a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-10-16 05:35:50.783203285 -0500
++++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-10-16 06:20:07.235345215 -0500
+@@ -513,315 +515,6 @@ const BASE_MESSAGES = () => [
+ ],
},
},
- {
+- {
- id: "PB_NEWTAB_FOCUS_PROMO",
- type: "default",
- template: "pb_newtab",
@@ -118,8 +117,7 @@ diff -Nru source/browser/components/newtab/lib/OnboardingMessageProvider.jsm sou
- ios: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
+- args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -129,8 +127,7 @@ diff -Nru source/browser/components/newtab/lib/OnboardingMessageProvider.jsm sou
- android: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
+- args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -225,8 +222,7 @@ diff -Nru source/browser/components/newtab/lib/OnboardingMessageProvider.jsm sou
- ios: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",
+- args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -236,8 +232,7 @@ diff -Nru source/browser/components/newtab/lib/OnboardingMessageProvider.jsm sou
- android: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",
+- args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -328,8 +323,7 @@ diff -Nru source/browser/components/newtab/lib/OnboardingMessageProvider.jsm sou
- ios: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",
+- args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -339,8 +333,7 @@ diff -Nru source/browser/components/newtab/lib/OnboardingMessageProvider.jsm sou
- android: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",
+- args: "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -380,17 +373,26 @@ diff -Nru source/browser/components/newtab/lib/OnboardingMessageProvider.jsm sou
- },
- targeting: "localeLanguageCode == 'de'",
- },
-- {
+ {
id: "PB_NEWTAB_INFO_SECTION",
template: "pb_newtab",
- content: {
-diff -Nru source/browser/components/newtab/lib/PanelTestProvider.jsm source/browser/components/newtab/lib/PanelTestProvider.jsm_fix
---- source/browser/components/newtab/lib/PanelTestProvider.jsm 2022-10-16 05:35:50.835203327 -0500
-+++ source/browser/components/newtab/lib/PanelTestProvider.jsm_fix 2022-10-16 06:24:48.095827505 -0500
-@@ -377,87 +377,6 @@
+@@ -1000,7 +699,6 @@ const BASE_MESSAGES = () => [
+ icon: "chrome://browser/skin/controlcenter/3rdpartycookies.svg",
+ icon_class: "cfr-doorhanger-small-icon",
+ persistent_doorhanger: true,
+- show_in_private_browsing: true,
+ heading_text: {
+ string_id: "cfr-cbh-header",
+ },
+diff --git a/browser/components/newtab/lib/PanelTestProvider.sys.mjs b/browser/components/newtab/lib/PanelTestProvider.sys.mjs
+index b5ff592..22cdf39 100644
+--- a/browser/components/newtab/lib/PanelTestProvider.sys.mjs 2022-10-16 05:35:50.835203327 -0500
++++ b/browser/components/newtab/lib/PanelTestProvider.sys.mjs 2022-10-16 06:24:48.095827505 -0500
+@@ -367,85 +374,6 @@ const MESSAGES = () => [
+ frequency: { lifetime: 3 },
trigger: { id: "defaultBrowserCheck" },
},
- {
+- {
- id: "PB_FOCUS_PROMO",
- groups: ["panel-test-provider"],
- template: "spotlight",
@@ -420,8 +422,7 @@ diff -Nru source/browser/components/newtab/lib/PanelTestProvider.jsm source/brow
- ios: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
+- args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -431,8 +432,7 @@ diff -Nru source/browser/components/newtab/lib/PanelTestProvider.jsm source/brow
- android: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
+- args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -471,13 +471,12 @@ diff -Nru source/browser/components/newtab/lib/PanelTestProvider.jsm source/brow
- },
- trigger: { id: "defaultBrowserCheck" },
- },
-- {
+ {
id: "PB_NEWTAB_VPN_PROMO",
template: "pb_newtab",
- content: {
-diff -Nru source_orig/browser/components/preferences/jar.mn source/browser/components/preferences/jar.mn
---- source_orig/browser/components/preferences/jar.mn 2022-05-22 09:35:55.400673986 +0000
-+++ source/browser/components/preferences/jar.mn 2022-05-22 21:45:51.512354083 +0000
+diff -Nru a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
+--- a/browser/components/preferences/jar.mn 2022-05-22 09:35:55.400673986 +0000
++++ b/browser/components/preferences/jar.mn 2022-05-22 21:45:51.512354083 +0000
@@ -18,7 +18,5 @@
content/browser/preferences/fxaPairDevice.xhtml
content/browser/preferences/fxaPairDevice.js
@@ -486,26 +485,26 @@ diff -Nru source_orig/browser/components/preferences/jar.mn source/browser/compo
- content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg
content/browser/preferences/web-appearance-dark.svg
content/browser/preferences/web-appearance-light.svg
-diff -Nru source_orig/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg source/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg
---- source_orig/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg 2022-05-22 09:35:55.400673986 +0000
-+++ source/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg 1970-01-01 00:00:00.000000000 +0000
+diff -Nru a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg
+--- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg 2022-05-22 09:35:55.400673986 +0000
++++ b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-
-
-diff -Nru source_orig/browser/components/preferences/more-from-mozilla-qr-code-simple.svg source/browser/components/preferences/more-from-mozilla-qr-code-simple.svg
---- source_orig/browser/components/preferences/more-from-mozilla-qr-code-simple.svg 2022-05-22 09:35:55.404674027 +0000
-+++ source/browser/components/preferences/more-from-mozilla-qr-code-simple.svg 1970-01-01 00:00:00.000000000 +0000
+diff -Nru a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg
+--- a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg 2022-05-22 09:35:55.404674027 +0000
++++ b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-
-
\ No newline at end of file
-diff -Nru source_orig/browser/components/preferences/moreFromMozilla.js source/browser/components/preferences/moreFromMozilla.js
---- source_orig/browser/components/preferences/moreFromMozilla.js 2022-05-22 09:35:55.404674027 +0000
-+++ source/browser/components/preferences/moreFromMozilla.js 2022-05-22 21:42:46.814391896 +0000
+diff -Nru a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js
+--- a/browser/components/preferences/moreFromMozilla.js 2022-05-22 09:35:55.404674027 +0000
++++ b/browser/components/preferences/moreFromMozilla.js 2022-05-22 21:42:46.814391896 +0000
@@ -81,38 +81,7 @@
},
@@ -546,9 +545,9 @@ diff -Nru source_orig/browser/components/preferences/moreFromMozilla.js source/b
if (BrowserUtils.shouldShowVPNPromo()) {
const vpn = {
-diff -Nru source_orig/browser/components/privatebrowsing/content/assets/focus-qr-code.svg source/browser/components/privatebrowsing/content/assets/focus-qr-code.svg
---- source_orig/browser/components/privatebrowsing/content/assets/focus-qr-code.svg 2022-05-22 09:35:55.412674110 +0000
-+++ source/browser/components/privatebrowsing/content/assets/focus-qr-code.svg 1970-01-01 00:00:00.000000000 +0000
+diff -Nru a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg
+--- a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg 2022-05-22 09:35:55.412674110 +0000
++++ b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg 1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-