From 7e0d8edf2b402cc87aa1678237179c3c66d40ad2 Mon Sep 17 00:00:00 2001
From: Jon Kuperman <jon.kuperman@gmail.com>
Date: Fri, 4 Nov 2016 12:25:18 -0700
Subject: [PATCH] payments advanced settings button hidden when payments
 disabled

---
 js/about/preferences.js            |  2 +-
 test/components/ledgerPanelTest.js | 25 ++++++++++++++++++++++++-
 test/lib/selectors.js              |  1 +
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/js/about/preferences.js b/js/about/preferences.js
index c14d5c0557d..5a6794d1b6d 100644
--- a/js/about/preferences.js
+++ b/js/about/preferences.js
@@ -1247,7 +1247,7 @@ class PaymentsTab extends ImmutableComponent {
             <span data-l10n-id='off' />
             <SettingCheckbox dataL10nId='on' prefKey={settings.PAYMENTS_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
           </div>
-          { this.props.ledgerData.get('created') ? <Button l10nId='advancedSettings' className='whiteButton inlineButton' onClick={this.props.showOverlay.bind(this, 'advancedSettings')} /> : null }
+          { this.props.ledgerData.get('created') && this.enabled ? <Button l10nId='advancedSettings' className='advancedSettings whiteButton inlineButton' onClick={this.props.showOverlay.bind(this, 'advancedSettings')} /> : null }
         </div>
       </div>
       {
diff --git a/test/components/ledgerPanelTest.js b/test/components/ledgerPanelTest.js
index bf089bb6ddb..50bf3178895 100644
--- a/test/components/ledgerPanelTest.js
+++ b/test/components/ledgerPanelTest.js
@@ -1,7 +1,7 @@
 /* global describe, it, beforeEach, before */
 
 const Brave = require('../lib/brave')
-const {urlInput, addFundsButton, paymentsStatus, paymentsWelcomePage, paymentsTab, walletSwitch, ledgerTable} = require('../lib/selectors')
+const {urlInput, advancedSettings, addFundsButton, paymentsStatus, paymentsWelcomePage, paymentsTab, walletSwitch, ledgerTable} = require('../lib/selectors')
 const assert = require('assert')
 
 const prefsUrl = 'about:preferences'
@@ -78,6 +78,29 @@ describe('Payments Panel', function () {
         }, ledgerAPIWaitTimeout)
     })
 
+    it('advanced settings is hidden by default', function * () {
+      yield this.app.client
+        .tabByIndex(0)
+        .loadUrl(prefsUrl)
+        .waitForVisible(paymentsTab)
+        .click(paymentsTab)
+        .waitForVisible(paymentsWelcomePage)
+        .waitForVisible(walletSwitch)
+        .waitForVisible(advancedSettings, 100, true)
+    })
+
+    it('advanced settings is visible when payments are enabled', function * () {
+      yield this.app.client
+        .tabByIndex(0)
+        .loadUrl(prefsUrl)
+        .waitForVisible(paymentsTab)
+        .click(paymentsTab)
+        .waitForVisible(paymentsWelcomePage)
+        .waitForVisible(walletSwitch)
+        .click(walletSwitch)
+        .waitForVisible(advancedSettings, ledgerAPIWaitTimeout)
+    })
+
     it('can create wallet', function * () {
       yield this.app.client
         .tabByIndex(0)
diff --git a/test/lib/selectors.js b/test/lib/selectors.js
index 22a7c2368d1..c4ae44c7868 100644
--- a/test/lib/selectors.js
+++ b/test/lib/selectors.js
@@ -54,6 +54,7 @@ module.exports = {
   homepageInput: '[data-l10n-id="homepageInput"]',
   walletSwitch: '.enablePaymentsSwitch .switchBackground',
   addFundsButton: '.addFunds',
+  advancedSettings: '.advancedSettings',
   fundsSelectBox: '#fundsSelectBox',
   paymentsStatus: '#walletStatus',
   ledgerTable: '#ledgerTable',