From 3bc7c1f5bca72db7cf0db7600bffd50abe953813 Mon Sep 17 00:00:00 2001
From: Cezar Augusto <cezaraugusto@outlook.it>
Date: Sun, 6 Aug 2017 20:03:55 -0300
Subject: [PATCH] Manual backport of code changed in 0.21.x which caused
 conflict with BAT Mercury.

Details:
Because the settings were renamed, git didn't properly handle changes when cherry-picking backwards.
This caused the code in 0.19.x and 0.20.x to use the naming from 0.21.x

Merge pull request #10164 from luixxiul/polish-hideLower
Replace hideLower with showLess
https://github.com/brave/browser-laptop/commit/f0d9c3dc13484c318539fee01fcc13a719845864

Merge pull request #10441 from brave/10322
add support for legacy ledger settings
https://github.com/brave/browser-laptop/commit/052277d76b0630ea40197ef4d66f6b3a82d29d82

Also includes fixes from https://github.com/brave/browser-laptop/commit/9ad7b4fa208fa61488c92d8f27ecd965d3d90ca1 (most of this commit was already backported, just grabbed the settings migration fixes)

Auditors: @NejcZdovc, @luixxiul, @cezaraugusto

Fixes https://github.com/brave/browser-laptop/issues/11261
Fixes https://github.com/brave/browser-laptop/issues/11260
Fixes https://github.com/brave/browser-laptop/issues/11250
Fixes https://github.com/brave/browser-laptop/issues/11246
Fixes https://github.com/brave/browser-laptop/issues/11263
---
 .../locales/en-US/preferences.properties      |  4 +-
 .../preferences/payment/advancedSettings.js   |  6 +-
 .../preferences/payment/ledgerTable.js        | 18 ++---
 .../components/preferences/paymentsTab.js     |  2 +-
 app/sessionStore.js                           | 31 ++++++++-
 docs/state.md                                 | 42 +++++++-----
 js/constants/appConfig.js                     | 67 +++++++++++++------
 js/constants/settings.js                      | 49 +++++++++-----
 js/settings.js                                | 10 ++-
 test/about/ledgerPanelTest.js                 |  6 +-
 test/unit/app/sessionStoreTest.js             | 49 +++++++++++++-
 test/unit/settingsTest.js                     | 26 +------
 12 files changed, 204 insertions(+), 106 deletions(-)

diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
index 6c986ad75f4..d2f3d073a4a 100644
--- a/app/extensions/brave/locales/en-US/preferences.properties
+++ b/app/extensions/brave/locales/en-US/preferences.properties
@@ -373,8 +373,8 @@ checkDefaultOnStartup=Always check on startup
 dashboardSettingsTitle=Dashboard
 dashboardShowImages=Show images
 requiresRestart=* Requires browser restart
-showAll=Show all
-hideLower=Hide lower
+showAll=Show All
+showLess=Show Less
 scaleSizeSmaller=Smaller
 scaleSizeNormal=Normal
 scaleSizeLarger=Larger
diff --git a/app/renderer/components/preferences/payment/advancedSettings.js b/app/renderer/components/preferences/payment/advancedSettings.js
index d5236dd6ba6..ba7bbc02e96 100644
--- a/app/renderer/components/preferences/payment/advancedSettings.js
+++ b/app/renderer/components/preferences/payment/advancedSettings.js
@@ -34,8 +34,8 @@ class AdvancedSettingsContent extends ImmutableComponent {
           <SettingItem>
             <SettingDropdown
               data-test-id='durationSelector'
-              defaultValue={minPublisherDuration || appConfig.defaultSettings[settings.MINIMUM_VISIT_TIME]}
-              onChange={changeSetting.bind(null, this.props.onChangeSetting, settings.MINIMUM_VISIT_TIME)}>
+              defaultValue={minPublisherDuration || appConfig.defaultSettings[settings.PAYMENTS_MINIMUM_VISIT_TIME]}
+              onChange={changeSetting.bind(null, this.props.onChangeSetting, settings.PAYMENTS_MINIMUM_VISIT_TIME)}>
               <option data-l10n-id='minimumPageTimeLow' value='5000' />
               <option data-l10n-id='minimumPageTimeMedium' value='8000' />
               <option data-l10n-id='minimumPageTimeHigh' value='60000' />
@@ -73,7 +73,7 @@ class AdvancedSettingsContent extends ImmutableComponent {
           <SettingCheckbox
             dataTestId='payment-advance-nonverified'
             dataL10nId='nonVerifiedPublishers'
-            prefKey={settings.PAYMENTS_NON_VERIFIED}
+            prefKey={settings.PAYMENTS_ALLOW_NON_VERIFIED}
             settings={this.props.settings}
             onChangeSetting={this.props.onChangeSetting}
             className={css(styles.listItem, commonStyles.noMarginBottom)}
diff --git a/app/renderer/components/preferences/payment/ledgerTable.js b/app/renderer/components/preferences/payment/ledgerTable.js
index b409d2c7df8..23c75054705 100644
--- a/app/renderer/components/preferences/payment/ledgerTable.js
+++ b/app/renderer/components/preferences/payment/ledgerTable.js
@@ -33,7 +33,7 @@ class LedgerTable extends ImmutableComponent {
   }
 
   showAll (value) {
-    this.props.onChangeSetting(settings.HIDE_LOWER_SITES, value)
+    this.props.onChangeSetting(settings.PAYMENTS_SITES_SHOW_LESS, value)
   }
 
   getFormattedTime (synopsis) {
@@ -235,7 +235,7 @@ class LedgerTable extends ImmutableComponent {
     }
 
     const allRows = this.synopsis.filter(synopsis => {
-      return (!getSetting(settings.HIDE_EXCLUDED_SITES, this.props.settings) || this.enabledForSite(synopsis)) &&
+      return (!getSetting(settings.PAYMENTS_SITES_HIDE_EXCLUDED, this.props.settings) || this.enabledForSite(synopsis)) &&
         this.shouldShow(synopsis)
     })
     const pinnedRows = allRows.filter(synopsis => {
@@ -246,9 +246,9 @@ class LedgerTable extends ImmutableComponent {
     })
 
     const totalUnPinnedRows = unPinnedRows.size
-    const hideLower = getSetting(settings.HIDE_LOWER_SITES, this.props.settings)
+    const showLess = getSetting(settings.PAYMENTS_SITES_SHOW_LESS, this.props.settings)
 
-    if (hideLower && totalUnPinnedRows > 10) {
+    if (showLess && totalUnPinnedRows > 10) {
       let sumUnPinned = 0
       let threshold = 90
       const limit = 0.9 // show only 90th of publishers
@@ -260,7 +260,7 @@ class LedgerTable extends ImmutableComponent {
       })
     }
 
-    const showButton = (hideLower && totalUnPinnedRows !== unPinnedRows.size) || (!hideLower && totalUnPinnedRows > 10)
+    const showButton = (showLess && totalUnPinnedRows !== unPinnedRows.size) || (!showLess && totalUnPinnedRows > 10)
 
     return <section data-test-id='ledgerTable'>
       <div className={css(styles.hideExcludedSites)}>
@@ -268,7 +268,7 @@ class LedgerTable extends ImmutableComponent {
         <div className={css(styles.rightColumn)}>
           <SettingCheckbox small
             dataL10nId='hideExcluded'
-            prefKey={settings.HIDE_EXCLUDED_SITES}
+            prefKey={settings.PAYMENTS_SITES_HIDE_EXCLUDED}
             settings={this.props.settings}
             onChangeSetting={this.props.onChangeSetting}
           />
@@ -308,9 +308,9 @@ class LedgerTable extends ImmutableComponent {
         showButton
         ? <div className={css(styles.ledgerTable__showAllWrap)}>
           <BrowserButton secondaryColor
-            testId={hideLower ? 'showAll' : 'hideLower'}
-            l10nId={hideLower ? 'showAll' : 'hideLower'}
-            onClick={this.showAll.bind(this, !hideLower)}
+            testId={showLess ? 'showAll' : 'showLess'}
+            l10nId={showLess ? 'showAll' : 'showLess'}
+            onClick={this.showAll.bind(this, !showLess)}
           />
         </div>
         : null
diff --git a/app/renderer/components/preferences/paymentsTab.js b/app/renderer/components/preferences/paymentsTab.js
index a9909fd7733..a025ed45f12 100644
--- a/app/renderer/components/preferences/paymentsTab.js
+++ b/app/renderer/components/preferences/paymentsTab.js
@@ -226,7 +226,7 @@ class PaymentsTab extends ImmutableComponent {
               <div className={css(styles.switchWrap__autoSuggestSwitch)}>
                 <div className={css(styles.flexAlignCenter, styles.autoSuggestSwitch__subtext)}>
                   <SettingCheckbox dataL10nId='autoSuggestSites'
-                    prefKey={settings.AUTO_SUGGEST_SITES}
+                    prefKey={settings.PAYMENTS_SITES_AUTO_SUGGEST}
                     settings={this.props.settings}
                     disabled={!enabled}
                     onChangeSetting={this.props.onChangeSetting}
diff --git a/app/sessionStore.js b/app/sessionStore.js
index a80388112cb..670e98eeda3 100644
--- a/app/sessionStore.js
+++ b/app/sessionStore.js
@@ -532,14 +532,43 @@ module.exports.runPreMigrations = (data) => {
       data.autofill.creditCards.guid = guids
     }
   }
-  // xml migration
   if (data.settings) {
+    // xml migration
     if (data.settings[settings.DEFAULT_SEARCH_ENGINE] === 'content/search/google.xml') {
       data.settings[settings.DEFAULT_SEARCH_ENGINE] = 'Google'
     }
     if (data.settings[settings.DEFAULT_SEARCH_ENGINE] === 'content/search/duckduckgo.xml') {
       data.settings[settings.DEFAULT_SEARCH_ENGINE] = 'DuckDuckGo'
     }
+    // ledger payments migration. see PR #10164
+    // changes was introduced in 0.21.x.
+    // if legacy setting exist, make sure the new setting inherits the legacy value
+    if (data.settings[settings.AUTO_SUGGEST_SITES] != null) {
+      data.settings[settings.PAYMENTS_SITES_AUTO_SUGGEST] = data.settings[settings.AUTO_SUGGEST_SITES]
+      delete data.settings[settings.AUTO_SUGGEST_SITES]
+    }
+    if (data.settings[settings.MINIMUM_VISIT_TIME] != null) {
+      data.settings[settings.PAYMENTS_MINIMUM_VISIT_TIME] = data.settings[settings.MINIMUM_VISIT_TIME]
+      delete data.settings[settings.MINIMUM_VISIT_TIME]
+    }
+    if (data.settings[settings.MINIMUM_VISITS] != null) {
+      data.settings[settings.PAYMENTS_MINIMUM_VISITS] = data.settings[settings.MINIMUM_VISITS]
+      delete data.settings[settings.MINIMUM_VISITS]
+    }
+    if (data.settings[settings.HIDE_LOWER_SITES] != null) {
+      data.settings[settings.PAYMENTS_SITES_SHOW_LESS] = data.settings[settings.HIDE_LOWER_SITES]
+      delete data.settings[settings.HIDE_LOWER_SITES]
+    }
+    if (data.settings[settings.HIDE_EXCLUDED_SITES] != null) {
+      data.settings[settings.PAYMENTS_SITES_HIDE_EXCLUDED] = data.settings[settings.HIDE_EXCLUDED_SITES]
+      delete data.settings[settings.HIDE_EXCLUDED_SITES]
+    }
+    // PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED kept the same
+    // constant but has its value changed.
+    if (data.settings['payments.notificationTryPaymentsDismissed'] != null) {
+      data.settings[settings.PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED] = data.settings['payments.notificationTryPaymentsDismissed']
+      delete data.settings['payments.notificationTryPaymentsDismissed']
+    }
   }
 
   return data
diff --git a/docs/state.md b/docs/state.md
index b1f8fa2f8ed..7599818da6f 100644
--- a/docs/state.md
+++ b/docs/state.md
@@ -299,21 +299,14 @@ AppStore
   settings: {
     // See defaults in js/constants/appConfig.js
     'adblock.customRules': string, // custom rules in ABP filter syntax
-    'advanced.auto-suggest-sites': boolean, // show auto suggestion
     'advanced.default-zoom-level': number, // the default zoom level for sites that have no specific setting
     'advanced.hardware-acceleration-enabled': boolean, // false if hardware acceleration should be explicitly disabled
-    'advanced.hide-excluded-sites': boolean, // whether to hide excluded sites in the payments list
-    'advanced.minimum-visit-time': number,
-    'advanced.minimum-visits': number,
-    'advanced.minimum-percentage': boolean,
     'advanced.pdfjs-enabled': boolean, // whether or not to render PDF documents in the browser
     'advanced.send-crash-reports': boolean, // true or undefined if crash reports should be sent
     'advanced.send-usage-statistics': boolean, // true or undefined if usage reports should be sent
     'advanced.smooth-scroll-enabled': boolean, // false if smooth scrolling should be explicitly disabled
     'advanced.torrent-viewer-enabled': boolean, // whether to render magnet links in the browser
     'bookmarks.toolbar.show': boolean, // true if the bookmakrs toolbar should be shown
-    'bookmarks.toolbar.showFavicon': boolean, // true if bookmark favicons should be shown on the bookmarks toolbar
-    'bookmarks.toolbar.showOnlyFavicon': boolean, // true if only favicons should be shown on the bookmarks toolbar
     'extensions.pocket.enabled': boolean, // true if pocket is enabled
     'extensions.vimium.enabled': boolean, // true if vimium is enabled
     'extensions.honey.enabled': boolean, // true if Honey is enabled
@@ -332,10 +325,18 @@ AppStore
     'general.useragent.value': (undefined|string), // custom user agent value
     'notification-add-funds-timestamp': number, // timestamp on which we decide if we will show notification Add founds
     'notification-reconcile-soon-timestamp': number, // timestamp
+    'payments.allow-non-verified-publishers': boolean,
     'payments.contribution-amount': number, // in USD
     'payments.enabled': boolean, // true if the Payments pane is active
+    'payments.minimum-visit-time': number,
+    'payments.minimum-visits': number,
+    'payments.notification-add-funds-timestamp': number,
+    'payments.notification-reconcile-soon-timestamp': number,
+    'payments.notification-try-payments-dismissed': boolean, // true if you dismiss the message or enable Payments
     'payments.notifications': boolean, // true to show payment notifications
-    'payments.notificationTryPaymentsDismissed': boolean, // true if you dismiss the message or enable Payments
+    'payments.sites-auto-suggest': boolean, // show auto suggestion
+    'payments.sites-hide-excluded': boolean, // whether to hide excluded sites in the payments list
+    'payments.sites-show-less': boolean, // whether to show less sites in the payments list
     'privacy.autocomplete.history-size': number, // number of autocomplete entries to keep
     'privacy.autofill-enabled': boolean, // true to enable autofill
     'privacy.block-canvas-fingerprinting': boolean, // canvas fingerprinting defense
@@ -350,12 +351,6 @@ AppStore
     'shields.blocked-count-badge': boolean, // true if blocked counts on the shield button should be enabled
     'shields.compact-bravery-panel': boolean, // true if the compact Bravery panel should be enabled
     'security.passwords.active-password-manager': string, // name of active password manager
-    'security.passwords.bitwarden-enabled': boolean, // true if the bitwarden extension should be enabled
-    'security.passwords.dashlane-enabled': boolean, // true if the Dashlane extension should be enabled
-    'security.passwords.enpass-enabled': boolean, // true if the Enpass extension should be enabled
-    'security.passwords.last-pass-enabled': boolean, // true if the Last password extension should be enabled
-    'security.passwords.manager-enabled': boolean, // whether to use default password manager
-    'security.passwords.one-password-enabled': boolean, // true if the 1Password extension should be enabled
     'security.fullscreen.content': string, // whether or not user choose to allow fullscreen content by default
     'shutdown.clear-all-site-cookies': boolean, // true to clear all site cookies on shutdown
     'shutdown.clear-autocomplete-data': boolean, // true to clear all autocomplete data on shutdown
@@ -368,7 +363,24 @@ AppStore
     'tabs.paint-tabs': boolean, // true if the page theme color and favicon color should be used for tabs
     'tabs.show-tab-previews': boolean, // true to show tab previews
     'tabs.switch-to-new-tabs': boolean, // true if newly opened tabs should be focused immediately
-    'tabs.tabs-per-page': number // number of tabs per tab page
+    'tabs.tabs-per-page': number, // number of tabs per tab page
+
+    // DEPRECATED with 0.11.4
+    'security.passwords.dashlane-enabled': boolean, // true if the Dashlane extension should be enabled
+    'security.passwords.last-pass-enabled': boolean, // true if the Last password extension should be enabled
+    'security.passwords.manager-enabled': boolean, // whether to use default password manager
+    'security.passwords.one-password-enabled': boolean, // true if the 1Password extension should be enabled
+
+    // DEPRECATED with 0.12.6
+    'bookmarks.toolbar.showFavicon': boolean, // true if bookmark favicons should be shown on the bookmarks toolbar
+    'bookmarks.toolbar.showOnlyFavicon': boolean, // true if only favicons should be shown on the bookmarks toolbar
+
+    // DEPRECATED with 0.21.0
+    'advanced.hide-excluded-sites': boolean, // whether to hide excluded sites in the payments list
+    'advanced.hide-lower-sites': boolean,
+    'advanced.minimum-visit-time': number,
+    'advanced.minimum-visits': number,
+    'advanced.auto-suggest-sites': boolean // show auto suggestion
   },
   sites: {
     [siteKey]: {
diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
index dad73529747..33ee3961f6c 100644
--- a/js/constants/appConfig.js
+++ b/js/constants/appConfig.js
@@ -151,25 +151,9 @@ module.exports = {
     'privacy.autocomplete.history-size': 500,
     'privacy.block-canvas-fingerprinting': false,
     'bookmarks.toolbar.show': false,
-    'bookmarks.toolbar.showFavicon': false,
-    'bookmarks.toolbar.showOnlyFavicon': false,
-    'payments.enabled': false,
-    'payments.notifications': false,
-    'payments.allow-non-verified-publishers': true,
-    // "Add funds to your wallet" -- Limit to once every n days to reduce nagging.
-    'payments.notification-add-funds-timestamp': null,
-    // "Out of money, pls add" / "In 24h we'll pay publishers [Review]"
-    // After shown, set timestamp to next reconcile time - 1 day.
-    'payments.notification-reconcile-soon-timestamp': null,
-    'payments.notificationTryPaymentsDismissed': false, // True if you dismiss the message or enable Payments
-    'payments.contribution-amount': 5, // USD
     'privacy.autofill-enabled': true,
     'privacy.do-not-track': false,
     'security.passwords.active-password-manager': null, // Set in settings.js by passwordManagerDefault (defaults to built in)
-    'security.passwords.manager-enabled': true,
-    'security.passwords.one-password-enabled': false,
-    'security.passwords.dashlane-enabled': false,
-    'security.passwords.last-pass-enabled': false,
     'security.passwords.enpass-enabled': false,
     'security.passwords.bitwarden-enabled': false,
     'security.fullscreen.content': fullscreenOption.ALWAYS_ASK,
@@ -190,6 +174,23 @@ module.exports = {
     // have immersive mode w/ touch makes it too hard to enter a URL.
     // Tracking issue for that and to re-enable title mode on Windows is at #9900.
     'general.disable-title-mode': process.platform === 'linux' || process.platform === 'win32',
+    // payments
+    'payments.allow-non-verified-publishers': true,
+    'payments.contribution-amount': 5, // USD
+    'payments.enabled': false,
+    'payments.minimum-visit-time': 8000,
+    'payments.minimum-visits': 1,
+    // "Add funds to your wallet" -- Limit to once every n days to reduce nagging.
+    'payments.notification-add-funds-timestamp': null,
+    // "Out of money, pls add" / "In 24h we'll pay publishers [Review]"
+    // After shown, set timestamp to next reconcile time - 1 day.
+    'payments.notification-reconcile-soon-timestamp': null,
+    'payments.notification-try-payments-dismissed': false, // True if you dismiss the message or enable Payments
+    'payments.notifications': false,
+    'payments.sites-auto-suggest': true,
+    'payments.sites-hide-excluded': false,
+    'payments.sites-show-less': true,
+    // advanced
     'advanced.hardware-acceleration-enabled': true,
     'advanced.default-zoom-level': null,
     'advanced.pdfjs-enabled': true,
@@ -198,11 +199,6 @@ module.exports = {
     'advanced.send-crash-reports': true,
     'advanced.send-usage-statistics': false,
     'advanced.update-to-preview-releases': false,
-    'advanced.hide-excluded-sites': false,
-    'advanced.minimum-visit-time': 8000,
-    'advanced.minimum-visits': 1,
-    'advanced.auto-suggest-sites': true,
-    'advanced.hide-lower-sites': true,
     'advanced.toolbar-ui-scale': 'normal',
     'advanced.swipe-nav-distance': 101,
     'shutdown.clear-history': false,
@@ -220,7 +216,34 @@ module.exports = {
     'general.bookmarks-toolbar-mode': null,
     'general.is-default-browser': null,
     'notification-add-funds-timestamp': null,
-    'notification-reconcile-soon-timestamp': null
+    'notification-reconcile-soon-timestamp': null,
+
+    // DEPRECATED settings
+    // DO NOT REMOVE OR CHANGE THESE VALUES
+    // ########################
+    // These values should only ever be references from ./settings.js
+    // Any place using those should have a migration to convert the value
+    // ########################
+
+    // START - DEPRECATED WITH 0.11.4
+    'security.passwords.manager-enabled': true,
+    'security.passwords.one-password-enabled': false,
+    'security.passwords.dashlane-enabled': false,
+    'security.passwords.last-pass-enabled': false,
+    // END - DEPRECATED WITH 0.11.4
+
+    // START - DEPRECATED WITH 0.12.6
+    'bookmarks.toolbar.showFavicon': false,
+    'bookmarks.toolbar.showOnlyFavicon': false,
+    // END - DEPRECATED WITH 0.12.6
+
+    // START - DEPRECATED WITH 0.21.0
+    'advanced.hide-excluded-sites': false,
+    'advanced.minimum-visit-time': 8000,
+    'advanced.minimum-visits': 1,
+    'advanced.auto-suggest-sites': true,
+    'advanced.hide-lower-sites': true
+    // END - DEPRECATED WITH 0.21.0
   },
   defaultFavicon: 'img/empty_favicon.png'
 }
diff --git a/js/constants/settings.js b/js/constants/settings.js
index fdf7180c5f1..1e0801c2fe3 100644
--- a/js/constants/settings.js
+++ b/js/constants/settings.js
@@ -53,13 +53,18 @@ const settings = {
   // Autofill
   AUTOFILL_ENABLED: 'privacy.autofill-enabled',
   // Payments Tab
+  PAYMENTS_ALLOW_NON_VERIFIED: 'payments.allow-non-verified-publishers',
+  PAYMENTS_CONTRIBUTION_AMOUNT: 'payments.contribution-amount',
   PAYMENTS_ENABLED: 'payments.enabled',
-  PAYMENTS_NOTIFICATIONS: 'payments.notifications',
+  PAYMENTS_MINIMUM_VISIT_TIME: 'payments.minimum-visit-time',
+  PAYMENTS_MINIMUM_VISITS: 'payments.minimum-visits',
   PAYMENTS_NOTIFICATION_ADD_FUNDS_TIMESTAMP: 'notification-add-funds-timestamp',
   PAYMENTS_NOTIFICATION_RECONCILE_SOON_TIMESTAMP: 'notification-reconcile-soon-timestamp',
-  PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED: 'payments.notificationTryPaymentsDismissed',
-  PAYMENTS_CONTRIBUTION_AMOUNT: 'payments.contribution-amount',
-  PAYMENTS_NON_VERIFIED: 'payments.allow-non-verified-publishers',
+  PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED: 'payments.notification-try-payments-dismissed',
+  PAYMENTS_NOTIFICATIONS: 'payments.notifications',
+  PAYMENTS_SITES_AUTO_SUGGEST: 'payments.sites-auto-suggest',
+  PAYMENTS_SITES_HIDE_EXCLUDED: 'payments.sites-hide-excluded',
+  PAYMENTS_SITES_SHOW_LESS: 'payments.sites-show-less',
   // Shields Tab
   BLOCKED_COUNT_BADGE: 'shields.blocked-count-badge',
   COMPACT_BRAVERY_PANEL: 'shields.compact-bravery-panel',
@@ -73,11 +78,6 @@ const settings = {
   SEND_USAGE_STATISTICS: 'advanced.send-usage-statistics',
   UPDATE_TO_PREVIEW_RELEASES: 'advanced.update-to-preview-releases',
   ADBLOCK_CUSTOM_RULES: 'adblock.customRules',
-  HIDE_EXCLUDED_SITES: 'advanced.hide-excluded-sites',
-  HIDE_LOWER_SITES: 'advanced.hide-lower-sites',
-  MINIMUM_VISIT_TIME: 'advanced.minimum-visit-time',
-  MINIMUM_VISITS: 'advanced.minimum-visits',
-  AUTO_SUGGEST_SITES: 'advanced.auto-suggest-sites',
   TOOLBAR_UI_SCALE: 'advanced.toolbar-ui-scale',
   SWIPE_NAV_DISTANCE: 'advanced.swipe-nav-distance',
   // Sync settings
@@ -87,26 +87,39 @@ const settings = {
   SYNC_TYPE_HISTORY: 'sync.type.history',
   SYNC_TYPE_SITE_SETTING: 'sync.type.siteSetting',
   SYNC_NETWORK_DISABLED: 'sync.network.disabled', // disable network connection to sync server. only used in testing.
+  // Extension settings
+  POCKET_ENABLED: 'extensions.pocket.enabled',
+  VIMIUM_ENABLED: 'extensions.vimium.enabled',
+  HONEY_ENABLED: 'extensions.honey.enabled',
+  PINTEREST_ENABLED: 'extensions.pinterest.enabled',
+  METAMASK_ENABLED: 'extensions.metamask.enabled',
+
   // DEPRECATED settings
+  // DO NOT REMOVE OR CHANGE THESE VALUES
   // ########################
   // these constants should not appear outside of this file, ../settings.js, and our tests
   // NOTE: these settings rely on default values being set in ./appConfig.js
   // ########################
-  // > phased out with 0.11.4
+
+  // START - DEPRECATED WITH 0.11.4
   PASSWORD_MANAGER_ENABLED: 'security.passwords.manager-enabled',
   ONE_PASSWORD_ENABLED: 'security.passwords.one-password-enabled',
   DASHLANE_ENABLED: 'security.passwords.dashlane-enabled',
   LAST_PASS_ENABLED: 'security.passwords.last-pass-enabled',
-  ENPASS_ENABLED: 'security.passwords.enpass-enabled',
-  BITWARDEN_ENABLED: 'security.passwords.bitwarden-enabled',
-  // > phased out with 0.12.6
+  // END - DEPRECATED WITH 0.11.4
+
+  // START - DEPRECATED WITH 0.12.6
   SHOW_BOOKMARKS_TOOLBAR_FAVICON: 'bookmarks.toolbar.showFavicon',
   SHOW_BOOKMARKS_TOOLBAR_ONLY_FAVICON: 'bookmarks.toolbar.showOnlyFavicon',
-  POCKET_ENABLED: 'extensions.pocket.enabled',
-  VIMIUM_ENABLED: 'extensions.vimium.enabled',
-  HONEY_ENABLED: 'extensions.honey.enabled',
-  PINTEREST_ENABLED: 'extensions.pinterest.enabled',
-  METAMASK_ENABLED: 'extensions.metamask.enabled'
+  // END - DEPRECATED WITH 0.12.6
+
+  // START - DEPRECATED WITH 0.21.0
+  HIDE_EXCLUDED_SITES: 'advanced.hide-excluded-sites',
+  HIDE_LOWER_SITES: 'advanced.hide-lower-sites',
+  MINIMUM_VISIT_TIME: 'advanced.minimum-visit-time',
+  MINIMUM_VISITS: 'advanced.minimum-visits',
+  AUTO_SUGGEST_SITES: 'advanced.auto-suggest-sites'
+  // END - DEPRECATED WITH 0.21.0
 }
 
 module.exports = settings
diff --git a/js/settings.js b/js/settings.js
index 2c30237a838..58c8636531d 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -8,6 +8,8 @@ const settings = require('./constants/settings')
 const {passwordManagers, defaultPasswordManager, extensionIds, displayNames} = require('./constants/passwordManagers')
 const {bookmarksToolbarMode} = require('../app/common/constants/settingsEnums')
 
+// individual settings were deprecated with 0.11.4
+// DO NOT ADD TO THIS LIST
 const passwordManagerDefault = (settingKey, settingsCollection) => {
   const onePasswordEnabled = resolveValue(settings.ONE_PASSWORD_ENABLED, settingsCollection) === true
   if (onePasswordEnabled) return passwordManagers.ONE_PASSWORD
@@ -18,18 +20,14 @@ const passwordManagerDefault = (settingKey, settingsCollection) => {
   const lastPassEnabled = resolveValue(settings.LAST_PASS_ENABLED, settingsCollection) === true
   if (lastPassEnabled) return passwordManagers.LAST_PASS
 
-  const enpassEnabled = resolveValue(settings.ENPASS_ENABLED, settingsCollection) === true
-  if (enpassEnabled) return passwordManagers.ENPASS
-
-  const bitwardenEnabled = resolveValue(settings.BITWARDEN_ENABLED, settingsCollection) === true
-  if (bitwardenEnabled) return passwordManagers.BITWARDEN
-
   const disabled = resolveValue(settings.PASSWORD_MANAGER_ENABLED, settingsCollection) === false
   if (disabled) return passwordManagers.UNMANAGED
 
   return defaultPasswordManager
 }
 
+// individual settings were deprecated with 0.12.6
+// DO NOT ADD TO THIS LIST
 const bookmarksBarDefault = (settingKey, settingsCollection) => {
   const faviconsOnly = resolveValue(settings.SHOW_BOOKMARKS_TOOLBAR_ONLY_FAVICON, settingsCollection) === true
   if (faviconsOnly) return bookmarksToolbarMode.FAVICONS_ONLY
diff --git a/test/about/ledgerPanelTest.js b/test/about/ledgerPanelTest.js
index fee65765566..026e10ba7e7 100644
--- a/test/about/ledgerPanelTest.js
+++ b/test/about/ledgerPanelTest.js
@@ -281,7 +281,7 @@ describe('Regular payment panel tests', function () {
     beforeEach(function * () {
       yield setup(this.app.client)
       yield this.app.client
-        .changeSetting(settings.AUTO_SUGGEST_SITES, true)
+        .changeSetting(settings.PAYMENTS_SITES_AUTO_SUGGEST, true)
         .tabByIndex(0)
         .loadUrl(prefsUrl)
         .waitForVisible(paymentsTab)
@@ -322,7 +322,7 @@ describe('Regular payment panel tests', function () {
     it('site is not added automatically', function * () {
       yield this.app.client
         .windowByUrl(Brave.browserWindowUrl)
-        .changeSetting(settings.AUTO_SUGGEST_SITES, false)
+        .changeSetting(settings.PAYMENTS_SITES_AUTO_SUGGEST, false)
         .tabByIndex(0)
         .loadUrl(site1)
         .windowByUrl(Brave.browserWindowUrl)
@@ -357,7 +357,7 @@ describe('Regular payment panel tests', function () {
         .waitForSiteEntry(site1)
         .tabByUrl(site1)
         .windowByUrl(Brave.browserWindowUrl)
-        .changeSetting(settings.AUTO_SUGGEST_SITES, false)
+        .changeSetting(settings.PAYMENTS_SITES_AUTO_SUGGEST, false)
         .tabByIndex(0)
         .loadUrl(site2)
         .windowByUrl(Brave.browserWindowUrl)
diff --git a/test/unit/app/sessionStoreTest.js b/test/unit/app/sessionStoreTest.js
index 012c5f0a31f..5527e1caf80 100644
--- a/test/unit/app/sessionStoreTest.js
+++ b/test/unit/app/sessionStoreTest.js
@@ -964,7 +964,13 @@ describe('sessionStore unit tests', function () {
           creditCards: ['guid1', 'guid2']
         },
         settings: {
-          [settings.DEFAULT_SEARCH_ENGINE]: 'content/search/google.xml'
+          [settings.DEFAULT_SEARCH_ENGINE]: 'content/search/google.xml',
+          [settings.AUTO_SUGGEST_SITES]: 'sure thing',
+          [settings.MINIMUM_VISIT_TIME]: 'almost instantly',
+          [settings.MINIMUM_VISITS]: 'a million',
+          [settings.HIDE_LOWER_SITES]: 'pls do it',
+          [settings.HIDE_EXCLUDED_SITES]: 'no thanks',
+          'payments.notificationTryPaymentsDismissed': 'why would I?'
         }
       }))
       runPreMigrations = sessionStore.runPreMigrations(data.toJS())
@@ -1016,6 +1022,47 @@ describe('sessionStore unit tests', function () {
           assert.equal(newValue, 'DuckDuckGo')
         })
       })
+
+      describe('payments migration', function () {
+        it('sets PAYMENTS_SITES_AUTO_SUGGEST based on AUTO_SUGGEST_SITES', function () {
+          const oldValue = data.getIn(['settings', settings.AUTO_SUGGEST_SITES])
+          const newValue = runPreMigrations.settings[settings.PAYMENTS_SITES_AUTO_SUGGEST]
+          assert.equal(newValue, oldValue)
+        })
+        it('sets PAYMENTS_MINIMUM_VISIT_TIME based on MINIMUM_VISIT_TIME', function () {
+          const oldValue = data.getIn(['settings', settings.MINIMUM_VISIT_TIME])
+          const newValue = runPreMigrations.settings[settings.PAYMENTS_MINIMUM_VISIT_TIME]
+          assert.equal(newValue, oldValue)
+        })
+        it('sets PAYMENTS_MINIMUM_VISITS based on MINIMUM_VISITS', function () {
+          const oldValue = data.getIn(['settings', settings.MINIMUM_VISITS])
+          const newValue = runPreMigrations.settings[settings.PAYMENTS_MINIMUM_VISITS]
+          assert.equal(newValue, oldValue)
+        })
+        it('sets PAYMENTS_SITES_SHOW_LESS based on HIDE_LOWER_SITES', function () {
+          const oldValue = data.getIn(['settings', settings.HIDE_LOWER_SITES])
+          const newValue = runPreMigrations.settings[settings.PAYMENTS_SITES_SHOW_LESS]
+          assert.equal(newValue, oldValue)
+        })
+        it('sets PAYMENTS_SITES_HIDE_EXCLUDED based on HIDE_EXCLUDED_SITES', function () {
+          const oldValue = data.getIn(['settings', settings.HIDE_EXCLUDED_SITES])
+          const newValue = runPreMigrations.settings[settings.PAYMENTS_SITES_HIDE_EXCLUDED]
+          assert.equal(newValue, oldValue)
+        })
+        it('sets PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED based on payments.notificationTryPaymentsDismissed', function () {
+          const oldValue = data.getIn(['settings', 'payments.notificationTryPaymentsDismissed'])
+          const newValue = runPreMigrations.settings[settings.PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED]
+          assert.equal(newValue, oldValue)
+        })
+        it('removes the old values', function () {
+          assert.equal(runPreMigrations.settings[settings.AUTO_SUGGEST_SITES], undefined)
+          assert.equal(runPreMigrations.settings[settings.MINIMUM_VISIT_TIME], undefined)
+          assert.equal(runPreMigrations.settings[settings.MINIMUM_VISITS], undefined)
+          assert.equal(runPreMigrations.settings[settings.HIDE_LOWER_SITES], undefined)
+          assert.equal(runPreMigrations.settings[settings.HIDE_EXCLUDED_SITES], undefined)
+          assert.equal(runPreMigrations.settings['payments.notificationTryPaymentsDismissed'], undefined)
+        })
+      })
     })
   })
 
diff --git a/test/unit/settingsTest.js b/test/unit/settingsTest.js
index e056610b867..846322d9f41 100644
--- a/test/unit/settingsTest.js
+++ b/test/unit/settingsTest.js
@@ -76,25 +76,13 @@ describe('settings unit test', function () {
           assert.equal(response, passwordManagers.LAST_PASS)
         })
 
-        it('returns `Enpass` if ENPASS_ENABLED was true', function () {
-          settingsCollection[settingsConst.ENPASS_ENABLED] = true
-          const response = settings.getSetting(settingsConst.ACTIVE_PASSWORD_MANAGER, settingsCollection)
-          assert.equal(response, passwordManagers.ENPASS)
-        })
-
-        it('returns `bitwarden` if BITWARDEN_ENABLED was true', function () {
-          settingsCollection[settingsConst.BITWARDEN_ENABLED] = true
-          const response = settings.getSetting(settingsConst.ACTIVE_PASSWORD_MANAGER, settingsCollection)
-          assert.equal(response, passwordManagers.BITWARDEN)
-        })
-
         it('returns `BuiltIn` if PASSWORD_MANAGER_ENABLED was true', function () {
           settingsCollection[settingsConst.PASSWORD_MANAGER_ENABLED] = true
           const response = settings.getSetting(settingsConst.ACTIVE_PASSWORD_MANAGER, settingsCollection)
           assert.equal(response, passwordManagers.BUILT_IN)
         })
 
-        it('returns `1Password`/`Dashlane`/`LastPass`/`Enpass`/`bitwarden`, even if PASSWORD_MANAGER_ENABLED was true', function () {
+        it('returns `1Password`/`Dashlane`/`LastPass`, even if PASSWORD_MANAGER_ENABLED was true', function () {
           // 1Password
           settingsCollection[settingsConst.ONE_PASSWORD_ENABLED] = true
           settingsCollection[settingsConst.PASSWORD_MANAGER_ENABLED] = true
@@ -112,18 +100,6 @@ describe('settings unit test', function () {
           settingsCollection[settingsConst.PASSWORD_MANAGER_ENABLED] = true
           response = settings.getSetting(settingsConst.ACTIVE_PASSWORD_MANAGER, settingsCollection)
           assert.equal(response, passwordManagers.LAST_PASS)
-          // Enpass
-          settingsCollection = {}
-          settingsCollection[settingsConst.ENPASS_ENABLED] = true
-          settingsCollection[settingsConst.PASSWORD_MANAGER_ENABLED] = true
-          response = settings.getSetting(settingsConst.ACTIVE_PASSWORD_MANAGER, settingsCollection)
-          assert.equal(response, passwordManagers.ENPASS)
-          // bitwarden
-          settingsCollection = {}
-          settingsCollection[settingsConst.BITWARDEN_ENABLED] = true
-          settingsCollection[settingsConst.PASSWORD_MANAGER_ENABLED] = true
-          response = settings.getSetting(settingsConst.ACTIVE_PASSWORD_MANAGER, settingsCollection)
-          assert.equal(response, passwordManagers.BITWARDEN)
         })
 
         it('returns `Unmanaged` if PASSWORD_MANAGER_ENABLED was false', function () {